Add patch by Jiří Popelka to fix build against cups-1.6, bug 428740

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

5 files changed, 222 insertions, 5 deletions

diff --git a/dev-perl/Net-CUPS/ChangeLog b/dev-perl/Net-CUPS/ChangeLog
index 234f73c15b44..1c3fe0c31a54 100644
--- a/dev-perl/Net-CUPS/ChangeLog
+++ b/dev-perl/Net-CUPS/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/Net-CUPS
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-CUPS/ChangeLog,v 1.39 2012/06/24 13:00:18 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-CUPS/ChangeLog,v 1.40 2012/08/24 22:21:00 dilfridge Exp $
+
+*Net-CUPS-0.610.0-r1 (24 Aug 2012)
+
+  24 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  Net-CUPS-0.610.0.ebuild, +Net-CUPS-0.610.0-r1.ebuild,
+  +files/Net-CUPS-0.610.0-cups16.patch:
+  Add patch by Jiří Popelka to fix build against cups-1.6, bug 428740
 
   24 Jun 2012; Torsten Veller <tove@gentoo.org> metadata.xml:
   Update CPAN upstream info
diff --git a/dev-perl/Net-CUPS/Manifest b/dev-perl/Net-CUPS/Manifest
index 602a65257154..873b0b9162da 100644
--- a/dev-perl/Net-CUPS/Manifest
+++ b/dev-perl/Net-CUPS/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX Net-CUPS-0.610.0-cups16.patch 5206 SHA256 36419f4f09a7d6706bc2ce6183e52a99a5f9bcf72e7fa80067b9c7d7ded6b308 SHA512 9113b0c0980f548a9a8af69968fbfebe802eb82ec9c019245f231f4eb87fd699a32f785c873194d114f740b0598db8889930edb9358d0b84265b931871b2a0d0 WHIRLPOOL d5437b4fe4f4d165f0e5163f730d48819915906c04d2180dc17f51e33904360bd1fcdc762a8391b700f7929d8cde198b26314c4297a693cb1b1066109624f116
 DIST Net-CUPS-0.61.tar.gz 83893 SHA256 fd4a5a86038df9dfe57dcfed78b2d045e4b18d507a6fa5a8f82ecb3a732e0e35 SHA512 6e906dfebd7a5970f393f8187808049004d6b89fc268bb89abb4dca43145ec97ea45dd3faa51a04de2843a2aedc8051bcb88ab688f4a9886acc188166e2c2cf7 WHIRLPOOL df2ac30aa164ab8e6494bcd0cad59143020df8e50d670d9fd6dcfd0ec986c73363788435ae83b6bc7ac67cdf430cd6550a5926038f124e950735caa47adfae53
