Revision bump and remove old. Fixes bug #382927 with help from Martin von Gagern and Rafał Mużyło.

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

4 files changed, 56 insertions, 13 deletions

diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog
index aa3ebfc87bf4..bd0fa4f56ce4 100644
--- a/net-print/gutenprint/ChangeLog
+++ b/net-print/gutenprint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/gutenprint
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.25 2011/09/11 07:28:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.26 2011/09/15 21:30:05 radhermit Exp $
+
+*gutenprint-5.2.7-r1 (15 Sep 2011)
+
+  15 Sep 2011; Tim Harder <radhermit@gentoo.org> -gutenprint-5.2.7.ebuild,
+  +gutenprint-5.2.7-r1.ebuild, +files/gutenprint-5.2.7-genppd.patch:
+  Revision bump and remove old. Fixes bug #382927 with help from Martin von
+  Gagern and Rafał Mużyło.
 
   11 Sep 2011; Tim Harder <radhermit@gentoo.org> gutenprint-5.2.7.ebuild:
   Respect CFLAGS and build genppd statically (fixes bug #382027).
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index ff39179e4b34..226ec3c705d2 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -3,6 +3,7 @@ Hash: SHA512
 
 AUX gutenprint-5.2.4-CFLAGS.patch 781 RMD160 f9c6650d899768cc3e8cb846cca388aca8c33872 SHA1 248af46ba40397d0c75b5cbf2b9ee5a99990fc22 SHA256 e4df928bf523a90f595bea773ffbbdaf3b982a941a6f995a5709abfdb5e5c438
 AUX gutenprint-5.2.5-Makefile.patch 564 RMD160 c292214f0a46d3cc36e6a08ac5fbc72a739279f7 SHA1 92df0231b7ce7b779c78f3ba80670acf032e5260 SHA256 b17043d3160e754ca1bb50acf92818f13d3f7983343c97508985f42aba288462
+AUX gutenprint-5.2.7-genppd.patch 2263 RMD160 6adb3f024faee881537cd91c3b0a085e5902f87f SHA1 e139fba1c475efa1ed60fff863b4dd1b486d6c2b SHA256 8acd830eaff2b063875843130bae1e83694335d33045549d1a61771f66a8b4b8
 DIST gutenprint-5.1.4.tar.bz2 4714151 RMD160 44f23d30eeab6f911f28c5982ca9ffc1677a0c49 SHA1 1e65fbb90d1b6f2344f32378d026326c103bb3eb SHA256 2189127e50171334ebd8ca3791455062daeef150894ce8dfb063bc2da7b35763
 DIST gutenprint-5.2.5.tar.bz2 5215539 RMD160 cd88cd3ffc28fcc54e1de94d2f5ee069102d23a6 SHA1 380d9f870e7f12088fc5dffac02413cae9a9ccb4 SHA256 6b562390769785573bb25715a9cbcb2e638b2740d391f4632a0ed4a0bc8fa3fa
 DIST gutenprint-5.2.6.tar.bz2 5283223 RMD160 ede2dea11742c77fede450880685efcde3a91967 SHA1 9fbe1ab899d5e83f34e21534cc5c1b8921c9039b SHA256 4744e1b5aab4c78a5af8da629d83d8ca3d8d217171301dc905c2e11dca5edc7e
@@ -10,17 +11,17 @@ DIST gutenprint-5.2.7.tar.bz2 5498414 RMD160 63c6dbc136ac7095c06accf48979a379a92
 EBUILD gutenprint-5.1.4.ebuild 2583 RMD160 62ceb05e24d0f6155c1ef8d9b6cbbd13426359b0 SHA1 5245949bc3987db34a62ad3f5ff0977e8547bdb8 SHA256 a96c2182807829c0545cd176e17a9748067e26ac134fca2f0afa5c41eb54f660
 EBUILD gutenprint-5.2.5-r1.ebuild 2564 RMD160 79d250dc1a8424a9e6538c2d12728605492e3014 SHA1 ac0df1235b6e3a7ce57f7d9869fde976a16433ee SHA256 218a4098056f276c7840fd522245e8c2b69e086ea5b675debf9ee405ddc2fc90
 EBUILD gutenprint-5.2.6.ebuild 2381 RMD160 889711343291d24c9a2e3fca2a8b7cfb14e7ac74 SHA1 5df153ea0052cdbd92e99cf1d989944d3623b35a SHA256 2e712e09c0675784d609beed8517ca8a48e3b2799d91e438f376c0c766d6841a
-EBUILD gutenprint-5.2.7.ebuild 2408 RMD160 6fe09e600f1f444e9874c79ba12ce28a1faa2759 SHA1 a6078a75dc20804cec6bb74d77a624b91417b0f7 SHA256 62af74f9ef1c14d136c40c1fac673979733e8d130f4e62860532de7a4df24381
-MISC ChangeLog 19497 RMD160 a3d21cf3e95f4183f0c920b4f2cd9bdef9188955 SHA1 2a8e48cf83b7ee6a111b682e389806a9a45411ac SHA256 1435bd999ae0d5be90f3ac1ec5a522d10fb24de9dac9fcc5b8959b92b5eefb74
+EBUILD gutenprint-5.2.7-r1.ebuild 2420 RMD160 030e930fd3e36448eb89698f0a1245eb9e2efc50 SHA1 e911d7f7cf8cd1ac53947fd1dd1b5ddb4608af10 SHA256 b9e13b1eedf58db6207b657a86f38b6545413b7f6e4b39fc4eb36f6e1a650db3
+MISC ChangeLog 19784 RMD160 f791110a82c49c5cee65d12f031a3a97dc8d88ab SHA1 1bfea1b287061a372d009458fd76e390dbb15bcd SHA256 1d00dee72f201c5d6da75b638864da0511fc9f4a29605a3cdc17b02cd257869b
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJObGMhAAoJEEqz6FtPBkyjAbsH/iZnI0lxsPBtte038dpfviwi
-FAQd8lEambzFV4ZHn+KZ29LVidDCuyZjocDgDklKgbfIcIKnTG8ndr6N0G66Pfsg
-Y1aiZxW5gjVw9JGinMpenIyD/+h3Yu/57ShVPKF+XByQmuWI8XjhMfPXlbhoQydA
-yzj03zEHApt3YADQ3ozBybfbf/tvfP4yXIR6AMmN/V/bLUXMh7f+HxitPMDHt10x
-Fs8tcKAkMlKrKhhJPKqKsKv2SYvZrens2kUeChsSYsKsdWjHGRLCidpetKX4UAgI
-+CZ6JYji6fZbxpPZJWzZVTlx8kYBLXjV0cUOXqaoPP5isjSQQjjo81YqQHjeQkA=
-=MP61
+iQEcBAEBCgAGBQJOcm5jAAoJEEqz6FtPBkyjsLgIAKs4xuOsWUcnZt4XUv+WcpI1
+ZHPwwwed8JX38aDwSWwi2hRAV6M2bC1Oow9BUn+PIw12Oc+ME5vtGTRlWTEj88CC
+8TZ0je2iwAwDLiaZ7r9ctfSXQbDR5u76JSE1AkSgMkf46gJ9N/LBnGaa1lAvExIO
+VVKjMJWqZAUVtawZLMyLbHWooBtIJT2vG1CoH/8UA1giFpqDJrg1Myuqg7NhaGoV
+9JM0a0ig6XncZaQabDaNIqNR6X9t2G43MISssqOyHH5ImxdwlrxjCGw9YIvF2kiN
+Ba3kuENBN9X2bbW55/LsjX5BuKsBZXY4VYaMpD7SDp5NPy0ACdMzMCnzg7CTTF4=
+=wzR0
 -----END PGP SIGNATURE-----
diff --git a/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch b/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch
new file mode 100644
index 000000000000..fbe6b6ace9c4
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.2.7-genppd.patch
@@ -0,0 +1,35 @@
+--- gutenprint-5.2.7/configure.ac.orig
++++ gutenprint-5.2.7/configure.ac
+@@ -128,8 +128,8 @@
+ dnl *_cflags:   cflags for pkg-config
+ dnl *_libs:     libs for pkg-config
+ 
+-GUTENPRINT_LIBS="-lgutenprint"
+-GUTENPRINTUI2_LIBS="-lgutenprintui2"
++GUTENPRINT_LIBS='$(top_builddir)/src/main/libgutenprint.la'
++GUTENPRINTUI2_LIBS='$(top_builddir)/src/gutenprintui2/libgutenprintui2.la'
+ gutenprint_version=${GUTENPRINT_VERSION}
+ gutenprintui2_version=${GUTENPRINT_VERSION}
+ 
+--- gutenprint-5.2.7/src/cups/Makefile.am.orig
++++ gutenprint-5.2.7/src/cups/Makefile.am
+@@ -96,16 +96,16 @@
+ 
+ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
+ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+-cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
+ cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = genppd.c i18n.c i18n.h
+ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"@ALL_LINGUAS@"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
+-gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
+ gutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
+-rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
++rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
+ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
+ 
+ ## Data
diff --git a/net-print/gutenprint/gutenprint-5.2.7.ebuild b/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild
index e210035e49ac..bc1c31756b8f 100644
--- a/net-print/gutenprint/gutenprint-5.2.7.ebuild
+++ b/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.7.ebuild,v 1.2 2011/09/11 07:28:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.7-r1.ebuild,v 1.1 2011/09/15 21:30:05 radhermit Exp $
 
 EAPI=4
 
@@ -32,7 +32,8 @@ RESTRICT="test"
 DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-5.2.4-CFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-5.2.4-CFLAGS.patch" \
+		"${FILESDIR}"/${P}-genppd.patch
 	sed -i -e "s:m4local:m4extra:" Makefile.am || die
 	eautoreconf
 }
@@ -58,7 +59,6 @@ src_configure() {
 		--enable-test \
 		--with-ghostscript \
 		--disable-translated-cups-ppds \
-		--enable-static-genppd \
 		$(use_with gimp gimp2) \
 		$(use_with gimp gimp2-as-gutenprint) \
 		$(use_with cups) \