Tweak how patches are handled (now ${PV} based). Rolled new patch tarball

Package-Manager: portage-2.1.1_pre2-r2

3 files changed, 20 insertions, 14 deletions

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 9fed4a016ef7..9ed0777a6078 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -5,7 +5,7 @@ DIST gentoo-apache-1.3.34-r11-20060131.tar.bz2 27897 RMD160 bbb33be5ac758f71041f
 DIST gentoo-apache-1.3.34-r12-20060401.tar.bz2 27547 RMD160 c1a60cc89b387ac1c2ba926c0c369eeef5d5f2c0 SHA1 c00816e114438fa6db8768ddcbe352b3bcf09550 SHA256 e1925eb955db1cc2bd2cd0fb0552ad3a4aebda0bc476eb904e87eb5dcfa6fb1d
 DIST gentoo-apache-1.3.34-r13-20060605.tar.bz2 27627 RMD160 2b95dc6413f93d6aeb10abd44c8913109724c2f5 SHA1 3a6f1aab269ae6422d30233d215abe86421043bd SHA256 8503ba7aff01cd593d7e74e4c1a0552b96b18ad0c4167bab80400acbb6a776ac
 DIST gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 SHA1 d05f1d554bc5b7021fa89750cd47e79aeecc94f7 SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149
-DIST gentoo-apache-1.3.37-20060729.tar.bz2 27552 RMD160 a11de53cb8e6251caae93c194fd9c99a86d1802b SHA1 7ddf0afe2bb26b24ed291aaf9d52376efee3d7a8 SHA256 8aff068a743f6f658afe94cef29d2ce3a26a4092ec22cb5e9fe205300c859d0d
+DIST gentoo-apache-1.3.37-20060729.tar.bz2 27992 RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 SHA1 05d3d2b4309365de54adfc5d1aba9ff4758fc3fc SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b
 DIST gentoo-apache-2.0.54-r31-20050918-02.tar.bz2 52990 RMD160 bc85ac9de56e017c035d798d9aa45cabab265006 SHA1 7ec8eb508404f572ad581446b12cf189c9e1c38c SHA256 23f2431f6285a24959a99ab9d55d52cef349e828bcb0e7bea026bbae14695ce5
 DIST gentoo-apache-2.0.55-r1-20060115.tar.bz2 51735 RMD160 18902966bdce2cbe67ba15b6eb66e311657a8d6d SHA1 2d0a84e20b575177dde67e0c644b82de5db60f33 SHA256 712fb5e292e87bdad0de984085837b5bb974ab57447e5e28356d0041cbb404e3
 DIST gentoo-apache-2.0.58-20060515.tar.bz2 51174 RMD160 e029caa8107e37b66999935d6c1e9ed2e95351f0 SHA1 c88f42534f7419517905679f028be8b5754af962 SHA256 3d11702d3fd6b5c143b1c238e9b4a0d4bed2b3c4b9834efa6a3436cca492c0e5
@@ -43,10 +43,10 @@ EBUILD apache-1.3.34-r14.ebuild 8744 RMD160 caac25c8d5dad0353d5b5c598812c798e9ae
 MD5 124e7d0ed40f2e72704abd6a65ce8c78 apache-1.3.34-r14.ebuild 8744
 RMD160 caac25c8d5dad0353d5b5c598812c798e9ae5287 apache-1.3.34-r14.ebuild 8744
 SHA256 46ac9855a19c2e4e107901f09f0dd72dbb92e2d8c98c84aaac11950cb55b08d1 apache-1.3.34-r14.ebuild 8744
-EBUILD apache-1.3.37.ebuild 8742 RMD160 8ca439ef46344f38adb20d03fbc71b79846e4d1b SHA1 aa645bdacba73bd69acd26dd22499e49990e4df5 SHA256 49220fcb57bd81cc13e5f1be4842ee42f2d0f24661c17e6656b0a6f84f32fc3a
-MD5 24900897f3bfc6e2983e1e8e7d99ad03 apache-1.3.37.ebuild 8742
-RMD160 8ca439ef46344f38adb20d03fbc71b79846e4d1b apache-1.3.37.ebuild 8742
-SHA256 49220fcb57bd81cc13e5f1be4842ee42f2d0f24661c17e6656b0a6f84f32fc3a apache-1.3.37.ebuild 8742
+EBUILD apache-1.3.37.ebuild 8942 RMD160 4b6de63c595bbe05c5404d5a33169f6707d7939f SHA1 83d654eddd1387e3241ab0d8480fbaac26825b23 SHA256 897bd655d315bb4fc60ee9e72c8314952ab6423d23fc88a9e6802adbbeb97f85
+MD5 cf06f60b32501b8d9751f8e339ebbf21 apache-1.3.37.ebuild 8942
+RMD160 4b6de63c595bbe05c5404d5a33169f6707d7939f apache-1.3.37.ebuild 8942
+SHA256 897bd655d315bb4fc60ee9e72c8314952ab6423d23fc88a9e6802adbbeb97f85 apache-1.3.37.ebuild 8942
 EBUILD apache-2.0.54-r31.ebuild 13386 RMD160 efa26be6cf032b3bd5fdb445fa0a47c01e6ee94e SHA1 a006a39f6d93fea80d89e10ffdb1bc1035ec5ebb SHA256 c674d1c6c5c7cba6f504e2e47eb7112f46078175d474654eaf67e15d9e7ff160
 MD5 477d93701a4872e5be29f52b2d167090 apache-2.0.54-r31.ebuild 13386
 RMD160 efa26be6cf032b3bd5fdb445fa0a47c01e6ee94e apache-2.0.54-r31.ebuild 13386
