Revision bump. Fix build with cups-1.5, thanks to Dale for the report on the gentoo-user mailing list.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 290 insertions, 16 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 643af324755c..db962b6a8c4f 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.188 2011/06/18 13:44:39 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.189 2011/06/19 11:34:59 billie Exp $
+
+*hplip-3.11.5-r1 (19 Jun 2011)
+
+  19 Jun 2011; Daniel Pielmeier <billie@gentoo.org> +hplip-3.11.5-r1.ebuild,
+  +files/hplip-3.11.5-cups-1.5.patch:
+  Revision bump. Fix build with cups-1.5, thanks to Dale for the report on the
+  gentoo-user mailing list.
 
   18 Jun 2011; Markos Chandras <hwoarang@gentoo.org> hplip-3.11.5.ebuild:
   Stable on amd64 wrt bug #372145
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index cc6f0ac5f306..fe8c52901b3f 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX hplip-3.10.5-udev-attrs.patch 13716 RMD160 93cfabc5471f56c540f0fafb144ebd3217491802 SHA1 470d632bb2b68e91f96805587e18314d0963fd0c SHA256 7a3958988250d818a35715e3f091e0547599957a9ea34358ee7238b1edddfeb9
 AUX hplip-3.10.9-cve-2010-4267.patch 405 RMD160 0be8b7d90180d38420dc9991ada4c3b0b19b72d2 SHA1 449062383eb96dcf971a25f37565aadeebc7f451 SHA256 2280fb55a03d61edbd8ff928ae016c2e58e77bede83226f3d8e627e95fa6103f
 AUX hplip-3.11.1-desktop.patch 506 RMD160 eb55a4cbe136fc2105eb6cad21d5fdd69a8539e6 SHA1 14b591e3fab7342d4ddae80c6aaf9819d864f0b4 SHA256 557faf17a05f3707e2918673ed5eff56954feab0d5555b535236c938306f4523
 AUX hplip-3.11.1-htmldir.patch 4470 RMD160 ab8369b02b3590a19dec6277e03d3e79768ab803 SHA1 b70b07654d9997d4085e32b5a2419a1913c0f611 SHA256 30185a66b033dfdf0db59e600b19454c7680f3fa09ea8c24adf0fff19c15585e
 AUX hplip-3.11.1-udev-attrs.patch 13946 RMD160 3634385078375936692251464ad9d31f76bc1c63 SHA1 abf1f2cfc709c9a46c18b4bff5f08420e50e2ae9 SHA256 a7ce9b86783c94f3c3c5e111364ef7874bbfda4af89137b1e7d158961d084d33
+AUX hplip-3.11.5-cups-1.5.patch 402 RMD160 eb51bd4534a13e905ff7cad95254754622e9e324 SHA1 c518e8e11b26757e822b4c2789a93e578405026c SHA256 e9fcc617da154cf962a728cdcc5bf5d517a2175d01f93679489060c20d99f595
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.10-desktop.patch 492 RMD160 52a8bcf1544d0073920e00a383aeb22a9caf5487 SHA1 9394a73448b7b1b3ab1a014ab63b9edc731def66 SHA256 04bb5ef5ee4145eadc5f9e6498ca8a2d3d2277569b179263cb86f0f56231e462
 AUX hplip-3.9.10-htmldir.patch 4444 RMD160 7c960a3049f0b27b761c0f05c4fa9b1484dcd323 SHA1 a9e4af023f23a8990c769158eca08eabd62a5566 SHA256 2ef20d6d8636e22789f48705d9ca219b88cf111d12c54ff0354b18f3b5e20476
