Revision bump. Switch to python-r1 to fix bug #455158.

Package-Manager: portage-2.1.11.50/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D

5 files changed, 275 insertions, 12 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index e049ae17ee50..44cb4dd9a06c 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.257 2012/12/15 09:31:35 billie Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.258 2013/02/09 08:57:51 billie Exp $
+
+*hplip-3.12.11-r1 (09 Feb 2013)
+
+  09 Feb 2013; Daniel Pielmeier <billie@gentoo.org> +hplip-3.12.11-r1.ebuild:
+  Revision bump. Switch to python-r1 to fix bug #455158.
 
   15 Dec 2012; Daniel Pielmeier <billie@gentoo.org> -hplip-3.12.9-r1.ebuild,
   -hplip-3.12.10a-r1.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 41e05f7b7312..082fa11885bf 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -4,14 +4,15 @@ Hash: SHA256
 DIST hplip-3.12.10-patches-1.tar.xz 10496 SHA256 7b8f10c1e58ca60778c5c240e51d68472237a45235a03f0b54cd1ffc9dac9632 SHA512 4947077b17bc9f4714302c99917d359cc7dda728393c8fe88d21f26e923dcb5d0535fc56c403920fce359be2951e6ac0c92cb5ba3a659bca452e08f83d8a09a8 WHIRLPOOL f759953c8495eddd0df0bbb3f2ad29e28004659d39f1d415c89604fdebf6729e914ab6830c540ff9c3f693ceb609aff882265bc0ff8a8d1e2637285d7d51158f
 DIST hplip-3.12.10a.tar.gz 21827613 SHA256 616a30f260407f959874d35d351eaf73c74f7f8f016a7826286c88d923a4b1fc SHA512 870a794fdd729aa69b392c3d5cba764ee77141be16313adaf43089c82de397b64517e88d986ecc6f1766cdd5381fa103528ee214358e7b9398f7d4bd70d5f33c WHIRLPOOL 45d2831f593b609b4e4e774c0bf446dd98cb8ad4eba797baafbc43d8af4897764973066348dde08f97ae90635becbe3e91419fbc080d4fdb0a3771b8e63d3c89
 DIST hplip-3.12.11.tar.gz 21932088 SHA256 c5b81167b21aa4ee6bdf3f5c120bfa050d0c794608da8bcc32e2580234919ffa SHA512 78593060f60a906e993ed4b2753fc41e7dae7a35a7697b87008b730fb893b3f4c54d488b7bb0d2fca72bd356dc963b2c2ca68c2797c5860f7052141bd0a81ea7 WHIRLPOOL 7983dc0f08ed38e5ae3ac9bde28f900f1315ad6d6cbd5773221799ea6c9ad9225ea35cb5be8537e4f6045b23c56a9e1776b6b337c91b626afa4e91416b830252
