Update cups blocker to match the new lprng-compat USE.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x9627F456F9DA7643!

4 files changed, 29 insertions, 92 deletions

diff --git a/net-print/lprng/ChangeLog b/net-print/lprng/ChangeLog
index 973c27218423..a94b8decdcb0 100644
--- a/net-print/lprng/ChangeLog
+++ b/net-print/lprng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/lprng
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/ChangeLog,v 1.68 2012/12/15 11:32:08 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/ChangeLog,v 1.69 2013/05/05 07:09:26 mgorny Exp $
+
+*lprng-3.8.35-r2 (05 May 2013)
+
+  05 May 2013; Michał Górny <mgorny@gentoo.org> +lprng-3.8.35-r2.ebuild,
+  -lprng-3.8.28.ebuild, -lprng-3.8.35-r1.ebuild:
+  Update cups blocker to match the new lprng-compat USE.
 
   15 Dec 2012; Michał Górny <mgorny@gentoo.org> lprng-3.8.35-r1.ebuild,
   metadata.xml:
diff --git a/net-print/lprng/Manifest b/net-print/lprng/Manifest
index e6ccca507c77..1fb5e47791c9 100644
--- a/net-print/lprng/Manifest
+++ b/net-print/lprng/Manifest
@@ -7,18 +7,26 @@ AUX lprng-3.8.28-lpq.diff 383 SHA256 2494154c1b49124f928b68f0c5d61d62a304881344e
 AUX lprng-3.8.28-make.diff 364 SHA256 0b52d36f0be51120489056be1064b8b44201c6d1f9f1412b51e55e7591a2dec7 SHA512 bddbcb12596daf86b9d4fdf270a57549626522081d46ae89eafa4eb4aee173a701732093646fb0f448653a94715e90eea379a7716839ec5769dea5e16c9b12f0 WHIRLPOOL 5b941c4f0e78c77080753f0c1f91ffc474c376ae9dfc5efeef9130f82b65ffe41696e4072062bcfec11206d5c83ef9a24f291dc08e5046f5a09d2a16d6a14682
 AUX lprng-init 1053 SHA256 f3555f562b2603d5870d5f0f65e183127e5ff57684f3f542d7482f091881da65 SHA512 b05bef2c722867d7e1b2b766f29695659211cdc95a11a553741a66dfd8e91ddab1f5909b22457197a7b6712e8c83ca8b3630de192ba4a4fcdc198d9ee89ba372 WHIRLPOOL 9f2201b9483ba73dba34258c08936448e9425da18c7ca6320b3dab3a57f87de9b68a06e58bea25bf72d0a3eaf6114c81fa0a2020bcf9f054cbafc072bb7d3db3
 AUX printcap 661 SHA256 6a91fc37ba2467903b5e7e3717fd5bf07ea59b404184849d64daf31ac200c985 SHA512 c506fcc35a01c2fb93875aa9c0c2668a2c1e43d7a6afa3827b11dd9bb16d59529b8878c9346035bad9dd7df380da3ba58ff1e7856f78d6b94c992c14f218c3d7 WHIRLPOOL 59b4c18b83f40bfaa4a9ce8c59ae505c8ea5c14fceb9714c0c4aaf04bdba02d2610f0f333abc36a966098bad9df4e04ca3c7b57ca27034f371acd1a79152012f
-DIST LPRng-3.8.28.tgz 10212500 SHA256 c22e9c20ac71f97daca79c68b8d70631ef51d34652ff37b8cb8413a3ebcb914d SHA512 0e35ee3648542b51d7ef3e0acd1482d5febf122a3f55496dbfec807115936092ef33da318c541ceeab860709686157d0e009f18e1d0d6d78de114bd17e3094e2 WHIRLPOOL 547ece941c4e325351bc8192ba39ce042db0e0f20b234a7463eaeed4809e4754da1ede523e3b5a905acc0d1510e033fc422ef66a4d03cf7ff16d93b1760d63e6
 DIST LPRng-3.8.35.tgz 12512453 SHA256 c9909a0b94f8611b8d2faeb1199e292a53b74bf7d16c363b810dce25b7623c37 SHA512 ddebf23087b6c98c89369af26a2e46194c01243490ae47b025afde8ffcf0b1c05b9689702296c1a8aa38c2c38934df094d8cc7e922ab1ac27f51ce19f3676771 WHIRLPOOL f4806cfae0a1f08b7328fd15d4886303c678b6b20f903688cf6a11f3b245ede7ab8f2158fec01946919411858e8cd9405fcebb847b98acd78bea9effae91d415
