Fix SLOT

Package-Manager: portage-2.1_pre6

5 files changed, 7 insertions, 86 deletions

diff --git a/dev-libs/apr-util/apr-util-1.2.2.ebuild b/dev-libs/apr-util/apr-util-1.2.2.ebuild
index c2a5ecefc636..a4783ae449e0 100644
--- a/dev-libs/apr-util/apr-util-1.2.2.ebuild
+++ b/dev-libs/apr-util/apr-util-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2006/03/30 19:35:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.2.2.ebuild,v 1.4 2006/04/11 23:41:22 vericgar Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://apr.apache.org/"
 SRC_URI="mirror://apache/apr/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="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"
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 5587785e259b..e9b4b3c3661e 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bded169aa04e183e34914506c5521d72 ChangeLog 6440
 RMD160 3fcb4b608bca26a788e9c147317a7df89cb007ec ChangeLog 6440
 SHA256 71828500f2b0ddce20d235ecf1e9e13225e13a17a4904186979081937db410c4 ChangeLog 6440
@@ -13,12 +10,9 @@ SHA256 2f0fb1cb303381110e350d314c7a57f2f31b0a651e823be0d826b9c108dc4d90 apr-0.9.
 MD5 994875c8daaca16f78b72d6ceb722054 apr-0.9.7.ebuild 1737
 RMD160 f45f8bc0092dc542991c0de967dbce1e20db28a1 apr-0.9.7.ebuild 1737
 SHA256 a7941151e8bd74de62ba7ba2876b3501889556c9434176a6019d13b1600c69ad apr-0.9.7.ebuild 1737
-MD5 2a6eccf76c91c46320c26f1bff7a9098 apr-1.1.1.ebuild 2022
-RMD160 ec753fca6978a0935fbfb1f9032bb22cae379037 apr-1.1.1.ebuild 2022
-SHA256 178bc2050c316ebd89ae0879c2f942d9ae22cdfa89564a0cd20f52c9c9cc9d34 apr-1.1.1.ebuild 2022
-MD5 a265fa16d0938aa71f88c4f4d743b487 apr-1.2.2.ebuild 1095
-RMD160 1ff8577cb5caa7e4f20e96d88a6c6b19160f71c6 apr-1.2.2.ebuild 1095
-SHA256 55dd6d4d113a78076c2c37a1d266343e6ed55f45fa7f90ede8b5121c757c41dc apr-1.2.2.ebuild 1095
+MD5 fa263089cfac55a0bb043e4505d35f9a apr-1.2.2.ebuild 1095
+RMD160 6010b2c4426e336fabed3ebd72b3ed64709d5a59 apr-1.2.2.ebuild 1095
+SHA256 6cf31fa1d5f24faa43a5195af5e1d53bf3432bc028d1a011217ea74f12d47fca apr-1.2.2.ebuild 1095
 MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r3 62
 RMD160 c93df8a84d86a2c31c744ca0c9c5293f5a207515 files/digest-apr-0.9.6-r3 62
 SHA256 f97cc8492692b5879bf12d8c6eeac60f002ad64be889ee0ebdce755e365fd5c2 files/digest-apr-0.9.6-r3 62
@@ -28,19 +22,9 @@ SHA256 f97cc8492692b5879bf12d8c6eeac60f002ad64be889ee0ebdce755e365fd5c2 files/di
 MD5 7445fa25c23b6a6c375133876ebed18b files/digest-apr-0.9.7 62
 RMD160 9bbfc09235db6c1c632fe03fb15c2dd03d7c8d86 files/digest-apr-0.9.7 62
 SHA256 4b5e9b75f16afb281d2894811af5eed7bec8e042429dcd9484f3bb4b177a3acb files/digest-apr-0.9.7 62
-MD5 7a3bbbaa94fd0f5b9f33afc40db8f618 files/digest-apr-1.1.1 62
-RMD160 163d645f060ca973117d0d692dbec919994088ff files/digest-apr-1.1.1 62
-SHA256 c52b0b66962d9e3c4a0dc950ac91870fcf3bbffa805ef923107ce1eaa5431cfc files/digest-apr-1.1.1 62
 MD5 235ee98ffaa0c6df524ab27e0d862290 files/digest-apr-1.2.2 232
 RMD160 6920410c7abecdc6e6cf9f0b89266d987e13949f files/digest-apr-1.2.2 232
 SHA256 0470c016cff11975573657a5dfbad7f8c3e902e6841d39de4f349dcb61b95e8d files/digest-apr-1.2.2 232
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
 SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELDSTAiZjviIA2XgRAmzBAJ93/FT72UQxGkf2EofKRYGYPNf4xgCg0hKO