@@ -106,9 +106,9 @@ SHA256 c2c9ea156e7dbfa996f8c68bb249ea87d1cfae71753ac8f97eb54b30bc0261f2 files/di
 MD5 9898e1d5318e43832fc20c4e71e49110 files/digest-apache-1.3.34-r14 1045
 RMD160 e3177b6c4899756c982888044d1c321733d121ef files/digest-apache-1.3.34-r14 1045
 SHA256 06ec0bcb6e35bc9e1cb81c6d264bb4684bd766fda12aa1d788c1c2d35a9173dc files/digest-apache-1.3.34-r14 1045
-MD5 4b1498d25440877e5e2635efae34f38d files/digest-apache-1.3.37 1033
-RMD160 9db292b904dd488a8e8670c9e993f049797771bd files/digest-apache-1.3.37 1033
-SHA256 2141378e02d2293fe83bff99d51fd843471c69345cf6fa21c2c802f681cf9657 files/digest-apache-1.3.37 1033
+MD5 9f2ae7acf0bff8d41440c7060bc8e3e9 files/digest-apache-1.3.37 1033
+RMD160 b5831b6b0f2a18f0319f68e8ca60fc93a3fff3b1 files/digest-apache-1.3.37 1033
+SHA256 03b05d6906fa667af8af8d84f5a3150ccd924dedbb8c3dc8777a1a9381c95012 files/digest-apache-1.3.37 1033
 MD5 bb39b04d1adab58fa4d554e919191659 files/digest-apache-2.0.54-r31 554
 RMD160 80612af5fbe4358cb4ee84c58adf8ccfd3264d71 files/digest-apache-2.0.54-r31 554
 SHA256 234f37bb3950cd615502c2a230a2bcdebe631c6a44c4e6b9ad5cd20ab82b1997 files/digest-apache-2.0.54-r31 554
diff --git a/net-www/apache/apache-1.3.37.ebuild b/net-www/apache/apache-1.3.37.ebuild
index c3b48f23663c..388dd97080ca 100644
--- a/net-www/apache/apache-1.3.37.ebuild
+++ b/net-www/apache/apache-1.3.37.ebuild
@@ -1,13 +1,13 @@
 # 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-1.3.37.ebuild,v 1.1 2006/07/29 20:08:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.37.ebuild,v 1.2 2006/07/30 04:35:11 vericgar Exp $
 
 inherit eutils fixheadtails multilib
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
 GENTOO_PATCHSTAMP="20060729"
-GENTOO_DEVSPACE="kloeri"
+GENTOO_DEVSPACE="vericgar"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
 # The mod_ssl archive is only for providing the EAPI patch in here.
@@ -63,7 +63,13 @@ src_unpack() {
 	# 90-99 security patches
 	EPATCH_SUFFIX="patch"
 	epatch ${GENTOO_PATCHDIR}/patches/[0-2]*
-	#epatch ${GENTOO_PATCHDIR}/patches/9*
+
+	# security patches are version based
+	# 99_all_${PV}_Name.patch
+	if $(ls ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* &>/dev/null); then
+		epatch ${GENTOO_PATCHDIR}/patches/9?_*_${PV}_* || \
+			die "Patching for version ${PV} failed"
+	fi
 
 	# setup the filesystem layout config
 	cat ${GENTOO_PATCHDIR}/patches/config.layout >> config.layout
diff --git a/net-www/apache/files/digest-apache-1.3.37 b/net-www/apache/files/digest-apache-1.3.37
index fe89016d9133..0558f91b506a 100644
--- a/net-www/apache/files/digest-apache-1.3.37
+++ b/net-www/apache/files/digest-apache-1.3.37
@@ -1,9 +1,9 @@
 MD5 b278f0969a9ccadeb781316e79e3520f apache_1.3.37.tar.gz 2665370
 RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 apache_1.3.37.tar.gz 2665370
 SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc apache_1.3.37.tar.gz 2665370
-MD5 a63730fecf4a5b1c40a6a05c5c4f5464 gentoo-apache-1.3.37-20060729.tar.bz2 27552
-RMD160 a11de53cb8e6251caae93c194fd9c99a86d1802b gentoo-apache-1.3.37-20060729.tar.bz2 27552
-SHA256 8aff068a743f6f658afe94cef29d2ce3a26a4092ec22cb5e9fe205300c859d0d gentoo-apache-1.3.37-20060729.tar.bz2 27552
+MD5 7f991bd4d1ce19222a54b6e241ce04a2 gentoo-apache-1.3.37-20060729.tar.bz2 27992
+RMD160 fdb8c3690c8daad501339545b2e348d533d1be09 gentoo-apache-1.3.37-20060729.tar.bz2 27992
+SHA256 00d759d184bec0c2aafbfaba2b748247ceae54bc04570d47979dc237b028ef2b gentoo-apache-1.3.37-20060729.tar.bz2 27992
 MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
 RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f lingerd-0.94.tar.gz 33938
 SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0 lingerd-0.94.tar.gz 33938