Bump for #405767

Package-Manager: portage-2.2.0_alpha97/cvs/Linux x86_64

3 files changed, 89 insertions, 16 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 210593086c40..7f4b351cbb07 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/apache-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.108 2012/03/29 10:41:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.109 2012/04/01 04:51:41 patrick Exp $
+
+*apache-tools-2.4.1 (01 Apr 2012)
+
+  01 Apr 2012; Patrick Lauer <patrick@gentoo.org> +apache-tools-2.4.1.ebuild:
+  Bump for #405767
 
   29 Mar 2012; Agostino Sarubbo <ago@gentoo.org> apache-tools-2.2.22.ebuild:
   Stable for amd64, wrt bug #401761
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 55363f97fcd6..1499ca0e857e 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX apache-tools-2.2.20-Makefile.patch 1621 RMD160 9932b9ec5a8aa63628c4aefed3437c0eded71b9c SHA1 50b81e7caeb2c128de377d682d95ca831be44b0a SHA256 bfed1a3d5e07766531a04c4752500c69dd60be45b71690c607383e2dc09e140d
 AUX apache-tools-Makefile.patch 1528 RMD160 a5f5431ab0170f07d4fd7723a93fb38db1030fa3 SHA1 863110419b1fa393d36dfbcd0adf1da827b86f76 SHA256 668caee92c1edd5559a0975c92bd2578ad0359f8835d51a9f0041f4b9e89564b
 DIST httpd-2.2.14.tar.bz2 5147171 RMD160 ff5077e444ba995475202bb3b9be733384c809d1 SHA1 eacd04c87b489231ae708c84a77dc8e9ee176fd2 SHA256 b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6
@@ -10,6 +7,7 @@ DIST httpd-2.2.17.tar.bz2 4951247 RMD160 4a2f16f2891094d4176565fadf0e8fcadf7dbaf
 DIST httpd-2.2.20.tar.bz2 5174611 RMD160 299d1a8a9f3a6eb925d63ce96fa8ea4a06ec1f17 SHA1 c8f00a505af6ed3f89f45b640217c388f5cd32b0 SHA256 1ee914855249b09d9cd2e20e98a0ab02f15c270fe277d4a5c9b62975479fc81e
 DIST httpd-2.2.21.tar.bz2 5324905 RMD160 6464a03d78ab858b1288ea9eef4cd5f73b60a9f1 SHA1 c02f9b05da9a7e316ff37d9053dc76a57ba51cb4 SHA256 18d5591fe48cfbac44fc20316036ffe17456df60bc3a2aaad238d56c6445577f
 DIST httpd-2.2.22.tar.bz2 5378934 RMD160 237a26a7759e7e1af175900d598e25fb082a4eb9 SHA1 766cd0843050a8dfb781e48b976f3ba6ebcf8696 SHA256 dcdc9f1dc722f84798caf69d69dca78daa5e09a4269060045aeca7e4f44cb231
+DIST httpd-2.4.1.tar.bz2 4101303 RMD160 6d21d828028ce1cff8648fb29c8eb1b75fd96451 SHA1 23beffce77529971e09d0fb1e760cadf80afa4e6 SHA256 7f1118cb0a1f9b505cdb9b7e854854fa2050d6ed0875b65e994bb35f267a0cca
 EBUILD apache-tools-2.2.14.ebuild 2278 RMD160 d5343cbb152ad2ca485f4bb8af49ae14f7c1ce12 SHA1 b9c686e79e85b961e4155a0173643884492e8339 SHA256 e31fdf1ef8db4ce82973637b7f1d0b4ad4cebaa9188c8e2aaba910651a4f18bd
 EBUILD apache-tools-2.2.15.ebuild 2278 RMD160 fa188e760527e9df296fe702dc0292f25f731a92 SHA1 4f7a69a4beb68f891937469d6ea0e6b493a6f252 SHA256 48ae8ba286d57ebe5d26c8b51e58cc4315ddfdac17431ad03ce30bde1eb9e970
 EBUILD apache-tools-2.2.16.ebuild 2278 RMD160 0709eb0d8595b84e0649ea71e1bb12b9f7d0b471 SHA1 ae69e4f093a21cefec38a45fcb5983841dbbdd14 SHA256 76339e9a16770c2338e29e60911ed32c03b5e0e6f6bd30bd2ed52c9e330acb88