-EBUILD Net-CUPS-0.610.0.ebuild 481 SHA256 ba76a32aeb0af669ab6dc99b59700576c84b4cfca3bd445e47d0f1b11b9d50f6 SHA512 7575b0ef422e1e48fcb40263068cf8d1763f42777e702d0b8f2f8da9eb1c48bbfe4ed0f338dc16c5ad5395231f3be31b10ebb40c1b1b1f442074a5aeef0b11f2 WHIRLPOOL 125af5fb73dea59707e1517e08e377eeb29830615511436e02b258931a1342bfe331f73a29f20f184331cc1be07c09e84c9542bb26fc455b7886ea9c14686bfb
-MISC ChangeLog 4478 SHA256 325ab63ca28cd0861c14166011d25fcf52a802b63240f6618399345c55b7f619 SHA512 740aafbdd2c7aea57be2c2052260725ea336caa5f4c9c664b62baf310080bd124e2949f1d264a85261c2e5dc810e99d4c2931a468e0363e72484cb22a26c3353 WHIRLPOOL ad2f9573a9177d7a898d59e9fce4749b4b41ffa8d4cc8fb412be7f9f8c42d7494586e854d4873b7ab745fc5b5fc96545bef7a317e609287733dbe97ee8153adc
+EBUILD Net-CUPS-0.610.0-r1.ebuild 524 SHA256 21bf0781097e47be1192b5ec70a27eef4e94dd89d9aba4108c910fc93e980085 SHA512 b8f0ea6a15cadc0fef4533a3a9ec94bef9eaf0b60659ed8fbf7672c3c8d31d70e0784ba4700cdbf9f1bc5cda6723155e34c7e0a33fde1f566393e05de7e5a320 WHIRLPOOL 8726f608c0bf3e2d416687dbde4c8b5ba3f1b7f4bbb8bab81519133d2cd451ed025a696436a28bba875b5c9feba558e2098371469fc051a69dbe092368e23c44
+EBUILD Net-CUPS-0.610.0.ebuild 485 SHA256 804a7685c7ee6cac2cbbbb7645f7c8128ed6b4a4cd459181de72e1abdf63c2c1 SHA512 12c3fa171242a69e97cfbd3f3422523f98a1e081ac6f0d24ebb0a6cac824ca7d4f5c50210802557c9cc7e9ee871d6c31081e3ec802d91c833af727aaea6a1029 WHIRLPOOL 02d6a832003bc3f138da80e4f92a03cb2df32290e39a272c0ef8aa059a3d220caf54bac34cb86f93a460e9d82c5c2b0ddf13d4ab1f4a4dedc42a7f035cbee424
+MISC ChangeLog 4745 SHA256 f7ca70475818a3f1a35295cb1a2e069b419ffd4c4b1c1808104d356134003586 SHA512 f8cdd5aaa43e2ba9a6152dabbb91ea39aba3602fa8bcfad6bf5c87b9cb36413ff8fe0311f149ea0ac95023703fbf52df00cf7262bf7e504bac35fb8834944e23 WHIRLPOOL 878d497fa5200c043a7e12e6e6fee19f0b2e30823eba6f66d744877a0a05853d4be782f61ce66c066a5c9bd42c8c55d58a4b83aa91571c978beb367d8947e755
 MISC metadata.xml 481 SHA256 28b2016eea8861668cf51f1664b5e35c7046da456aa741746b2e672cf52cc85c SHA512 e717e47135736cc5c05fa00642e6b23bc7a0988d2f9b4e3902c0c176b4cc3ca476be351f17c78d4a4e14b48e3b5decfd62dd879f407e07d25964cf2c5164319f WHIRLPOOL eb338afd9d00a09f92d6b0571ce8a47d8076a4d7718f7908e8ddccef12790c6d4474b4502554a9baeaccb576166e040e3b460352ee9bd22b1b212a344edf8e99
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQN/63AAoJEEb+UGWnxTyHqd0QAI8ScPiOF9uK0tCYHrFATgXh
+9xKY54DW6SYTTDL75rlyVU0+heLWm9FMtjdGKOVSkWBjeFRZPwsR736Y3VhE0xqP
+euQ0lIPyB3nH5upwMb9pvoKJCUZlJkXzgsqlpLlTycNp0U1sI4j9jRO4TA7BYFtR
+vW+WeZN6jRdx3Chu/UsNCrE7SjmDKoGuD+4/WbhNg8RHbFVqLkoXJMrs/gPx/z5s
+l5drYo3Pc82bBWBjfRZoVaNEAl9vkhgxBj67+e+9cEX3MBLWsPYKTk6krfH8J7KT
+nZDxaRvRlIFClXH+Wju605s/I8ngUJCqa+djthfsZRhwnh95Krwcy4WQIKFrGtbL
+wB7rE5l2LjVwh0aM2Sz/4UCTDvuAXPjLe8zAlCO9/SL0RxEWqNRazQfd96JsbfSJ
+myUcifKiUk6r4W4ozp21MrfTzuQwRTZrhfVYos7BCKLunqiy8UfA95afHSXqV4DP
+eye+f6dHJ4gMG+HqLTmS0w+XgHK+3z3vptkN32ypoPANDqDNDSs8UDhBeTuKLNfr
+f1lA7udd7hJ4CYUz2BEdU9HfUys+cHz8wDq0ndd8UwanEmQfrKTtj9885Sn8BFVt
+S9l7cx0S1gkQXNg9iuWGlzONnfmLSLU1s4h5+Sc8NLi2sKK8xIyI7WjRgIw8O/MV
+qjkRRo/Hp3J1QVemc/cX
+=IrUU
+-----END PGP SIGNATURE-----
diff --git a/dev-perl/Net-CUPS/Net-CUPS-0.610.0-r1.ebuild b/dev-perl/Net-CUPS/Net-CUPS-0.610.0-r1.ebuild
new file mode 100644
index 000000000000..c60daec3c21d
--- /dev/null
+++ b/dev-perl/Net-CUPS/Net-CUPS-0.610.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-CUPS/Net-CUPS-0.610.0-r1.ebuild,v 1.1 2012/08/24 22:21:00 dilfridge Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=DHAGEMAN
+MODULE_VERSION=0.61
+inherit perl-module
+
+DESCRIPTION="CUPS C API Interface"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="net-print/cups"
+DEPEND="${RDEPEND}
+	test? ( virtual/perl-Test-Simple )"
+
+PATCHES=( "${FILESDIR}/${P}-cups16.patch" )
+
+SRC_TEST="do"
diff --git a/dev-perl/Net-CUPS/Net-CUPS-0.610.0.ebuild b/dev-perl/Net-CUPS/Net-CUPS-0.610.0.ebuild
index 573df1616d02..3811aba890b5 100644
--- a/dev-perl/Net-CUPS/Net-CUPS-0.610.0.ebuild
+++ b/dev-perl/Net-CUPS/Net-CUPS-0.610.0.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/dev-perl/Net-CUPS/Net-CUPS-0.610.0.ebuild,v 1.4 2012/05/06 16:44:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-CUPS/Net-CUPS-0.610.0.ebuild,v 1.5 2012/08/24 22:21:00 dilfridge Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
 
