Version bump.

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

3 files changed, 274 insertions, 19 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 7e3bb1f093d0..8709bdc048c9 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.327 2015/06/14 08:41:22 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.328 2015/07/31 14:27:45 billie Exp $
+
+*hplip-3.15.7 (31 Jul 2015)
+
+  31 Jul 2015; Daniel Pielmeier <billie@gentoo.org> +hplip-3.15.7.ebuild:
+  Version bump.
 
 *hplip-3.15.6 (14 Jun 2015)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 18d1bf583a3b..3a6dd0595d53 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,32 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST hplip-3.14.10-patches-1.tar.xz 8140 SHA256 33116a5e2c104495d60f0b15e923b2ae5eaaf269cd5ee8e988b035eb20aa23ab SHA512 a8deb03979c55b660ef299505afc328fc930786ea9d473109a9fafd83d72528a9c3700faf4742f2e05829824fc97c3656538e1a607e2191e617f3944f0482e9a WHIRLPOOL bbf5d62f29c0fb0162f34b7815fc190459c619fdaf4f96e33d085f9b7228fa5431b6d668322256995a0a1d16aa1cccb75171000bbb2334ad3b51fec47f2653c0
 DIST hplip-3.14.10.tar.gz 21773429 SHA256 11b3cd8311dea6b22a4c80be1e5d021e84d15a5f3e7e22cbd43798e5c1a89598 SHA512 ed184c8d0d3d8d5aad454831013d7c5e0b1685b088ee8099b6efc1b152f8b159a2349f23f0c5c77a7a5f1a48165b0e22f2ff83ced1beb14633bd278d4ef4d6dc WHIRLPOOL 8e1985cfd370849db96765f792655da36e22b6cecb660dd4707b0ff33dd53c8b66b2ec73a9596c7e60036edc1843c195bbbde64f37c5a1c319752bf0ebc08eb6
 DIST hplip-3.15.4.tar.gz 21926172 SHA256 a3872f17690f2bfafbe025cea524b933260c81349b91083c465600705d8c3e68 SHA512 8d0d7f40d353c4cb9cc2a24944467502ba5c4850969c194db66a824b9d435099e9a49f35c29f74b724988322528632b41cada494692d4729ad631b6918ce8296 WHIRLPOOL da39ec7318926cb9169cdcf5ffc48bd0b0582fdd943f49ad7dfa139a8d6bdfbfaf3a050a7a101790db782e5889706f128dde33806c011d680507df3122570cb4
 DIST hplip-3.15.6-patches-1.tar.xz 8176 SHA256 3f42f72590966f49788ae620948dd3fe206c914d2d4a8d21aaaa86ef5f8b4645 SHA512 d9a35c594f087508a58d07b7c9f47e7bfb280ad66533481b069065cfbdc1927d56d50ab8b50d256bba1bd369fecc6c647bdae7a56a7f0e9edd74da8377dd22f4 WHIRLPOOL f3e0eb720ba14d596f68f106b71c7bd225dfe753cdd56857aa8d2600a72517384ad1a0cbfec7b3ac60922d682bd77a7f3ea2b44db6cdebacee820ebcfbcfc232
 DIST hplip-3.15.6.tar.gz 21956752 SHA256 30c513ee65aa5b342d8074ff89439c0827c35191683727335738d8bc0f9776c9 SHA512 97abde02c588563b77bd1eca73e1864eb6bda218fe9e7b77396ecc461ea884d94b5757c01486c81177c354e1aeec73eae0620d3a06d7b42d0ad2f62cb91334d3 WHIRLPOOL 12c72f36d0abbe73a0b4c489d783a9e11bbf33bfe15575a40db37a598edf34f9f8ccc4b5dc1aadbf7f308311decf19ca92af6192094c6d8e0c40c1a9d1b6c464
