Bump (but leave masked) for #412481

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

3 files changed, 89 insertions, 2 deletions

diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index a25d6244df06..deb16f4de93d 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.115 2012/04/17 19:33:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.116 2012/04/20 04:00:31 patrick Exp $
+
+*apache-tools-2.4.2 (20 Apr 2012)
+
+  20 Apr 2012; Patrick Lauer <patrick@gentoo.org> +apache-tools-2.4.2.ebuild:
+  Bump (but leave masked) for #412481
 
   17 Apr 2012; Brent Baude <ranger@gentoo.org> apache-tools-2.2.22.ebuild:
   Marking apache-tools-2.2.22 ppc64 for bug 401761
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index ad9724198826..02b82a43ad93 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -8,6 +8,7 @@ DIST httpd-2.2.20.tar.bz2 5174611 RMD160 299d1a8a9f3a6eb925d63ce96fa8ea4a06ec1f1
 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
+DIST httpd-2.4.2.tar.bz2 4132105 RMD160 1b97ab44075bea0f398f507dacb5f719a87b720b SHA1 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2 SHA256 5382f9c507d3d02706e33d6308ea041f39e8511b5948aef0ca188df8f90159b8
 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
@@ -16,5 +17,6 @@ EBUILD apache-tools-2.2.20.ebuild 2193 RMD160 d91e8696d2f91f7018819cf73e045f1479
 EBUILD apache-tools-2.2.21.ebuild 2193 RMD160 a5aa55b8d6639c3afeae72ce4c5f23e9602b4ce9 SHA1 ea103fbe1febcafb57ca7618c1657f426c3dae95 SHA256 4dad414ea1453bdf5627697ae4d3ad0dc226d089d589988221b19e81ac0ff78f
 EBUILD apache-tools-2.2.22.ebuild 2192 RMD160 0754bfc27b750e90b1dc3f8ef8de7270c8b1b43a SHA1 2be186311296c25d5e5e1acbcea639f2c1be05a4 SHA256 2145b07d59cd1df5a933e54f64ccd3866aeac24d15d054686c2a93ede623836f
 EBUILD apache-tools-2.4.1.ebuild 1953 RMD160 2e20a9320fc2c1a459784077769232a5c0f3185f SHA1 552a2ef40796d70266fc89384f4ff4a8142a5fce SHA256 df902239134f236e6abb907ac964c10d2247a9d29f4724823e091b92a68a69e3
-MISC ChangeLog 15225 RMD160 bfa0e331725d763c99a518ca0af1fa3cf0880f4c SHA1 7a0fb54a71c867758b2717eac418fee74e1d89e2 SHA256 a782fa5cfe0bd265debb06cab357efd663f156c8cad6fad8daeed5cc6a127cc3
+EBUILD apache-tools-2.4.2.ebuild 1953 RMD160 d09b3b7b2f87e0e46780bf272a2f920eb9c6aaff SHA1 fde4dbc459feec4091cd9405f4751928334bd4a7 SHA256 b5f76863b42280e4f61517fba0a6ebb231165c120109d8632ca8c9dbdb7d0697
+MISC ChangeLog 15378 RMD160 0d2f7aa047ed7f49c84d92083be06d7fee399adf SHA1 8e2b155f7173aa7c68cd67ce71defaae0c62d7e6 SHA256 a50c33af84b14dffe1f0ba337728e58efb3df609e4ade839052e74b0d4e8cd51
 MISC metadata.xml 740 RMD160 d7c1fb22c5db40796d9fbfe0d7ec49eaa3e25b73 SHA1 c83da0ebabef3bc3593410736acbc092f2353b95 SHA256 d9a6e6550077d56e9b56524ebe1b31c6485d16345d232b2a542faa8c92193fc0
diff --git a/app-admin/apache-tools/apache-tools-2.4.2.ebuild b/app-admin/apache-tools/apache-tools-2.4.2.ebuild
new file mode 100644
index 000000000000..0027ba4aeb68
--- /dev/null
+++ b/app-admin/apache-tools/apache-tools-2.4.2.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.2.ebuild,v 1.1 2012/04/20 04:00:31 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
+}