[patch] Allow lprng and cups to both be installed

gentoo388515a.patch (text/plain), 4.18 KB, created by Martin von Gagern on 2011-10-26 08:52:18 UTC

diff -ur /usr/portage/net-print/lprng/lprng-3.8.28.ebuild net-print/lprng/lprng-3.8.28.ebuild
--- /usr/portage/net-print/lprng/lprng-3.8.28.ebuild	2011-03-19 19:01:20.000000000 +0100
+++ net-print/lprng/lprng-3.8.28.ebuild	2011-10-26 10:50:06.647388348 +0200
@@ -2,6 +2,8 @@
 # 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.20 2011/03/19 17:56:05 ssuominen Exp $
 
+EAPI=4
+
 inherit eutils flag-o-matic
 
 MY_PN=LPRng
@@ -12,27 +14,26 @@
 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="foomaticdb kerberos nls ssl"
+IUSE="cups foomaticdb kerberos nls ssl"
 
 RDEPEND="sys-process/procps
 	ssl? ( dev-libs/openssl )
-	foomaticdb? ( net-print/foomatic-filters net-print/foomatic-db )"
+	foomaticdb? ( net-print/foomatic-filters net-print/foomatic-db )
+	!cups? ( !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}"
+src_prepare() {
 	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() {
+src_configure() {
 	# wont compile with -O3, needs -O2
 	replace-flags -O[3-9] -O2
 
@@ -49,7 +50,9 @@
 		--libexecdir=/usr/libexec/lprng \
 		--sysconfdir=/etc/lprng \
 		--disable-strip || die "econf failed"
+}
 
+src_compile() {
 	emake -j1 || die "printer on fire!"
 }
 
@@ -63,8 +66,17 @@
 		POSTINSTALL="NO" \
 		gnulocaledir="${D}"/usr/share/locale || die "emake install failed"
 
+	if use cups; then
+		local file
+		for file in "${ED}"/usr/bin/* "${ED}"/usr/sbin/* \
+				"${ED}"/usr/share/man/*/*
+		do
+			mv "${file}" "${file%/*}/${PN}-${file##*/}"
+		done
+	fi
+
 	dodoc CHANGES README VERSION "${FILESDIR}"/printcap lpd.conf lpd.perms
-	dohtml HOWTO/*
+	dohtml PrintingCookbook/HTML/*
 
 	insinto /etc/lprng
 	doins "${FILESDIR}"/printcap lpd.conf lpd.perms
diff -ur /usr/portage/net-print/lprng/Manifest net-print/lprng/Manifest
--- /usr/portage/net-print/lprng/Manifest	2011-03-19 19:01:20.000000000 +0100
+++ net-print/lprng/Manifest	2011-10-26 10:50:13.559481609 +0200
@@ -5,6 +5,6 @@
 AUX lprng-init 994 RMD160 9065bc8e29e30e06224570e4a07a557e7d98bf27 SHA1 cb711d10d82db52164e7325836fa4c91de9a59d5 SHA256 2b247e66daf120a9960cabc3bf3eddcdd096b32f3c8f20689662a2bb9de03be5
 AUX printcap 661 RMD160 1b45dbc09a87729d202efb2738f15a33bf72a719 SHA1 8337d47cad350b3dca61094bafa8ac1809843055 SHA256 6a91fc37ba2467903b5e7e3717fd5bf07ea59b404184849d64daf31ac200c985
 DIST LPRng-3.8.28.tgz 10212500 RMD160 f0460d7fa7d1ea0ce6b49fcb656905fdda3d0d41 SHA1 f4373004adb1439819600701bb98517137daf1fc SHA256 c22e9c20ac71f97daca79c68b8d70631ef51d34652ff37b8cb8413a3ebcb914d
-EBUILD lprng-3.8.28.ebuild 2040 RMD160 7c43376a79139a0992fc8b3416d8856126d8624b SHA1 9cb7cc0fb96322003939dccd604caa2142883e75 SHA256 904f06a55054301fae1654d457dcbb30a76026ed0cd2b0f4bd4d6e61b24aecf4
+EBUILD lprng-3.8.28.ebuild 2273 RMD160 b6c619f061bdaad7e2b8e587d295664d6317af9b SHA1 3261638ad0cc6a4f29599e8b5e7f374d9389c9c8 SHA256 eccd757e94a0302905804fbb225c0c16e1a60f3f3e913cc38f86e23b9bb56e58
 MISC ChangeLog 7410 RMD160 f521b6f612f9ce478e7c3857352b59b4ff62ba33 SHA1 d7fab3c014457801c3e7e47f1cfa0fe144dd247c SHA256 a11d5c666006bf113e51b63d030a73c72c490916f1a1a55015eefd8772c2c2a3
-MISC metadata.xml 233 RMD160 3c4fd0a84bb475a13d2006285bea2ce6deb9090d SHA1 04b0678447cdf5bfa103c398c73a0e90f19dfbd0 SHA256 5ff619159c47d92b89c79b0f439761e3fc2b1205d5ab3c548f39babc07ca5a89
+MISC metadata.xml 334 RMD160 ac27e224a70ae11f19db2f846a97e792e3b6c350 SHA1 2d1cfcd2d60a3fc1927a26de73c4a65ba803cf5f SHA256 dc97c6eaa56f2b84bba1936014852004475384a7d28305d777e9a34ba7b4d4ab
diff -ur /usr/portage/net-print/lprng/metadata.xml net-print/lprng/metadata.xml
--- /usr/portage/net-print/lprng/metadata.xml	2006-11-07 00:45:43.000000000 +0100
+++ net-print/lprng/metadata.xml	2011-10-26 10:47:44.595463754 +0200
@@ -5,4 +5,7 @@
 <maintainer>
 	<email>[e-mail]</email>
 </maintainer>
+<use>
+  <flag name='cups'>Rename files to allow concurrent installation alongside cups</flag>
+</use>
 </pkgmetadata>