version bump

Package-Manager: portage-2.1.3.7

4 files changed, 124 insertions, 5 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 163cfd33bd41..d915e25fd049 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.15 2007/09/04 18:35:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.16 2007/09/07 21:41:34 hollow Exp $
+
+*apache-tools-2.2.6 (07 Sep 2007)
+
+  07 Sep 2007; Benedikt Böhm <hollow@gentoo.org>
+  +apache-tools-2.2.6.ebuild:
+  version bump
 
   04 Sep 2007; Raúl Porcel <armin76@gentoo.org>
   apache-tools-2.2.4-r4.ebuild:
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 6b8e418bde33..9f062e374ab2 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,16 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX apache-tools-Makefile.patch 1518 RMD160 a04c70be28753d3588b05487b9bd36b238778ab4 SHA1 c133ee0a12bddaa43ed57e0636c85b5fd4663afe SHA256 8be1a3b06f54cb2aa7311b2ab1cfbe381de9cca5b0b9ace804730d9d14c33236
 MD5 5834d2f066be9d8d62c35d7d3776138d files/apache-tools-Makefile.patch 1518
 RMD160 a04c70be28753d3588b05487b9bd36b238778ab4 files/apache-tools-Makefile.patch 1518
 SHA256 8be1a3b06f54cb2aa7311b2ab1cfbe381de9cca5b0b9ace804730d9d14c33236 files/apache-tools-Makefile.patch 1518
 DIST httpd-2.2.4.tar.bz2 4930375 RMD160 bb6e8a7447fa8e8f629010f30b548068de518523 SHA1 64ceae373434a986dc99b8ed953afa0d4fad85ce SHA256 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8
+DIST httpd-2.2.6.tar.bz2 4717066 RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f SHA1 e6ef926ecd1f9a412af8c266239f0a6f58c63854 SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c
 EBUILD apache-tools-2.2.4-r4.ebuild 2247 RMD160 8262fa4da7c217278431f7f8a0069396ee3eff35 SHA1 4b09c9c4b4e1f7fb782562a7bfa92fceccccfa4f SHA256 fb51710ebfd90cc6cb1b19f97e14ce472ba70079ef21119f5baa4bf2f1104de4
 MD5 2c2987079874fd6e72a839844fa79991 apache-tools-2.2.4-r4.ebuild 2247
 RMD160 8262fa4da7c217278431f7f8a0069396ee3eff35 apache-tools-2.2.4-r4.ebuild 2247
 SHA256 fb51710ebfd90cc6cb1b19f97e14ce472ba70079ef21119f5baa4bf2f1104de4 apache-tools-2.2.4-r4.ebuild 2247
-MISC ChangeLog 2440 RMD160 8860b28bc3db68bff00632be015c7d28191c8c1c SHA1 6b53f6ced8e9a5a225813e1b2c81391c5979201a SHA256 38eec704d2c1e1db6d743f8577cf8a1d248b9d30d61c18b03ecb158ac3ff02f0
-MD5 0378d5e969367f92d70b91bff6050d52 ChangeLog 2440
-RMD160 8860b28bc3db68bff00632be015c7d28191c8c1c ChangeLog 2440
-SHA256 38eec704d2c1e1db6d743f8577cf8a1d248b9d30d61c18b03ecb158ac3ff02f0 ChangeLog 2440
+EBUILD apache-tools-2.2.6.ebuild 2258 RMD160 2e11a96827daf238a88d4b242f511ef06bf8376b SHA1 b5458a1abd46603c6d4a6c8e90051274b42f8fe8 SHA256 8a88f6d83b83e34218272430a8d918bc9caa957509927f7d6fcab9d1e55ab9a0
+MD5 487935fab85a5ce61d82c55b1b151cb3 apache-tools-2.2.6.ebuild 2258
+RMD160 2e11a96827daf238a88d4b242f511ef06bf8376b apache-tools-2.2.6.ebuild 2258
+SHA256 8a88f6d83b83e34218272430a8d918bc9caa957509927f7d6fcab9d1e55ab9a0 apache-tools-2.2.6.ebuild 2258
+MISC ChangeLog 2570 RMD160 e8cf68193231c4c635092d0779c92ac981971b0f SHA1 4af08cb280aea0424be0c62c7c1c0d1ade8417f1 SHA256 19430ec3be6e300c1ad645ddb5ac9947cd4aa1c16c5b249955bb07baedcdefe5
+MD5 98041554d9f65e91b40486490b12aac4 ChangeLog 2570
+RMD160 e8cf68193231c4c635092d0779c92ac981971b0f ChangeLog 2570
+SHA256 19430ec3be6e300c1ad645ddb5ac9947cd4aa1c16c5b249955bb07baedcdefe5 ChangeLog 2570
 MISC metadata.xml 444 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 SHA1 4083f4a0f8f98832142f9ef9fb1e9581876bf699 SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c
 MD5 f58e4db131bec13f30dc06e7f43d3da1 metadata.xml 444
 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 metadata.xml 444
@@ -18,3 +26,13 @@ SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c metadata
 MD5 aa71cde94322b137c83be34a071fa0b0 files/digest-apache-tools-2.2.4-r4 241
 RMD160 e147c8301d25ae38730c7fadf7353a0cdcf9a599 files/digest-apache-tools-2.2.4-r4 241
 SHA256 b4719ddba967e2c38193dc4fd4c74fd3c9a670528d947ff22095b6cf562edb41 files/digest-apache-tools-2.2.4-r4 241
+MD5 3729d56e624804a07bc7048221b1f373 files/digest-apache-tools-2.2.6 241
+RMD160 6cbe1c93cea65a5533a6e64a009b95f4c2a8fb31 files/digest-apache-tools-2.2.6 241
+SHA256 4df3dc9e6e15133ac587bd68b1bb01ccd5f9539c6acfab770af651c5720914eb files/digest-apache-tools-2.2.6 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG4cWgmPFBzbX68WERAnuSAJ4qIIEVlG4aPSSXfTRkrvSo00RNEACghY47
+FK9c13qsKvCP2WyECE08LgM=
+=BWcw
+-----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.2.6.ebuild b/app-admin/apache-tools/apache-tools-2.2.6.ebuild
new file mode 100644
index 000000000000..5fa7e2afc774
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.6.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.6.ebuild,v 1.1 2007/09/07 21:41:34 hollow Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
+HOMEPAGE="http://httpd.apache.org/"
+SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+IUSE="ssl"
+RESTRICT="test"
+
+RDEPEND="=dev-libs/apr-1*
+	=dev-libs/apr-util-1*
+	dev-libs/libpcre
+	ssl? ( dev-libs/openssl )
+	!<www-servers/apache-2.2.4"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Apply these patches:
+	# (1)	apache-tools-Makefile.patch:
+	#		- fix up the `make install' for support/
+	#		- remove envvars from `make install'
+	epatch "${FILESDIR}"/${PN}-Makefile.patch
+}
+
+src_compile() {
+	local myconf=""
+	cd "${S}"
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	# Thanks to Harald van Dijk
+	append-ldflags -Wl,--no-as-needed
+
+	if use ssl ; then
+		myconf="${myconf} --with-ssl=/usr --enable-ssl"
+		append-flags -DHAVE_OPENSSL -DUSE_SSL -I/usr/include/openssl
+		append-ldflags -lssl
+	fi
+
+	# econf overwrites the stuff from config.layout, so we have to put them into
+	# our myconf line too
+
+	econf \
+		--sbindir=/usr/sbin \
+		--with-perl=/usr/bin/perl \
+		--with-expat=/usr \
+		--with-z=/usr \
+		--with-apr=/usr \
+		--with-apr-util=/usr \
+		--with-pcre=/usr \
+		${myconf} || die "econf failed!"
+
+	cd support
+	emake || die "emake support/ failed!"
+}
+
+src_install () {
+	cd "${S}"/support
+
+	make DESTDIR="${D}" install || die "make install failed!"
+
+	# install manpages
+	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
+		"${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+
+	for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+
+	# Provide a symlink for ab-ssl
+	if use ssl ; then
+		dosym /usr/sbin/ab /usr/sbin/ab-ssl
+		dosym /usr/sbin/ab /usr/sbin/ab2-ssl
+	fi
+
+	dodoc "${S}"/CHANGES
+}
diff --git a/app-admin/apache-tools/files/digest-apache-tools-2.2.6 b/app-admin/apache-tools/files/digest-apache-tools-2.2.6
new file mode 100644
index 000000000000..c8d86da16d22
--- /dev/null
+++ b/app-admin/apache-tools/files/digest-apache-tools-2.2.6
@@ -0,0 +1,3 @@
+MD5 203bea91715064f0c787f6499d33a377 httpd-2.2.6.tar.bz2 4717066
+RMD160 5ae895c6898213e1e3b7e7b02cdfcbe5b36a108f httpd-2.2.6.tar.bz2 4717066
+SHA256 f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c httpd-2.2.6.tar.bz2 4717066