Use udev.pc pkg-config file to determine correct udevdir for rules.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 260 insertions, 8 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 26180291f394..795ea77209a4 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.231 2012/08/08 18:00:38 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.232 2012/08/13 11:13:13 ssuominen Exp $
+
+*hplip-3.12.6-r1 (13 Aug 2012)
+
+  13 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +hplip-3.12.6-r1.ebuild:
+  Use udev.pc pkg-config file to determine correct udevdir for rules.
 
   08 Aug 2012; Daniel Pielmeier <billie@gentoo.org> hplip-3.12.6.ebuild:
   Fix building with cups-1.6. Thanks to all involved in bug #428672.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index ef61576faa7e..a56944fb3969 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -8,20 +8,25 @@ AUX hplip-3.11.10-udev-attrs.patch 13895 SHA256 83a7b126877f49fbfb28e5d9df26607e
 AUX hplip-3.9.10-browser.patch 1447 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875 SHA512 95d15191193d1cb8da3cab6a6f7748ec56cafba7625ec2e437510c04a46cb2265e03290793315b8eed3d69c481ffaa1b9745946d6f943ff477d0f1f6df4a1c17 WHIRLPOOL e204c62ccc1843d8353e1f7512f33083f7477ab3957f90c54208d1e0b8c3badb25a478e9e2ef4a5fe4350dfc8ebff436f413e9d7eb2c1307f6bdd4cca51d9ea3
 AUX hplip-3.9.12-cupsddk.patch 1265 SHA256 3050221f497c14ae3a7a093043018d55f4deb2b2ebd81840a8285cec4eb7759d SHA512 761ac5f14ca17c3beca6a46c32aafcd5180582d24810b9b2f2c636a19997ae4fe777c011eddfa4a03341854f99c492552d946cc843d2cada05a5d54d2cd61530 WHIRLPOOL 32684fcc8adf2fb0bd2775f98e976a8e04e7e00151b3ab7f3d7c7b0fe67149ad0f7bac7f571c341163266ef94d30dd31ddc80ea5ddab49f257eb2b44220a2a54
 AUX hplip-3.9.12-systray.patch 795 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719 SHA512 808795411e334fda023be54b52856d4068c3c016bc1b05eeccf93a24d82c7c9289a2a775017cf2962154a52c5ca19778d075e70f93e07c2e7a03fce30f9322a9 WHIRLPOOL e3d52948ca910077bc588c00303fc7b6b8ec07806a529dd020d03a6d6ab4877f24d4db33b295c95cce7527bbb3622eda6ef57b210859f2cebebba5b05c732d16
-DIST hplip-3.11.10.tar.gz 21419965 RMD160 d5e7bd065f1fea5f536b4bf47c8962374de95591 SHA1 716dea09c1570356b359e5b6d4a50f8b2654d760 SHA256 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81
-DIST hplip-3.12.4-patches-1.tar.xz 9048 RMD160 ed71850016c8ae6f81fa22f3cd9244e2ab793bd9 SHA1 73580a97aa71b458929dab608f6103698cd3fc2f SHA256 88924b3a7bca2350de57e7f1eca5632cb423ea105e8d2f958971d905a3882eba
-DIST hplip-3.12.4.tar.gz 20603723 RMD160 616d23a39db65d1590e6cbd821f130a53c2743c2 SHA1 6c095321fac3a06c508531e193dcdd83c30ea99b SHA256 350375c78d79adf635a59a448b27b3fe9ab7ac622637c47125fe5f7d8a537fff
+DIST hplip-3.11.10.tar.gz 21419965 SHA256 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81
+DIST hplip-3.12.4-patches-1.tar.xz 9048 SHA256 88924b3a7bca2350de57e7f1eca5632cb423ea105e8d2f958971d905a3882eba
+DIST hplip-3.12.4.tar.gz 20603723 SHA256 350375c78d79adf635a59a448b27b3fe9ab7ac622637c47125fe5f7d8a537fff
 DIST hplip-3.12.6-patches-2.tar.xz 11324 SHA256 c1923ed3f5d0256e42907f631a185135de67c13efc849fc5550ce70da39191cb SHA512 f2de0a62c7a7204e14c8cdce7f22ebcfda2bde344afdae2e257fc45ca59cdf245f0ef9c726cf92f67f1ea6b727c514b14119e0edf9ce31fbac3864414826b323 WHIRLPOOL 6b7fb2a6aa0e79a2a8e277a8dbe464cfb1e12508e92c0b38a45202d80de9493b95ced9401c02c96265398d10d7b9c6772e86906800105adae16778fb263e3ebe
 DIST hplip-3.12.6.tar.gz 21227044 SHA256 54578000792969adb583e75efeacb9c46ab69659ec7e9424de390613f3595775 SHA512 39fefb59e01739aeffb013690e514ee73a93b2d26e1ee03c77d9c28b80de7fdb10496a1d1295328ea0b0948bfdc5b0bf0c67b6dd94b532290524a023bb7e4283 WHIRLPOOL 0564044242be8f6c98ac0cf256ded022378d076d0fbd04568a7ec120b85c80e4892a67a03dad145a58c9853bca6a31edf4293d2ccbb81f3d1d4746aab71c56a5
 EBUILD hplip-3.11.10.ebuild 7632 SHA256 564a6f920494bc5be3154e488212d8b3cf65b3541415f3998bca16ec838e0a1e SHA512 d3e2044e506a89ab31c847bd5f5b7b6c306c221e1b5dde88a8a860092dff81038716829da6c881a42bb3d5e2b5acb6add16eace7d8970fe5e7fd6dc89b2720d0 WHIRLPOOL cca2400af07091e43c4792ddd58e7019fdcd243fe0df0c5726d9a6d6d68096251a2594492953c3644e7103f0cf3a68aa541fd8cb37a2a5e1d6de677aad55525e
 EBUILD hplip-3.12.4.ebuild 6539 SHA256 d5e1808bb0f3a57277c718c3485f47ebfc4f3aae5209189203e01003ba228b03 SHA512 31e2034113274afb15cb6f5090e99795a5eda98e02be8040a655c7737572b471115630bd53859cf9209875bad63bcf760c0992e3f02507c01048e738194926ab WHIRLPOOL 32a207ccd041cd3ae80dc05db9736de7ead7e381a807c93b8c438397a830d8d52ee768324f2d37e780362a7c0db1adada5873f4c0373c7820dea85d30c582373
