Add version that works with cups-1.6, adjust dependencies

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
RepoMan-Options: --force

8 files changed, 97 insertions, 22 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/Manifest b/dev-python/pycups/Manifest
index d96c5d0d85e2..f9ebe146a17a 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,20 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST pycups-1.9.49.tar.bz2 45320 SHA256 f38e5640b55521150fc1e0206ebca88b6637a1612e2af82bf9854b3b3512f7be SHA512 69afafadd20ac9780da02168d7551aa6e5563dddca91d92b2be7f105448f4b59495b9610f9dba62dcbace71c0fa5b4f7d6f1271da6bfe1b5cb1ce4048d9c0f43 WHIRLPOOL 161e60e1f0cf607be27a001847831ea7b81888e207381076d121dbca5b85f8adf90be9981d69cfe0d0a0019eed78c4d0f20243d24b0e15c6d970e10037059e04
 DIST pycups-1.9.57.tar.bz2 49955 SHA256 24cc626bb48275238daeb6a12a48e7d1d5b05ea25353ac8df5e6ba6a09a4a38a SHA512 1b57c887928d5ebb9d017ae9aebf49ff10b343323247b8301e8f42d48467c46ce3d29c7e49b03d4b3617c88691ae4fc9a117aeca0d039f5893f37a487ade17c5 WHIRLPOOL 8004bf2efcb62b04e299a12d92e80b432dd3e566155e4ddd4d82a552e84d2244601f242c54e6da4fa6d914d9aa515086fa6298e549da150211200f5502376049
 DIST pycups-1.9.60.tar.bz2 51731 SHA256 799ca29f63ec17e9915de2877a7061ebff2a6a0a9957a8a70d1c88f3c1e1f563 SHA512 7b96aac183771c0abde7459ee03e8b6c5acf7cb21df1cb93eb51ee77ffe4361921203df5fe3459f1476aea96ceb640c047dd217a5d380ca400089908511805cb WHIRLPOOL 2a1c2ed768a19b664effb3b1d7ae944634ce40cee1e8aacd12892118329914fb4ecf2b0d1bedd1b1b503f3a6d4f34b5020e6e2693f0d22deae38b0705663802d
+DIST pycups-1.9.61-cups16.patch.xz 11356 SHA256 f18bea26c2e5d36d5f5b7cddd79bc64bf7ee6a3ddf5bce6aca4c189a108b72d8 SHA512 8a400c8dac374f93adb3100ee3367eb7699c5fd9c2fd0759bd295d2d7d41f3406f4592d5ed2dfa5d03dad5ea4183f33d8e92b67575bc3ac26856f35c6f1f2ac1 WHIRLPOOL ab117153250a4b9711837045779e405a50c73ddb03487eb048cb82637421b8b152cc0c059c5dc2e62165a0bca6b0cc20da77fcfd04b31161b5d47389451e1e4a
 DIST pycups-1.9.61.tar.bz2 52018 SHA256 ce8876353b990919555fbe53a8d7d93cb22a2f97f9979307a97279e4f1057779 SHA512 fa30fd6089426d15ee2994772b7969371da290c1eebfb0894fe3039cfb3fd92df216b4d7546ca3be9c8cde88b65846f14a03d39e63d9ea474a469f933aee1752 WHIRLPOOL ecaa89e3f53c6e6a06ca93f8f48ef2b0eb10eb279f86cb83e981ff7e01e271b31467b3d474bce97802cec8bfcd59fd027ca31af57f8e3cbe09d1e4621b71241f
