New version for apache 2.2

(Portage version: 2.1_pre4-r1)

8 files changed, 181 insertions, 22 deletions

diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog
index a6a71652626b..b9ff3227b0f4 100644
--- a/dev-libs/apr-util/ChangeLog
+++ b/dev-libs/apr-util/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/apr-util
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.43 2006/01/15 02:34:33 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.44 2006/02/15 06:08:34 vericgar Exp $
+
+*apr-util-1.2.2 (15 Feb 2006)
+
+  15 Feb 2006; Michael Stewart <vericgar@gentoo.org> +apr-util-1.2.2.ebuild:
+  New version for apache 2.2
 
   15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> apr-util-0.9.7.ebuild:
   Stable on amd64, bug 117835.
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index cd4cedc5f269..b0b6e533b0bc 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -1,19 +1,33 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ce7da75ebf1031081d02862f600bd9d3 ChangeLog 5471
+RMD160 225c05336d7ddce53a7d07cc59b538743d44606b ChangeLog 5471
+SHA256 9794793744334f84ceac1f588d7dc6f49cbe23d62627e822f53a8f5cd1e29723 ChangeLog 5471
 MD5 069b36180a4df1925f6d6b7ab8eed362 apr-util-0.9.6-r2.ebuild 2036
+RMD160 4566d2c311956c728e35d3bcfb23b185f5291806 apr-util-0.9.6-r2.ebuild 2036
+SHA256 fb55f6582b5a49157cb3ec7cf0e33273f78f895d761c5d632ec510d35b0c52ee apr-util-0.9.6-r2.ebuild 2036
 MD5 788f2fbbbbce32e6bbeaa056ceeab6da apr-util-0.9.7.ebuild 1829
+RMD160 ddb045124cce879d3c1d6a28b2603766f4dd5fb2 apr-util-0.9.7.ebuild 1829
+SHA256 03e28675f31b7a3702b8a3c7da8637d6eaa5a37ab9f9cf9f213c43737ad25b68 apr-util-0.9.7.ebuild 1829
 MD5 eb1e072b34afd26a02d5673d81dd0046 apr-util-1.1.2.ebuild 1910
+RMD160 203baf14a0dc84b921983c357e8e408b75e54377 apr-util-1.1.2.ebuild 1910
+SHA256 d34141e74b40ea55a6cabab381e8a3624b5854f54a72960ea202198f982b4d9d apr-util-1.1.2.ebuild 1910
+MD5 6d2693b3d520f7160303eae4642821c1 apr-util-1.2.2.ebuild 1928
+RMD160 0cbaf6ae939c0f130bac96a5049e2911fff1cc56 apr-util-1.2.2.ebuild 1928
+SHA256 101b4f6b007a3f2cd754b0b83cfe7c9ce567fb789fdaaa28f64785b84a6a30f1 apr-util-1.2.2.ebuild 1928
 MD5 5c39070c5a30db4f82b9373cadee4c45 files/apr-util-0.9.x-161086:161087.patch 4671
+RMD160 e43a94b8320f6069dae600ffc4c0bf9c2e1fcbc7 files/apr-util-0.9.x-161086:161087.patch 4671
+SHA256 4967c04070d5a58ba206a11cbf2ba913da1052ad654a05a0af59228900c52e53 files/apr-util-0.9.x-161086:161087.patch 4671
 MD5 467e8ba98a938b691d27ec9971dbfe12 files/digest-apr-util-0.9.6-r2 66
+RMD160 3d559313b8cfac5fbecda3e9f36e62647af5bc50 files/digest-apr-util-0.9.6-r2 66
+SHA256 57a6415ba2347c7c5701709d8290dc6410e568d9b3241d11b02f161cc8dd5713 files/digest-apr-util-0.9.6-r2 66
 MD5 6bf0076ded392d07180f520a63f5cb66 files/digest-apr-util-0.9.7 66
+RMD160 17616de13b64c5bb00123bda9ac88b72e85c2b4a files/digest-apr-util-0.9.7 66
+SHA256 aed5509ff6195f36bd7e7ba6decd60209f434e3f009c2de62ec3f52b848700e3 files/digest-apr-util-0.9.7 66
 MD5 c46881efc10b92ab7b6189cdc9070929 files/digest-apr-util-1.1.2 66