+EBUILD hplip-3.12.6-r1.ebuild 6840 SHA256 f08316a044548154922b83cfd3968b3965ddce714dd6773d3fe776963557319b SHA512 007873a19f2396b5d6a20af3d09f1071b1ca6999c3ab90444345754f425ce48d51c3558e361ea37ae6470d7114cfd8b308dc18b2654b28baf71f85be91fd54b6 WHIRLPOOL fe1945e1c0da60d4fe02f0b12aee6e3ca0883d92f72a2eb174a0bfede86cbe582f7c70ae656bf8b622e30bc612e824981eafd0636c240e528f1609771cd92a2e
 EBUILD hplip-3.12.6.ebuild 6604 SHA256 26a77140322ab757b3d26493af206b6be25a97c8c116b48bd3b87a1cb8bae770 SHA512 b0ee39d40e9e6fc5fa7623dbdb1bec8f02d5198835a8ffde3db8e19a44a439f6d4591820eea7a09b98ba174137399f55dfeef0597fe5cb3aee3394fdc4589543 WHIRLPOOL 6888abdf0e21638dc8cfaf5c0822cef0ab3c4ccfea6658c21e0090ef920d5f0b0b2a5f9c72e0c495f7c64cd7b5ae405e43839ee93395e130c7b446b21bc87b09
-MISC ChangeLog 40325 SHA256 3d54e6ca42b62be3f0a2add152cf4c7d6ee646bac0a9f830eb4612759c01c9e8 SHA512 fa459539b89f579396d8a8c0c4f82cd103899db3862e6e912dc2e251e794c6954a76c689ec8da79da59ab1558d1acd30b52f513e4104da9093cc773cf0fb504f WHIRLPOOL 8520c4a311b20f3a07d87984098172a8a956d4dd7b897728c0f079863c4189401204dbe431354c01b1a3d59535a37dcaea53f692c48734dc9272e63296d22ce5
+MISC ChangeLog 40510 SHA256 e0c26f6e6ce8dcbeb7cf873bc19c2c57ca5de5f0abdbd624c75af3f3cf9477a5 SHA512 ff47c3c7a2d47eef27a68846f74aed17de77094d738bdc34a3a74bc6e5a23d1ab86b3a6eacda15361779bdbdf710251a21f0137c1a19c3dc3f4460988d301331 WHIRLPOOL fa689b630302643582df49b7a9519091f888cb3aa6d05b75ddaaaa43dde896d0f82534fdd738128ddd6f0cc54db5f902019077a26ec945baa5b64a4adf0eb020
 MISC metadata.xml 1711 SHA256 7859a09f81f31df3e3b1bc2281f69936856ea8b81f381bea85d84d77f389ccc4 SHA512 ee7c3bb53561df1b81738e8a8b2f8beb8fad570bc4db910e72054b4115d1bd7797569d692a3b4b28a076e9797290c1b501ddb4a37ebded914f0093d61b6a1c8c WHIRLPOOL 63c67c317f97f7ca3c3d1450733765551adae4bfc4b4c3ff342de695953e5bbc9cda53235c2b0e3a489d29cd8734685500989076489708fdaa0529a94de8c5aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAiqVEACgkQlcuUeyFa0U3Y0ACgpxyHA9b57cczTZigHcK8itUS
