Remove applied patches.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

6 files changed, 23 insertions, 156 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index f8357894a80c..d888e95efc87 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.12 2012/06/09 21:09:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.13 2012/06/10 10:34:25 scarabeus Exp $
+
+  10 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/cups-filters-9999-imagetopdf.patch,
+  -files/cups-filters-9999-imagetoraster.patch,
+  -files/cups-filters-9999-png.patch, cups-filters-9999.ebuild:
+  Remove applied patches.
 
   09 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> cups-filters-9999.ebuild:
   Introduce also perl useflag.
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 39944c9fbe53..2e02e2017165 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,30 +2,27 @@
 Hash: SHA1
 
 AUX cups-filters-1.0.11-makefiles.patch 7582 RMD160 9a753859a45c56d6e18b0275eafd6f69d5195334 SHA1 9773ee18d3481e1759986c20baf1adfa2d30d203 SHA256 9a25decdb0033eb1a1910c3787eaad6ac4ec69715db426edbdbdf22b759a5bdc
-AUX cups-filters-9999-imagetopdf.patch 298 RMD160 4801e29622bd534359bf87bc6276be52b000b03e SHA1 91810fb6172cda24058cf1fc0676e2dbb423b472 SHA256 9c6f1564143a0b75ff62fd6c0786be9e2c72a10aed7d8900e576ae2fa670e0e1
-AUX cups-filters-9999-imagetoraster.patch 367 RMD160 083c6f47b479c5a17449745efac4a268b003a3f2 SHA1 357fa3da30c24c80209b3d626bf76aa4143f22eb SHA256 e5d58754d7c64e9933b9f3fc80e5a18c04ef81028938c069c7646c4631dadca6
-AUX cups-filters-9999-png.patch 1971 RMD160 476c57194f60ee2e9f73107b430f5480c8a2d857 SHA1 d413858b93463385ff0e95ffd2792ac376b657f8 SHA256 9309ead9042fe1d4adbe97b3c6efc66a827a313f74a98f14ef5f930a95cbaf19
 DIST cups-filters-1.0.17.tar.gz 1019661 RMD160 de5c5fa4eb1391271d76ca5c049145d601ed0923 SHA1 fd80efeefb5f37755588db868c52a8cd49e620d5 SHA256 af66f4b19c6448f4b42613a66c852fbd7d4622aa9bad1ccc0e42cb7f2e617772
 DIST cups-filters-1.0.18.tar.gz 1022509 RMD160 84cba51cab4a8c78f80de268342ec281967bdf68 SHA1 00fa6d585a4b546b36d0f4a92855a43982933875 SHA256 6926980653e7cb5f94b91921517678cca7f0e6781364823a05f7b4b0ec919106
 EBUILD cups-filters-1.0.17.ebuild 1119 RMD160 65561b8d4be11439ddccc8fccc3ef4681721999e SHA1 c8a647667d83e53f543b51ad580f807bc8d0c107 SHA256 1cc5f7de3b0b68f7bd0a0c083d235db7fc152bc62b12b874a955e78559566a8a
 EBUILD cups-filters-1.0.18.ebuild 1119 RMD160 7cf53106d123bb434d3e54907ca2f4dbc902bc28 SHA1 1da23549bc08811f42c983081d0177035f10633d SHA256 9f93882bd7da4d4bf55c8254bf1868427b8892cabbbca27cc092ed65e7840ae9
-EBUILD cups-filters-9999.ebuild 1780 RMD160 83236b0e42285171ff454c4311cb1a8ce8c1fc43 SHA1 8408171a23fef6a2fa207db858c191a55c8d3093 SHA256 c20f0530c456d71dd9deb028231f2219ee4a824538b3c472f5b2dbac9e51f302
-MISC ChangeLog 2536 RMD160 d8292e281476e8b03c390df7d0468871f9500df2 SHA1 909d1b01e3769b3d52195924d545406c6aa0566e SHA256 af3a972ff4c76360c441708f4ad859c8c4ef60b3a416f9ca1b8ea8e916f41729
+EBUILD cups-filters-9999.ebuild 1659 RMD160 44448c768655f63b5fab295d393fa1fb7f2f19a1 SHA1 64998ee95ac01ccd342addf95c0ae5e31de496dd SHA256 d67f717f48c208a09127ab102ca49c0857d0622591aed15c14b1325f761d501d
+MISC ChangeLog 2775 RMD160 147421c4faf137061a68e0499dfdf97f99007c9b SHA1 4279a64575748fc8b57c7a6d7464712d55e72902 SHA256 a4ffcef20c927b87f9d14299d1abba3a1eced9789eb8bc3fb728a5c9c56340c3
 MISC metadata.xml 162 RMD160 145aada347c27fc879828b9bb22ff79f4e23325c SHA1 97a164202fb2c7165cdbd9721ea05b4ac2724035 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP07uPAAoJEOSiRoyO7jvoa40QALHlUr47TCUjA0h6IBPBIXUS
