summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2012-04-01 13:30:07 +0000
committerPatrick Lauer <patrick@gentoo.org>2012-04-01 13:30:07 +0000
commit29da438f9f4c061b14d518d8a55cdaada9e444da (patch)
treeaddbcc6ce4cb875682472a6cd663974e2a93fbd5 /www-servers/apache
parent[bump] virtual/perl-Safe-2.320.0 (diff)
downloadhistorical-29da438f9f4c061b14d518d8a55cdaada9e444da.tar.gz
historical-29da438f9f4c061b14d518d8a55cdaada9e444da.tar.bz2
historical-29da438f9f4c061b14d518d8a55cdaada9e444da.zip
Actually installing apxs, #407327
Package-Manager: portage-2.2.0_alpha97/cvs/Linux x86_64
Diffstat (limited to 'www-servers/apache')
-rw-r--r--www-servers/apache/ChangeLog8
-rw-r--r--www-servers/apache/Manifest4
-rw-r--r--www-servers/apache/apache-2.4.1-r1.ebuild (renamed from www-servers/apache/apache-2.4.1.ebuild)6
3 files changed, 14 insertions, 4 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 57f841fa45c1..9bd0dae2843d 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for www-servers/apache
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.181 2012/04/01 04:50:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.182 2012/04/01 13:30:07 patrick Exp $
+
+*apache-2.4.1-r1 (01 Apr 2012)
+
+ 01 Apr 2012; Patrick Lauer <patrick@gentoo.org> +apache-2.4.1-r1.ebuild,
+ -apache-2.4.1.ebuild:
+ Actually installing apxs, #407327
*apache-2.4.1 (01 Apr 2012)
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index dbafce739e63..fed9391927e1 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -8,7 +8,7 @@ DIST httpd-2.4.1.tar.bz2 4101303 RMD160 6d21d828028ce1cff8648fb29c8eb1b75fd96451
EBUILD apache-2.2.21-r1.ebuild 2754 RMD160 0aff5594a9a8d5155255eacc08463a4e4ac8d21a SHA1 46b377446354d5f139eb1f6572b108025267a3cc SHA256 fab891049f8d174c592348c6fff981a19908a79908fe039f390627d0d2fb9cc5
EBUILD apache-2.2.21-r2.ebuild 2711 RMD160 1debb13ca577ca8f799f15be22a22d1c0c484c0f SHA1 76f455ec29b823bb65ace1872409abbe45c5cf60 SHA256 3bfcafd961393ecdaeff2d596f53ac636dc5764da69f39cc20d72fec72fdc83f
EBUILD apache-2.2.22.ebuild 2918 RMD160 8bd21a25b4556dcf27be64f7cbff820bd9bf1418 SHA1 24acd6dc31cdb10a1cb25f9088be91b6ea82b63b SHA256 e7841b2b6d2bec394865bdf0798727d69c22a2dbefed02bee037a216b731dd3e
-EBUILD apache-2.4.1.ebuild 3519 RMD160 d2ab79571b0fd0143712a410524c45b9f2613010 SHA1 6ba101dcc96f155d2208f2976236da9d1d1b371b SHA256 d7182b0188638e223a374569bd820f11ff50c0a6f2e138a72423daaeb67b6980
-MISC ChangeLog 12691 RMD160 1dc12bd2777e25d4c8ddbd2b74a3a85741c47adc SHA1 3d7a6b1a12e418507702afeef0b132ada8eacc26 SHA256 574b7c30ee56f4e59ce92835a0daa6f593f7df12d8aa28114ce90c211fd0de6f
+EBUILD apache-2.4.1-r1.ebuild 3699 RMD160 9102f21e5be920d04be3d11f67bb8fb446593df3 SHA1 ad24782035eece7091a037ed4b72b05710c57f2d SHA256 6b6f2c0a98478606ae15570a9e04923857140c2d52fb00514f7698c62de3acfd
+MISC ChangeLog 12859 RMD160 6edd2997f4fb22500220aa82c085f00269e95d7c SHA1 1b1e3daff3d1cc1e6fa98c3240c9cb38e21aa457 SHA256 f6701ea6fb49e5c642ac619b74ad58186cf78eddd1af2c682e2b4aebeb4cbbed
MISC ChangeLog-2008 105137 RMD160 0ee2162a0e57feab08fd8ee0c04b43bcf63ba9b4 SHA1 28bc5fda825c08a5a2b1d03dbfbc128d083507cf SHA256 4afec18ad3c76df40314edb37b5512f81ca6223c38a899534d9d15342481accf
MISC metadata.xml 932 RMD160 ee4ba8303731f1bb451fa96f30095dd380d7a824 SHA1 39f5bd400764a3f55b51ee17de547bc547e6c78d SHA256 f221f82c988695a174827e069157102017e724bdaae01e55f604479484e4cbaa
diff --git a/www-servers/apache/apache-2.4.1.ebuild b/www-servers/apache/apache-2.4.1-r1.ebuild
index 8c452e5d5949..409cf7dd12d4 100644
--- a/www-servers/apache/apache-2.4.1.ebuild
+++ b/www-servers/apache/apache-2.4.1-r1.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.1.ebuild,v 1.1 2012/04/01 04:50:02 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.4.1-r1.ebuild,v 1.1 2012/04/01 13:30:07 patrick Exp $
EAPI="2"
# latest gentoo apache files
GENTOO_PATCHSTAMP="20120401"
GENTOO_DEVELOPER="patrick"
+GENTOO_PATCHNAME="gentoo-${P}"
# IUSE/USE_EXPAND magic
IUSE_MPMS_FORK="itk peruser prefork"
@@ -121,4 +122,7 @@ src_install() {
for i in /usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}; do
rm "${D}/"$i || die "Failed to prune apache-tools bits"
done
+
+ # well, actually installing things makes them more installed, I guess?
+ cp ${S}/support/apxs ${D}/usr/sbin/apxs || die "Failed to install apxs"
}