dev-libs/apr-util: delete old
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@481 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
@@ -1,58 +0,0 @@
|
||||
--- /usr/portage/dev-libs/apr-util/apr-util-1.2.12.ebuild 2008-06-01 14:06:34.000000000 +0200
|
||||
+++ apr-util-1.3.4-r100.ebuild 2008-01-19 19:41:41.000000000 +0100
|
||||
@@ -12,24 +12,37 @@
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="1"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
|
||||
-IUSE="berkdb doc gdbm ldap mysql postgres sqlite sqlite3"
|
||||
+IUSE="berkdb doc gdbm ldap mozldap mysql postgres sqlite sqlite3"
|
||||
RESTRICT="test"
|
||||
|
||||
-RDEPEND="dev-libs/expat
|
||||
+DEPEND="dev-libs/expat
|
||||
>=dev-libs/apr-${PV}
|
||||
berkdb? ( =sys-libs/db-4* )
|
||||
+ doc? ( app-doc/doxygen )
|
||||
gdbm? ( sys-libs/gdbm )
|
||||
ldap? ( =net-nds/openldap-2* )
|
||||
+ mozldap? ( =dev-libs/mozldap-6*
|
||||
+ =dev-libs/nspr-4*
|
||||
+ =dev-libs/nss-3* )
|
||||
mysql? ( =virtual/mysql-5* )
|
||||
- postgres? ( virtual/postgresql-base )
|
||||
+ postgres? ( dev-db/libpq )
|
||||
sqlite? ( =dev-db/sqlite-2* )
|
||||
sqlite3? ( =dev-db/sqlite-3* )"
|
||||
-DEPEND="${RDEPEND}
|
||||
- doc? ( app-doc/doxygen )"
|
||||
+
|
||||
+pkg_setup() {
|
||||
+ if use ldap && use mozldap ; then
|
||||
+ eerror "you cant activate ldap & mozldap at the same time "
|
||||
+ eerror "plz deactivate \"dev-libs/apr-util -ldap mozldap\" one in"
|
||||
+ eerror "\"etc/portage/package.use\" ;p"
|
||||
+ die "ldap and mozldap USE conflict"
|
||||
+ fi
|
||||
+}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
+
|
||||
+ epatch "${FILESDIR}"/"${PN}"-1.2.10-mozldap60-2.patch
|
||||
|
||||
./buildconf --with-apr=../apr-${PV} || die "buildconf failed"
|
||||
elibtoolize || die "elibtoolize failed"
|
||||
@@ -40,6 +53,12 @@
|
||||
|
||||
use ldap && myconf="${myconf} --with-ldap"
|
||||
|
||||
+ use mozldap && myconf="${myconf} --with-ldap \
|
||||
+ --with-ldap-include=/usr/include/mozldap/ \
|
||||
+ --with-ldap-lib=/usr/$(get_libdir)/mozldap/ \
|
||||
+ --with-nss-lib=/usr/$(get_libdir)/nss/ \
|
||||
+ --with-nspr-lib=/usr/$(get_libdir)/nspr"
|
||||
+
|
||||
if use berkdb; then
|
||||
dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
|
||||
dbver="$(db_ver_to_slot "$dbver")"
|
||||
@@ -1,27 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario-fetka at gmx dot at)
|
||||
Date: 2007-08-20
|
||||
Initial Package Version: 1.2.8
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: This patch adds support for mozldap (its a hack)
|
||||
|
||||
diff -Naur apr-util-1.2.8.orig/build/apu-conf.m4 apr-util-1.2.8/build/apu-conf.m4
|
||||
--- apr-util-1.2.8.orig/build/apu-conf.m4 2007-08-20 18:22:08.000000000 +0000
|
||||
+++ apr-util-1.2.8/build/apu-conf.m4 2007-08-20 19:44:42.000000000 +0000
|
||||
@@ -296,6 +296,7 @@
|
||||
LIBLDAP="$withval"
|
||||
if test "$LIBLDAP" = "yes"; then
|
||||
dnl The iPlanet C SDK 5.0 is as yet untested...
|
||||
+ APU_FIND_LDAPLIB("ldap60", "-lnspr4 -lplc4 -lplds4 -lldif60 -lnss3 -lprldap60 -lssl3 -lssldap60")
|
||||
APU_FIND_LDAPLIB("ldap50", "-lnspr4 -lplc4 -lplds4 -liutil50 -llber50 -lldif50 -lnss3 -lprldap50 -lssl3 -lssldap50")
|
||||
APU_FIND_LDAPLIB("ldapssl41", "-lnspr3 -lplc3 -lplds3")
|
||||
APU_FIND_LDAPLIB("ldapssl40")
|
||||
@@ -315,7 +316,7 @@
|
||||
fi
|
||||
|
||||
test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)
|
||||
- AC_CHECK_LIB(lber, ber_init)
|
||||
+ AC_CHECK_LIB(ldap60, ber_init)
|
||||
|
||||
AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
--- apr-util-1.2.10.ebuild 2007-12-11 11:35:55.000000000 +0100
|
||||
+++ apr-util-1.2.10-r99.ebuild 2007-10-05 23:15:07.000000000 +0200
|
||||
@@ -15,8 +15,8 @@
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="1"
|
||||
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
|
||||
-IUSE="berkdb doc gdbm ldap mysql postgres sqlite sqlite3"
|
||||
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
|
||||
+IUSE="berkdb doc gdbm ldap mozldap mysql postgres sqlite sqlite3"
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="dev-libs/expat
|
||||
@@ -25,14 +25,28 @@
|
||||
doc? ( app-doc/doxygen )
|
||||
gdbm? ( sys-libs/gdbm )
|
||||
ldap? ( =net-nds/openldap-2* )
|
||||
+ mozldap? ( =dev-libs/mozldap-6*
|
||||
+ =dev-libs/nspr-4*
|
||||
+ =dev-libs/nss-3* )
|
||||
mysql? ( =virtual/mysql-5* )
|
||||
postgres? ( dev-db/libpq )
|
||||
sqlite? ( =dev-db/sqlite-2* )
|
||||
sqlite3? ( =dev-db/sqlite-3* )"
|
||||
|
||||
+pkg_setup() {
|
||||
+ if use ldap && use mozldap ; then
|
||||
+ eerror "you cant activate ldap & mozldap at the same time "
|
||||
+ eerror "plz deactivate \"dev-libs/apr-util -ldap mozldap\" one in"
|
||||
+ eerror "\"etc/portage/package.use\" ;p"
|
||||
+ die "ldap and mozldap USE conflict"
|
||||
+ fi
|
||||
+}
|
||||
+
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
+
|
||||
+ epatch "${FILESDIR}"/"${P}"-mozldap60-2.patch
|
||||
|
||||
if use mysql ; then
|
||||
cp "${DISTDIR}"/apr_dbd_mysql-r${DBD_MYSQL}.c \
|
||||
@@ -48,6 +62,12 @@
|
||||
|
||||
use ldap && myconf="${myconf} --with-ldap"
|
||||
|
||||
+ use mozldap && myconf="${myconf} --with-ldap \
|
||||
+ --with-ldap-include=/usr/include/mozldap/ \
|
||||
+ --with-ldap-lib=/usr/$(get_libdir)/mozldap/ \
|
||||
+ --with-nss-lib=/usr/$(get_libdir)/nss/ \
|
||||
+ --with-nspr-lib=/usr/$(get_libdir)/nspr"
|
||||
+
|
||||
if use berkdb; then
|
||||
dbver="$(db_findver sys-libs/db)" || die "Unable to find db version"
|
||||
dbver="$(db_ver_to_slot "$dbver")"
|
||||
Reference in New Issue
Block a user