Version bump.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x215AD14D

3 files changed, 272 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 1eea13a99065..fd289c6e1c7c 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.283 2013/10/14 18:30:49 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.284 2013/11/07 17:09:49 billie Exp $
+
+*hplip-3.13.11 (07 Nov 2013)
+
+  07 Nov 2013; Daniel Pielmeier <billie@gentoo.org> +hplip-3.13.11.ebuild:
+  Version bump.
 
 *hplip-3.13.10 (14 Oct 2013)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 1516acd2b120..eafdd6202c98 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -5,17 +5,19 @@ DIST hplip-3.12.10-patches-1.tar.xz 10496 SHA256 7b8f10c1e58ca60778c5c240e51d684
 DIST hplip-3.12.10a.tar.gz 21827613 SHA256 616a30f260407f959874d35d351eaf73c74f7f8f016a7826286c88d923a4b1fc SHA512 870a794fdd729aa69b392c3d5cba764ee77141be16313adaf43089c82de397b64517e88d986ecc6f1766cdd5381fa103528ee214358e7b9398f7d4bd70d5f33c WHIRLPOOL 45d2831f593b609b4e4e774c0bf446dd98cb8ad4eba797baafbc43d8af4897764973066348dde08f97ae90635becbe3e91419fbc080d4fdb0a3771b8e63d3c89
 DIST hplip-3.13.10-patches-1.tar.xz 5792 SHA256 8acbd3a9725209b9a0d05cea98712dada121b57f29a424e6dbf1772b1b627a76 SHA512 00ff77025f76869260ab6538e3dfe2bbb9b11dbb242bb8d11e62a4c7ba16a154cbe8a61a7ea664ed200cb2e4389b3239b5f4f3b98ddfc99c70b0de5051654051 WHIRLPOOL e7388cc1c7550d16abd7c75d3cd6680cf0f1ed17d230501170d1467ae6ba4276c8dc851a7ff50ca66a507b0ce5797a0e1c1dcf9a97ebaf136fd4820ae8d8e257
 DIST hplip-3.13.10.tar.gz 20951136 SHA256 a8122cd824398ac6374154f86152e24fdf5c0100b5c1d6518e853308362e627d SHA512 db79aa4e1da86ab1f7cab2bb8c0666e4d77343a2351c80007c91cd607c14596b832e7cfd3497813093821134ea25a4ca152a3bf32288801cf073df07069999c5 WHIRLPOOL 9b0f88fad7498e39bf3b647ab172ff43de196351a435206eccae8143670a2846ae17ebbd56486de58ab77a17da6f12001a802a0f3947ceb164a0c2e0e48b7f56
+DIST hplip-3.13.11.tar.gz 21104424 SHA256 1ea0ed020ab54e08620fe6ea7c30e93dbb8be505f2e6994e7222a7be63ca3b34 SHA512 31cfb57baa870f5086a6c02ebf2893290a489afef4a450d7b2627eb240669e70e7dadca5a418d628d547ec9d07202f28e065b97ad64d42095e15798370fbdd7f WHIRLPOOL fde504d5e4c77d49da60032b7302bb739f8112593b1c6f189b892f087eba446e2d022dc477aee6797eadede0aa759f2ce00a5cf0eba354b4f25898163de7d5c0
 DIST hplip-3.13.9-patches-1.tar.xz 8096 SHA256 cabdc3ad00ed745728810f4af667356baa3b0b757ee889486d424102ce4cdce4 SHA512 88f6c542c5b9d1125eaa0748b17d99ea177f455023a7678a1fa7ff74fdace2b6b16ba3e08a61b1ff2006af511212c434cab60cac2c50e8584d1c4a9f8510cc9e WHIRLPOOL ca44d44b6e4d33a8c9300e2388982983e44305b389c32998c342fbf3cbc0a2217e032a49377231518c813540f6267d0f7c6664a21bec0e6072d2caebc24d4aa7
 DIST hplip-3.13.9.tar.gz 20878480 SHA256 d95c729a79b0d28be3ecb6cba6df5a931b0788484c4d323963abc36d514bb120 SHA512 7895b55336a61db9479f1457ef7d46084e22bb92a59c5f705be47f435e8854a51ba0409f7bbc332215edcb372fb5f21423ab1222fda5286113f105a20d928960 WHIRLPOOL 86c7ceac0bf33a4a2799233b7ee7718e23bab7f6720fa1c571967c98e5c7ba77667efcd8320a98a0f4eea773ae2c7325320a475029d9b1d0f5741c9d478e368b
 EBUILD hplip-3.12.10a.ebuild 6774 SHA256 0bbe59d0b90af08c9b9ba92c75a80b7864755e222514cf3ec5f02697b4857701 SHA512 7088959016734bf194fbae687f96881ebcbf712a89054fd0e883f51e7fd70a28989cb84d07eabb3613a1c77887b335be241acd3e789395bb078873ac27533987 WHIRLPOOL f8eb2628b67872e55c72b1923c522716a23524b4e8592707a713653e435a3051cd999e033eaae39ecea9dc68c167d349edccc0910797b8693e08db042ef47002
 EBUILD hplip-3.13.10.ebuild 7653 SHA256 5a57508c6507275ab7749a6071e9368a00ef2fb5df6a5a6ac1bae7a7490f058d SHA512 3f47c9630187e71654601b338bee31ef12edc4c9a4e2e67b6291bc32bf80aec809b2fb85eba575f63e2bc5736fee62a9d159e6bd67c88e59fb3590dcdeb0c129 WHIRLPOOL 4cf4cf30fece836ebac1a1d05d66e9a9da14a652710bfaf9bd2c525f6344be136d09991fc85359422b9c519515deb9a7693411744ca46cdbd2e923548072142c