+RMD160 1373d71c620fe80cadf15871ef3ebc0abbe8e0df files/digest-apr-util-1.1.2 66
+SHA256 24011c140614ccc1ac2e447f37e510099f55ff937a08ec53c3cacc0b807dd32c files/digest-apr-util-1.1.2 66
+MD5 c7cedf64c36cca8e31e0df1feaf9e741 files/digest-apr-util-1.2.2 244
+RMD160 0c76d67fc1401e0303ca7ccc76b53aca4ec54b57 files/digest-apr-util-1.2.2 244
+SHA256 d76aa7b7fdc284fcb4d41d1e242d499089cf7b06310c9f1b0b8963ea16091aef files/digest-apr-util-1.2.2 244
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDybTDntT9W3vfTuoRAo+GAJwLsEwI9m+A3bcn1VFPeMF2mLeglQCfR1Md
-zWKb/jHwG3ae1098zxbWvZo=
-=X+Ik
------END PGP SIGNATURE-----
+RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
+SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
diff --git a/dev-libs/apr-util/apr-util-1.2.2.ebuild b/dev-libs/apr-util/apr-util-1.2.2.ebuild
new file mode 100644
index 000000000000..8d91ec762d3b
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.2.2.ebuild
@@ -0,0 +1,72 @@
+# 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.1 2006/02/15 06:08:34 vericgar Exp $
+
+inherit eutils
+
+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 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_unpack() {
+	unpack ${A} || die
+}
+
+
+src_compile() {
+
+	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
+		if has_version '=sys-libs/db-4.3*'; then
+			myconf="${myconf} --with-dbm=db43
+			--with-berkeley-db=/usr/include/db4.3:/usr/$(get_libdir)"
+		elif 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)"
+		fi
+	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/files/digest-apr-util-1.2.2 b/dev-libs/apr-util/files/digest-apr-util-1.2.2
new file mode 100644
index 000000000000..073c9a4bd805
--- /dev/null
+++ b/dev-libs/apr-util/files/digest-apr-util-1.2.2
@@ -0,0 +1,3 @@
+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/ChangeLog b/dev-libs/apr/ChangeLog
index 784d99885f5c..38a605f0ddc0 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/apr
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.50 2006/01/15 02:33:22 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.51 2006/02/15 06:06:15 vericgar Exp $
+
+*apr-1.2.2 (15 Feb 2006)
+
+  15 Feb 2006; Michael Stewart <vericgar@gentoo.org> +apr-1.2.2.ebuild:
+  New version for apache 2.2
 
   15 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> apr-0.9.7.ebuild:
   Stable on amd64, bug 117835.
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 79864d505369..89d8005a9742 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,20 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 04f26e62d82c69008feb26a096c2c11b ChangeLog 6211
+RMD160 793037e7b73461af445a63fcdc301910c9f58852 ChangeLog 6211
+SHA256 2f212777fcd4371f200e207081b1e66481f2d1a1adf23dd45baedac50b8afc1d ChangeLog 6211
 MD5 2fc416814f4a3443b28fc548cf8d86dc apr-0.9.6-r3.ebuild 1534
+RMD160 7c2e849526b2de3e59606a0939adee47db1a3f11 apr-0.9.6-r3.ebuild 1534
+SHA256 0795ed7fb1daed9fa97160ce1d117ce43ec063d48b06f1a6b56ab28a0497db08 apr-0.9.6-r3.ebuild 1534
 MD5 e60102c3837e3d05e9d2cbf520bce415 apr-0.9.6-r4.ebuild 1741
+RMD160 d814da08bca64f1e8772c4cd6259910ca0a8a7dc apr-0.9.6-r4.ebuild 1741
+SHA256 2f0fb1cb303381110e350d314c7a57f2f31b0a651e823be0d826b9c108dc4d90 apr-0.9.6-r4.ebuild 1741
 MD5 d7317b83929491d06a1559f2354d5c30 apr-0.9.7.ebuild 1723
+RMD160 377aeeaceee722c3fd3f3ed16eb4828d9a00975e apr-0.9.7.ebuild 1723
+SHA256 564a8bef7dac40a8a25b40b59e470e11d68bf16531008d7935dfaa25346e44cc apr-0.9.7.ebuild 1723
 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 a93f37813c9dad1c851e1897b64fd57b apr-1.2.2.ebuild 1092
+RMD160 8a1163d1c8b7b90e0db07ba7ad80da677f806f14 apr-1.2.2.ebuild 1092
+SHA256 492c7711bb42e8292a814c11e291f5a6b48630ba4d23298892862cf9d1b0dfd3 apr-1.2.2.ebuild 1092
 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
 MD5 2b9c5f7ab799254e5738997732c9be8c files/digest-apr-0.9.6-r4 62
+RMD160 c93df8a84d86a2c31c744ca0c9c5293f5a207515 files/digest-apr-0.9.6-r4 62
+SHA256 f97cc8492692b5879bf12d8c6eeac60f002ad64be889ee0ebdce755e365fd5c2 files/digest-apr-0.9.6-r4 62
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDybR8ntT9W3vfTuoRAmUwAJ41E1ARm7JdTEAuzXkqFTQBNivkHQCeP2C4
-nVXkuye3Ix/8g3NfG4hx1Os=
-=DYjA
------END PGP SIGNATURE-----
+RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
+SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
diff --git a/dev-libs/apr/apr-1.2.2.ebuild b/dev-libs/apr/apr-1.2.2.ebuild
new file mode 100644
index 000000000000..e14c358473c0
--- /dev/null
+++ b/dev-libs/apr/apr-1.2.2.ebuild
@@ -0,0 +1,41 @@
+# 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 $
+
+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() {
+
+	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/files/digest-apr-1.2.2 b/dev-libs/apr/files/digest-apr-1.2.2
new file mode 100644
index 000000000000..f4858e970324
--- /dev/null
+++ b/dev-libs/apr/files/digest-apr-1.2.2
@@ -0,0 +1,3 @@
+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