diff options
| author |   Michael Stewart <vericgar@gentoo.org> | 2006-11-28 03:35:16 +0000 |
|---|---|---|
| committer | Michael Stewart <vericgar@gentoo.org> | 2006-11-28 03:35:16 +0000 |
| commit | 153c6542bc819aeb42bcdd67aeee2c547bf1e3ae (patch) | |
| tree | 1f4c0136ce7862b1aa17d9ce88c1012491a8fc08 /net-www/apache | |
| parent | Stabilized on amd64 (see bug #155622). (diff) | |
| download | historical-153c6542bc819aeb42bcdd67aeee2c547bf1e3ae.tar.gz historical-153c6542bc819aeb42bcdd67aeee2c547bf1e3ae.tar.bz2 historical-153c6542bc819aeb42bcdd67aeee2c547bf1e3ae.zip | |
Fix logic for srvdir USE-flag, closes bug #156394
Package-Manager: portage-2.1.2_pre2-r5
Diffstat (limited to 'net-www/apache')
| -rw-r--r-- | net-www/apache/Manifest | 8 | ||||
| -rw-r--r-- | net-www/apache/apache-2.2.3-r1.ebuild | 24 |
2 files changed, 17 insertions, 15 deletions
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index 0ae5d7a12533..dca5911dfa11 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -60,10 +60,10 @@ EBUILD apache-2.2.2-r1.ebuild 13898 RMD160 56a87cd0e2d2ad79995aad1084f5d980454b6 MD5 864a1733d246ddd80cc19a37b074a228 apache-2.2.2-r1.ebuild 13898 RMD160 56a87cd0e2d2ad79995aad1084f5d980454b69af apache-2.2.2-r1.ebuild 13898 SHA256 7611e65207fac0034d5755f8187ee4fa51d232f9f3c04353e299d5469a41a2f2 apache-2.2.2-r1.ebuild 13898 -EBUILD apache-2.2.3-r1.ebuild 15210 RMD160 ed9c0df49f0be0ef5c2c7cf73f18b7d412debccf SHA1 16f01bcb77783ad43295c79965ca9517460a5f86 SHA256 dbce407a5690d1646c507f4b0011fef7e50d18494853279c3491ef1fd1669b33 -MD5 997f2fdd5e22de13eaf4d4a8af74af64 apache-2.2.3-r1.ebuild 15210 -RMD160 ed9c0df49f0be0ef5c2c7cf73f18b7d412debccf apache-2.2.3-r1.ebuild 15210 -SHA256 dbce407a5690d1646c507f4b0011fef7e50d18494853279c3491ef1fd1669b33 apache-2.2.3-r1.ebuild 15210 +EBUILD apache-2.2.3-r1.ebuild 15201 RMD160 ae11a1e392347553e91712c065d16b2564dd0749 SHA1 265a6186c3f77c68f164a4a8f7fecb6f624c104e SHA256 a78a285da8ec1c1aee18196c0fe09e8552943a0357fd042e1b9dd2f543d331e7 +MD5 ae0d3029ff7132f30d11fd740ce87768 apache-2.2.3-r1.ebuild 15201 +RMD160 ae11a1e392347553e91712c065d16b2564dd0749 apache-2.2.3-r1.ebuild 15201 +SHA256 a78a285da8ec1c1aee18196c0fe09e8552943a0357fd042e1b9dd2f543d331e7 apache-2.2.3-r1.ebuild 15201 EBUILD apache-2.2.3.ebuild 13978 RMD160 b606ac2f5fb0ba7ff0cbdd9c5e13547b212a8e2f SHA1 422c6dbde5977fa1ed39eac94346654915b21584 SHA256 5108612084de298195dc646be0e3f0a09818f205c918b451ee142b08c00ab46d MD5 63eb4103c9d36639f2893fefa0313dae apache-2.2.3.ebuild 13978 RMD160 b606ac2f5fb0ba7ff0cbdd9c5e13547b212a8e2f apache-2.2.3.ebuild 13978 diff --git a/net-www/apache/apache-2.2.3-r1.ebuild b/net-www/apache/apache-2.2.3-r1.ebuild index 637bcdfb2851..f3c61cdc4bf1 100644 --- a/net-www/apache/apache-2.2.3-r1.ebuild +++ b/net-www/apache/apache-2.2.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.3-r1.ebuild,v 1.1 2006/11/27 02:45:56 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.3-r1.ebuild,v 1.2 2006/11/28 03:35:16 vericgar Exp $ inherit eutils flag-o-matic gnuconfig multilib autotools @@ -89,16 +89,18 @@ src_unpack() { ${GENTOO_PATCHDIR}/{conf/httpd.conf,init/*,patches/config.layout,scripts/Makefile.suexec,scripts/suexec2-config} \ || die "libdir sed failed" - # Use /srv/<FQDN>/www instead of /var/www/<FQDN> if USE=srvdir - useq srvdir && sed -i -e "s:/var/www/localhost:/srv/localhost/www:g" \ - ${GENTOO_PATCHDIR}/{conf/httpd.conf,conf/modules.d/*,conf/vhosts.d/*,patches/config.layout,init/apache2.confd} \ - || die "srvdir sed failed (1)" - useq srvdir && sed -i -e "s:/var/www/example.com:/srv/example.com/www:g" \ - ${GENTOO_PATCHDIR}/conf/vhosts.d/*.example \ - || die "srvdir sed failed (2)" - useq srvdir && sed -i -e "s:/var/www:/srv:g" \ - ${GENTOO_PATCHDIR}/{conf/httpd.conf,conf/suexec-conf,conf/vhosts.d/*.example,scripts/suexec2-config} \ - || die "srvdir sed failed (3)" + if useq srvdir; then + # Use /srv/<FQDN>/www instead of /var/www/<FQDN> if USE=srvdir + sed -i -e "s:/var/www/localhost:/srv/localhost/www:g" \ + ${GENTOO_PATCHDIR}/{conf/httpd.conf,conf/modules.d/*,conf/vhosts.d/*,patches/config.layout,init/apache2.confd} \ + || die "srvdir sed failed (1)" + sed -i -e "s:/var/www/example.com:/srv/example.com/www:g" \ + ${GENTOO_PATCHDIR}/conf/vhosts.d/*.example \ + || die "srvdir sed failed (2)" + sed -i -e "s:/var/www:/srv:g" \ + ${GENTOO_PATCHDIR}/{conf/httpd.conf,conf/suexec-conf,conf/vhosts.d/*.example,scripts/suexec2-config} \ + || die "srvdir sed failed (3)" + fi #### Patch Organization # 00-19 Gentoo specific (00_all_some-title.patch) |