Revbump with patch for CUPS 1.2 goodness - see bug #143039

(Portage version: 2.1.2_pre1)

4 files changed, 97 insertions, 1 deletions

diff --git a/dev-perl/Net-CUPS/ChangeLog b/dev-perl/Net-CUPS/ChangeLog
index f6e2c863fcf0..530762394a5f 100644
--- a/dev-perl/Net-CUPS/ChangeLog
+++ b/dev-perl/Net-CUPS/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-perl/Net-CUPS
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-CUPS/ChangeLog,v 1.8 2006/08/06 18:13:38 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-CUPS/ChangeLog,v 1.9 2006/09/20 22:35:39 ian Exp $
+
+*Net-CUPS-0.41-r1 (20 Sep 2006)
+
+  20 Sep 2006; Christian Hartmann <ian@gentoo.org>
+  +files/CUPS_FOO_DEVICE.patch, +Net-CUPS-0.41-r1.ebuild:
+  Revbump with patch for CUPS 1.2 goodness - see bug #143039
 
   06 Aug 2006; Michael Cummings <mcummings@gentoo.org> Net-CUPS-0.41.ebuild:
   Marking amd64 stable
diff --git a/dev-perl/Net-CUPS/Net-CUPS-0.41-r1.ebuild b/dev-perl/Net-CUPS/Net-CUPS-0.41-r1.ebuild
new file mode 100644
index 000000000000..be8b76794766
--- /dev/null
+++ b/dev-perl/Net-CUPS/Net-CUPS-0.41-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2006 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.41-r1.ebuild,v 1.1 2006/09/20 22:35:39 ian Exp $
+
+inherit perl-module
+
+DESCRIPTION="CUPS C API Interface"
+HOMEPAGE="http://search.cpan.org/search?query=${PN}"
+SRC_URI="mirror://cpan/authors/id/D/DH/DHAGEMAN/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE=""
+SRC_TEST="do"
+
+DEPEND=">=net-print/cups-1.1.21
+		dev-perl/Exporter-Cluster
+		dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# - Make 0.41 work with CUPS 1.2* - see bug #143039 --ian
+	epatch ${FILESDIR}/CUPS_FOO_DEVICE.patch
+}
diff --git a/dev-perl/Net-CUPS/files/CUPS_FOO_DEVICE.patch b/dev-perl/Net-CUPS/files/CUPS_FOO_DEVICE.patch
new file mode 100644
index 000000000000..d2933ab9985b
--- /dev/null
+++ b/dev-perl/Net-CUPS/files/CUPS_FOO_DEVICE.patch
@@ -0,0 +1,60 @@
+diff -ru Net-CUPS-0.41-orig/Protocol/Protocol_constant_c.inc Net-CUPS-0.41/Protocol/Protocol_constant_c.inc
+--- Net-CUPS-0.41-orig/Protocol/Protocol_constant_c.inc	2006-08-06 21:12:26.000000000 -0400
++++ Net-CUPS-0.41/Protocol/Protocol_constant_c.inc	2006-08-06 21:16:49.000000000 -0400
+@@ -1096,15 +1096,6 @@
+     }
+     break;
+   case '_':
+-    if (memEQ(name, "CUPS_ADD_DEVICE", 15)) {
+-    /*                       ^             */
+-
+-      *iv_return = CUPS_ADD_DEVICE;
+-      return PERL_constant_ISIV;
+-
+-      
+-
+-    }
+     if (memEQ(name, "HTTP_MAX_BUFFER", 15)) {
+     /*                       ^             */
+ 
+@@ -1706,15 +1697,6 @@
+     }
+     break;
+   case '_':
+-    if (memEQ(name, "CUPS_DELETE_DEVICE", 18)) {
+-    /*                          ^             */
+-
+-      *iv_return = CUPS_DELETE_DEVICE;
+-      return PERL_constant_ISIV;
+-
+-      
+-
+-    }
+     if (memEQ(name, "HTTP_ENCODE_LENGTH", 18)) {
+     /*                          ^             */
+ 
+@@ -3153,8 +3135,8 @@
+ use ExtUtils::Constant qw (constant_types C_constant XS_constant);
+ 
+ my $types = {map {($_, 1)} qw(IV)};
+-my @names = (qw(CUPS_ACCEPT_JOBS CUPS_ADD_CLASS CUPS_ADD_DEVICE
+-	       CUPS_ADD_PRINTER CUPS_DELETE_CLASS CUPS_DELETE_DEVICE
++my @names = (qw(CUPS_ACCEPT_JOBS CUPS_ADD_CLASS
++	       CUPS_ADD_PRINTER CUPS_DELETE_CLASS
+ 	       CUPS_DELETE_PRINTER CUPS_GET_CLASSES CUPS_GET_DEFAULT
+ 	       CUPS_GET_DEVICES CUPS_GET_PPDS CUPS_GET_PRINTERS CUPS_MOVE_JOB
+ 	       CUPS_REJECT_JOBS CUPS_SET_DEFAULT HTTP_0_9 HTTP_1_0 HTTP_1_1
+diff -ru Net-CUPS-0.41-orig/Protocol/Protocol.pm Net-CUPS-0.41/Protocol/Protocol.pm
+--- Net-CUPS-0.41-orig/Protocol/Protocol.pm	2006-08-06 21:12:26.000000000 -0400
++++ Net-CUPS-0.41/Protocol/Protocol.pm	2006-08-06 21:13:40.000000000 -0400
+@@ -20,10 +20,8 @@
+ our @EXPORT = qw(
+ 					CUPS_ACCEPT_JOBS 
+ 					CUPS_ADD_CLASS 
+-					CUPS_ADD_DEVICE
+ 					CUPS_ADD_PRINTER 
+ 					CUPS_DELETE_CLASS 
+-					CUPS_DELETE_DEVICE
+ 					CUPS_DELETE_PRINTER 
+ 					CUPS_GET_CLASSES 
+ 					CUPS_GET_DEFAULT
diff --git a/dev-perl/Net-CUPS/files/digest-Net-CUPS-0.41-r1 b/dev-perl/Net-CUPS/files/digest-Net-CUPS-0.41-r1
new file mode 100644
index 000000000000..e5282f040d32
--- /dev/null
+++ b/dev-perl/Net-CUPS/files/digest-Net-CUPS-0.41-r1
@@ -0,0 +1,3 @@
+MD5 e7aa8df973e237c7d44df4beb4fc9cb7 Net-CUPS-0.41.tar.gz 54430
+RMD160 9403429c98d0716bedb66bb536332b32c83e3fe6 Net-CUPS-0.41.tar.gz 54430
+SHA256 773735ee005894ebab815a7e845f78cddec608553aa127d321fd132638a0d6dc Net-CUPS-0.41.tar.gz 54430