Removed broken patches from -r14

Package-Manager: portage-2.0.51.19

4 files changed, 20 insertions, 15 deletions

diff --git a/net-www/webapp-config/ChangeLog b/net-www/webapp-config/ChangeLog
index 762070bc1a84..d308fee9debc 100644
--- a/net-www/webapp-config/ChangeLog
+++ b/net-www/webapp-config/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/webapp-config
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/ChangeLog,v 1.82 2005/05/30 22:04:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/ChangeLog,v 1.83 2005/05/31 08:58:06 stuart Exp $
+
+  31 May 2005; Stuart Herbert <stuart@gentoo.org>
+  webapp-config-1.10-r12.ebuild, webapp-config-1.10-r14.ebuild:
+  Urgh - seeing as -r14 just won't go away, I've removed the broken patches
+  from it (effectively making it the same as -r12)
 
   30 May 2005; Bryan Østergaard <kloeri@gentoo.org>
   +files/webapp-config_fixperms.patch,
diff --git a/net-www/webapp-config/Manifest b/net-www/webapp-config/Manifest
index 8bd85ffef4a5..d8dc987f218f 100644
--- a/net-www/webapp-config/Manifest
+++ b/net-www/webapp-config/Manifest
@@ -1,18 +1,18 @@
-MD5 25d81a1c2aeb21b2d21752e62fdcc548 ChangeLog 12068
+MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
+MD5 e5ac34345db3fc7d56b55fecfe099241 ChangeLog 12310
+MD5 5fa2a14e6a01fde1f4d9ef5c75319974 webapp-config-1.9-r2.ebuild 1143
 MD5 f6d518ef4ea229230b1bcf85d4ed9a4e webapp-config-1.10-r6.ebuild 1406
+MD5 0a227eed730e13eda60077d2ad92b79a webapp-config-1.10-r10.ebuild 1414
 MD5 832c7b1b4124880c77156ae93673934d webapp-config-1.10-r11.ebuild 1438
-MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
+MD5 b83c57dfc4bb030edda59db1cbb85fd2 webapp-config-1.10-r12.ebuild 1645
+MD5 6308235684a3d5115a69cf9334bbf12a webapp-config-1.10-r14.ebuild 2068
 MD5 4ce58d748ebda3c89b14a37388b322e5 webapp-config-1.11.ebuild 1436
-MD5 0a227eed730e13eda60077d2ad92b79a webapp-config-1.10-r10.ebuild 1414
-MD5 5fa2a14e6a01fde1f4d9ef5c75319974 webapp-config-1.9-r2.ebuild 1143
-MD5 40122b960ca578746df423447ca94d8d webapp-config-1.10-r14.ebuild 2066
-MD5 1b3a7af5aab43121eee269209e3982c4 webapp-config-1.10-r12.ebuild 1647
+MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r11 74
 MD5 0c1ae4fd2fcc6de80a24f04993a63d80 files/digest-webapp-config-1.9-r2 72
 MD5 e605a4d1868a4a3e17cd2ecd474f7076 files/webapp-config_fixperms.patch 2786
-MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r11 74
-MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r14 74
-MD5 6aad9c4cd4548cb948cd4035286d6ac7 files/digest-webapp-config-1.11 70
-MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r12 74
 MD5 675f730140fb4b7303082b203e27ba0b files/digest-webapp-config-1.10-r6 73
 MD5 ad4be087a0a4be0991e124d97fe377ac files/digest-webapp-config-1.10-r10 74
+MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r12 74
+MD5 72b2e4879ffabdc297ea4fd9ae4c3184 files/digest-webapp-config-1.10-r14 74
 MD5 b9efc67836c3d94009bea1f83cc92027 files/webapp-config_improved-tmpfile-handling.patch 973
+MD5 6aad9c4cd4548cb948cd4035286d6ac7 files/digest-webapp-config-1.11 70
diff --git a/net-www/webapp-config/webapp-config-1.10-r12.ebuild b/net-www/webapp-config/webapp-config-1.10-r12.ebuild
index 7c0c2b590366..3c2ab7802fb7 100644
--- a/net-www/webapp-config/webapp-config-1.10-r12.ebuild
+++ b/net-www/webapp-config/webapp-config-1.10-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.10-r12.ebuild,v 1.1 2005/04/25 13:50:28 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.10-r12.ebuild,v 1.2 2005/05/31 08:58:06 stuart Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.gentoo.org/~stuart/${PN}/${P}-r11.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-www/webapp-config/webapp-config-1.10-r14.ebuild b/net-www/webapp-config/webapp-config-1.10-r14.ebuild
index 54130abf8148..7b4b9cb3116d 100644
--- a/net-www/webapp-config/webapp-config-1.10-r14.ebuild
+++ b/net-www/webapp-config/webapp-config-1.10-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.10-r14.ebuild,v 1.11 2005/05/30 22:04:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/webapp-config/webapp-config-1.10-r14.ebuild,v 1.12 2005/05/31 08:58:06 stuart Exp $
 
 inherit eutils
 
@@ -31,7 +31,7 @@ src_unpack() {
 	# Have webapp-config fixup permissions on site and document root directories
 	# that are/have previously been installed with mode 777 (word-writable).
 	# Bugs #88831 and #87708.
-	epatch ${FILESDIR}/webapp-config_fixperms.patch
+	# epatch ${FILESDIR}/webapp-config_fixperms.patch
 
 	# Improve temporary file handling code with the use of mktemp(1), bug
 	# #91785.