@@ -14,23 +15,14 @@ AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95
 DIST hplip-3.10.9.tar.gz 21818298 RMD160 37f512c73768e7a02bdf2814bb7528804cfada32 SHA1 5e145eafefbc5122bbe98345f2984fc0a55e5787 SHA256 1d34630084eccfcc80c08065becdf9313fd8f5a09a4cf523dbd9d3ec724206b9
 DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
 EBUILD hplip-3.10.9-r1.ebuild 7570 RMD160 ddf7fc3a51247ee8d5bb0e083cd175a0fdca8148 SHA1 75b114e414af90c9ea1b5aca5ca3ef1b723f9a51 SHA256 6e8606b9cf7e14a942a10e42b583e2b2b3513817693d22a32020d15f8eb14dd6
+EBUILD hplip-3.11.5-r1.ebuild 7656 RMD160 d4b0aed75c9bd5c3103a8233f1f7a93a90e27d77 SHA1 7bc4bdd4a634e6eadc628851eef02b89ffa5a421 SHA256 3d8320a9d4bb57216ee50cdb409b557eb44853c3d71a6fe3d72de17275d2c0fa
 EBUILD hplip-3.11.5.ebuild 7576 RMD160 0b3671ed57d3961f442ebeee19bbfca19307a5d9 SHA1 3787d8a2a73293cc6e609cd8f79d37009bb6770b SHA256 12ebb583cc04dd10adbf2ef81b0e47e3afedd5e7578c7463f96c35016a8d7e20