-juzHVAyWug+4JH7dUNBnJw8=
-=slnX
------END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-1.1.1.ebuild b/dev-libs/apr/apr-1.1.1.ebuild
deleted file mode 100644
index 4716f0e7e732..000000000000
--- a/dev-libs/apr/apr-1.1.1.ebuild
+++ /dev/null
@@ -1,62 +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-1.1.1.ebuild,v 1.5 2005/09/29 21:14:42 matsuu Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Apache Portable Runtime Library"
-HOMEPAGE="http://apr.apache.org/"
-SRC_URI="mirror://apache/apr/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT="1"
-IUSE="ipv6"
-RESTRICT="test"
-
-DEPEND=">=sys-apps/sed-4"
-
-# this function shall maybe go into flag-o-matic.eclass
-lfs-flags() {
-	echo -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-}
-
-src_compile() {
-	myconf=""
-
-	myconf="${myconf} $(use_enable ipv6 ipv6)"
-	myconf="${myconf} --enable-threads"
-	myconf="${myconf} --enable-nonportable-atomics"
-
-	append-lfs-flags
-
-	./configure \
-	       --prefix=/usr \
-	       --host=${CHOST} \
-	       --mandir=/usr/share/man \
-	       --infodir=/usr/share/info \
-	       --datadir=/usr/share/apr-1 \
-	       --sysconfdir=/etc \
-	       --localstatedir=/var/lib \
-	       $myconf || die
-
-	emake || die
-}
-
-src_install() {
-	einstall installbuilddir=${D}/usr/share/apr-1/build
-
-	#bogus values pointing at /var/tmp/portage
-	sed -i -e 's:APR_SOURCE_DIR=.*:APR_SOURCE_DIR=/usr/share/apr-1:g' ${D}/usr/bin/apr-1-config
-	sed -i -e 's:APR_BUILD_DIR=.*:APR_BUILD_DIR=/usr/share/apr-1/build:g' ${D}/usr/bin/apr-1-config
-	sed -i -e 's:installbuilddir=.*:installbuilddir="/usr/share/apr-1/build":g' ${D}/usr/bin/apr-1-config
-	sed -i -e 's:apr_builddir=.*:apr_builddir=/usr/share/apr-1/build:g' ${D}/usr/share/apr-1/build/apr_rules.mk
-	sed -i -e 's:apr_builders=.*:apr_builders=/usr/share/apr-1/build:g' ${D}/usr/share/apr-1/build/apr_rules.mk
-	sed -i -e "s:CPPFLAGS=\"\\(.*\\)\":CPPFLAGS=\"\\1 `lfs-flags`\":" ${D}/usr/bin/apr-1-config
-
-	cp -p build/*.awk ${D}/usr/share/apr-1/build
-	cp -p build/*.sh ${D}/usr/share/apr-1/build
-	cp -p build/*.pl ${D}/usr/share/apr-1/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
index e14c358473c0..73a14875db56 100644
--- a/dev-libs/apr/apr-1.2.2.ebuild
+++ b/dev-libs/apr/apr-1.2.2.ebuild
@@ -1,13 +1,13 @@
 # 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.1 2006/02/15 06:06:15 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.2.2.ebuild,v 1.2 2006/04/11 23:38:02 vericgar Exp $
 
 DESCRIPTION="Apache Portable Runtime Library"
 HOMEPAGE="http://apr.apache.org/"
 SRC_URI="mirror://apache/apr/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
-SLOT="0"
+SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ipv6 urandom"
 RESTRICT="test"
diff --git a/dev-libs/apr/files/digest-apr-1.1.1 b/dev-libs/apr/files/digest-apr-1.1.1
deleted file mode 100644
index 2e9dde522f3f..000000000000
--- a/dev-libs/apr/files/digest-apr-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e153fda2df2338250548448c7a6e3d59 apr-1.1.1.tar.gz 1081272