-cAwCfPulkUQYkaXMM9sv7Yh1z1XtEruAnhvoNdiwcq62BknuvhmFyzvVe4Y+UE7f
-4r7+ilF+AxQKzIz5h0KWPgq4DA+9eNuchiW5VgfqVTMNsMHLxxg8kOt7Lgm+1VtX
-x7eBvia0cyJUqWkDFi2ejZdUHSXzk3JCacRqa2ktOjFv5jgcjuHUBpB8Ve40Y1d2
-hunCFRzpOn7tuhK0uAifhU6U5oHSrgyNq/2HZAOd0lsqsCJpVDVAWmEhIZiiqXgS
-wMWdphM4/MpfB8Y5+kIH1112JIaMsGGvqlYq4mAw1aY0wh1W5NoB+gKuALAeQp+J
-bBheulUWZv/vnejWd7QMYqqN7GVvx+GOWq9cvkH14lcummWOV8tC8EDH+zhpZBU2
-lNSN0cBS00wMVwFLVFq4tb6aiZdx7/QHZl8VUkSV+x5yqInGZCcUpKF0X0Q0cdGy
-2vj3rCReVr9fU4AS4kqiuEUOoEwxFdjhvbJj3nYxMxi+rrxYpfcUETUcH0lWNXxW
-CZoiJgEuWizbWcPGbTezIWL45U+uzsC0is5cTCAxKo5A7bgYawBHvgRINBJdRi3v
-3l2kyIFdBG9PW+pzKgtpn9K5KDsq8fnGy81IbUqg3XGEIFhX18+85z/rldg5TjKc
-0gTFnTM7iIxlh2bp/Rdj
-=V//w
+iQIcBAEBAgAGBQJP1Hg/AAoJEOSiRoyO7jvouEIP/RDS9OROGGlBeE4QJ0Yeq0B+
+I2Gkou+0+gBwueHGiViRCn2yScnPrC3GmF9LRnSIPkH2D4x8ssycMt6iAwRmYiTL
+YM/BAfq2Mbixr0hvv3zMUTERiJnr/9rSI4OCrLNWgsbrN5UCTuAVqV5v8HwnrYQL
+2fX04RMeROJrXHeCcB4SmvTkQCm2iWQ2OVEqPF72zDjvqY2m35IcFWEex1Rtemad
+wMBzTDFEU6Vb+c+ub2ermDDOhOgEfOxOAYOb+UuFqWO0pPWoDK4IdOJbo4KymE+T
+IGzKj8AHilytejuMpPh6Y5KeIU4K4/xodv/txoYTxiLSVIOTBHnV6WDSXrG7cE+i
+OD1T9WjXFC4/u/nnq/nqqtLlOqXpzMnSXGfIqZvfySCFQ1KxTC/mCWYj4wvWTwFd
+1fW5zDBlyk3YiNY2btG7Y3XkmP/TiY5/uvHxqGkyJAOfS48tfbub5SrKxC6scGUj
+OL2wY3FrWSTVJ5ZP4cVIaae8oHRbQSw58L1dvXUzXK8Z3FWwQmo5WfAv6n30qKRX
+ddBabNCrAJJYj/+t0rEHo/AJ2cGOE+5nKqwcM98/9RMZUFmwzIlZcimXsdnmknHC
+Z9jS3o0lEBq/uALu2VeCO6OzG6ZCwzBfpRjpsifC053ZZojeFZNzn6qS+caUA34l
+JLGcxUY5g/Xah5ImtdoM
+=sXpk
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index f07cf5572223..1bdaffa94453 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.8 2012/06/09 21:09:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.9 2012/06/10 10:34:25 scarabeus Exp $
 
 EAPI=4
 