@@ -17,16 +15,6 @@ EBUILD apache-tools-2.2.17.ebuild 2278 RMD160 895211a8d5826186d2ff97f6b58f71094d
 EBUILD apache-tools-2.2.20.ebuild 2193 RMD160 d91e8696d2f91f7018819cf73e045f1479a6b316 SHA1 e022c94716dd36c72a39fa2d81d1d34a4ab22f29 SHA256 24112652c333eb2549d7c0ed69d097ee787bc58516882d738156bcd1cd36f828
 EBUILD apache-tools-2.2.21.ebuild 2193 RMD160 a5aa55b8d6639c3afeae72ce4c5f23e9602b4ce9 SHA1 ea103fbe1febcafb57ca7618c1657f426c3dae95 SHA256 4dad414ea1453bdf5627697ae4d3ad0dc226d089d589988221b19e81ac0ff78f
 EBUILD apache-tools-2.2.22.ebuild 2199 RMD160 0b1e0cfd3a073bf6482ab8bf2b26440dd40dfc34 SHA1 bfdaa65416905ce549361606a30251262e502a97 SHA256 802d6cbb3db7c1e59bcda157011c95b42b69b0a2696dea176223a708a652a22b
-MISC ChangeLog 14395 RMD160 4a729d63c5783a62ba2dd8e26ce1b5734bfeaf84 SHA1 4d16a33de89c8dfbcac9a9c7a8b500d82f5c36d5 SHA256 af471d9ee52b8d607a22da3842cf7fc7837df8421a18fa648d1a598825ea81e9
+EBUILD apache-tools-2.4.1.ebuild 1953 RMD160 2e20a9320fc2c1a459784077769232a5c0f3185f SHA1 552a2ef40796d70266fc89384f4ff4a8142a5fce SHA256 df902239134f236e6abb907ac964c10d2247a9d29f4724823e091b92a68a69e3
+MISC ChangeLog 14532 RMD160 479a596b9610d801f22742aca35b40d7f8e06172 SHA1 98fbf82f57495140346fa7dd70a3d032d965c2a3 SHA256 2657919022b60e156de963c4079882669a30b7b68a764f1f1c973e90089d6d8c
 MISC metadata.xml 740 RMD160 d7c1fb22c5db40796d9fbfe0d7ec49eaa3e25b73 SHA1 c83da0ebabef3bc3593410736acbc092f2353b95 SHA256 d9a6e6550077d56e9b56524ebe1b31c6485d16345d232b2a542faa8c92193fc0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJPdDxJAAoJEOTDgjZ80txdgn4H/0cu0xKsWcnWkdKvlVNu6JU3
-hF3oVHaUE7GuLw5KdHBPU603U4TdTEF+SckU7Qoy9f7gMv0i2yvpu+tWEheCdkcy
-teBzSRYeEb5SAFJARGT5RWiiLQ1OvCwZ2HBkrnAle3VMI7X/S96S1fb1I752kgKV
-HqWB7kOnSV9/qA07WxpJI1dV3pXkDhhiWqkoTlqAcY4L42U/SlL2SDqgrNjFQ+9H
-GCmaAts/kbxnPjAIsgAYCcbsT8OeIz6DlryOXizvG/OU3+83/DYhjDmKv45EeOj5
-rXwVJrxEqom2m0B3rzBvgGrJK1KNkuMCUZ+txPJdJ+tIQe3+hcvqvcCVPB2lbEc=
-=dA24
------END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.4.1.ebuild b/app-admin/apache-tools/apache-tools-2.4.1.ebuild
new file mode 100644
index 000000000000..3ca6dd5d13ce
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 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.4.1.ebuild,v 1.1 2012/04/01 04:51:41 patrick Exp $
+
+EAPI="2"
+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 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S="${WORKDIR}/httpd-${PV}"
+
+src_configure() {
+	local myconf=""
+
+	# Instead of filtering --as-needed (bug #128505), append --no-as-needed
+	append-ldflags $(no-as-needed)
+
+	use ssl && myconf+=" --with-ssl=/usr --enable-ssl"
+
+	# 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}
+}
+
+src_compile() {
+	cd support || die
+	emake
+}
+
+src_install () {
+	cd support || die
+
+	make DESTDIR="${D}" install
+
+	# install manpages
+	doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
+		"${S}"/docs/man/{htcacheclean,rotatelogs}.8
+
+	# Providing compatiblity symlinks for #177697 (which we'll stop to install
+	# at some point).
+	pushd "${D}"/usr/sbin/ >/dev/null
+	for i in *; do
+		dosym /usr/sbin/${i} /usr/sbin/${i}2
+	done
+	popd "${D}"/usr/sbin/ >/dev/null
+
+	# 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
+}