-qPEAnjAr2uMdCXgVJS+aY11gnJSwGHXS
-=Xwky
+iQEcBAEBCAAGBQJQKOEkAAoJEEdUh39IaPFNGNwH/inQFIKPfBDsSk5XZPudgifw
+xTroEn2qeq5cF8KKSTKcn7Y5CMhHLMFpTepZ7g4kjJvZdUZMOm/0TM/Ne0YB3iTj
+jl8PbgCpDaNtYzaXsuE4ZZogmnscZxp/Y6BTPRJSqXoaRDLdkH9Sfpo0mqqG0kEP
+pJTZ17HV4jTnBCTQc5nncnoRhb6eGoF5j6T5LF521PwCHNX3EKlYZfNOxHRVGCni
+qvN+uKmIhw2QNxTcvsIMmKoK58oy+oaYulA0TE8DYBS7zs99oPu8TpXktzSNTYA3
+edZYaw+2lIxJmf6Yj7lFrlTWq5RHtDarilLD+AKU2SWbaPS4uRCoYt2M2jcWZ9w=
+=k6T9
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.12.6-r1.ebuild b/net-print/hplip/hplip-3.12.6-r1.ebuild
new file mode 100644
index 000000000000..df7d2d3e563d
--- /dev/null
+++ b/net-print/hplip/hplip-3.12.6-r1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.6-r1.ebuild,v 1.1 2012/08/13 11:13:13 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="!minimal? 2"
+PYTHON_USE_WITH="threads xml"
+PYTHON_USE_WITH_OPT="!minimal"
+
+inherit fdo-mime linux-info python autotools toolchain-funcs
+
+DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+		http://dev.gentoo.org/~billie/distfiles/${P}-patches-2.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+# zeroconf does not work properly with >=cups-1.4.
+# Thus support for it is also disabled in hplip.
+IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X"
+
+# udev-acl has been moved as part of consolekit and is legacy code that
+# shouldn't be used anymore. figure out dropping USE=acl also from hplip?
+# -ssuominen 2012, August
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	acl? ( || ( >sys-auth/consolekit-0.4.5[acl] <sys-fs/udev-171[extras] ) )
+	!minimal? (
+		>=net-print/cups-1.4.0
+		virtual/libusb:1
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( sys-apps/dbus )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl:0
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	policykit? (
+		sys-auth/polkit
+	)
+	!minimal? (
+		dev-python/pygobject:2
+		kernel_linux? ( >=sys-fs/udev-114 )
+		scanner? (
+			dev-python/imaging
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+		fax? (
+			dev-python/reportlab
+			dev-python/dbus-python
+		)
+		qt4? (
+			dev-python/PyQt4[dbus,X]
+			libnotify? (
+				dev-python/notify-python
+			)
+		)
+	)"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+pkg_setup() {
+	if ! use minimal; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	use !minimal && python_convert_shebangs -q -r 2 .
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Fix for Gentoo bug #345725
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i}
+	done
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use fax || use qt4 ; then
+		myconf="${myconf} --enable-dbus-build"
+	else
+		myconf="${myconf} --disable-dbus-build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+	fi
+
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-libusb01_build \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build) \
+		$(use_enable acl udev-acl-rules) \
+		$(use_enable qt4 gui-build) \
+		$(use_enable qt4) \
+		$(use_enable policykit)
+}
+
+src_install() {
+	default
+
+	# Installed by sane-backends
+	# Gentoo Bug: #201023
+	rm -f "${D}"/etc/sane.d/dll.conf || die
+
+	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${D}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -exec rm -rf {} + || die
+}
+
+pkg_postinst() {
+	use !minimal && python_mod_optimize /usr/share/${PN}
+	fdo-mime_desktop_database_update
+
+	elog "For more information on setting up your printer please take"
+	elog "a look at the hplip section of the gentoo printing guide:"
+	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
+	elog
+	elog "Any user who wants to print must be in the lp group."
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}