From: Luca Longinotti Date: Sun, 28 Jan 2007 20:11:11 +0000 (+0000) Subject: Cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e623cb44233942660977ec5b687b452f7d96d7a6;p=gentoo.git Cleanup. Package-Manager: portage-2.1.2-r4 --- diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog index 9aec7a3db24c..7d143a87dcb1 100644 --- a/dev-libs/apr-util/ChangeLog +++ b/dev-libs/apr-util/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/apr-util # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.67 2007/01/21 15:31:05 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.68 2007/01/28 20:06:37 chtekk Exp $ + + 28 Jan 2007; Luca Longinotti + -files/apr-util-0.9.x-161086-161087.patch, metadata.xml, + -apr-util-0.9.6-r2.ebuild, -apr-util-0.9.7.ebuild, -apr-util-1.2.2.ebuild, + -apr-util-1.2.7.ebuild: + Remove redundant versions. *apr-util-1.2.8 (21 Jan 2007) diff --git a/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild b/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild deleted file mode 100644 index 6adb2f15f168..000000000000 --- a/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.6-r2.ebuild,v 1.18 2006/04/22 12:49:02 chtekk Exp $ - -inherit eutils libtool - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc-macos ppc64 s390 sh sparc x86" -IUSE="berkdb gdbm ldap" -RESTRICT="test" - -DEPEND="dev-libs/expat - ~dev-libs/apr-0.9.6 - berkdb? ( sys-libs/db ) - gdbm? ( sys-libs/gdbm ) - ldap? ( =net-nds/openldap-2* )" - -src_unpack() { - unpack ${A} || die "unpack" - - cd ${S} || die - - epatch "${FILESDIR}/apr-util-0.9.x-161086-161087.patch" \ - || die "patching failed" - - elibtoolize || die "elibtoolize failed" -} - -src_compile() { - local myconf="" - if use ldap; then - myconf="${myconf} --with-ldap" - fi - - if use berkdb; then - if has_version '=sys-libs/db-4.2*'; then - myconf="${myconf} --with-dbm=db42 - --with-berkeley-db=/usr/include/db4.2:/usr/$(get_libdir)" - elif has_version '=sys-libs/db-4*'; then - myconf="${myconf} --with-dbm=db4 - --with-berkeley-db=/usr/include/db4:/usr/$(get_libdir)" - elif has_version '=sys-libs/db-3*'; then - myconf="${myconf} --with-dbm=db3 - --with-berkeley-db=/usr/include/db3:/usr/$(get_libdir)" - elif has_version '=sys-libs/db-2'; then - myconf="${myconf} --with-dbm=db2 - --with-berkely-db=/usr/include/db2:/usr/$(get_libdir)" - fi - fi - - econf \ - --datadir=/usr/share/apr-util-0 \ - --with-apr=/usr \ - --with-expat=/usr \ - $myconf || die - - emake || die -} - -src_install() { - make DESTDIR="${D}" installbuilddir=/usr/share/apr-util-0/build install || die - - #bogus values pointing at /var/tmp/portage - sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config - sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=/usr/share/apr-util-0/build:g' ${D}/usr/bin/apu-config - - dodoc CHANGES NOTICE - - # Will install as portage user when using userpriv. Fixing - chown -R root:0 ${D}/usr/include/apr-0/ -} diff --git a/dev-libs/apr-util/apr-util-0.9.7.ebuild b/dev-libs/apr-util/apr-util-0.9.7.ebuild deleted file mode 100644 index cbc7f601b393..000000000000 --- a/dev-libs/apr-util/apr-util-0.9.7.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-0.9.7.ebuild,v 1.12 2006/06/04 13:23:34 chtekk Exp $ - -inherit eutils libtool db-use - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="berkdb gdbm ldap" -RESTRICT="test" - -DEPEND="dev-libs/expat - ~dev-libs/apr-0.9.7 - berkdb? ( =sys-libs/db-4* ) - gdbm? ( sys-libs/gdbm ) - ldap? ( =net-nds/openldap-2* )" - -src_compile() { - elibtoolize || die "elibtoolize failed" - - local myconf="" - - use ldap && myconf="${myconf} --with-ldap" - myconf="${myconf} $(use_with gdbm)" - - 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-0 \ - --with-apr=/usr \ - --with-expat=/usr \ - $myconf || die - - emake || die -} - -src_install() { - make DESTDIR="${D}" installbuilddir=/usr/share/apr-util-0/build install || die - - #bogus values pointing at /var/tmp/portage - sed -i -e 's:APU_SOURCE_DIR=.*:APU_SOURCE_DIR=:g' ${D}/usr/bin/apu-config - sed -i -e 's:APU_BUILD_DIR=.*:APU_BUILD_DIR=/usr/share/apr-util-0/build:g' ${D}/usr/bin/apu-config - - dodoc CHANGES NOTICE - - # Will install as portage user when using userpriv. Fixing - chown -R root:0 ${D}/usr/include/apr-0/ -} diff --git a/dev-libs/apr-util/apr-util-1.2.2.ebuild b/dev-libs/apr-util/apr-util-1.2.2.ebuild deleted file mode 100644 index af03584c5f11..000000000000 --- a/dev-libs/apr-util/apr-util-1.2.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2006 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.2.ebuild,v 1.6 2006/06/04 13:23:34 chtekk Exp $ - -inherit eutils libtool db-use - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="berkdb gdbm ldap postgres sqlite sqlite3" -RESTRICT="test" - -DEPEND="dev-libs/expat - ~dev-libs/apr-${PV} - berkdb? ( =sys-libs/db-4* ) - gdbm? ( sys-libs/gdbm ) - ldap? ( =net-nds/openldap-2* ) - postgres? ( dev-db/postgresql ) - sqlite? ( =dev-db/sqlite-2* ) - sqlite3? ( =dev-db/sqlite-3* )" - -# NOTE: This package in theory can support mysql, -# but in reality the build system is broken for it.... - -src_compile() { - elibtoolize || die "elibtoolize failed" - - local myconf="" - - use ldap && myconf="${myconf} --with-ldap" - myconf="${myconf} $(use_with gdbm)" - myconf="${myconf} $(use_with postgres pgsql)" - myconf="${myconf} $(use_with sqlite sqlite2)" - myconf="${myconf} $(use_with sqlite3)" - - 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 \ - $myconf || die "configure failed" - - emake || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGES NOTICE -} diff --git a/dev-libs/apr-util/apr-util-1.2.7.ebuild b/dev-libs/apr-util/apr-util-1.2.7.ebuild deleted file mode 100644 index 160147cfe741..000000000000 --- a/dev-libs/apr-util/apr-util-1.2.7.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2006 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.7.ebuild,v 1.8 2006/10/18 12:59:02 uberlord Exp $ - -inherit eutils flag-o-matic libtool db-use - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="berkdb gdbm ldap postgres sqlite sqlite3" -RESTRICT="test" - -DEPEND="dev-libs/expat - ~dev-libs/apr-${PV} - berkdb? ( =sys-libs/db-4* ) - gdbm? ( sys-libs/gdbm ) - ldap? ( =net-nds/openldap-2* ) - postgres? ( dev-db/postgresql ) - sqlite? ( =dev-db/sqlite-2* ) - sqlite3? ( =dev-db/sqlite-3* )" - -# NOTE: This package in theory can support mysql, -# but in reality the build system is broken for it.... - -src_compile() { - elibtoolize || die "elibtoolize failed" - - local myconf="" - - use ldap && myconf="${myconf} --with-ldap" - myconf="${myconf} $(use_with gdbm)" - myconf="${myconf} $(use_with postgres pgsql)" - myconf="${myconf} $(use_with sqlite sqlite2)" - myconf="${myconf} $(use_with sqlite3)" - - 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 \ - $myconf || die "configure failed" - - emake || die "make 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/files/apr-util-0.9.x-161086-161087.patch b/dev-libs/apr-util/files/apr-util-0.9.x-161086-161087.patch deleted file mode 100644 index 9cca25d358ce..000000000000 --- a/dev-libs/apr-util/files/apr-util-0.9.x-161086-161087.patch +++ /dev/null @@ -1,140 +0,0 @@ -Index: include/apr_reslist.h -=================================================================== ---- include/apr_reslist.h (revision 161086) -+++ include/apr_reslist.h (revision 161087) -@@ -112,6 +112,24 @@ - APU_DECLARE(apr_status_t) apr_reslist_release(apr_reslist_t *reslist, - void *resource); - -+/** -+ * Set the timeout the acquire will wait for a free resource -+ * when the maximum number of resources is exceeded. -+ * @param reslist The resource list. -+ * @param timeout Timeout to wait. The zero waits forewer. -+ */ -+APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist, -+ apr_interval_time_t timeout); -+ -+/** -+ * Invalidate a resource in the pool - e.g. a database connection -+ * that returns a "lost connection" error and can't be restored. -+ * Use this instead of apr_reslist_release if the resource is bad. -+ */ -+APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist, -+ void *resource); -+ -+ - #ifdef __cplusplus - } - #endif -Index: misc/apr_reslist.c -=================================================================== ---- misc/apr_reslist.c (revision 161086) -+++ misc/apr_reslist.c (revision 161087) -@@ -50,6 +50,7 @@ - int smax; /* soft maximum on the total number of resources */ - int hmax; /* hard maximum on the total number of resources */ - apr_interval_time_t ttl; /* TTL when we have too many resources */ -+ apr_interval_time_t timeout; /* Timeout for waiting on resource */ - apr_reslist_constructor constructor; - apr_reslist_destructor destructor; - void *params; /* opaque data passed to constructor and destructor calls */ -@@ -119,12 +120,9 @@ - res = apr_pcalloc(reslist->pool, sizeof(*res)); - - rv = reslist->constructor(&res->opaque, reslist->params, reslist->pool); -- if (rv != APR_SUCCESS) { -- return rv; -- } - - *ret_res = res; -- return APR_SUCCESS; -+ return rv; - } - - /** -@@ -133,14 +131,7 @@ - */ - static apr_status_t destroy_resource(apr_reslist_t *reslist, apr_res_t *res) - { -- apr_status_t rv; -- -- rv = reslist->destructor(res->opaque, reslist->params, reslist->pool); -- if (rv != APR_SUCCESS) { -- return rv; -- } -- -- return APR_SUCCESS; -+ return reslist->destructor(res->opaque, reslist->params, reslist->pool); - } - - static apr_status_t reslist_cleanup(void *data_) -@@ -188,6 +179,7 @@ - /* Create the resource */ - rv = create_resource(reslist, &res); - if (rv != APR_SUCCESS) { -+ free_container(reslist, res); - apr_thread_mutex_unlock(reslist->listlock); - return rv; - } -@@ -314,7 +306,15 @@ - * a new one, or something becomes free. */ - else while (reslist->ntotal >= reslist->hmax - && reslist->nidle <= 0) { -- apr_thread_cond_wait(reslist->avail, reslist->listlock); -+ if (reslist->timeout) { -+ if ((rv = apr_thread_cond_timedwait(reslist->avail, -+ reslist->listlock, reslist->timeout)) != APR_SUCCESS) { -+ apr_thread_mutex_unlock(reslist->listlock); -+ return rv; -+ } -+ } -+ else -+ apr_thread_cond_wait(reslist->avail, reslist->listlock); - } - /* If we popped out of the loop, first try to see if there - * are new resources available for immediate use. */ -@@ -330,17 +330,13 @@ - * a resource to fill the slot and use it. */ - else { - rv = create_resource(reslist, &res); -- -- if (rv != APR_SUCCESS) { -- apr_thread_mutex_unlock(reslist->listlock); -- return rv; -+ if (rv == APR_SUCCESS) { -+ reslist->ntotal++; -+ *resource = res->opaque; - } -- -- reslist->ntotal++; -- *resource = res->opaque; - free_container(reslist, res); - apr_thread_mutex_unlock(reslist->listlock); -- return APR_SUCCESS; -+ return rv; - } - } - -@@ -359,4 +355,21 @@ - return reslist_maint(reslist); - } - -+APU_DECLARE(void) apr_reslist_timeout_set(apr_reslist_t *reslist, -+ apr_interval_time_t timeout) -+{ -+ reslist->timeout = timeout; -+} -+ -+APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist, -+ void *resource) -+{ -+ apr_status_t ret; -+ apr_thread_mutex_lock(reslist->listlock); -+ ret = reslist->destructor(resource, reslist->params, reslist->pool); -+ reslist->ntotal--; -+ apr_thread_mutex_unlock(reslist->listlock); -+ return ret; -+} -+ - #endif /* APR_HAS_THREADS */ diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.6-r2 b/dev-libs/apr-util/files/digest-apr-util-0.9.6-r2 deleted file mode 100644 index 09e520fe6560..000000000000 --- a/dev-libs/apr-util/files/digest-apr-util-0.9.6-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a3a2671368e47b7efcb381e991451a9f apr-util-0.9.6.tar.gz 724680 -RMD160 db862e3c04a9a701a9322048047ddccec7ccd8cb apr-util-0.9.6.tar.gz 724680 -SHA256 a5f15d41303baec838f7230f1408f81b90af7bddbc44b2ec323fe958c844f83c apr-util-0.9.6.tar.gz 724680 diff --git a/dev-libs/apr-util/files/digest-apr-util-0.9.7 b/dev-libs/apr-util/files/digest-apr-util-0.9.7 deleted file mode 100644 index b34df06f2ce7..000000000000 --- a/dev-libs/apr-util/files/digest-apr-util-0.9.7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 6afa5f2866537639dc2d248eb7219e01 apr-util-0.9.7.tar.gz 741891 -RMD160 ea11424ae5a99e360b902b0bb203d6781832d690 apr-util-0.9.7.tar.gz 741891 -SHA256 ee2ab06fbfc029dbc6d49f2a37ac0deb319434f264ead26525b2d6152e08feaa apr-util-0.9.7.tar.gz 741891 diff --git a/dev-libs/apr-util/files/digest-apr-util-1.2.2 b/dev-libs/apr-util/files/digest-apr-util-1.2.2 deleted file mode 100644 index 073c9a4bd805..000000000000 --- a/dev-libs/apr-util/files/digest-apr-util-1.2.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8b3f04dde7048946c3c94f85b4debb94 apr-util-1.2.2.tar.gz 645311 -RMD160 5a507e01d32f79ee9405b3d3698f0fc08ad38acc apr-util-1.2.2.tar.gz 645311 -SHA256 b7170fe39edff9ef044464a321194bbee382065dacd0720abc823adbe47731e1 apr-util-1.2.2.tar.gz 645311 diff --git a/dev-libs/apr-util/files/digest-apr-util-1.2.7 b/dev-libs/apr-util/files/digest-apr-util-1.2.7 deleted file mode 100644 index 0f5374538b18..000000000000 --- a/dev-libs/apr-util/files/digest-apr-util-1.2.7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c3702668a640be1695956115857ec22e apr-util-1.2.7.tar.gz 641600 -RMD160 339983cbbf4ee66139f14dbb3437d596e5790b2f apr-util-1.2.7.tar.gz 641600 -SHA256 8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3 apr-util-1.2.7.tar.gz 641600 diff --git a/dev-libs/apr-util/metadata.xml b/dev-libs/apr-util/metadata.xml index ff5b6490402e..a1f5ceff2352 100644 --- a/dev-libs/apr-util/metadata.xml +++ b/dev-libs/apr-util/metadata.xml @@ -1,8 +1,8 @@ -apache - - apache-bugs@gentoo.org - + apache + + apache-bugs@gentoo.org + diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog index e4d5ca202e60..011a1cae4e79 100644 --- a/dev-libs/apr/ChangeLog +++ b/dev-libs/apr/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/apr # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.75 2007/01/21 15:27:39 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.76 2007/01/28 20:11:11 chtekk Exp $ + + 28 Jan 2007; Luca Longinotti metadata.xml, + -apr-0.9.6-r3.ebuild, -apr-0.9.6-r4.ebuild, -apr-0.9.7.ebuild, + -apr-1.2.2.ebuild, -apr-1.2.7.ebuild, -apr-1.2.7-r1.ebuild, + -apr-1.2.7-r2.ebuild, -apr-1.2.7-r3.ebuild: + Remove redundant versions. *apr-1.2.8 (21 Jan 2007) diff --git a/dev-libs/apr/apr-0.9.6-r3.ebuild b/dev-libs/apr/apr-0.9.6-r3.ebuild deleted file mode 100644 index 6fb9359fc11f..000000000000 --- a/dev-libs/apr/apr-0.9.6-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.6-r3.ebuild,v 1.12 2005/10/21 14:13:55 ka0ttic Exp $ - -inherit flag-o-matic libtool - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86" -IUSE="ipv6" -RESTRICT="test" - -DEPEND="" - -src_compile() { - elibtoolize || die "elibtoolize failed" - - myconf="--datadir=/usr/share/apr-0" - - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} --enable-threads" - myconf="${myconf} --enable-nonportable-atomics" - myconf="${myconf} --with-devrandom=/dev/random" - - econf ${myconf} || die - emake || die -} - -src_install() { - make DESTDIR="${D}" installbuilddir=/usr/share/apr-0/build install || die - - # bogus values pointing at /var/tmp/portage - sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=/usr/share/apr-0:g' ${D}/usr/bin/apr-config - sed -i -e 's:APR_BUILD_DIR=.*:APR_BUILD_DIR=/usr/share/apr-0/build:g' ${D}/usr/bin/apr-config - - sed -i -e 's:apr_builddir=.*:apr_builddir=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk - sed -i -e 's:apr_builders=.*:apr_builders=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk - - cp -p build/*.awk ${D}/usr/share/apr-0/build - cp -p build/*.sh ${D}/usr/share/apr-0/build - cp -p build/*.pl ${D}/usr/share/apr-0/build - - dodoc CHANGES LICENSE NOTICE -} diff --git a/dev-libs/apr/apr-0.9.6-r4.ebuild b/dev-libs/apr/apr-0.9.6-r4.ebuild deleted file mode 100644 index 0756f676ed6d..000000000000 --- a/dev-libs/apr/apr-0.9.6-r4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.6-r4.ebuild,v 1.3 2005/10/10 20:57:00 kugelfang Exp $ - -inherit flag-o-matic libtool - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ipv6 urandom" -RESTRICT="test" - -DEPEND="" - -src_compile() { - elibtoolize || die "elibtoolize failed" - - myconf="--datadir=/usr/share/apr-0" - - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} --enable-threads" - myconf="${myconf} --enable-nonportable-atomics" - if use urandom; then - einfo "Using /dev/urandom as random device" - myconf="${myconf} --with-devrandom=/dev/urandom" - else - einfo "Using /dev/random as random device" - myconf="${myconf} --with-devrandom=/dev/random" - fi - - econf ${myconf} || die - emake || die -} - -src_install() { - make DESTDIR="${D}" installbuilddir=/usr/share/apr-0/build install || die - - # bogus values pointing at /var/tmp/portage - sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=/usr/share/apr-0:g' ${D}/usr/bin/apr-config - sed -i -e 's:APR_BUILD_DIR=.*:APR_BUILD_DIR=/usr/share/apr-0/build:g' ${D}/usr/bin/apr-config - - sed -i -e 's:apr_builddir=.*:apr_builddir=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk - sed -i -e 's:apr_builders=.*:apr_builders=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk - - cp -p build/*.awk ${D}/usr/share/apr-0/build - cp -p build/*.sh ${D}/usr/share/apr-0/build - cp -p build/*.pl ${D}/usr/share/apr-0/build - - dodoc CHANGES LICENSE NOTICE -} diff --git a/dev-libs/apr/apr-0.9.7.ebuild b/dev-libs/apr/apr-0.9.7.ebuild deleted file mode 100644 index 3b6539e01e2b..000000000000 --- a/dev-libs/apr/apr-0.9.7.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-0.9.7.ebuild,v 1.11 2006/05/18 18:14:40 vericgar Exp $ - -inherit flag-o-matic libtool - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="ipv6 urandom" -RESTRICT="test" - -DEPEND="" - -src_compile() { - - filter-ldflags -Wl,--as-needed --as-needed - - elibtoolize || die "elibtoolize failed" - - myconf="--datadir=/usr/share/apr-0" - - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} --enable-threads" - myconf="${myconf} --enable-nonportable-atomics" - if use urandom; then - einfo "Using /dev/urandom as random device" - myconf="${myconf} --with-devrandom=/dev/urandom" - else - einfo "Using /dev/random as random device" - myconf="${myconf} --with-devrandom=/dev/random" - fi - - econf ${myconf} || die - emake || die -} - -src_install() { - make DESTDIR="${D}" installbuilddir=/usr/share/apr-0/build install || die - - # bogus values pointing at /var/tmp/portage - sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=/usr/share/apr-0:g' ${D}/usr/bin/apr-config - sed -i -e 's:APR_BUILD_DIR=.*:APR_BUILD_DIR=/usr/share/apr-0/build:g' ${D}/usr/bin/apr-config - - sed -i -e 's:apr_builddir=.*:apr_builddir=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk - sed -i -e 's:apr_builders=.*:apr_builders=/usr/share/apr-0/build:g' ${D}/usr/share/apr-0/build/apr_rules.mk - - cp -p build/*.awk ${D}/usr/share/apr-0/build - cp -p build/*.sh ${D}/usr/share/apr-0/build - cp -p build/*.pl ${D}/usr/share/apr-0/build - - dodoc CHANGES LICENSE NOTICE -} diff --git a/dev-libs/apr/apr-1.2.2.ebuild b/dev-libs/apr/apr-1.2.2.ebuild deleted file mode 100644 index 2d27850b1c2d..000000000000 --- a/dev-libs/apr/apr-1.2.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.2.ebuild,v 1.3 2006/04/19 00:55:06 vericgar Exp $ - -inherit libtool - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ipv6 urandom" -RESTRICT="test" - -DEPEND="" - -src_compile() { - elibtoolize || die "elibtoolize failed" - - myconf="--datadir=/usr/share/apr-1" - - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} --enable-threads" - myconf="${myconf} --enable-nonportable-atomics" - if use urandom; then - einfo "Using /dev/urandom as random device" - myconf="${myconf} --with-devrandom=/dev/urandom" - else - einfo "Using /dev/random as random device" - myconf="${myconf} --with-devrandom=/dev/random" - fi - - econf ${myconf} || die "Configure failed" - emake || die "Make failed" -} - -src_install() { - - make DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGES NOTICE LICENSE -} diff --git a/dev-libs/apr/apr-1.2.7-r1.ebuild b/dev-libs/apr/apr-1.2.7-r1.ebuild deleted file mode 100644 index 26aed1dd28ea..000000000000 --- a/dev-libs/apr/apr-1.2.7-r1.ebuild +++ /dev/null @@ -1,75 +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/apr-1.2.7-r1.ebuild,v 1.3 2007/01/08 23:35:43 phreak Exp $ - -inherit autotools - -WANT_AUTOCONF="2.5" - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ipv6 urandom" -RESTRICT="test" - -DEPEND="" - -src_compile() { - - # for some reason not all the .m4 files that are referenced in - # configure.in exist, so we remove all references and include every - # .m4 file in build using aclocal via eautoreconf - # See bug 135463 - sed -i -e '/sinclude/d' configure.in - AT_M4DIR="build" eautoreconf - - myconf="--datadir=/usr/share/apr-1" - - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} --enable-threads" - myconf="${myconf} --enable-nonportable-atomics" - if use urandom; then - einfo "Using /dev/urandom as random device" - myconf="${myconf} --with-devrandom=/dev/urandom" - else - einfo "Using /dev/random as random device" - myconf="${myconf} --with-devrandom=/dev/random" - fi - - # We pre-load the cache with the correct answer! This avoids - # it violating the sandbox. This may have to be changed for - # non-Linux systems or if sem_open changes on Linux. This - # hack is built around documentation in /usr/include/semaphore.h - # and the glibc (pthread) source - # See bugs 24215 and 133573 - echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache - - econf ${myconf} || die "Configure failed" - - # Make sure we use the system libtool - sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk - sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config - rm libtool - - emake || die "Make failed" -} - -src_install() { - - make DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGES NOTICE LICENSE -} - -pkg_postinst() { - ewarn "We are now using the system's libtool rather then bundling" - ewarn "our own. You will need to rebuild Apache and possibly other" - ewarn "software if you get a message similiar to the following:" - ewarn - ewarn " /usr/share/apr-1/build-1/libtool: No such file or directory" - ewarn -} diff --git a/dev-libs/apr/apr-1.2.7-r2.ebuild b/dev-libs/apr/apr-1.2.7-r2.ebuild deleted file mode 100644 index 0c5cae28ca6b..000000000000 --- a/dev-libs/apr/apr-1.2.7-r2.ebuild +++ /dev/null @@ -1,81 +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/apr-1.2.7-r2.ebuild,v 1.2 2007/01/08 23:35:43 phreak Exp $ - -inherit autotools - -WANT_AUTOCONF="2.5" - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ipv6 urandom debug" -RESTRICT="test" - -DEPEND="" - -src_compile() { - - # for some reason not all the .m4 files that are referenced in - # configure.in exist, so we remove all references and include every - # .m4 file in build using aclocal via eautoreconf - # See bug 135463 - sed -i -e '/sinclude/d' configure.in - AT_M4DIR="build" eautoreconf - - myconf="--datadir=/usr/share/apr-1" - - # For now we always enable ipv6. Testing has shown that is still works - # correctly in ipv4 systems, and currently, the ipv4-only support - # is broken in apr. (ipv6 is enabled by default) - #myconf="${myconf} $(use_enable ipv6)" - - myconf="${myconf} --enable-threads" - myconf="${myconf} --enable-nonportable-atomics" - if use urandom; then - einfo "Using /dev/urandom as random device" - myconf="${myconf} --with-devrandom=/dev/urandom" - else - einfo "Using /dev/random as random device" - myconf="${myconf} --with-devrandom=/dev/random" - fi - - useq debug && myconf="${myconf} --enable-maintainer-mode" - - # We pre-load the cache with the correct answer! This avoids - # it violating the sandbox. This may have to be changed for - # non-Linux systems or if sem_open changes on Linux. This - # hack is built around documentation in /usr/include/semaphore.h - # and the glibc (pthread) source - # See bugs 24215 and 133573 - echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache - - econf ${myconf} || die "Configure failed" - - # Make sure we use the system libtool - sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk - sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config - rm libtool - - emake || die "Make failed" -} - -src_install() { - - make DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGES NOTICE LICENSE -} - -pkg_postinst() { - ewarn "We are now using the system's libtool rather then bundling" - ewarn "our own. You will need to rebuild Apache and possibly other" - ewarn "software if you get a message similiar to the following:" - ewarn - ewarn " /usr/share/apr-1/build-1/libtool: No such file or directory" - ewarn -} diff --git a/dev-libs/apr/apr-1.2.7-r3.ebuild b/dev-libs/apr/apr-1.2.7-r3.ebuild deleted file mode 100644 index 0a21d694cfec..000000000000 --- a/dev-libs/apr/apr-1.2.7-r3.ebuild +++ /dev/null @@ -1,94 +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/apr-1.2.7-r3.ebuild,v 1.5 2007/01/08 23:35:43 phreak Exp $ - -inherit autotools - -WANT_AUTOCONF="2.5" - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="ipv6 urandom debug" -RESTRICT="test" - -DEPEND="" - -src_unpack() { - unpack ${A} - cd ${S} - - # for some reason not all the .m4 files that are referenced in - # configure.in exist, so we remove all references and include every - # .m4 file in build using aclocal via eautoreconf - # See bug 135463 - sed -i -e '/sinclude/d' configure.in - AT_M4DIR="build" eautoreconf - - epatch ${FILESDIR}/config.layout.patch - -} - -src_compile() { - - - myconf="--enable-layout=gentoo" - - # For now we always enable ipv6. Testing has shown that is still works - # correctly in ipv4 systems, and currently, the ipv4-only support - # is broken in apr. (ipv6 is enabled by default) - #myconf="${myconf} $(use_enable ipv6)" - - myconf="${myconf} --enable-threads" - myconf="${myconf} --enable-nonportable-atomics" - if use urandom; then - einfo "Using /dev/urandom as random device" - myconf="${myconf} --with-devrandom=/dev/urandom" - else - einfo "Using /dev/random as random device" - myconf="${myconf} --with-devrandom=/dev/random" - fi - - useq debug && myconf="${myconf} --enable-maintainer-mode" - - # We pre-load the cache with the correct answer! This avoids - # it violating the sandbox. This may have to be changed for - # non-Linux systems or if sem_open changes on Linux. This - # hack is built around documentation in /usr/include/semaphore.h - # and the glibc (pthread) source - # See bugs 24215 and 133573 - echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache - - econf ${myconf} || die "Configure failed" - - # Make sure we use the system libtool - sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' build/apr_rules.mk - sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' apr-1-config - rm libtool - - emake || die "Make failed" -} - -src_install() { - - make DESTDIR="${D}" install || die "make install failed" - - # 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)/apr.exp - - dodoc CHANGES NOTICE LICENSE -} - -pkg_postinst() { - ewarn "We are now using the system's libtool rather then bundling" - ewarn "our own. You will need to rebuild Apache and possibly other" - ewarn "software if you get a message similiar to the following:" - ewarn - ewarn " /usr/share/apr-1/build-1/libtool: No such file or directory" - ewarn -} diff --git a/dev-libs/apr/apr-1.2.7.ebuild b/dev-libs/apr/apr-1.2.7.ebuild deleted file mode 100644 index 6fdb6aa1d8ba..000000000000 --- a/dev-libs/apr/apr-1.2.7.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.7.ebuild,v 1.6 2006/06/06 16:12:51 vericgar Exp $ - -inherit flag-o-matic libtool - -DESCRIPTION="Apache Portable Runtime Library" -HOMEPAGE="http://apr.apache.org/" -SRC_URI="mirror://apache/apr/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ipv6 urandom" -RESTRICT="test" - -DEPEND="" - -src_compile() { - - elibtoolize || die "elibtoolize failed" - - myconf="--datadir=/usr/share/apr-1" - - myconf="${myconf} $(use_enable ipv6)" - myconf="${myconf} --enable-threads" - myconf="${myconf} --enable-nonportable-atomics" - if use urandom; then - einfo "Using /dev/urandom as random device" - myconf="${myconf} --with-devrandom=/dev/urandom" - else - einfo "Using /dev/random as random device" - myconf="${myconf} --with-devrandom=/dev/random" - fi - - # We pre-load the cache with the correct answer! This avoids - # it violating the sandbox. This may have to be changed for - # non-Linux systems or if sem_open changes on Linux. This - # hack is built around documentation in /usr/include/semaphore.h - # and the glibc (pthread) source - # See bugs 24215 and 133573 - echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache - - econf ${myconf} || die "Configure failed" - emake || die "Make failed" -} - -src_install() { - - make DESTDIR="${D}" install || die "make install failed" - - dodoc CHANGES NOTICE LICENSE -} diff --git a/dev-libs/apr/files/digest-apr-0.9.6-r3 b/dev-libs/apr/files/digest-apr-0.9.6-r3 deleted file mode 100644 index 809c77ef1b72..000000000000 --- a/dev-libs/apr/files/digest-apr-0.9.6-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231 -RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 apr-0.9.6.tar.gz 1025231 -SHA256 df9cdac4e99fd8a5f666a7cfd9e9097666d5a80e34f3e1431e8f0f185e413fe5 apr-0.9.6.tar.gz 1025231 diff --git a/dev-libs/apr/files/digest-apr-0.9.6-r4 b/dev-libs/apr/files/digest-apr-0.9.6-r4 deleted file mode 100644 index 809c77ef1b72..000000000000 --- a/dev-libs/apr/files/digest-apr-0.9.6-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b7e4c52cccb421b42a41b0bed5a9f9bc apr-0.9.6.tar.gz 1025231 -RMD160 5ae7ddf3976b9c3a03db2f3df6b5eda96c142b76 apr-0.9.6.tar.gz 1025231 -SHA256 df9cdac4e99fd8a5f666a7cfd9e9097666d5a80e34f3e1431e8f0f185e413fe5 apr-0.9.6.tar.gz 1025231 diff --git a/dev-libs/apr/files/digest-apr-0.9.7 b/dev-libs/apr/files/digest-apr-0.9.7 deleted file mode 100644 index 3ec4c9a9e565..000000000000 --- a/dev-libs/apr/files/digest-apr-0.9.7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 061772cac0d8acf8e3ee402eb57944c9 apr-0.9.7.tar.gz 1045136 -RMD160 d2978d3f3d505885e0782b2b2b40fa1ccc2e9e7a apr-0.9.7.tar.gz 1045136 -SHA256 9d102909d840b2e2960a8175408e6d6a6e28a35112bd1190a22d346b0b66b2ba apr-0.9.7.tar.gz 1045136 diff --git a/dev-libs/apr/files/digest-apr-1.2.2 b/dev-libs/apr/files/digest-apr-1.2.2 deleted file mode 100644 index f4858e970324..000000000000 --- a/dev-libs/apr/files/digest-apr-1.2.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f96e3b04ccf86ed28a0734d7efc5bb65 apr-1.2.2.tar.gz 1096029 -RMD160 13a4edd59fb93596c8cae4549d38a0022a5c6758 apr-1.2.2.tar.gz 1096029 -SHA256 23826f62b305efef3f6c6e7e6b8ddad05ec48a2f36410ff508b3fc4714a33dfc apr-1.2.2.tar.gz 1096029 diff --git a/dev-libs/apr/files/digest-apr-1.2.7 b/dev-libs/apr/files/digest-apr-1.2.7 deleted file mode 100644 index 13dfeb0ca3cd..000000000000 --- a/dev-libs/apr/files/digest-apr-1.2.7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370 -RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370 -SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370 diff --git a/dev-libs/apr/files/digest-apr-1.2.7-r1 b/dev-libs/apr/files/digest-apr-1.2.7-r1 deleted file mode 100644 index 13dfeb0ca3cd..000000000000 --- a/dev-libs/apr/files/digest-apr-1.2.7-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370 -RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370 -SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370 diff --git a/dev-libs/apr/files/digest-apr-1.2.7-r2 b/dev-libs/apr/files/digest-apr-1.2.7-r2 deleted file mode 100644 index 13dfeb0ca3cd..000000000000 --- a/dev-libs/apr/files/digest-apr-1.2.7-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370 -RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370 -SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370 diff --git a/dev-libs/apr/files/digest-apr-1.2.7-r3 b/dev-libs/apr/files/digest-apr-1.2.7-r3 deleted file mode 100644 index 13dfeb0ca3cd..000000000000 --- a/dev-libs/apr/files/digest-apr-1.2.7-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 aea926cbe588f844ad9e317157d60175 apr-1.2.7.tar.gz 1102370 -RMD160 9dfeb562b376c32261b8a263887a05515c4afbe2 apr-1.2.7.tar.gz 1102370 -SHA256 4bde26d8168216f00e0f652e34e20e527dab38edca6a7c0d85aea542bf0fc5fa apr-1.2.7.tar.gz 1102370 diff --git a/dev-libs/apr/metadata.xml b/dev-libs/apr/metadata.xml index ff5b6490402e..a1f5ceff2352 100644 --- a/dev-libs/apr/metadata.xml +++ b/dev-libs/apr/metadata.xml @@ -1,8 +1,8 @@ -apache - - apache-bugs@gentoo.org - + apache + + apache-bugs@gentoo.org +