+DIST hplip-3.15.7.tar.gz 21979938 SHA256 d310903048f3600f93422e5a8c39ddd682511e0849cd9abc5e943f9a10bdd49d SHA512 45458b74ec496816292c40a9c1d5aed4a288f84be62e79378e701fff5fb1cb55cc77e8415884b824602ec6af8d1155b7dc288ef7382a2e4d96b337520d541a1c WHIRLPOOL 9cf840f79a63877e8fb36ddd51681e1473450c81bd46263272037682519e3ddfdfffc79ac86a60212d46ae61778fac118a9e5576bbf02892c46eba645b960f00
 EBUILD hplip-3.14.10.ebuild 7907 SHA256 4ba6773b226c5e10d1a2f4f06bff5e97f3ce5a769f1d338a9d0b9f6ea065a5b2 SHA512 184c0d639a0dcdeb92bba599057580c7ebfd12190ad0b716bf529871e8502d3eb3eba3e935a3af2900455ef0138fc1fc866a57727a681f6caf778e69030befaa WHIRLPOOL 065456a42ac8be192426ef6c6e400e1cb93373365e9a74ad9bc1ea9fef3496ffd4d558be86041cad9cccec38f78529084c7f2a17827fa88e37e15fdb4bfcbad8
 EBUILD hplip-3.15.4.ebuild 7653 SHA256 4086a7405cea742735a43a9897ec0f47845464be66d95f82b571c7e0cd560023 SHA512 8f6745c68dc95d6764534b87f60c7c51fca651526826cd13ce7f24bec6edca5e639e957cc02439c45e51e16c608237f383d2e62713c3adc7fd67f456beace7cf WHIRLPOOL c36c5021301d9fd6180486cb53bb80a49e818d45151bd1641bc45929cfac843f08dc6c580f2e3c519cd6ca0d70b9ec1743dc0826365d94f314a49530a69f1cd6
 EBUILD hplip-3.15.6.ebuild 7652 SHA256 12de1519841f3ad612fdb41e2f68a4da0c33efcefc11930b8e24d405f9b33b56 SHA512 48fff8095cf0711c1dff100bffe05f3ee7f0f116ead863caeef405cb66e5e6534fe4abb9ea002c0a4e01831a8ace2ebc3a52665a1a6220c098debc37205a8f3e WHIRLPOOL e9b98c19f5fa8088a80b7340e0bf06b6d915e2da56fc8b52cb73277b7849ed1e6b207544319972a20f6b3c658b17e4a13fbcdc66b474d4852241f716d037f0c1