@@ -36,13 +36,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-png.patch"
-	"${FILESDIR}/${P}-imagetopdf.patch"
-	"${FILESDIR}/${P}-imagetoraster.patch"
-)
-
-
 src_prepare() {
 	base_src_prepare
 	if [[ "${PV}"=="9999" ]] ; then
diff --git a/net-print/cups-filters/files/cups-filters-9999-imagetopdf.patch b/net-print/cups-filters/files/cups-filters-9999-imagetopdf.patch
deleted file mode 100644
index e4e424aa2b93..000000000000
--- a/net-print/cups-filters/files/cups-filters-9999-imagetopdf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-=== modified file 'Makefile.am'
---- Makefile.am	2012-06-08 21:51:15 +0000
-+++ Makefile.am	2012-06-08 21:53:42 +0000
-@@ -469,7 +469,8 @@
- 	$(CUPS_LIBS) \
- 	$(LIBJPEG_LIBS) \
- 	$(LIBPNG_LIBS) \
--	$(TIFF_LIBS)
-+	$(TIFF_LIBS) \
-+	libcupsfilters.la
- 
- imagetoraster_SOURCES = \
- 	cupsfilters/image.h \
-
diff --git a/net-print/cups-filters/files/cups-filters-9999-imagetoraster.patch b/net-print/cups-filters/files/cups-filters-9999-imagetoraster.patch
deleted file mode 100644
index ff5421c10313..000000000000
--- a/net-print/cups-filters/files/cups-filters-9999-imagetoraster.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-=== modified file 'Makefile.am'
---- Makefile.am	2012-06-08 21:57:38 +0000
-+++ Makefile.am	2012-06-08 22:10:33 +0000
-@@ -479,7 +479,9 @@
- 	filter/common.h \
- 	filter/imagetoraster.c
- imagetoraster_CFLAGS = $(CUPS_CFLAGS)
--imagetoraster_LDADD = $(CUPS_LIBS)
-+imagetoraster_LDADD = \
-+	$(CUPS_LIBS) \
-+	libcupsfilters.la
- 
- pdftoijs_SOURCES = \
- 	filter/pdftoijs.cxx \
-
diff --git a/net-print/cups-filters/files/cups-filters-9999-png.patch b/net-print/cups-filters/files/cups-filters-9999-png.patch
deleted file mode 100644
index 22a305d978c0..000000000000
--- a/net-print/cups-filters/files/cups-filters-9999-png.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-=== modified file 'Makefile.am'
---- Makefile.am	2012-06-07 21:27:52 +0000
-+++ Makefile.am	2012-06-08 21:43:40 +0000
-@@ -131,13 +131,13 @@
- libcupsfilters_la_LIBADD = \
- 	$(CUPS_LIBS) \
- 	$(LIBJPEG_LIBS) \
--	$(PNG_LIBS) \
-+	$(LIBPNG_LIBS) \
- 	$(TIFF_LIBS) \
- 	-lm
- libcupsfilters_la_CFLAGS = \
- 	$(CUPS_CFLAGS) \
- 	$(LIBJPEG_CFLAGS) \
--	$(PNG_CFLAGS) \
-+	$(LIBPNG_CFLAGS) \
- 	$(TIFF_CFLAGS)
- 
- libcupsfilters_la_LDFLAGS = \
-@@ -163,13 +163,13 @@
- 	$(pkgfiltersinclude_DATA)
- testimage_LDADD = \
- 	$(LIBJPEG_LIBS) \
--	$(PNG_LIBS) \
-+	$(LIBPNG_LIBS) \
- 	$(TIFF_LIBS) \
- 	libcupsfilters.la \
- 	-lm
- testimage_CFLAGS = \
- 	$(LIBJPEG_CFLAGS) \
--	$(PNG_CFLAGS) \
-+	$(LIBPNG_CFLAGS) \
- 	$(TIFF_CFLAGS)
- 
- testrgb_SOURCES = \
-@@ -426,14 +426,14 @@
- bannertopdf_CFLAGS = \
- 	$(CUPS_CFLAGS) \
- 	$(LIBJPEG_CFLAGS) \
--	$(PNG_CFLAGS) \
-+	$(LIBPNG_CFLAGS) \
- 	$(POPPLER_CFLAGS) \
- 	$(TIFF_CFLAGS)
- bannertopdf_CXXFLAGS = $(bannertopdf_CFLAGS)
- bannertopdf_LDADD = \
- 	$(CUPS_LIBS) \
- 	$(LIBJPEG_LIBS) \
--	$(PNG_LIBS) \
-+	$(LIBPNG_LIBS) \
- 	$(POPPLER_LIBS) \
- 	$(TIFF_LIBS)
- 
-@@ -463,12 +463,12 @@
- imagetopdf_CFLAGS = \
- 	$(CUPS_CFLAGS) \
- 	$(LIBJPEG_CFLAGS) \
--	$(PNG_CFLAGS) \
-+	$(LIBPNG_CFLAGS) \
- 	$(TIFF_CFLAGS)
- imagetopdf_LDADD = \
- 	$(CUPS_LIBS) \
- 	$(LIBJPEG_LIBS) \
--	$(PNG_LIBS) \
-+	$(LIBPNG_LIBS) \
- 	$(TIFF_LIBS)
- 
- imagetoraster_SOURCES = \
-@@ -507,7 +507,7 @@
- 	$(CUPS_CFLAGS) \
- 	$(LCMS_CFLAGS) \
- 	$(LIBJPEG_CFLAGS) \
--	$(PNG_CFLAGS) \
-+	$(LIBPNG_CFLAGS) \
- 	$(POPPLER_CFLAGS) \
- 	$(TIFF_CFLAGS) \
- 	-I$(srcdir)/cupsfilters/
-@@ -516,7 +516,7 @@
- 	$(CUPS_LIBS) \
- 	$(LCMS_LIBS) \
- 	$(LIBJPEG_LIBS) \
--	$(PNG_LIBS) \
-+	$(LIBPNG_LIBS) \
- 	$(POPPLER_LIBS) \
- 	$(TIFF_LIBS) \
- 	libcupsfilters.la
-@@ -540,11 +540,11 @@
- 	filter/rastertopclx.c
- rastertopclx_CFLAGS = \
- 	$(CUPS_CFLAGS) \
--	$(PNG_CFLAGS) \
-+	$(LIBPNG_CFLAGS) \
- 	-I$(srcdir)/cupsfilters/
- rastertopclx_LDADD = \
- 	$(CUPS_LIBS) \
--	$(PNG_LIBS) \
-+	$(LIBPNG_LIBS) \
- 	libcupsfilters.la
- 
- test_pdf1_SOURCES = \
-