-RDEPEND=">=net-print/cups-1.1.21"
+RDEPEND="<=net-print/cups-1.5.9999"
 DEPEND="${RDEPEND}
 	test? ( virtual/perl-Test-Simple )"
 
diff --git a/dev-perl/Net-CUPS/files/Net-CUPS-0.610.0-cups16.patch b/dev-perl/Net-CUPS/files/Net-CUPS-0.610.0-cups16.patch
new file mode 100644
index 000000000000..4c5bf66ca6d2
--- /dev/null
+++ b/dev-perl/Net-CUPS/files/Net-CUPS-0.610.0-cups16.patch
@@ -0,0 +1,165 @@
+diff --git a/CUPS.xs b/CUPS.xs
+index 2da9558..109f73f 100644
+--- a/CUPS.xs
++++ b/CUPS.xs
+@@ -5,9 +5,17 @@
+ #include "ppport.h"
+ 
+ #include <cups/cups.h>
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
+ /*#include <cups/backend.h>*/
+ #include <cups/http.h>
+-#include <cups/image.h>
++#ifdef HAVE_CUPS_1_6
++ #include <cupsfilters/image.h>
++#else
++ #include <cups/image.h>
++#endif
+ #include <cups/ipp.h>
+ #include <cups/ppd.h>
+ #include <cups/file.h>
+@@ -19,6 +27,17 @@
+ #include "const-c.inc"
+ #include "packer.c"
+ 
++#ifndef HAVE_CUPS_1_6
++#define ippGetGroupTag(attr)  attr->group_tag
++#define ippGetName(attr)      attr->name
++#define ippGetValueTag(attr)  attr->value_tag
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++#define ippGetStatusCode(ipp)  ipp->request.status.status_code
++#define ippFirstAttribute(ipp) ipp->current = ipp->attrs
++#define ippNextAttribute(ipp)  ipp->current = ipp->current->next
++#endif
++
+ static SV *password_cb = (SV*) NULL;
+ 
+ const char *
+@@ -200,7 +219,7 @@ NETCUPS_getPPDMakes()
+ 		if (response != NULL) {
+ 			attr = ippFindAttribute(response, "ppd-make", IPP_TAG_TEXT); 
+ 			rv = sv_newmortal();
+-			sv_setpv(rv, attr->values[0].string.text);
++			sv_setpv(rv, ippGetString(attr, 0, NULL));
+ 			XPUSHs(rv);
+ 			count++;
+ 
+@@ -211,7 +230,7 @@ NETCUPS_getPPDMakes()
+ 				}
+ 
+ 				rv = sv_newmortal();
+-				sv_setpv(rv, attr->values[0].string.text);
++				sv_setpv(rv, ippGetString(attr, 0, NULL));
+ 				XPUSHs(rv);
+ 				count++;
+ 			}			
+@@ -252,7 +271,7 @@ NETCUPS_getAllPPDs ()
+ 									"ppd-make-and-model", 
+ 									IPP_TAG_TEXT); 
+ 			rv = sv_newmortal();
+-			sv_setpv(rv, attr->values[0].string.text);
++			sv_setpv(rv, ippGetString(attr, 0, NULL));
+ 			XPUSHs(rv);
+ 			count++;
+ 			while (attr != NULL) {
+@@ -263,7 +282,7 @@ NETCUPS_getAllPPDs ()
+ 					break;
+ 				}
+ 				rv = sv_newmortal();
+-				sv_setpv(rv, attr->values[0].string.text);
++				sv_setpv(rv, ippGetString(attr, 0, NULL));
+ 				XPUSHs(rv);
+ 				count++;
+ 			}			
+@@ -356,14 +375,14 @@ NETCUPS_getPPDFileName(ppdfilename);
+ 		if (response != NULL) {
+ 			attr = ippFindAttribute(response, "ppd-name", IPP_TAG_NAME );
+ 			while ((attr != NULL) && (i < 1)) {
+-				tmpppd = attr->values[0].string.text;	
++				tmpppd = ippGetString(attr, 0, NULL);	
+ 				attr = ippFindNextAttribute(response, 
+ 											"ppd-make", 
+ 											IPP_TAG_TEXT);
+ 				attr = ippFindNextAttribute(response, 
+ 											"ppd-make-and-model", 
+ 											IPP_TAG_TEXT);
+-				if (strcmp(attr->values[0].string.text, ppdfilename) == 0 ) {
++				if (strcmp(ippGetString(attr, 0, NULL), ppdfilename) == 0 ) {
+ 					/* return tmpppd; */
+ 					strcpy(test, tmpppd);	
+ 					break;	
+@@ -410,12 +429,12 @@ NETCUPS_getDeviceAttribute( device, attribute, attribute_type )
+ 			attr = ippFindNextAttribute(response, "printer-name", IPP_TAG_NAME);
+ 
+ 			while (attr != NULL) {
+-				if (strcmp(attr->values[0].string.text, device) == 0) { 
++				if (strcmp(ippGetString(attr, 0, NULL), device) == 0) { 
+ 					attr = ippFindNextAttribute( response, 
+ 												 attribute, 
+ 												 attribute_type);
+ 					rv = sv_newmortal();  
+-					sv_setpv( rv, attr->values[0].string.text); 
++					sv_setpv( rv, ippGetString(attr, 0, NULL)); 
+ 					XPUSHs( rv );
+ 					break;	
+ 				}					
+@@ -858,15 +877,15 @@ NETCUPS_getAttributes( ipp )
+ 		SV* rv = NULL;
+ 		int count = 0;
+ 		ipp_attribute_t* attr = NULL;
+-		for (attr = ipp->attrs; attr != NULL; attr = attr->next)
++		for (attr = ippFirstAttribute(ipp); attr != NULL; attr = ippNextAttribute(ipp))
+ 		{
+-			while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
+- 		       attr = attr->next;
++			while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_JOB)
++ 		       attr = ippNextAttribute(ipp);
+ 
+ 			if (attr == NULL)
+ 				break;
+ 			rv = sv_newmortal();
+-			sv_setpv( rv, attr->name );
++			sv_setpv( rv, ippGetName(attr) );
+ 			XPUSHs( rv );
+ 			count++;
+ 		}
+@@ -880,27 +899,27 @@ NETCUPS_getAttributeValue( ipp, name )
+ 		SV* rv = NULL;
+ 		int count = 0;
+ 		ipp_attribute_t* attr = NULL;
+-		for (attr = ipp->attrs; attr != NULL; attr = attr->next)
++		for (attr = ippFirstAttribute(ipp); attr != NULL; attr = ippNextAttribute(ipp))
+ 		{
+-			while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
+- 		       attr = attr->next;
++			while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_JOB)
++ 		       attr = ippNextAttribute(ipp);
+ 
+ 			if (attr == NULL)
+ 				break;
+ 
+-			if( !strcmp( attr->name, name ) )
++			if( !strcmp( ippGetName(attr), name ) )
+ 			{
+ 				rv = sv_newmortal();
+-				if( ( attr->value_tag == IPP_TAG_INTEGER ) ||
+-					( attr->value_tag == IPP_TAG_ENUM ) )
++				if( ( ippGetValueTag(attr) == IPP_TAG_INTEGER ) ||
++					( ippGetValueTag(attr) == IPP_TAG_ENUM ) )
+ 				{
+ 					/* We have a number with any luck ... */
+-					sv_setiv( rv, attr->values[0].integer );
++					sv_setiv( rv, ippGetInteger(attr, 0) );
+ 				}
+ 				else
+ 				{
+ 					/* We have a string ... maybe ... try to set it. */
+-					sv_setpv( rv, attr->values[0].string.text );
++					sv_setpv( rv, ippGetString(attr, 0, NULL) );
+ 				}
+ 
+ 				XPUSHs( rv );