summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2013-01-15 19:36:18 +0000
committerChristoph Junghans <ottxor@gentoo.org>2013-01-15 19:36:18 +0000
commit546fea99a5b28af2dbf5b401055ac7aff3dc88aa (patch)
treea801e22fdb9cd1be8e374586f1b9d2e0b1bf699a /app-admin/apache-tools
parentForgot credits and bug # (diff)
downloadhistorical-546fea99a5b28af2dbf5b401055ac7aff3dc88aa.tar.gz
historical-546fea99a5b28af2dbf5b401055ac7aff3dc88aa.tar.bz2
historical-546fea99a5b28af2dbf5b401055ac7aff3dc88aa.zip
added prefix support (bug #447298)
Package-Manager: portage-2.2.0_alpha153/cvs/Linux x86_64 Manifest-Sign-Key: 0xC2000586
Diffstat (limited to 'app-admin/apache-tools')
-rw-r--r--app-admin/apache-tools/ChangeLog8
-rw-r--r--app-admin/apache-tools/Manifest14
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild22
3 files changed, 27 insertions, 17 deletions
diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog
index 94bd1becf02f..20e8a3c7f2c5 100644
--- a/app-admin/apache-tools/ChangeLog
+++ b/app-admin/apache-tools/ChangeLog
@@ -1,6 +1,10 @@
# 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.128 2012/11/27 18:38:44 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.129 2013/01/15 19:36:09 ottxor Exp $
+
+ 15 Jan 2013; Christoph Junghans <ottxor@gentoo.org>
+ apache-tools-2.4.3-r1.ebuild:
+ added prefix support (bug #447298)
27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Drop apache herd as discussed in http://www.gossamer-
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index f5e53fdd8de4..41bef7cbdfa6 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -8,13 +8,17 @@ DIST httpd-2.2.23.tar.bz2 5485205 SHA256 14fe79bd6edd957c02cb41f4175e132c08e6ff7
DIST httpd-2.4.3.tar.bz2 4559279 SHA256 d82102b9c111f1892fb20a2bccf4370de579c6521b2f172ed0b36f2759fb249e SHA512 d4501ae69aacb75d960bc8cb61c9e1ff52e6e42a37c37ca84c839262e183ca2f305794da28266aa2119d211ba0f4531705f66330079ab594c05e92ae8196d1ab WHIRLPOOL 4ffb7dc8057200f676557a70591d6938e92a8990d88dc88237d278f185290d260312dd8cfdd08994ffd7b7280502b3debea0f3e02acc718dd9db613222b6d2ae
EBUILD apache-tools-2.2.22.ebuild 2206 SHA256 557aa0e173108d78bd3d971897df47e621b66f5abb3db31716f901fe5c70b9bd SHA512 411fc23bb8a9221b5c6ceaeb6a5ac7af25ee8fd8dd12fe930688b8e7669d65113fbab89e912ca10ab468401ed067f11f3f8f690658d3f33c4438db2e7d4a29ea WHIRLPOOL b1c47e27da7c51aacb7da44397d37a800e07f4187c972277faf8d523bbce2dd442ae44536ab81428316aa4899c0a5ced389c9f9355c7787cb2d43737994768e7
EBUILD apache-tools-2.2.23.ebuild 2205 SHA256 3f7b19bfb004b0de17b30b9d4f1ab23097cfca7e336cc2d3995d143814521029 SHA512 0a112b7bf01717d102a7eae63d368afcc4bd553d9dc94c40abca472f755e17405e99b97885ec75db4b4b3c4243d2a97a51277f71f3b95fa2db31d4b4d27bfae5 WHIRLPOOL 66beebdf1b88bf390d57910f5c91cee02f4bc1c3b68881abcc946e6fc81bdf7318ec1e420c437a0fb60710d82e542253c63c5b1064d7b1a5074565b5295b3a9c
-EBUILD apache-tools-2.4.3-r1.ebuild 1818 SHA256 b32fa6b4ccaa10e39921001cf88285e0d0c8c8a0ef4a51f133b30c2936d941e7 SHA512 e6ea6785247eecc8cff9b6d35899b26b5e3dee6a41c946fcb67ebbfd3bd0181433aec343f71ad6928e2ee9ffbb60b18d48498670e9a4b2eaa374aaf35cc86374 WHIRLPOOL e5cc1df110ec9ff60cfb7ef94b509da3716938ced3d023d963d8258075a9547c5589205f60e7fae2f7bda5dc3894aa23e87ffb2cfa2d85231b6f08491fb3137d
-MISC ChangeLog 17086 SHA256 555708aebf33d9e5344bebada382e3773de74fc2579062f654dfbe4394927eae SHA512 555f70a717eb06d999202da5c8bb5ca60bb1dc815ceec0d9f226959de3511a611299b3461ae76ab226439ba9be5220cdc2fd5b5cbb39eea3fd524450b1d8ef50 WHIRLPOOL 0c8e1c57a89b2e5a8e6d43d2e1d89a22363c5a118cbfcfe994cdfe076fcf4da6fafbf584e160bb557281d83350bcd4855e2ddd3df7af22acf1b78a42dac17061
+EBUILD apache-tools-2.4.3-r1.ebuild 2074 SHA256 b736115eac535253e7f27d5a70f2c525ef16175723f9f57a87a5cf4033c8fb1a SHA512 fe18aaa6a763ead2490f9d4e49530c0666305dd7a53bbc891c7fc856b512d24a56ecb0d486d598892e6f403e91f31363606c7c66e229d263644badd7e0b158e6 WHIRLPOOL 040cbaba1144a49c2d80027e9082a5646818e909a2693c5496f873ff7d026008b7cabe9fcfcc82ba01c7236c742405400bb9130c2055ec7a5f0f4351e4491a3c
+MISC ChangeLog 17211 SHA256 df28921109dca3af744fc9dcc2188ab210e033fa1c35de520720f60b4bc57cd0 SHA512 ab378a758a393ff8e2408344d7ddc2eecaced29c558223ea6fd8f1cd6ac8cfcf1a9e68ac7426d8111ae76cbf227540ae7d4184462d9ae58a1acbd099a12d83f1 WHIRLPOOL 861a50ef61f592cbb1bdbf69f5f3c2b4a90c5e2629595558138f91d85d330c82275820075b123f09faa672013607b6e117ecb3f040ae3bdcafd44db75bfa26c3
MISC metadata.xml 650 SHA256 f74b85f1fdef8fe6aea259c46635a8a67b433570bde43ad16719f082c8e03b03 SHA512 7de390a680c2375fd4a4862fc7af80eccabdf37883e09398daed9817dcda40fba32e91418c133cf99e055f5f27fd1636367637a9441e30ef085b9c8f488bd4d0 WHIRLPOOL 219ec2548cd230cd29478c1a22383ac42ec7caeb5f4e8e2f4b2f303b9a86b961719a440f894edb5ad5fbd77af762cc730457bc70676268dc858d820aac7fbc56
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlC1CLUACgkQCaWpQKGI+9TNAACfbIgDYnsALhu3pvCEi5+aWf+3
-9sUAnir1Z4qL5IrSdHrdrjfEnV7b+09m
-=1Mao
+iQEcBAEBCAAGBQJQ9a+rAAoJEOeBhlrCAAWGfCYIALvKzkHYyyDV5Vj/oVS3ojBJ
+nyWokjf4LzPBHOo0k7Z5JT2AJSkwqELekP2NXj/TU6AageMgXz5czPMtNMCNBxP2
+sr/BPfIVqWJhT5q+g1ABjT1THUO91mp/9LPrb5aESyp0NmLBWqeKOL9eQcxK/WqV
+LNMR5S89Mlw+LiDytrA6zn97MeHr6qJoTgg6pTiVe10+kZyD8GfNdjqFavRhb+mg
+j1c24EaS9w6jDyQNp3L5hxjVts4xlZgE8qzROyxjIzu1W+ABveTxnDgFZ6O3gDfu
+irmMfN0tuyF36AdA+3/t9mTeeyqYIGKt5A53kXGVZzzxeTW+rxoJRa08Crcbv38=
+=4b5/
-----END PGP SIGNATURE-----
diff --git a/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild
index afd0bf3f9ae8..a8385b7f5f11 100644
--- a/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.3-r1.ebuild,v 1.1 2012/11/01 06:55:40 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild,v 1.2 2013/01/15 19:36:09 ottxor Exp $
EAPI="3"
inherit flag-o-matic eutils
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
IUSE="ssl"
RESTRICT="test"
@@ -31,16 +31,18 @@ src_configure() {
# Instead of filtering --as-needed (bug #128505), append --no-as-needed
append-ldflags $(no-as-needed)
- use ssl && myconf+=" --with-ssl=/usr --enable-ssl"
+ use ssl && myconf+=" --with-ssl=${EPREFIX}/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 \
+ --sbindir="${EPREFIX}"/usr/sbin \
+ --with-perl="${EPREFIX}"/usr/bin/perl \
+ --with-expat="${EPREFIX}"/usr \
+ --with-z="${EPREFIX}"/usr \
+ --with-apr="${EPREFIX}"/usr \
+ --with-apr-util="${EPREFIX}"/usr \
+ --with-pcre="${EPREFIX}"/usr \
${myconf}
}
@@ -52,7 +54,7 @@ src_compile() {
src_install () {
cd support || die
- make DESTDIR="${ED}" install
+ make DESTDIR="${D}" install
# install manpages
doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \