Making mod_auth_kerb-5.0-axps1.patch, mod_auth_kerb-5.0-cache.patch and mod_auth_kerb-5.0-exports.patch conditional on USE=apache2, allowing mod_auth_kerb to still work and compile w/ =net-www/apache-1.3*.

Package-Manager: portage-2.1.2_rc4-r6

4 files changed, 34 insertions, 24 deletions

diff --git a/net-www/mod_auth_kerb/ChangeLog b/net-www/mod_auth_kerb/ChangeLog
index 7c7afe83a3f2..7e2d4f0e14e3 100644
--- a/net-www/mod_auth_kerb/ChangeLog
+++ b/net-www/mod_auth_kerb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_auth_kerb
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/ChangeLog,v 1.16 2007/01/10 21:48:46 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/ChangeLog,v 1.17 2007/01/10 21:59:54 phreak Exp $
+
+  10 Jan 2007; Christian Heim <phreak@gentoo.org>
+  mod_auth_kerb-5.0_rc6-r1.ebuild, mod_auth_kerb-5.0_rc7-r1.ebuild:
+  Making mod_auth_kerb-5.0-axps1.patch, mod_auth_kerb-5.0-cache.patch and
+  mod_auth_kerb-5.0-exports.patch conditional on USE=apache2, allowing
+  mod_auth_kerb to still work and compile w/ =net-www/apache-1.3*.
 
 *mod_auth_kerb-5.0_rc7-r1 (10 Jan 2007)
 *mod_auth_kerb-5.0_rc6-r1 (10 Jan 2007)
diff --git a/net-www/mod_auth_kerb/Manifest b/net-www/mod_auth_kerb/Manifest
index 00511d95da75..60d6a89a76dd 100644
--- a/net-www/mod_auth_kerb/Manifest
+++ b/net-www/mod_auth_kerb/Manifest
@@ -28,18 +28,18 @@ SHA256 f60a7cc4234ab5fc732323487057f36e2483655db676172867df2b2d845d9186 files/mo
 DIST mod_auth_kerb-5.0-rc6.tar.gz 68761 RMD160 a9a277c532e7f72b3a649346e88db7aea1889036 SHA1 b1700b4eca2d50691977849750f5e614c7caa80d SHA256 ae33ab3ae5b419819725091d154add1a1d1a5d6d97e31e9f327f71a0b6370d3e
 DIST mod_auth_kerb-5.0rc7.tar.gz 72272 RMD160 f336f1c9c4b67a88fd162395ec1299f73c5e89c4 SHA1 5a3e699b86c0f08b09fe44aa2747bfd8a67f5b87 SHA256 8cd4cdcc635ad153c82041d2256b17566bc74618ee79336f432e74b1d5a0930a
 DIST mod_auth_kerb-5.3.tar.gz 73530 RMD160 c1ba0dc27470ad4b355d795ba51374726ce57f03 SHA1 934e8afbd4e13e208ee0f1cf9e7498d7b6f7acd5 SHA256 89cd779a94405521770cbcb169af5af61e7f2aad91c4f4b82efaae35df7595ec
-EBUILD mod_auth_kerb-5.0_rc6-r1.ebuild 1335 RMD160 304f2c71ab500c630e3c08df3938e066c7d13a99 SHA1 1d925fc2dde4eb50713183088924d02381139e1f SHA256 dbebe95389b7d212aa0a26dedfdd9d437798dac8d44a8462d5fa787ecb3e81e8
-MD5 3053b81c949dbde4f088e71454d298b8 mod_auth_kerb-5.0_rc6-r1.ebuild 1335
-RMD160 304f2c71ab500c630e3c08df3938e066c7d13a99 mod_auth_kerb-5.0_rc6-r1.ebuild 1335
-SHA256 dbebe95389b7d212aa0a26dedfdd9d437798dac8d44a8462d5fa787ecb3e81e8 mod_auth_kerb-5.0_rc6-r1.ebuild 1335
+EBUILD mod_auth_kerb-5.0_rc6-r1.ebuild 1365 RMD160 e9464917403a83d171246f9cff950ab58d5e2791 SHA1 8bae6e2f0966d5eba1059b57a91e965275a9a528 SHA256 2c8a83e7efd8d2718fd46ab2f6f6efefeeca9eaefa07410cc84ee9f72c074e7d
+MD5 f851565829b5b924e303df975d256b86 mod_auth_kerb-5.0_rc6-r1.ebuild 1365
+RMD160 e9464917403a83d171246f9cff950ab58d5e2791 mod_auth_kerb-5.0_rc6-r1.ebuild 1365
+SHA256 2c8a83e7efd8d2718fd46ab2f6f6efefeeca9eaefa07410cc84ee9f72c074e7d mod_auth_kerb-5.0_rc6-r1.ebuild 1365
 EBUILD mod_auth_kerb-5.0_rc6.ebuild 994 RMD160 59884098014995847824de37c745f7b59396c5df SHA1 5411cdeec70c0ca17b953e6881cbde8e5897cc93 SHA256 a46dcfcf816a75f05e19d422a4df210935e5f2aa9fbf41ee51a1625dfee1eb29
 MD5 f27c51774dfa20631dfbc8ee83e76267 mod_auth_kerb-5.0_rc6.ebuild 994
 RMD160 59884098014995847824de37c745f7b59396c5df mod_auth_kerb-5.0_rc6.ebuild 994
 SHA256 a46dcfcf816a75f05e19d422a4df210935e5f2aa9fbf41ee51a1625dfee1eb29 mod_auth_kerb-5.0_rc6.ebuild 994
-EBUILD mod_auth_kerb-5.0_rc7-r1.ebuild 1334 RMD160 f43683d4f3c0425c4f95c097951f04bd75b939ef SHA1 e6c5a3580fbca061d587f74791c85cf87b40c31c SHA256 ed73f817469f141bfa5faed96a6ee4617205857035468db0e4d2b38091fee269
-MD5 02cbccb1e0a4f2c7a3c205dfc6ec4fba mod_auth_kerb-5.0_rc7-r1.ebuild 1334
-RMD160 f43683d4f3c0425c4f95c097951f04bd75b939ef mod_auth_kerb-5.0_rc7-r1.ebuild 1334
-SHA256 ed73f817469f141bfa5faed96a6ee4617205857035468db0e4d2b38091fee269 mod_auth_kerb-5.0_rc7-r1.ebuild 1334
+EBUILD mod_auth_kerb-5.0_rc7-r1.ebuild 1364 RMD160 f4473a39a0f5663f9bb10172a1b8aeabe37fd2ea SHA1 ceaddcf47fdb64246154617d409df5b175e07809 SHA256 f1ee32c34ff7d985fedc60c9e920ddf2d1b7e5d5501951ad4eedc83c228cd385
+MD5 19babfdbec361269c49980bf67b7ec89 mod_auth_kerb-5.0_rc7-r1.ebuild 1364
+RMD160 f4473a39a0f5663f9bb10172a1b8aeabe37fd2ea mod_auth_kerb-5.0_rc7-r1.ebuild 1364
+SHA256 f1ee32c34ff7d985fedc60c9e920ddf2d1b7e5d5501951ad4eedc83c228cd385 mod_auth_kerb-5.0_rc7-r1.ebuild 1364
 EBUILD mod_auth_kerb-5.0_rc7.ebuild 994 RMD160 e3eac2c0d1c0a104572656e8a526fa8b0a94f64d SHA1 6cb92235ea481a3afc0ff3fa0de6b55bcced47d2 SHA256 e8941b81333972497934727dba7de00f49f391261713ed29a633a5cd31a6ffe1
 MD5 5a22278bd688624404ea66a059b8d0c9 mod_auth_kerb-5.0_rc7.ebuild 994
 RMD160 e3eac2c0d1c0a104572656e8a526fa8b0a94f64d mod_auth_kerb-5.0_rc7.ebuild 994
@@ -48,10 +48,10 @@ EBUILD mod_auth_kerb-5.3.ebuild 990 RMD160 bbda8b2899044236f1998883e30de1a8321bb
 MD5 b9ded4dd06eec4a770f372c014a05fa8 mod_auth_kerb-5.3.ebuild 990
 RMD160 bbda8b2899044236f1998883e30de1a8321bbcc6 mod_auth_kerb-5.3.ebuild 990
 SHA256 8099dac3a3b101658b80680d09cdcdc3c719f1800dec320fe104ae93951ff42b mod_auth_kerb-5.3.ebuild 990
