version bump wrt #283729

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 101 insertions, 2 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index adfe7028632d..758ddffecc55 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.62 2009/10/04 14:38:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.63 2009/10/06 12:43:35 hollow Exp $
+
+*apache-tools-2.2.14 (06 Oct 2009)
+
+  06 Oct 2009; Benedikt Böhm <hollow@gentoo.org>
+  +apache-tools-2.2.14.ebuild:
+  version bump wrt #283729
 
   04 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
   apache-tools-2.2.11.ebuild, apache-tools-2.2.12.ebuild,
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 325b9c730f86..2797c469c71c 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -2,8 +2,10 @@ AUX apache-tools-Makefile.patch 1528 RMD160 a5f5431ab0170f07d4fd7723a93fb38db103
 DIST httpd-2.2.11.tar.bz2 5230130 RMD160 b2012af716a459f666e0e41eb04808bd0f7fc28d SHA1 7af256d53b79342f82222bd7b86eedbd9ac21d9a SHA256 5ce34825c5b84d1808605a22f8d16d44c6f91882a538bb98a3affed8f5dff6fe
 DIST httpd-2.2.12.tar.bz2 5140433 RMD160 4c8e781e5e60a7a332383a798fe0ddc1adffc914 SHA1 76e243a5b7dc9896e83bdfac1aa98bbfdc85aeae SHA256 b1e95d4f19a8f6cf9c2b9d44f5f109d22d79d3efb3e0a3c8265eebc9f82fc416
 DIST httpd-2.2.13.tar.bz2 5300199 RMD160 4a6a2247cc118175a9a36f1e14344ee71da24627 SHA1 44d85da1b8e6c579d4514cfefbea00b284717b69 SHA256 24a812e010d936a3114141bad56461fcaa1089aa720bd16355feb3516ab8d6d6
+DIST httpd-2.2.14.tar.bz2 5147171 RMD160 ff5077e444ba995475202bb3b9be733384c809d1 SHA1 eacd04c87b489231ae708c84a77dc8e9ee176fd2 SHA256 b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
 EBUILD apache-tools-2.2.11.ebuild 2261 RMD160 9c0ebe2cf7b2793acbd57079758cb92b3186c32a SHA1 6d7663d91c631f9bddc44dc1ad04dabaa1adbccd SHA256 1d9fa6d23c9354c31c391aafe72c119b9c7b0ce694eba1b3d5860a1ea8a7b4f8
 EBUILD apache-tools-2.2.12.ebuild 2272 RMD160 f1d702b63c67d3fb29b9bd4a4be4657bc8862ac4 SHA1 09bca8a7710f567104a351ccd05a8b9ab077e877 SHA256 991261bab56937d0e4b3e50a2bab1261d215e1396ce39ce9dedac11dc8612ac7
 EBUILD apache-tools-2.2.13.ebuild 2272 RMD160 3eb14a4a6051bf11650b1b366989aa39442b815d SHA1 eb034458d1425c71a6af8cec939a4149f07f97a1 SHA256 e7a586ed7cd0405da7cceb3de7a28333c5d1c0b4599e3dffb9f3bff9206d6027
-MISC ChangeLog 8294 RMD160 a7a21c5e04cb10acb6861f436737091c6643c0f4 SHA1 e9e0dba8a7e59a68c3d212877a109c1655fd009b SHA256 5e17dd480266da1b9034c6d7865992e4851eb18046862ee3eec16ea860c4b116
+EBUILD apache-tools-2.2.14.ebuild 2269 RMD160 d307617d664f25a0af34b8e9be497f8da1f8fc89 SHA1 6174671b367f3ec69b3f57c7371ba44bbf089a47 SHA256 1b92c6dca95a4bd20d1a47981ff71cf92b459bb94d5a58091d6539fd8cf3eb41
+MISC ChangeLog 8436 RMD160 97d126a6cd1542b32f9d22eb4a1a4e050d5608df SHA1 f1519a55b3ebf263e7921b1caf49fbe861137b6b SHA256 93286cded96eb3e1ff8c6127bd828c7aaad0225f86c19a2181446d5674dd777b
 MISC metadata.xml 444 RMD160 d8596b5b240df6adafad384c6faaf85e0730a966 SHA1 4083f4a0f8f98832142f9ef9fb1e9581876bf699 SHA256 1f54f0529721d94f50b5bfcda2fad18fab605e4d633c59f4a9c63eee278ab40c
diff --git a/app-admin/apache-tools/apache-tools-2.2.14.ebuild b/app-admin/apache-tools/apache-tools-2.2.14.ebuild
new file mode 100644
index 000000000000..169b637591dc
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.2.14.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2009 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.14.ebuild,v 1.1 2009/10/06 12:43:36 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 ~sparc-fbsd ~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 $(no-as-needed)
+
+	if use ssl ; then
+		myconf="${myconf} --with-ssl=/usr --enable-ssl"
+	fi
+
+	# econf overwrites the stuff from config.layout, so we have to put them into
+	# our myconf line too
+	econf \
+		--sbindir=/usr/sbin \
+		--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
+
+	# make htpasswd accessible for non-root users
+	dosym /usr/sbin/htpasswd /usr/bin/htpasswd
+	dosym /usr/sbin/htdigest /usr/bin/htdigest
+
+	dodoc "${S}"/CHANGES
+}