-MISC ChangeLog 32519 RMD160 19120a071ca318e1040fdca11f9907645b916fc3 SHA1 c963d76a5f51d90926cc89f3ce622204d4794ff0 SHA256 01594cf06ab8caf8511b8f080c2a4e22ec3034b2c898131d498647bba5bd2927
+MISC ChangeLog 32772 RMD160 8b008f3143786faf6b2c625a813843b89f1f549c SHA1 935e1043c6c9837c71db5c5f65b2fd84bc33d040 SHA256 17eef6abeb84869171a104dce7598741389f6df15cd40dd00074521c1800b422
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN/KvcAAoJEPqDWhW0r/LCv/AP/A42k7kPHGTLSxPoPtl6wV4I
-zLGl7kpaeTKkpQsonUUBkho14qpwXKDcXB7+buBVNpc42BqFCxzS0zJ/H8xYbIma
-Fxdr5pMocXNWu5909HCDsE+Lw9xB69s6sIpk/+dUYuOLATBmOSE1GZRYuK0EsiiQ
-4JC+jkgMJa2tHouKcmeA0mWL/ugn6J09DDLS6womFWN8zapms2P01rflHr/Hc/wI
-wAgC4k09vseRxV6Gxyn8BFqqvshgy2W4Uyfm1SbPdUMg6I/+bv7qOxK23weoKiWB
-85Y6OhJJrIYjPpzGw2RVh3JmY2LDPqKQ8leRod8ijYWvUN9sEmpwbwsf+LTHvvE7
-xI8wIZSfszzv8xAsVr3O90nslcC3Kx4xFzDpS2xrEJ8Kr02ZbQI5efVvYWeOtMi4
-rl3ADeQ4n2+lnQCQJqtwD4fjMOCV7LDpe52iPi3OHHX0v2tzCH4dlrPgoHIC0UBg
-utMX4KHJZ9j/39sMdS1ruBCAHUn1IXamg2eemcmmO2UUoYV92Wg9rePq00OokrIb
-PTjkCUvpiorkp2u1zbNskmlYx4QjKdjJ5kwf4VunkgN87BtRr1yzgmvKBYE3pf4m
-EkpscBS+lM3OC6J3ucST1TNSGXqmfF4+i5Dj5ExnODby2bkjey+vcG+mQSWDL+gv
-WFDnjPe/Y4udqs7/FwlV
-=7If3
+iEYEARECAAYFAk393wYACgkQlcuUeyFa0U1LDACeP23bw7AXKFkooSShgBFjg/9P
+fEAAn2Q8EUZZ/7GbNz/0vdXV4EK+Lm2Z
+=qQ6q
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/hplip-3.11.5-cups-1.5.patch b/net-print/hplip/files/hplip-3.11.5-cups-1.5.patch
new file mode 100644
index 000000000000..a6e95f1cc615
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.11.5-cups-1.5.patch
@@ -0,0 +1,11 @@
+diff -up hplip-3.11.5/prnt/hpps/hppsfilter.c.cups15 hplip-3.11.5/prnt/hpps/hppsfilter.c
+--- hplip-3.11.5/prnt/hpps/hppsfilter.c.cups15	2011-06-10 11:44:25.933781345 +0100
++++ hplip-3.11.5/prnt/hpps/hppsfilter.c	2011-06-10 11:46:24.474510996 +0100
+@@ -38,6 +38,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
diff --git a/net-print/hplip/hplip-3.11.5-r1.ebuild b/net-print/hplip/hplip-3.11.5-r1.ebuild
new file mode 100644
index 000000000000..674925c465e7
--- /dev/null
+++ b/net-print/hplip/hplip-3.11.5-r1.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.5-r1.ebuild,v 1.1 2011/06/19 11:34:59 billie Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="!minimal? 2"
+PYTHON_USE_WITH="threads xml"
+PYTHON_USE_WITH_OPT="!minimal"
+
+inherit fdo-mime linux-info python autotools
+
+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"
+
+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"
+
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) )
+	snmp? (
+		net-analyzer/net-snmp
+		dev-libs/openssl
+	)
+	!minimal? (
+		net-print/cups
+		virtual/libusb:0
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( sys-apps/dbus )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
+	!minimal? (
+		dev-python/pygobject
+		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
+			)
+			policykit? (
+				sys-auth/polkit
+			)
+		)
+	)"
+
+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."
+		ewarn "Recommended USE flags: USE=\"hpcups -hpijs\")."
+	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 and/or hpijs the appropiate"
+		ewarn "drivers are installed."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	python_convert_shebangs -q -r 2 .
+
+	# Fix for Gentoo bug #345725
+	sed -i -e "s|/etc/udev/rules.d|/$(get_libdir)/udev/rules.d|" \
+		$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
+		|| die "sed udev rules"
+
+	# Do not install desktop files if there is no gui
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
+	epatch "${FILESDIR}"/${PN}-3.11.1-desktop.patch
+
+	# Browser detection through xdg-open
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
+	epatch "${FILESDIR}"/${PN}-3.9.10-browser.patch
+
+	# Use cups-config when checking for cupsddk
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
+	epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
+
+	# Htmldocs are not installed under docdir/html so enable htmldir configure
+	# switch
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
+	epatch "${FILESDIR}"/${PN}-3.11.1-htmldir.patch
+
+	# Increase systray check timeout for slower machines
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/335662
+	epatch "${FILESDIR}"/${PN}-3.9.12-systray.patch
+
+	# SYSFS deprecated but kept upstream for compatibility reasons
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
+	epatch "${FILESDIR}"/${PN}-3.11.1-udev-attrs.patch
+
+	# CVE-2010-4267 SNMP Response Processing Buffer Overflow Vulnerability
+	# http://secunia.com/advisories/42956/
+	# https://bugzilla.redhat.com/show_bug.cgi?id=662740
+	epatch "${FILESDIR}"/${PN}-3.10.9-cve-2010-4267.patch
+
+	# Fix build with cups-1.5
+	epatch "${FILESDIR}"/${PN}-3.11.5-cups-1.5.patch
+
+	# 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 gui_build myconf drv_build minimal_build
+
+	if use qt4 ; then
+		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
+		if use policykit ; then
+			myconf="--enable-policykit"
+		else
+			myconf="--disable-policykit"
+		fi
+	else
+		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
+	fi
+
+	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 --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-dependency-tracking \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--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 \
+		${gui_build} \
+		${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)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# Installed by sane-backends
+	# Gentoo Bug: #201023
+	rm -f "${D}"/etc/sane.d/dll.conf || 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"
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}