Remove duplicate patches.

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

6 files changed, 18 insertions, 37 deletions

diff --git a/dev-dotnet/pnetlib/ChangeLog b/dev-dotnet/pnetlib/ChangeLog
index 5992d775c14b..5283b556cc5b 100644
--- a/dev-dotnet/pnetlib/ChangeLog
+++ b/dev-dotnet/pnetlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-dotnet/pnetlib
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/ChangeLog,v 1.43 2009/01/04 23:00:13 ulm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/ChangeLog,v 1.44 2009/09/25 10:26:27 flameeyes Exp $
+
+  25 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/0.7.0-resgen.patch, pnetlib-0.7.4.ebuild,
+  -files/0.8.0-resgen.patch, pnetlib-0.8.0.ebuild:
+  Remove duplicate patches.
 
   04 Jan 2009; Ulrich Mueller <ulm@gentoo.org> pnetlib-0.6.12.ebuild,
   pnetlib-0.7.4.ebuild, pnetlib-0.8.0.ebuild:
diff --git a/dev-dotnet/pnetlib/Manifest b/dev-dotnet/pnetlib/Manifest
index 9f4fbba63c04..79ed0b686ddc 100644
--- a/dev-dotnet/pnetlib/Manifest
+++ b/dev-dotnet/pnetlib/Manifest
@@ -2,21 +2,19 @@
 Hash: SHA1
 
 AUX 0.6.12-resgen.patch 538 RMD160 35c2f6af082e17bec6d9014afdfd7b5fb81a5436 SHA1 389230a429f54a558af68e17805769f1ef85cc19 SHA256 180618948a8e520f8e1de567bd7da47b91d012386f5b12f975580053ea1fb57e
-AUX 0.7.0-resgen.patch 538 RMD160 35c2f6af082e17bec6d9014afdfd7b5fb81a5436 SHA1 389230a429f54a558af68e17805769f1ef85cc19 SHA256 180618948a8e520f8e1de567bd7da47b91d012386f5b12f975580053ea1fb57e
-AUX 0.8.0-resgen.patch 538 RMD160 35c2f6af082e17bec6d9014afdfd7b5fb81a5436 SHA1 389230a429f54a558af68e17805769f1ef85cc19 SHA256 180618948a8e520f8e1de567bd7da47b91d012386f5b12f975580053ea1fb57e
 AUX configure-freetype.patch 391 RMD160 3359ebb8b01a4c6ea2a0f2a1b6c5febd4cce67dd SHA1 698bfa51ef67c5dd9d1ea53dcedfdfb1de3a977c SHA256 7690886d562034321492446160de23a630be51bf546807b627a3b620f534233f
 DIST pnetlib-0.6.12.tar.gz 4021922 RMD160 8f8120d94806a2188488ba89ac20d551985bee5a SHA1 9a228e10c4f3e7a8caa32387193482d790e79679 SHA256 0c672221d5eb37584835501deeabc082a66c467819685ece137ffd67f21b1f46
 DIST pnetlib-0.7.4.tar.gz 4100640 RMD160 8ee753dfd4078f439b274be48fc90c3993fbc1c8 SHA1 289432378c5783be8f3c8880efec14c7cc4d3ef6 SHA256 d6d1a2ab67a6291307c06007c7378d1da1654abb6b1b32dad442fd1711b1568a
 DIST pnetlib-0.8.0.tar.gz 5092807 RMD160 e438c03ac7439c962452fc235dea5e6e6e3c293f SHA1 294c04a9d2e88f878382397f405ad21fb3939d23 SHA256 baea8982b09b0a7b65fb65c918e4bf2b040e959f25d3c8681e379a9ebd2db9a9
 EBUILD pnetlib-0.6.12.ebuild 1310 RMD160 ffe6e98f48450cfbd2839745b2c431cc7afe012a SHA1 9038204c0d1a0f9e791f403ee2b3b039813361fc SHA256 196dfdbefc89c313dae01d5c8a6d854fcdff63992c7828541e7d59ed8b4b9858