-EBUILD hplip-3.12.10a.ebuild 6770 SHA256 59daa524bd7d0692b44748c3d16a92d7d7897bf189cbde9dc60ee2ec9b5a8164 SHA512 6e1ad629bc8e8a985f1f6540698d5bdd5e8c250f44a1832fe2b26d63636c109eab5b6146e6a0a9a508c7fa80d3c7f9ac5976e5fcf5f7267d212f2a46ee430c93 WHIRLPOOL 9e1cd1a793edbf60e951afeca5a5e454fca8c0c2a5cbfba56d7cee8ae08a908260d636b60b6855b7a154bcd17bbc558a08b1e611e80a4d6e529f69c28d3f1e14
-EBUILD hplip-3.12.11.ebuild 7352 SHA256 6c57b67b8207c80d4fe00592ccf7d2ba38546388c070c5a81bb7c65a4b3062c5 SHA512 9edc0edce681bd2f934eb7c5ef1ca30e2e51442fcd78c448900a599f7759ae746bd5abeb691e06de88ea00bce35f520b06482e8f92378f0891447461110efd2f WHIRLPOOL 7286f4debe51dde5c6642f0b83e45a0c24691d2545ed92e7ba15f6489bf1a23636cce809a2bb38ab91c06f435a8c523adcf317577a5c93635bbdb514833b7338
-MISC ChangeLog 44660 SHA256 64c5eb95ed198a8157169e8b102f7bddb17fe56aae3fe759b1fc747556f5ad08 SHA512 8f71e86397b7a7a9a45ab83eef6ede90c26280813f04981e281e8a743768ba20be058683913fe4b223723d937fbdad13d08619af20b8aa0f66a14a3a18ef76d9 WHIRLPOOL 2cb2e03ed19a85c95a44aa0f9901a7c570035ba48c7d7771f2b6fe523f66feb5ba5b3e39085e44b1eda39aed39d058583fd955057c124a8aed67a9b1af359be4
+EBUILD hplip-3.12.10a.ebuild 6774 SHA256 0bbe59d0b90af08c9b9ba92c75a80b7864755e222514cf3ec5f02697b4857701 SHA512 7088959016734bf194fbae687f96881ebcbf712a89054fd0e883f51e7fd70a28989cb84d07eabb3613a1c77887b335be241acd3e789395bb078873ac27533987 WHIRLPOOL f8eb2628b67872e55c72b1923c522716a23524b4e8592707a713653e435a3051cd999e033eaae39ecea9dc68c167d349edccc0910797b8693e08db042ef47002
+EBUILD hplip-3.12.11-r1.ebuild 7562 SHA256 09bbd3929ab7d61183cd0effd0f047830181337c4bde55ed9a1e3fb8dded165d SHA512 4ec0a5e5bfdf1862d1110dd2bdb7f3b79af747430127f2dc9af43d7ba33cd883431d5fc8204944888200ebec6cfff1abf1846fdfd9ce8525ad78c8043cef5071 WHIRLPOOL 97309968c1785e90af027b6e0727a8e57c9f0a901a0e9f1cd4a614f008d478fc141519b18caca5ff2bfbad7e81323006bf31ec7f1fcbf56e530893ce7497820f
+EBUILD hplip-3.12.11.ebuild 7355 SHA256 d858baf56091fa43052b1a501d9c6700ccc95d50eaaa4d8c69cb99128096f3be SHA512 51a603543a8cc589fea752cf0950813b1d01603048910daf269cd4b9bd70ac62aa86097d5dd0d1b2bbf5d043dc29def7a53bd83f5a45442ff8bf802016a67a95 WHIRLPOOL 4deea1115db5b5ba54f8d894b3ef754f7127a49584c0aa692afd77d45846eaf65c6d001668b142d2687bc419a3276c4a48b6f56eca649f9ec3803f90530b338e
+MISC ChangeLog 44829 SHA256 79a95150256511856378679906952750f8234130d89c3e2776b48d84db0ab36a SHA512 e64e41e60a8407296775fa8629ff086428d13fb5dfc67f0d5f5b6a15b8b5880d7c71dca7fc72b8b60c732ee5a72d59670808184cbf185322224a8050ec0afca0 WHIRLPOOL 0e7a13cf1d5d0cb58e018e85d52da23cfc9cf8741f23141c7539d93503fb5af9ff7ee3133def161997fba7e1060e62879372528635098248725c32ea4f067eb5
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDMQ3gACgkQlcuUeyFa0U0UDwCg5mei91Sraj/CS5M0yGNi554u
-ygsAoOeE7Pnno4A+mHCf3g8eKhoLvi+s
-=Ef4q
+iEYEAREIAAYFAlEWD5YACgkQlcuUeyFa0U0g0QCgmdMZYkRG1vGBWrrI1gmh4L2A
+JpoAn2yZHmJ6xQRuA0rfgGMllq5TYy3S
+=Si/7
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.12.10a.ebuild b/net-print/hplip/hplip-3.12.10a.ebuild
index 33a6ac56cc36..2e8dc318cfa1 100644
--- a/net-print/hplip/hplip-3.12.10a.ebuild
+++ b/net-print/hplip/hplip-3.12.10a.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/hplip/hplip-3.12.10a.ebuild,v 1.9 2012/12/11 17:01:02 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.10a.ebuild,v 1.10 2013/02/09 08:57:51 billie Exp $
 
 EAPI=4
 
diff --git a/net-print/hplip/hplip-3.12.11-r1.ebuild b/net-print/hplip/hplip-3.12.11-r1.ebuild
new file mode 100644
index 000000000000..e14872b637de
--- /dev/null
+++ b/net-print/hplip/hplip-3.12.11-r1.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.11-r1.ebuild,v 1.1 2013/02/09 08:57:51 billie Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit eutils fdo-mime linux-info python-single-r1 udev 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/${PN}-3.12.10-patches-1.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 -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
+
+# TODO: check if net-print/cups, sys-apps/dbus, net-analyzer/net-snmp
+# and dev-python/notify-python are migrated to python-r1
+
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	!minimal? (
+		${PYTHON_DEPS}
+		>=net-print/cups-1.4.0
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		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
+	>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+	policykit? (
+		sys-auth/polkit
+	)
+	!minimal? (
+		>=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
+		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
+		scanner? (
+			>=dev-python/imaging-1.1.7-r2[${PYTHON_USEDEP}]
+			X? ( || (
+				kde? ( kde-misc/skanlite )
+				media-gfx/xsane
+				media-gfx/sane-frontends
+			) )
+		)
+		fax? (
+			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
+			>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+		)
+		qt4? (
+			>=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}]
+			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() {
+	use !minimal && python-single-r1_pkg_setup
+
+	! 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() {
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_fix_shebang .
+	fi
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(udev_get_udevdir)
+	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 || die
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || die
+		mv ${i}.temp ${i} || die
+	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 libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_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-udev_sysfs_rules \
+		--disable-udev-acl-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 qt4 gui-build) \
+		$(use_enable qt4) \
+		$(use_enable policykit)
+}
+
+src_install() {
+	default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=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
+
+	if use !minimal ; then
+		python_export EPYTHON PYTHON
+		python_optimize "${D}"/usr/share/hplip
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		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."
+	fi
+}
diff --git a/net-print/hplip/hplip-3.12.11.ebuild b/net-print/hplip/hplip-3.12.11.ebuild
index edb322d6c603..77e738239574 100644
--- a/net-print/hplip/hplip-3.12.11.ebuild
+++ b/net-print/hplip/hplip-3.12.11.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/hplip/hplip-3.12.11.ebuild,v 1.2 2012/12/11 17:01:02 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.11.ebuild,v 1.3 2013/02/09 08:57:51 billie Exp $
 
 EAPI=5