+EBUILD hplip-3.13.11.ebuild 7653 SHA256 73e221747c8c9373d69f94cb84cbdcef9b9f24ba887d96f36c3c08b394b08673 SHA512 f2cbf4a4c2cc61b85cd9fbf8813112e69d73c16e0b2ccbe8d45ae922a582403014a9b676383c26e5bcc7c0908b2499d0c61d203bc6d680f387a810f2e0ac0c2c WHIRLPOOL e9448ae03eaac2cdc0c14553c4f9340d4c0d0b88abcb5b85d1935ae1b4bd0e6ff373f2d9a334049bb314b45956a9a616f460830b4c1549fdbece6ed3236bfc87
 EBUILD hplip-3.13.9.ebuild 8066 SHA256 8a10bb1cd67a7e48f163ab919f0d1c7362635c09212bd996105bfe904f8bea18 SHA512 82b57e4e203c209f2b3c6e77b4a879e7d8d7e60ab02e2e31d621306ce521ade3247ea4c2c157278138bfffd783fb207fdf02cb81c608867c9906b39a0153b8b5 WHIRLPOOL 586507aa249174cbb6f2d8a45d017e84a3b326814947926bc0ac001a360d4533598e75224e536eae8e68fb8f86260b2de7e115b361c4e5acddac12522898fff0
-MISC ChangeLog 48385 SHA256 b8f51a7e30acbbaf4fa6e0935cd13a401fd29c17c11e259480e6b976646bafd7 SHA512 d70b35df6b8dc86e93d38f83ea3d94bede379c69302491935b8d2bd8ab276aa3a72a7bec2c0e12d90b2aaef7699823dba8f07793473aa1a5c65828b63876f528 WHIRLPOOL 2eaa98d5cdd818f5f6b17ec0cc808124082514dc1005fad3ee63c6ea451727ab29e7dfe203ad5e496ed95388373279520003c30c1270575c8b5888a465015c6f
+MISC ChangeLog 48507 SHA256 eaa9c18ac5940fdf618d0b4d0c876168485bfd3390a5831ccba14ae1080b6f9b SHA512 ef58b91171fbf4c1fdab53f0f4cbe455feeb8dd1c34c1c262a3d462cb621448d979e055e5ab785e53d50b484e032687c79ebbf3943ee35fa24ca0ae5f9de91bf WHIRLPOOL 4b7199347dc97c8904466adb6fe53b82f9b684e241c9d92b2d94dca44d860ad0b0a5e767260b707b9611f9f858de65d4c1e1b49c6010f6d37238831aa813a8e4
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJcOFoACgkQlcuUeyFa0U2dKwCghfI2RK77fcJm2KB9glNSVB1Q
-j/kAn1OxSnxJm648YqD0nu6Bafe9xtKy
-=JWbq
+iEYEAREIAAYFAlJ7yV4ACgkQlcuUeyFa0U2dNwCghG2hXVscp6uOpA4GBRO3DG4I
+KDYAoMrmStufGeWclmLmyolrWtLxwRJu
+=eOPA
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.13.11.ebuild b/net-print/hplip/hplip-3.13.11.ebuild
new file mode 100644
index 000000000000..4f258b3730d8
--- /dev/null
+++ b/net-print/hplip/hplip-3.13.11.ebuild
@@ -0,0 +1,260 @@
+# 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.13.11.ebuild,v 1.1 2013/11/07 17:09:49 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.13.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, net-analyzer/net-snmp
+# 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-1.6.8-r1 )
+		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/reportlab-2.6[${PYTHON_USEDEP}]
+			>=virtual/python-imaging-1[${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-0.1.1-r3[${PYTHON_USEDEP}]
+			)
+		)
+	)"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+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
+}