-EBUILD lprng-3.8.28.ebuild 2058 SHA256 77ac87521ed2bb16700aa75e7d27f069fc631348c8c6e79dc709b6b1b4b32b02 SHA512 ea3c1d74dcca58090b01069b161a541f97f112d8cabbdd5d88da9ceecee08cf449a08ada43ae16387e8110f5f8fc6b9889a1af46bbd5717ab4e1b36a6d97cf87 WHIRLPOOL b199802321fb7a84c4e2d78d2886f0cf9ef6538deebaef6118ef859d7dd8bedc2c22c43b1700c1295eabd7567c92d68b15a905b400aa43d15b75670503a66b6e
-EBUILD lprng-3.8.35-r1.ebuild 2011 SHA256 9a7ad980d034ebc0a3e0e966d5f5507fff7dca14d342ee8f45323d43aa48f5cb SHA512 0daa708a128df7941ee0f2026c97f0ea83b0e72bbf437277933a44df6e151068709012d1d2b4d6c79ba405156946b1eeb56e562c6558089fd1cb7c1b7d3b9314 WHIRLPOOL 09b42e7a0897342c2803852b6fd9001c39143d4d47868095342958d956ac81dfa6aeeccb9a0fe8ccb9a4be8259981bdd2d1feb001166135a947728b368724bb6
-MISC ChangeLog 8866 SHA256 517faa22d5848de3d5614021a64d5bc8710c8deeb2ed658462decb134ced38fd SHA512 61ed6d04881aa4d8de6b54f23c186b9835b12797641bea6cbc3731a2212f3966bcf03426d4bd0b3b01880f4fabb0448c9b958adda5050b7b2c02441e12074c86 WHIRLPOOL eb90bf21b97b64dbed47b2391321e83654808e093ca4fae31f709e11009c15579b49fbacff2a8324e5a88e7016deebbd01bef65190b457f96d773becf5debc2e
+EBUILD lprng-3.8.35-r2.ebuild 2064 SHA256 e8c68b084be0bfa8fa4d216c70e09866b4f3604cc3360cf46bfb6c19fe73c1bf SHA512 5637ebd29e3dfee4257df40cc27e66a506270db1d5b86ac42a92a097fb60f0ec47f8b499ab222b001d6700cf975bf3dd1e7b12277deeaa243ee3939de6efb58b WHIRLPOOL 688e717c6fc70567e21c4e810bbbd07a974b569489eafc86eba445a7a404b89dcb27737219f42062584f99c7db1a2744f170bcca2607ae7baa0e0156ac4b0f9d
+MISC ChangeLog 9080 SHA256 f745c227b62cd29a66b1729ad6658d91c5f5cec778f134d7ba00ff9116f2f2cf SHA512 aa038daa34bd495c3cdb5f5d3675b72987f40f0105d876f53cfc78096d4e1872cc97196b08559dd654d15014d2e011ed0e927f211705dea5dfc59b13e2730fde WHIRLPOOL 2e2ba1a20975e5debfbce92157e86aef3f145db94537b11f3e21050e6a0f633657482f08ed52ee041fde86149610aca6ae8e9a0201af79a507432821d06ee5f3
 MISC metadata.xml 256 SHA256 8811d2f3b2aede7496c218651eb6231ac5720e5af005171741c81408bcd82a10 SHA512 7aa43666f4e6f6015397e6b1b5638ab0f708ef905c2fa46b83b42e6abd7dc9c537ac8f5384506269d2df1574b89fb11098466f421413b342dd252251740ee828 WHIRLPOOL c62fae6c7eaddc14dfa29ab9f470054410db1caa6d55d69f005b32578110184f286c73bad13fb41d6961c3f7b16fb0f8a9e8d87c921ceb1ff4d7eb9437ae65e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDMX8kACgkQfXuS5UK5QB3CRgP/XjoLc15UzD8mcxOrhNXr4bRv
-heSBkYNO7Glm2j/g0AqjnsU/G2pXl2rF9b9NRhSl/7A2QygWV/GMyzjXFMUUv9vD
-tnigAfr/P73RURO3MgAbxOmLmNOApy0yYuZDC/qAifgugCwqVxH0Rz3Ia1QGyGj1
-VxsCyGBRsFdOlOmZdss=
-=AzI5
+iQJ8BAEBCABmBQJRhgWwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDfBcP/2v2T/yNTt5FzvnUKORBnGFG
+ZHtgPgtX1tBqL+KqKT1FkrKIC50tKb0jSCE7D5KuhcQ0aR/1OCzGrUK2g7DRkZIm
+hhDx8Gns+2LoDrqdLePaXY6OY6kUaXphXBHxbGn8bBvSSWOIws5nv7aw5q6+92UD
+8tZanvnbc7rQ1j/qw16LQfVNGRM9dXHyQFRiKACR9Gbnf16LYrX8WBhWWGIvOvR+
+PrEVftTgvN22L4qlsYsYTGQk6YbCFBhijoOmGf8eSRhy51aiFcYg7kP+aY7aGoZm
+aIgBLU7d4im5yzEXw+3qg3W+gzr0cp8HZqrWTjHJbtjcmR1CJ5gMBLXP+7s3ITS4
+ZAaan80vOxx5CGZ5EVwXvI+2GCWRfNR3fN30pOsjRHZV8xfDnpUmbtobd6X1Ajwb
+U8iK9rOxVmb4aMW/qZcOZ0A2/AvYfHTc1B4ebDYETv+AtGrUE/qEYcC9QcDLyMeS
+5PDJ53uK1t+etodbuU/b7bRjQH5M4gjSV3dVxOAeekNTHRQk0ephkvqIjIdqYp3V
+GpTSuLQj2RsyqzcBdvp3OQ1I79HHUPH6BuK9xUuEtgkFy/uRQSUsPo9NxhOjfxKZ
+AO/AJ4KTh5lSyrf9Q8kAGv+BeeJC/M2QbfTHtiT2q+Jpapn6n/wJjQSO43nwyZLh
+sZP02hMJNHKVCPdMoTT2
+=WBUY
 -----END PGP SIGNATURE-----