-MISC ChangeLog 2682 RMD160 5e6156449823cd8d0ffec46c4ed944322b20d84c SHA1 d75c372c68ca9de9422c0858dfe6cfb2ab753447 SHA256 67eeb0fab907104640423d13994aa17f6ed1be2f5bb232efbf9054e00301e86f
-MD5 b900147cd4e983b9fe4650005561b173 ChangeLog 2682
-RMD160 5e6156449823cd8d0ffec46c4ed944322b20d84c ChangeLog 2682
-SHA256 67eeb0fab907104640423d13994aa17f6ed1be2f5bb232efbf9054e00301e86f ChangeLog 2682
+MISC ChangeLog 3013 RMD160 0ef85f2844fc34e9f908d3a7ae04df1b65d3212f SHA1 7bb404623ce8a18e58ad9c91e6960bbdc39b1ee6 SHA256 48e4f3b4998b7a2741c6199d4e84c20afc8ed5ba8f7dce242e9a1d64a0428bb5
+MD5 d64071e20e7a21a99eaccef712a38615 ChangeLog 3013
+RMD160 0ef85f2844fc34e9f908d3a7ae04df1b65d3212f ChangeLog 3013
+SHA256 48e4f3b4998b7a2741c6199d4e84c20afc8ed5ba8f7dce242e9a1d64a0428bb5 ChangeLog 3013
 MISC metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce SHA1 66b21c56c3a98e5a4b489dc000ff1d5956ab63d0 SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3
 MD5 94cc9443fa6aead0b11dda55a10e117e metadata.xml 231
 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce metadata.xml 231
@@ -74,7 +74,7 @@ SHA256 7a09875fc28474a3531327dad26f07afc4ed8ad73b27b6600583c046d3a618bc files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD4DBQFFpV8LyuNVb5qfaOYRApATAJUb/7/EMIe68IhO77t8MaJAmki8AJsHUi7W
-Opzf/8ZxxJwpXyhMbQMRbQ==
-=NLP2
+iD8DBQFFpWGlyuNVb5qfaOYRAlZJAJ0avPkD4S47MAfm7fsYKNNixtb8eQCfWQ0R
+W7Ni8L0RWlFEJOw2zdxcLos=
+=5n5g
 -----END PGP SIGNATURE-----
diff --git a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild
index c18b45c597f3..d9668fc51da0 100644
--- a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild
+++ b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild,v 1.1 2007/01/10 21:48:46 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc6-r1.ebuild,v 1.2 2007/01/10 21:59:54 phreak Exp $
 
 MY_PV="${PV/_rc/-rc}"
 
@@ -38,10 +38,12 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-5.0-CVE-2006-5989.patch"
-	epatch "${FILESDIR}/${PN}-5.0-axps1.patch"
 	epatch "${FILESDIR}/${PN}-5.0-gcc4.patch"
-	epatch "${FILESDIR}/${PN}-5.0-exports.patch"
-	epatch "${FILESDIR}/${PN}-5.0-cache.patch"
+	if use apache2 ; then
+		epatch "${FILESDIR}/${PN}-5.0-axps1.patch"
+		epatch "${FILESDIR}/${PN}-5.0-cache.patch"
+		epatch "${FILESDIR}/${PN}-5.0-exports.patch"
+	fi
 
 	eautoreconf
 }
diff --git a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild
index ee402a9267d5..5b8390042784 100644
--- a/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild
+++ b/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild,v 1.1 2007/01/10 21:48:46 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_kerb/mod_auth_kerb-5.0_rc7-r1.ebuild,v 1.2 2007/01/10 21:59:54 phreak Exp $
 
 MY_PV="${PV/_rc/rc}"
 
@@ -38,10 +38,12 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-5.0-CVE-2006-5989.patch"
-	epatch "${FILESDIR}/${PN}-5.0-axps1.patch"
 	epatch "${FILESDIR}/${PN}-5.0-gcc4.patch"
-	epatch "${FILESDIR}/${PN}-5.0-exports.patch"
-	epatch "${FILESDIR}/${PN}-5.0-cache.patch"
+	if use apache2 ; then
+		epatch "${FILESDIR}/${PN}-5.0-axps1.patch"
+		epatch "${FILESDIR}/${PN}-5.0-cache.patch"
+		epatch "${FILESDIR}/${PN}-5.0-exports.patch"
+	fi
 
 	eautoreconf
 }