-EBUILD pycups-1.9.49.ebuild 1086 SHA256 b84ac6d8560b028c1356b0e2f15e4111bdf1d11b2dc40906264da61afa8f9032 SHA512 81d4a97fc6a2cbe7517c060fb56a50aa33c1b633a622ebbd8f6f329c20677081ad95e09709d9b9ccb8e98c617aef27e5020ec2be20e9d16cd0ed8963798cb54c WHIRLPOOL 71b9ff054c09b88cd64283509250b62c9a992dfe8fcd81cfea504ebc86625aa65be0ce1294002146b5f017992673f14950305bc0a16ddf652cefebdcd7140d4f
-EBUILD pycups-1.9.57.ebuild 1084 SHA256 6e45803e2c6aa88ff69062e1a22beb5ba48068ba47e493d7dc5db09d5d3f6812 SHA512 79c68b98cf3f9bd2cb17eb453a03a2c3541537f205a12f4e9ebcc04c26a47d148d733006c9cc0051dc20b07bca06effe8ea1c3418dc0a33bd2f15b8d912d077f WHIRLPOOL bea45985fdae50d99023275c75e782b3f6aa0c1130473339623abea3b0e0058bc4e5a13652d2f0216b5c5f28d17ab5637931fd9fe87d057bd38c44379bc7a8b4
-EBUILD pycups-1.9.60.ebuild 1081 SHA256 8109d7a0ef9a1f0f5b292e5c768f85e1131e048be35163b3a960671abbfd68bd SHA512 5a9abde051989dd081ee8c0c4c2628b615304cf480c7d6f7cecfb46ae37c227e2fd9e75d3c92fd29ab32b6541e5a254e24fc155e07b248a9361fb5ee1f5f3759 WHIRLPOOL f5fb1d0061914c22efb69852aecdf72da21e10df843be97c147e3506c78593b3bc6ec88c58501d53e5906fad12d88003cbcd35cd1d1a6a5994521df32fe1efdb
-EBUILD pycups-1.9.61.ebuild 1077 SHA256 ae837a2c572edf61f5fab0fd1a2cb5fcbb23c9271982408db300371d47810c2b SHA512 09bf5f435871ea49445a2eb9d4c155f5465ac0e44b72a5195b0debfe17a875e08b2c95bfe00d65ab3cdc704b2488fc62f9882eecc58f45fdc4bc888279e47548 WHIRLPOOL e73b3b3f6fb5bf324f2a919322e76807e4d8493283d99da46b1cb5e2ced48ba55995f32e328eeb7ff3901840fc7f47621cbf096b4cd4115cc6abbccbe420cf91
-MISC ChangeLog 7190 SHA256 49f3d71f7b060ed1c1c3b4c7e886ef4f1b60cf8fe8986dc919077b0a561ef60a SHA512 03cbe62252ee88ac52e35920db4dc62736e9570e70bcf68e593975297157efa03c1c96f07c2e947872040a7ea3a38901588d3f587976b13be77b12c4c863f13d WHIRLPOOL 34334e8a072061594c745dcfc3306e1bfcfb4ce2e2217d01ab210e2f17409ddde739f042e759f599fa068f69061a80925170e909ab0cbed37f63b47dfd0a4cf6
-MISC metadata.xml 255 SHA256 0783ed6e9fe482ef59895af90133639bd3296d33c6b7103e52615910697cdbc1 SHA512 dbdac88e96a3eb1d81ad92dcd27e4a71d1078b182a300f90052d5fb10fd24d2190d45829a9154c69d3b96ba610cd6aac45251b0b7795fc4eaf16460ace123d45 WHIRLPOOL ad64281014355534ac71a1c5412721338ec0301641eef7b91f7bc1562f56c9c082104352071d7e2fc95182568b6c4badc4880b93a44313e91bca62e4754c723b
+EBUILD pycups-1.9.49.ebuild 1094 SHA256 7a9420a98fe0004cd66cf90cf03c49f3a7f10c9ffe9faa979c1f0c3c55e811c9 SHA512 b724db64b9cc42830ded190b0424af4d4add0da2d3a76cd8bf2fac08f406e5d9b1bd7a26473f356e3f8c12815f20e02d281a72516eb7ae2af292dec2389cf3e6 WHIRLPOOL b03dbd3be7af33f0f77acc04e81288c00dd0c0571a0d0df413988acb05b76c3408f47ab5ebca292ba50ea9cfabfd133526e7bee778d085a7c39917af241afd6d
+EBUILD pycups-1.9.57.ebuild 1092 SHA256 ae95324613477c8ff002e5850c8cff4cac9a332eb423a3ddd51dedb2322af79e SHA512 0ef1da009502454b0755f9a5ff015978d77836c307be93c530da3a06e2877032b1952d5e346ac286e586b06dc8409c8d0ecf064744eb02f8ee9b2ad505a0d300 WHIRLPOOL 458c81b75189af29d5183fccd7360a009eb787572635e8912b1d60d1ad92fd7030408bde62d298ae2fe27439517b317de6873dd801c166b1bbe297d08e5a25d6
+EBUILD pycups-1.9.60.ebuild 1090 SHA256 d3654d67c329b839b42ad7fb81e841c883c43b2a993812b0bac4106a9ec9c721 SHA512 4185a0d51809936d8d51e56fa3d9aea4737cec2b59a1f00711c8f365f55fdb5b92a8e0f81a35dd0693cbb15e1fec7e35b274bce64d8370364c2a03b34d614c57 WHIRLPOOL d7cd18802286a2d1d1646bc85543057d15efdaeb9b0eb9145e186a5cacdef234428f0e7fa67f9f5cbac1d2142e84445abd7dd47b3b4abb9790234f515925ec59
+EBUILD pycups-1.9.61-r1.ebuild 1248 SHA256 2bb53b3567877eafd606148de6ac68fd392e627cd8b9aefcac217f8bdc96c36b SHA512 7e204e6b278104e9808b2a9c4d956991aef2e069fb095285aab6354e1178311f2add7f4c4bd7573e4446bcbcac8d454bd0a8a6dd2b522085cd766f5118daec6e WHIRLPOOL 1512dd54101af44c8fc76e147a31e71e4db6c17f2890a2e813fb60325f9fc77f3cfaa14a2ab8a481fb45015d98e3a58de7c2ea6f7ede72ff81e6c0798b49373e
+EBUILD pycups-1.9.61.ebuild 1090 SHA256 0c0ea797d61c302df40f04756d9ba1e93506fe32277ebd427ed005f528b5a614 SHA512 9467766c8ca0e188845cae19653926a1b516dbbf81e67e575b51d232a19902af99e82cd0b61f21e50cba932e634580bde0fe568ccf2d32b6044f8935cd4240bb WHIRLPOOL a1c98605ceb0ce5bba3e31eeccc0313928b88396c2bea0cc8f8b57d9664ff8af1d0a523edebc49802ea069f11ebe96f19491c668f7e5d5fe6f10b7b40f5afea5
+MISC ChangeLog 7478 SHA256 46dd50d2a40482c61d8cb6beb958d11cbbd17fd77e8661db17cb837d516f4f80 SHA512 c8924f4088ab04c5c072e38ac48d6612294423fb489e842850a325e4d46e35e02f2c0f4334fc33cd0b5a676548bb6270721c30787eb238c0039d3948a8972c82 WHIRLPOOL 4a304063444d671c5a25500e37c04d039a6f3ab3700d045792b06e346c972a52ba59e33fb7e188aa2007273ccda71db3df2e14149dfc4714204101019690004f
+MISC metadata.xml 278 SHA256 5f40bf1d721e02d68aa5aca227a954312ff07881d1198db34384d22d5eab437e SHA512 49d4e5a24e92fe2e9916fa99aaf6fffee21120b887b575a657362a9ee387d38f9f86188ae77795c7b3965288e8018a051895d2c654881098b39d1d585a5ae57d WHIRLPOOL a30e40a0632819cc003a3903456b502aa68e3c10280a69a1b7ee43cfc12dbb0f4da3bbdc0fdcc8bd8964539001c728aa26b3c21ee97e4c10d07ba327a31dc4a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/6xowACgkQVWmRsqeSphMFkgCfYb8BasFvAiDkZmJAq8yVwTtA
-mvsAn2mT2/WsW5L4zGJb59wTOSDO0coP
-=vWWD
+iQIcBAEBCAAGBQJQF5MzAAoJEEb+UGWnxTyHbAMP/1fR5xhwqbBHC8S44oj/VNl5
+eH1UDlTwlxVf6IhhvYcNl55NP7xG6pKuIz7OxVjkmMufRHmywY+lF5Me4ydySlMT
+eKccCrNg1Qp1d4QBCevEgAo6hVXo7kg9o4IABdP3v4Fp18ywpN1ZT/MUjCpa6WE+
+QaiZTLhy4P48uiy9ryiMhZnRCw06PHQjI0wVHEqny+E1L9ejPq/6zQjESrgabeZl
+7zvVF/l0wKyXH+7aGtuLmE3WvkBmNziHC5Vk4Dn+ctFbT//lDKtYTg8F05RIfmWN
+KgIIRTBKVOq1g+3hRzYkHk6BbWF7TWLQ822H8vnT6I/E30AKxbgEDADFR9NuNo1q
+hclhzhimfR21zw/Qp5ZKPNoaZR5Y7hJTAEyE9DL3hUyCqasS2FSJqMoLNO7xU44k
+Qh03SeGLItg9ygNeU109Wc056wL8NRvFwDaCpXaqFwUj9oz1Sjg/a69UWGlH3WQE
+yVJfegOx6Qsa66IzcO4oyTztGkdaYaMIfdVvQef3WaNko/nNn7t3O9uFU0XJzl3a
+cbAzcUKoQMFUlTs1dTeXyW7BAooLzmxlPGUHZecLzEFegWObV7NBuWKtl0MoKw07
+pj60QPb09IkHoD56cdvkry63wtrqczPWaNqCayIJjx1cFnQ0fiYE9M90FvD4OrNC
+4mYUA5kD87uzO3OeCReP
+=Wh6r
 -----END PGP SIGNATURE-----
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 )