diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog index 4c052e77..bdcf105b 100644 --- a/dev-libs/apr-util/ChangeLog +++ b/dev-libs/apr-util/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 Aug 2008; Mario Fetka + -files/apr-util-1.2.8-mozldap60-1.patch, + -files/apr-util-ebuild-1.2.10-mozldap.patch, -files/apr-util-1.2.12.patch, + -apr-util-1.2.8-r99.ebuild, -apr-util-1.2.10-r99.ebuild, + -apr-util-1.2.12-r100.ebuild, -apr-util-1.3.0-r100.ebuild: + delete old + 30 Aug 2008; Mario Fetka files/apr-util-1.2.12.patch, +files/apr-util-1.3.2.patch, +apr-util-1.3.4-r100.ebuild: diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest index cfcbbf2d..ee6b8ea7 100644 --- a/dev-libs/apr-util/Manifest +++ b/dev-libs/apr-util/Manifest @@ -1,24 +1,8 @@ AUX apr-util-1.2.10-mozldap60-2.patch 4251 RMD160 202f330c9dd9d5f9677de9f77149e3f912f2ea9c SHA1 1ee53d4de45c6dbc470ba3c2c408161fb16d1412 SHA256 fe43f98d6c1455157c4f3f5436f948496172d1e59733c56f54690ee8e70ad32e -AUX apr-util-1.2.12.patch 1956 RMD160 9d77f7013e2ea76c7622c231f0dadd99c470f615 SHA1 b63bfff7348304fb339b48a9f963e858c8f779be SHA256 9be8cfcfc863b549cd237f05baad5f0f7934982582f1e7d24e4ac56cf959937a -AUX apr-util-1.2.8-mozldap60-1.patch 1141 RMD160 40f3e0f1e3ce1a20838e3810689a3e123dfa3032 SHA1 de18b668862129214e8a101c0ea006398b35fb56 SHA256 2687ad2ed39dadc288d205de8152369bdf59696fb0403b8b0e084559581004ee AUX apr-util-1.3.2.patch 1534 RMD160 b4e71d704eb3d0d858391e68e196e64c9e9b76e0 SHA1 83a3b299b7517ad699e1059728d2098441f3f5f7 SHA256 fd4299a0ee259340a515a74b05383eccd80586676b050f71c1f33a84b6b3ae9b -AUX apr-util-ebuild-1.2.10-mozldap.patch 1832 RMD160 d2f28958e1a5b1273e4db0e01e5752ecf0f275ea SHA1 d879f46c7c11cae7db6b82eb5636d164c412fa7b SHA256 948b205764b6c31795f08cdc9a513669482ffe8eea7f1bc83d56090b13f45ed0 -DIST apr-1.2.11.tar.gz 1114033 RMD160 8b1c1831cd8281de17f41f84ffc5cfd9b6c35553 SHA1 bde2c8b6e477752bcac4f387ac0de9671cd15d1a SHA256 fc7a14e8ded002c252cf5f3ccce6cd5636f01a85986188e373f9343a174c42ff -DIST apr-1.2.12.tar.gz 1127522 RMD160 912c34e412b42e678288727b811ba35f03d07b6b SHA1 12ebc5ee6bba6b66b75e25ff8326fd2d2ad8f4ff SHA256 23759142c483be869a0aec0529c5b8c94745b4dfd1c2c23f38417f4e02adcead -DIST apr-1.2.8.tar.gz 1107189 RMD160 299e1ddb1f7c9b0169a410e120c30abea38557c5 SHA1 b8c89bab084d1bae1cb15d7b9d5f40d03dfe2c4a SHA256 96e31f0ea2e028f372d5fdbbd4f88f31d59e14eda85cd12153183759f8e221c7 -DIST apr-1.3.0.tar.gz 1145703 RMD160 1b392ce9335f6608102edbba162cc2e9924da6cf SHA1 5cccd027d43e94acf813ca627a3b0984520fe50a SHA256 1bf89994de9758061fdd304d5fe37971d5f2f9e95f587ba847ceb33e67f1d1f0 -DIST apr-util-1.2.10.tar.gz 654083 RMD160 6d577b04a4d75efcb40e132fddf15faede7b29c1 SHA1 9e136a5492313a0eb3c50154a25da2c99dcabb1b SHA256 8761fec487ff98e7b9d965864125d0468a3d4adf2c91a44834faff3c693e6f47 -DIST apr-util-1.2.12.tar.gz 668292 RMD160 438528fe4d207dc2290de80ccbd2973266853f8a SHA1 7c0d929a3c0b328c257c916408bc2c9d47690fed SHA256 7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f -DIST apr-util-1.2.8.tar.gz 646379 RMD160 00b10ef0aab26f3ea5d374e2400c1dba566a9020 SHA1 49260d98b863756974bd83cd28bc39338d4f3a82 SHA256 6527cb0b3dd619acfca668412e84e52860dfd862054246ca903822d5ea824de6 -DIST apr-util-1.3.0.tar.gz 746522 RMD160 f8ca262db8bc1d4d7b2a5ad992850d662f6a8241 SHA1 56114a5750cc76e1536bf3e000f9b710de2c70d0 SHA256 ccbbce2c06410a44b93259d7071dc25697c71410666c076feb7d6669960bcd8d DIST apr-util-1.3.2.tar.gz 778182 RMD160 868a503cfb038c9dd5f82b0cdd1eee4691ef1096 SHA1 29d3974d928d29fe996f3cf1e6b4794b82272683 SHA256 0c95069e5b4962d56ec4112f2aa85701b93a7374b76adcca348ca19c0db560f1 DIST apr-util-1.3.4.tar.gz 778902 RMD160 741b9b8e9449ce3cae565aeac57deaeb688071d3 SHA1 c538c566447cf38b849288a40cf81e5267d9117f SHA256 3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e -DIST apr_dbd_mysql-r84.c 49110 RMD160 9d665f2e964b09f58b182829563a203f59e16640 SHA1 04c82a4dda00bbeaddc713b29dae826562fc0db6 SHA256 79893740a58c96fba6e04f800e950ec42d8128e034056ff8a5770e0d3acc4919 -EBUILD apr-util-1.2.10-r99.ebuild 3070 RMD160 34451dfa4838d9434a2f682b58bd4b2fa3a9a94b SHA1 7643c830b012872dc315be6d5daadcbf86067f18 SHA256 3a6b89e665dd1fba7f444698867a082f02bf3da9db89383dd1c9cfbfd9a13a95 -EBUILD apr-util-1.2.12-r100.ebuild 2845 RMD160 3574cc8b165acbcbc9b728cf79955cd3ffde9288 SHA1 0041f4b2dd5be2e6b57731c65ae678c8d59f2d8c SHA256 711aa0ff217bcf0a83ef8b992232d966dfffe639c29e71223f4d8a9d7df31fa0 -EBUILD apr-util-1.2.8-r99.ebuild 2390 RMD160 9bde7988e3a1de338050948518cf3987504e2bd6 SHA1 a26ed400b3f131b360e6bc91125bd3f078590fea SHA256 3159e97ff85978446dba74848ac7b85a477586ec1fc78a8da977eede653e2221 -EBUILD apr-util-1.3.0-r100.ebuild 2844 RMD160 f76ee1b2036917970d3aed1952c9f76532e6cf0d SHA1 7794bd529c31eaef0cdbfab7e3b19441ad4329e2 SHA256 b690e67ffe8d1e65166b72af4e2703f2080190f629027bb002e6054af25cd17a EBUILD apr-util-1.3.2-r100.ebuild 2532 RMD160 1b4e62879457592371893d954ad5a7c214d73d89 SHA1 b32f909cecbd8a0739733c19640a98af39e18f54 SHA256 2e0a86de2d33d0f9e4fc01f3cab7dd3e34a463200f0db483f03daf8a713250ff EBUILD apr-util-1.3.4-r100.ebuild 2544 RMD160 f5c47a0f12e3ac2e7bae4d0d18861a8a65ca2ea6 SHA1 b87e4d09f79a0b1f3618d2efc0745f60e163dec1 SHA256 f54c6266ba7f22c9b93c8ff901fad44f92eee45c48fd36f6225ee93e041d4435 -MISC ChangeLog 774 RMD160 7dc177331ef820b2d9c9df972231b72fb626c92d SHA1 5d878cf0de118703bdb8d3e70a97a0a2294342c4 SHA256 03b68f55b86dd6c4b9ed5eeaf9099deaaf5c9255a043026115c703ecb3f53483 +MISC ChangeLog 1079 RMD160 aad090f0234f68d48b8ddd9fe910bfea446fa59b SHA1 0648bd5a97a2964668b30020bf2f4f8d0a2ec6d2 SHA256 35e2a4b22650707f951885cab9035efb9224e2f89eae85403c3c088e0e0f0b6d MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/dev-libs/apr-util/apr-util-1.2.10-r99.ebuild b/dev-libs/apr-util/apr-util-1.2.10-r99.ebuild deleted file mode 100644 index a11d36e8..00000000 --- a/dev-libs/apr-util/apr-util-1.2.10-r99.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.10.ebuild,v 1.2 2007/09/09 07:14:48 hollow Exp $ - -inherit autotools eutils flag-o-matic libtool db-use - -DBD_MYSQL=84 -APR_PV=1.2.11 - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz - mirror://apache/apr/apr-${APR_PV}.tar.gz - mysql? ( mirror://gentoo/apr_dbd_mysql-r${DBD_MYSQL}.c )" - -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 mozldap mysql postgres sqlite sqlite3" -RESTRICT="test" - -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? ( 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 \ - "${S}"/dbd/apr_dbd_mysql.c || die "could not copy mysql driver" - fi - - ./buildconf --with-apr=../apr-${APR_PV} || die "buildconf failed" - elibtoolize || die "elibtoolize failed" -} - -src_compile() { - local myconf="" - - 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")" - dbver="${dbver/\./}" - myconf="${myconf} --with-dbm=db${dbver} - --with-berkeley-db=$(db_includedir):/usr/$(get_libdir)" - else - myconf="${myconf} --without-berkeley-db" - fi - - econf --datadir=/usr/share/apr-util-1 \ - --with-apr=/usr \ - --with-expat=/usr \ - $(use_with gdbm) \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with sqlite sqlite2) \ - $(use_with sqlite3) \ - ${myconf} || die "econf failed!" - - emake || die "emake failed!" - - if use doc; then - emake dox || die "make dox failed" - fi -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGES NOTICE - - if use doc; then - dohtml docs/dox/html/* || die - fi - - # This file is only used on AIX systems, which gentoo is not, - # and causes collisions between the SLOTs, so kill it - rm "${D}"/usr/$(get_libdir)/aprutil.exp -} diff --git a/dev-libs/apr-util/apr-util-1.2.12-r100.ebuild b/dev-libs/apr-util/apr-util-1.2.12-r100.ebuild deleted file mode 100644 index 19138623..00000000 --- a/dev-libs/apr-util/apr-util-1.2.12-r100.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.12.ebuild,v 1.1 2007/12/15 14:26:31 hollow Exp $ - -inherit autotools eutils flag-o-matic libtool db-use - -DESCRIPTION="Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz - mirror://apache/apr/apr-${PV}.tar.gz" - -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 mozldap mysql postgres sqlite sqlite3" -RESTRICT="test" - -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? ( 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}"/"${PN}"-1.2.10-mozldap60-2.patch - - ./buildconf --with-apr=../apr-${PV} || die "buildconf failed" - elibtoolize || die "elibtoolize failed" -} - -src_compile() { - local myconf="" - - 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")" - dbver="${dbver/\./}" - myconf="${myconf} --with-dbm=db${dbver} - --with-berkeley-db=$(db_includedir):/usr/$(get_libdir)" - else - myconf="${myconf} --without-berkeley-db" - fi - - econf --datadir=/usr/share/apr-util-1 \ - --with-apr=/usr \ - --with-expat=/usr \ - $(use_with gdbm) \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with sqlite sqlite2) \ - $(use_with sqlite3) \ - ${myconf} - - emake || die "emake failed!" - - if use doc; then - emake dox || die "emake dox failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc CHANGES NOTICE - - if use doc; then - dohtml docs/dox/html/* || die "dohtml failed" - fi - - # This file is only used on AIX systems, which gentoo is not, - # and causes collisions between the SLOTs, so kill it - rm "${D}"/usr/$(get_libdir)/aprutil.exp -} diff --git a/dev-libs/apr-util/apr-util-1.2.8-r99.ebuild b/dev-libs/apr-util/apr-util-1.2.8-r99.ebuild deleted file mode 100644 index 5673070a..00000000 --- a/dev-libs/apr-util/apr-util-1.2.8-r99.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.8-r1.ebuild,v 1.3 2007/07/31 10:35:02 phreak Exp $ - -inherit autotools eutils flag-o-matic libtool db-use - -DBD_MYSQL=84 - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz - mirror://apache/apr/apr-${PV}.tar.gz - mysql? ( mirror://gentoo/apr_dbd_mysql-r${DBD_MYSQL}.c )" - -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 gdbm ldap mysql postgres sqlite sqlite3 mozldap" -RESTRICT="test" - -DEPEND="dev-libs/expat - >=dev-libs/apr-${PV} - berkdb? ( =sys-libs/db-4* ) - gdbm? ( sys-libs/gdbm ) - ldap? ( =net-nds/openldap-2* ) - mysql? ( =virtual/mysql-5* ) - postgres? ( dev-db/libpq ) - sqlite? ( =dev-db/sqlite-2* ) - sqlite3? ( =dev-db/sqlite-3* )" - -src_unpack() { - unpack ${A} - cd "${S}" - - if use mozldap ; then - epatch "${FILESDIR}"/"${P}"-mozldap60-1.patch - fi - - if use mysql ; then - cp "${DISTDIR}"/apr_dbd_mysql-r${DBD_MYSQL}.c \ - "${S}"/dbd/apr_dbd_mysql.c || die "could not copy mysql driver" - fi - - ./buildconf --with-apr=../apr-${PV} || die "buildconf failed" - elibtoolize || die "elibtoolize failed" -} - -src_compile() { - local myconf="" - - use ldap && myconf="${myconf} --with-ldap" - - use mozldap && myconf="${myconf} --with-ldap-include=/usr/include/mozldap --with-ldap-lib=/usr/$(get_libdir)/mozldap" - - if use berkdb; then - dbver="$(db_findver sys-libs/db)" || die "Unable to find db version" - dbver="$(db_ver_to_slot "$dbver")" - dbver="${dbver/\./}" - myconf="${myconf} --with-dbm=db${dbver} - --with-berkeley-db=$(db_includedir):/usr/$(get_libdir)" - else - myconf="${myconf} --without-berkeley-db" - fi - - econf --datadir=/usr/share/apr-util-1 \ - --with-apr=/usr \ - --with-expat=/usr \ - $(use_with gdbm) \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with sqlite sqlite2) \ - $(use_with sqlite3) \ - ${myconf} || die "econf failed!" - - emake || die "emake failed!" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGES NOTICE - - # This file is only used on AIX systems, which gentoo is not, - # and causes collisions between the SLOTs, so kill it - rm "${D}"/usr/$(get_libdir)/aprutil.exp -} diff --git a/dev-libs/apr-util/apr-util-1.3.0-r100.ebuild b/dev-libs/apr-util/apr-util-1.3.0-r100.ebuild deleted file mode 100644 index 3af8df63..00000000 --- a/dev-libs/apr-util/apr-util-1.3.0-r100.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.3.0.ebuild,v 1.1 2008/06/11 19:14:22 hollow Exp $ - -inherit autotools eutils flag-o-matic libtool db-use - -DESCRIPTION="Apache Portable Runtime Utility Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz - mirror://apache/apr/apr-${PV}.tar.gz" - -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 mozldap mysql postgres sqlite sqlite3" -RESTRICT="test" - -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? ( 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}"/"${PN}"-1.2.10-mozldap60-2.patch - - ./buildconf --with-apr=../apr-${PV} || die "buildconf failed" - elibtoolize || die "elibtoolize failed" -} - -src_compile() { - local myconf="" - - 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")" - dbver="${dbver/\./}" - myconf="${myconf} --with-dbm=db${dbver} - --with-berkeley-db=$(db_includedir):/usr/$(get_libdir)" - else - myconf="${myconf} --without-berkeley-db" - fi - - econf --datadir=/usr/share/apr-util-1 \ - --with-apr=/usr \ - --with-expat=/usr \ - $(use_with gdbm) \ - $(use_with mysql) \ - $(use_with postgres pgsql) \ - $(use_with sqlite sqlite2) \ - $(use_with sqlite3) \ - ${myconf} - - emake || die "emake failed!" - - if use doc; then - emake dox || die "emake dox failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - dodoc CHANGES NOTICE - - if use doc; then - dohtml docs/dox/html/* || die "dohtml failed" - fi - - # This file is only used on AIX systems, which gentoo is not, - # and causes collisions between the SLOTs, so kill it - rm "${D}"/usr/$(get_libdir)/aprutil.exp -} diff --git a/dev-libs/apr-util/files/apr-util-1.2.12.patch b/dev-libs/apr-util/files/apr-util-1.2.12.patch deleted file mode 100644 index ce08e622..00000000 --- a/dev-libs/apr-util/files/apr-util-1.2.12.patch +++ /dev/null @@ -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")" diff --git a/dev-libs/apr-util/files/apr-util-1.2.8-mozldap60-1.patch b/dev-libs/apr-util/files/apr-util-1.2.8-mozldap60-1.patch deleted file mode 100644 index b47450c4..00000000 --- a/dev-libs/apr-util/files/apr-util-1.2.8-mozldap60-1.patch +++ /dev/null @@ -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 "]) - diff --git a/dev-libs/apr-util/files/apr-util-ebuild-1.2.10-mozldap.patch b/dev-libs/apr-util/files/apr-util-ebuild-1.2.10-mozldap.patch deleted file mode 100644 index 9d82836a..00000000 --- a/dev-libs/apr-util/files/apr-util-ebuild-1.2.10-mozldap.patch +++ /dev/null @@ -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")"