Add version that works with cups-1.6, adjust dependencies

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64, RepoMan options: --force)

7 files changed, 75 insertions, 12 deletions

diff --git a/dev-python/pycups/ChangeLog b/dev-python/pycups/ChangeLog
index 351d657591ae..4f6b198da888 100644
--- a/dev-python/pycups/ChangeLog
+++ b/dev-python/pycups/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pycups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/ChangeLog,v 1.57 2012/07/09 11:54:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/ChangeLog,v 1.58 2012/07/31 08:09:49 dilfridge Exp $
+
+*pycups-1.9.61-r1 (31 Jul 2012)
+
+  31 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +pycups-1.9.61-r1.ebuild, metadata.xml, pycups-1.9.49.ebuild,
+  pycups-1.9.57.ebuild, pycups-1.9.60.ebuild, pycups-1.9.61.ebuild:
+  Add version that works with cups-1.6, adjust dependencies
 
   09 Jul 2012; Jeroen Roovers <jer@gentoo.org> pycups-1.9.61.ebuild:
   Stable for HPPA (bug #418905).
@@ -215,4 +222,3 @@
   05 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; +metadata.xml,
   +pycups-1.9.12.ebuild:
   Python bindings for the CUPS API
-
diff --git a/dev-python/pycups/metadata.xml b/dev-python/pycups/metadata.xml
index a968ff19bc5a..abb0e279d172 100644
--- a/dev-python/pycups/metadata.xml
+++ b/dev-python/pycups/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<herd>printing</herd>
 	<maintainer>
 		<email>reavertm@gentoo.org</email>
 		<name>Maciej Mrozowski</name>
diff --git a/dev-python/pycups/pycups-1.9.49.ebuild b/dev-python/pycups/pycups-1.9.49.ebuild
index 2935d9f5a5af..b840018f38ed 100644
--- a/dev-python/pycups/pycups-1.9.49.ebuild
+++ b/dev-python/pycups/pycups-1.9.49.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.49.ebuild,v 1.13 2011/09/12 22:26:15 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.49.ebuild,v 1.14 2012/07/31 08:09:49 dilfridge Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="doc examples"
 
 RDEPEND="
-	net-print/cups
+	<net-print/cups-1.6.0
 "
 DEPEND="${RDEPEND}
 	doc? ( dev-python/epydoc )
diff --git a/dev-python/pycups/pycups-1.9.57.ebuild b/dev-python/pycups/pycups-1.9.57.ebuild
index 1e9f284b7813..a76a1bb99035 100644
--- a/dev-python/pycups/pycups-1.9.57.ebuild
+++ b/dev-python/pycups/pycups-1.9.57.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.57.ebuild,v 1.7 2011/09/12 22:26:15 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.57.ebuild,v 1.8 2012/07/31 08:09:49 dilfridge Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="doc examples"
 
 RDEPEND="
-	net-print/cups
+	<net-print/cups-1.6.0
 "
 DEPEND="${RDEPEND}
 	doc? ( dev-python/epydoc )
diff --git a/dev-python/pycups/pycups-1.9.60.ebuild b/dev-python/pycups/pycups-1.9.60.ebuild
index cc22599333d3..a61f2497ba97 100644
--- a/dev-python/pycups/pycups-1.9.60.ebuild
+++ b/dev-python/pycups/pycups-1.9.60.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-python/pycups/pycups-1.9.60.ebuild,v 1.8 2012/03/25 15:04:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.60.ebuild,v 1.9 2012/07/31 08:09:49 dilfridge Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="doc examples"
 
 RDEPEND="
-	net-print/cups
+	<net-print/cups-1.6.0
 "
 DEPEND="${RDEPEND}
 	doc? ( dev-python/epydoc )
diff --git a/dev-python/pycups/pycups-1.9.61-r1.ebuild b/dev-python/pycups/pycups-1.9.61-r1.ebuild
new file mode 100644
index 000000000000..5bf9b69d39ce
--- /dev/null
+++ b/dev-python/pycups/pycups-1.9.61-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.61-r1.ebuild,v 1.1 2012/07/31 08:09:49 dilfridge Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.5"
+RESTRICT_PYTHON_ABIS="*-jython"
+inherit eutils distutils flag-o-matic
+
+DESCRIPTION="Python bindings for the CUPS API"
+HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
+SRC_URI="http://cyberelk.net/tim/data/pycups/${P}.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/${P}-cups16.patch.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND="
+	net-print/cups
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/epydoc )
+"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${WORKDIR}/${P}-cups16.patch"
+	distutils_src_prepare
+}
+
+src_compile() {
+	append-cflags -DVERSION=\\\"${PV}\\\"
+	distutils_src_compile
+
+	if use doc; then
+		emake doc || die "emake doc failed"
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml -r html/ || die "installing html docs failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/"${P}"
+		doins -r examples/ || die "installing examples failed"
+	fi
+}
diff --git a/dev-python/pycups/pycups-1.9.61.ebuild b/dev-python/pycups/pycups-1.9.61.ebuild
index c804a5cbe6a3..cd212d789da7 100644
--- a/dev-python/pycups/pycups-1.9.61.ebuild
+++ b/dev-python/pycups/pycups-1.9.61.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-python/pycups/pycups-1.9.61.ebuild,v 1.8 2012/07/09 11:54:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.61.ebuild,v 1.9 2012/07/31 08:09:49 dilfridge Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ SLOT="0"
 IUSE="doc examples"
 
 RDEPEND="
-	net-print/cups
+	<net-print/cups-1.6.0
 "
 DEPEND="${RDEPEND}
 	doc? ( dev-python/epydoc )