-MISC ChangeLog 54610 SHA256 36e2b4681b1e4f00792995feeabe88f86a047b7817f3756870e33aadbd6e6286 SHA512 696d3c2796dd25b3d9cbdfecdfbc16029c3a63c6dad14f54d24794c765c70d901f7690139c32bf0fb125cec09c94684943ac0083e08891bba16e065a624cb903 WHIRLPOOL fb9f7a27f715d4025f09c459f516b60dacfb7065aabccef7fc55c9916c6f55f6467202eb895fb9fad1674cded95aba74ebef8e2c311e995df2646eca0e5e2ae0
+EBUILD hplip-3.15.7.ebuild 7652 SHA256 c09661cd6997cc0efdb642b7c17aea1cd4d184a8e2095b877ef45c39986fc2f5 SHA512 d194a46bccc5493a5a92bc15495bc7e9f843360332e7d3cb9a4ae38d18e8a46eba74f43def82cb1dd0eb2ea76398f63a4d58d0ba25abd36b8d04567e314ff77f WHIRLPOOL 222f0ac9846d2ac5546f16b2b61e25f3a56a2707764fcbcba0f31b30bc82c45ba3138dd64770e2f3a689f0561eeabc3d4856e509f796fb8ce41075c83c65c8cf
+MISC ChangeLog 54730 SHA256 e879e815ae5c8a6fb2cc5f4d59df908a691a5c15dda045f95dc9b97da6a2a172 SHA512 8ee5f3e4f119e185fe981c9530b42736925bf3095df435f2bb200fe7400dcb2c849d3d0cc71b04fbc692b7f8e7d98378885ce1cb1da926aabdda84b605527912 WHIRLPOOL 3656c7550b0a745d75555218fcae9a6d5187eac00d536b40604b786233693e8f46af57b870e663f558d4548bc692f2658613b002e2f0241f3caed52c1cd79018
 MISC metadata.xml 1817 SHA256 db3b5d18fbd1db40762cfbd1126d572d3ed71fdec59a98a6613152140ff28c92 SHA512 8a62e0e05f36ab7dad3838da52dc2cebdcc9ffb01d2014dd94a05d85e68b0033f4385eed24636651295ae79bdafd2dfa4eff1ca74461e3b2ab231940da6bb5a6 WHIRLPOOL b7e3a3c66333c8d9f7ccdd99bfdf732a98b7a73f4386a5f77a034975fbfecd69c8c265f51da313ddd9f691aa93f932fa43621f0b1e6c4cacf8b97f0341a85d96
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfxf2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmicJkP/0sZfVs/kPR4wkI+gGdXBMcq
-K9D2Q95/B4gfbxCHXn2JueM9GTmvrkd7JqCJVydXnUP5hx6hBhwsFoWJWexbL+Nx
-j0yVbsjXOW59QT3lMFleRtnfJ8W/o3YlM9h9Hb98m1OXqDXbOGbIzkh0j30k2ulC
-bDHxoqM825lo3GK4HE4Z8h7VZ0wcjtmZIdswUNpHMpUey+IDvUkoqYoYLRHEy62R
-Am49TkmelzFxfx9a0h054pWUp2xZBCr3hB4p6ni8We6R+acvAihJERtTUmEhoInM
-5Iz+70Bvg3RfR9TO4RTZ9/YSQ4ZX8KkRO4wkrryWUPwIm6uaPKLYwL+uFgRFbhPp
-HSdgBVRDIz11Zuxjyi87vlaSkRM0dusQVu1N6GJQu11WT6XpaSHKwANmbTycoWzV
-6JFa4yUehqfLcJePlISWPI3ai83lOJIzxQ9+SzDVnuQWqMOSqf471QxRO71nMb1L
-rPmwRDiz53XQO3FCu0BcbeBCDHIqJu2IXBljV52e6zeUNmIVGDL77kwWHpRaOBhk
-q17YGUM20euOcUVnXBJ2higjTHYzRlZ0CwIydumX3pCv2DxahwoZhhnmdg6Tegcj
-t7DMkknWBgEv6Lv74kPMynSpS5zWO6rLmn877pnw2AKXzZLIfAM1jHTAaA/YFz64
-wjHPCARzuxfKS7zm0Vch
-=kn7b
+iEYEAREIAAYFAlW7he0ACgkQlcuUeyFa0U2KAwCgstT+4DPcxpM+CGHq1Z65KRLJ
+6b0An3glklFtnKiThiWd90bx0ttdny/a
+=9CFG
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.15.7.ebuild b/net-print/hplip/hplip-3.15.7.ebuild
new file mode 100644
index 000000000000..fe7cf37be9d5
--- /dev/null
+++ b/net-print/hplip/hplip-3.15.7.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.15.7.ebuild,v 1.1 2015/07/31 14:27:45 billie Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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.15.6-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libnotify -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
+
+COMMON_DEPEND="
+	virtual/jpeg:0
+	hpijs? (
+		|| ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=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
+	policykit? (
+		sys-auth/polkit
+	)
+	!minimal? (
+		>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
+		kernel_linux? ( virtual/udev )
+		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}]
+		)
+		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=$(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 \
+		--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
+
+	prune_libtool_files --all
+
+	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 "https://wiki.gentoo.org/wiki/Printing"
+		elog
+		elog "Any user who wants to print must be in the lp group."
+		elog
+		elog "Please note: Printers requiring a binary plugin are currently"
+		elog "not supported. All bugs regarding the plugin are most likely"
+		elog "closed. A bug about including the plugin package to gentoo is"
+		elog "available here: https://bugs.gentoo.org/352439"
+	fi
+}