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

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 9627F456F9DA7643!)

3 files changed, 12 insertions, 83 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/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 )"