-EBUILD pnetlib-0.7.4.ebuild 1313 RMD160 ad3f672a67add573a5b344e1ecb4fd62789f10b6 SHA1 b160042be452d7495db0ea6dcff9f3bb87e7132c SHA256 990f76322ca9e05477a27682cca8325b93b44bb510f54b70548dd72c663a80ad
-EBUILD pnetlib-0.8.0.ebuild 1387 RMD160 948614987acb97e7032136558e25315d47c22fd0 SHA1 29fc5d225ab37d04da51f3e060cdc3efe6815c4a SHA256 6141b94c7a260fe9c2a45e4f68fdd1da13e0e7ab79afb337e3ab57a5d093e0ad
-MISC ChangeLog 7259 RMD160 58a4eb5a4c4f7ca31dd257e9883ece92cb991d98 SHA1 2bd60ffa729ba34a45f4b7453c4e38de02a70fc5 SHA256 86628e44a0269b376b72dea2dc5201029e242b504753d070edb74525aa224ef4
+EBUILD pnetlib-0.7.4.ebuild 1322 RMD160 586853c221de40e15374ac8d436a27bdfea3ecfc SHA1 7b52b0abab534d55eac87f38df2babe1dd5617a2 SHA256 1e509f7e07805ba649853dbae8e8211d238c36aab80db55ca55de0fc75a5348e
+EBUILD pnetlib-0.8.0.ebuild 1396 RMD160 6f1a156206326b92992afdb7b6fa6854cf6b9c3e SHA1 ceebd9ad377d33e61a81b507d77a1c8bc1c2a155 SHA256 971396e7dc2832cc9fbe225d330699eee100ad8f4f77e5cdbd4daa394387479e
+MISC ChangeLog 7452 RMD160 2b9bcb9472d5226ffd65cbe18cd1f47a79be24e7 SHA1 b9ab3d0835d78a997412669041706ecb763f4eeb SHA256 d2549555aa225f669b4c2246c146c679c400866b0c299734dc32c5fee7005f4b
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAklhP7MACgkQOeoy/oIi7uy0YgCgofO4hr9EwyHZljTYcBBb0MsX
-IK0An2RuKHC79x9Qwlx+q7KaLcZswpPf
-=OjND
+iEYEARECAAYFAkq8mtsACgkQAiZjviIA2Xi26gCgjPd7a6eJFrbqWbikCE8h2ZGT
+skkAmgKZbNvxwfnOgleE3QEyBIB16JgX
+=TkYZ
 -----END PGP SIGNATURE-----
diff --git a/dev-dotnet/pnetlib/files/0.7.0-resgen.patch b/dev-dotnet/pnetlib/files/0.7.0-resgen.patch
deleted file mode 100644
index 775360c64ffc..000000000000
--- a/dev-dotnet/pnetlib/files/0.7.0-resgen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2005-01-16 08:18:30.586416224 +0100
-+++ configure.in	2005-01-16 08:20:48.656426392 +0100
-@@ -143,7 +143,7 @@
- 
- dnl Find the .NET resource generator to use.
- if test "$MSTOOLS" = "no"; then
--	AC_PATH_PROG(RESGEN, resgen,, $PNET_PATH/resgen:${prefix}/bin:$PATH)
-+	AC_PATH_PROG(RESGEN, resgen.pnet,, $PNET_PATH/resgen.pnet:${prefix}/bin:$PATH)
- 	if test "$RESGEN" = "" ; then
- 		echo '**************************************************************'
- 		echo "Portable.NET's or Microsoft's resgen is required to build."
diff --git a/dev-dotnet/pnetlib/files/0.8.0-resgen.patch b/dev-dotnet/pnetlib/files/0.8.0-resgen.patch
deleted file mode 100644
index 775360c64ffc..000000000000
--- a/dev-dotnet/pnetlib/files/0.8.0-resgen.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2005-01-16 08:18:30.586416224 +0100
-+++ configure.in	2005-01-16 08:20:48.656426392 +0100
-@@ -143,7 +143,7 @@
- 
- dnl Find the .NET resource generator to use.
- if test "$MSTOOLS" = "no"; then
--	AC_PATH_PROG(RESGEN, resgen,, $PNET_PATH/resgen:${prefix}/bin:$PATH)
-+	AC_PATH_PROG(RESGEN, resgen.pnet,, $PNET_PATH/resgen.pnet:${prefix}/bin:$PATH)
- 	if test "$RESGEN" = "" ; then
- 		echo '**************************************************************'
- 		echo "Portable.NET's or Microsoft's resgen is required to build."
diff --git a/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild b/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild
index 87d08b3517b5..4dade5c1f459 100644
--- a/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild
+++ b/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild,v 1.11 2009/01/04 23:00:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/pnetlib-0.7.4.ebuild,v 1.12 2009/09/25 10:26:27 flameeyes Exp $
 
 inherit autotools eutils
 
@@ -29,7 +29,7 @@ src_unpack() {
 	cd ${S}
 
 	# patch configure.in to detect renamed resgen.pnet ; bug #39369
-	epatch ${FILESDIR}/0.7.0-resgen.patch
+	epatch "${FILESDIR}"/0.6.12-resgen.patch
 
 	eautoreconf || die "eautoreconf failed"
 }
diff --git a/dev-dotnet/pnetlib/pnetlib-0.8.0.ebuild b/dev-dotnet/pnetlib/pnetlib-0.8.0.ebuild
index e3302f7ca6ef..a8db020b264c 100644
--- a/dev-dotnet/pnetlib/pnetlib-0.8.0.ebuild
+++ b/dev-dotnet/pnetlib/pnetlib-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/pnetlib-0.8.0.ebuild,v 1.3 2009/01/04 23:00:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/pnetlib/pnetlib-0.8.0.ebuild,v 1.4 2009/09/25 10:26:27 flameeyes Exp $
 
 inherit autotools eutils
 
@@ -30,7 +30,7 @@ src_unpack() {
 	cd ${S}
 
 	# patch configure.in to detect renamed resgen.pnet ; bug #39369
-	epatch ${FILESDIR}/0.8.0-resgen.patch
+	epatch "${FILESDIR}"/0.6.12-resgen.patch
 
 	eautoreconf || die "eautoreconf failed"
 }