diff --git a/net-print/lprng/lprng-3.8.28.ebuild b/net-print/lprng/lprng-3.8.28.ebuild
deleted file mode 100644
index 2e17e6909077..000000000000
--- a/net-print/lprng/lprng-3.8.28.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.28.ebuild,v 1.21 2012/01/27 14:33:47 phajdan.jr Exp $
-
-inherit eutils flag-o-matic
-
-MY_PN=LPRng
-DESCRIPTION="Extended implementation of the Berkeley LPR print spooler"
-HOMEPAGE="http://www.lprng.com/"
-SRC_URI="ftp://ftp.lprng.com/pub/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tgz"
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="foomaticdb kerberos nls ssl"
-
-RDEPEND="sys-process/procps
-	ssl? ( dev-libs/openssl )
-	foomaticdb? ( net-print/foomatic-filters net-print/foomatic-db )
-	!net-print/cups"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	kerberos? ( app-crypt/mit-krb5 )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.8.27-certs.diff
-	epatch "${FILESDIR}"/${P}-lpq.diff
-	epatch "${FILESDIR}"/${P}-make.diff
-	epatch "${FILESDIR}"/${P}-krb.diff
-}
-
-src_compile() {
-	# wont compile with -O3, needs -O2
-	replace-flags -O[3-9] -O2
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable kerberos) \
-		$(use_enable ssl) \
-		--disable-setuid \
-		--disable-werror \
-		--with-userid=lp \
-		--with-groupid=lp \
-		--with-lpd_conf_path=/etc/lprng/lpd.conf \
-		--with-lpd_perms_path=/etc/lprng/lpd.perms \
-		--libexecdir=/usr/libexec/lprng \
-		--sysconfdir=/etc/lprng \
-		--disable-strip || die "econf failed"
-
-	emake -j1 || die "printer on fire!"
-}
-
-src_install() {
-	dodir /var/spool/lpd
-	diropts -m 700 -o lp -g lp
-	dodir /var/spool/lpd/lp
-
-	emake install \
-		DESTDIR="${D}" \
-		POSTINSTALL="NO" \
-		gnulocaledir="${D}"/usr/share/locale || die "emake install failed"
-
-	dodoc CHANGES README VERSION "${FILESDIR}"/printcap lpd.conf lpd.perms
-	dohtml HOWTO/*
-
-	insinto /etc/lprng
-	doins "${FILESDIR}"/printcap lpd.conf lpd.perms
-	dosym /etc/lprng/printcap /etc/printcap
-	newinitd "${FILESDIR}"/lprng-init lprng
-}
-
-pkg_postinst() {
-	einfo "If printing does not work, try 'checkpc'/'checkpc -f'"
-}
diff --git a/net-print/lprng/lprng-3.8.35-r1.ebuild b/net-print/lprng/lprng-3.8.35-r2.ebuild
index c093167074bd..ce4f127b73a8 100644
--- a/net-print/lprng/lprng-3.8.35-r1.ebuild
+++ b/net-print/lprng/lprng-3.8.35-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.35-r1.ebuild,v 1.8 2012/12/15 11:32:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/lprng/lprng-3.8.35-r2.ebuild,v 1.1 2013/05/05 07:09:26 mgorny Exp $
 
 EAPI=4
 
@@ -19,7 +19,8 @@ IUSE="foomaticdb kerberos nls ssl"
 RDEPEND="sys-process/procps
 	ssl? ( dev-libs/openssl )
 	foomaticdb? ( net-print/foomatic-filters net-print/foomatic-db )
-	!net-print/cups"
+	!>=net-print/cups-1.6.2-r4[-lprng-compat]
+	!<net-print/cups-1.6.2-r4"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	kerberos? ( app-crypt/mit-krb5 )"