Add a patch to fix minimal build with hpijs disabled and hpcups enabled. This should fix bug #402727. Thanks to Francisco Vazquez for the report. Correct other USE="minmal" related issues.

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

4 files changed, 303 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 1f7a081ef1c5..9010d9ae41e6 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,14 @@
 # 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.211 2012/02/08 19:29:59 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.212 2012/02/16 19:35:13 billie Exp $
+
+*hplip-3.12.2-r1 (16 Feb 2012)
+
+  16 Feb 2012; Daniel Pielmeier <billie@gentoo.org> +hplip-3.12.2-r1.ebuild,
+  +files/hplip-3.12.2-minimal.patch:
+  Add a patch to fix minimal build with hpijs disabled and hpcups enabled. This
+  should fix bug #402727. Thanks to Francisco Vazquez for the report. Correct
+  other USE="minmal" related issues.
 
   08 Feb 2012; Daniel Pielmeier <billie@gentoo.org>
   files/hplip-3.11.12-fast-pp.patch:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 69b51e8abb28..7aaf837285bc 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -9,6 +9,7 @@ AUX hplip-3.11.10-udev-attrs.patch 13895 RMD160 e350d51abbf93f20c1829bdeaf01d300
 AUX hplip-3.11.12-black-stripes-pcl5c.patch 552 RMD160 8f6828824244e387418c2d467be63b2c9131e84a SHA1 4d6174bc075560b6ae49bc246a4ff8d55da21217 SHA256 5636e9d32d6bcc71ea358426d1723a0e57080ae5be0e65d597f1d1764eb5728e
 AUX hplip-3.11.12-fast-pp.patch 22850 RMD160 048ccbc67a5baa669694d05db8bf3a9822050405 SHA1 5f48cc43ee69362a4817ac6684253c56bcbb55e6 SHA256 ee827c8c18591815d4994fa216778e9efeba1627c927015699c89e0b96ac3dee
 AUX hplip-3.11.12-udev-rules.patch 951 RMD160 29947b36f48b2bce89baf44c215ee044ea916711 SHA1 ef9d4b84520d3ddfdb4f300acc125f86fc47fe0f SHA256 9e461b7f6a264434317fcc83bb53c313f5f9c467bdec8c572b49684f6ddfcfa7
+AUX hplip-3.12.2-minimal.patch 1543 RMD160 860e4c19b32c1458b3b80026a3223505982c3c3a SHA1 37f21a6d88d47d7ccb03105cd99442eddafdcc98 SHA256 c1eb3b95bca8806720a476b74bf0a9a34e8856bfc906f9ca9b3d7cb3f3938a00
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490114 SHA1 01ce069ab67277aab9205ea59537ec55362ef1aa SHA256 3050221f497c14ae3a7a093043018d55f4deb2b2ebd81840a8285cec4eb7759d
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
@@ -19,13 +20,14 @@ DIST hplip-3.12.2.tar.gz 20579749 RMD160 99893258300446bab8ae6d4198cc2f0b62197fb
 EBUILD hplip-3.11.10.ebuild 7527 RMD160 ac1c37d102321db5ecf6da112902023e89e0d1ef SHA1 29485a677f4cbad83a36aaf65f5fc6a791f477e6 SHA256 4aab63ac5bfa7c8220f63e89af051c70b8a14b2bac4ec8bca9a4a66f418f4b28
 EBUILD hplip-3.11.12-r2.ebuild 7942 RMD160 79686dccbbeb52d91c4b2cdb322a59d4e3f385e1 SHA1 48a5c77cf231574971d3e9633fb26a128e28fd09 SHA256 7943a001486424a6ac12ddddaf4a1b8a9965614a3e3c940041bbed44e258bffe
 EBUILD hplip-3.11.5.ebuild 7524 RMD160 9796167bb42c741ec7334c92efac174d2b1e3ab0 SHA1 f64c398442fe0ee399ea290afe67d1dec9726265 SHA256 f649c426149b98b1458d4b146718427905c46d3cf4bcf5fe57eb62acbb81dc44
+EBUILD hplip-3.12.2-r1.ebuild 7568 RMD160 60796022764fa723cccaa60db9b43926b02e3878 SHA1 7c4dff075adb717af5946d5c022f582b8d7c4417 SHA256 c388ae5e2c57fe0bc98fc1472d7812800b0ee38cc647bce980141185bd5d0aca
 EBUILD hplip-3.12.2.ebuild 7823 RMD160 3301e2f85b69a1ac4102a47a4298af6b77dab396 SHA1 4d327c0895fb7064912144296c59cdd38032ef0e SHA256 d927a6bcc29eacdf4ccbedd729b30806a371731119931e6d1d049acf47826814
-MISC ChangeLog 36629 RMD160 5f25239f438b33a67fc21b45115f9a83bddac176 SHA1 95b088defbd2e62d3e51e1fab8788d89d57765d5 SHA256 63220193ec78f6da89be338c77ac82fac5d85e20c250618d854dca0208fb95c0
+MISC ChangeLog 36971 RMD160 c1038d6811e6f500bce4ae7d80ab3f5c33794262 SHA1 9f023192c473b3171a8e5a054c48cf1506e1fc1d SHA256 feef380229bfb126b7aed0c557b7028558a90295822ecad8b8a4d2a6412b7987
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk8yzUQACgkQlcuUeyFa0U1McgCdHXOI0ChnX1qyIVwA3cNXRCPt
-OS8AoOX0LylhD1D79jPIZMZCL7xKAvX6
-=XQxZ
+iEYEAREIAAYFAk89Wn4ACgkQlcuUeyFa0U39gQCfW3/yo/uVGBbqOYBTWTr2R9t1
+RwYAoMDYrQGK7uKvI7cUedtI2IRalZuH
+=Y3ZB
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/hplip-3.12.2-minimal.patch b/net-print/hplip/files/hplip-3.12.2-minimal.patch
new file mode 100644
index 000000000000..a33b7286fcde
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.12.2-minimal.patch
@@ -0,0 +1,25 @@
+--- configure.in	2012-02-01 12:56:29.000000000 +0100
++++ configure.in	2012-02-13 20:06:15.570726513 +0100
+@@ -472,7 +472,7 @@
+ 
+ # Check conditional packages.
+ 
+-if test "$hpijs_only_build" = "no" && test "$network_build" = "yes"; then
++if test "$hpijs_only_build" = "no" && test "$network_build" = "yes" && test "$hpcups_only_build" = "no"; then
+ #   AC_CHECK_LIB([crypto], [CRYPTO_free], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find net-snmp support (or --disable-network-build)], 4)])
+ #   AC_CHECK_LIB([netsnmp], [snmp_timeout], [LIBS="$LIBS" AC_DEFINE([HAVE_LIBNETSNMP])], [AC_MSG_ERROR([cannot find net-snmp support (or --disable-network-build)], 4)])
+ #   AC_CHECK_HEADERS(net-snmp/net-snmp-config.h,, [AC_MSG_ERROR([cannot find net-snmp-devel support (or --disable-network-build)], 5)])
+@@ -489,11 +489,11 @@
+ fi
+ fi
+ 
+-if test "$hpijs_only_build" = "no" && test "$pp_build" = "yes"; then
++if test "$hpijs_only_build" = "no" && test "$pp_build" = "yes" && test "$hpcups_only_build" = "no"; then
+    AC_CHECK_HEADERS(linux/ppdev.h, ,[AC_MSG_ERROR([cannot find ppdev-devel support (or --disable-pp-build)], 8)])
+ fi
+ 
+-if test "$hpijs_only_build" = "no"; then
++if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+    AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)])
+    AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
+    AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)])
diff --git a/net-print/hplip/hplip-3.12.2-r1.ebuild b/net-print/hplip/hplip-3.12.2-r1.ebuild
new file mode 100644
index 000000000000..f6d8a712015e
--- /dev/null
+++ b/net-print/hplip/hplip-3.12.2-r1.ebuild
@@ -0,0 +1,263 @@
+# 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.2-r1.ebuild,v 1.1 2012/02/16 19:35:13 billie Exp $
+
+EAPI=4
+
+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"
+
+REQUIRED_USE="|| ( hpijs hpcups )"
+
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	acl? ( || ( >=sys-fs/udev-171[acl] >=sys-fs/udev-145[extras] ) )
+	!minimal? (
+		>=net-print/cups-1.4.0
+		virtual/libusb:0
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( sys-apps/dbus )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/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 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 .
+
+	# Fix for Gentoo bug #345725
+	sed -i -e "s|/etc/udev/rules.d|/lib/udev/rules.d|" \
+		$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
+		|| die
+
+	# 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
+
+	# Let 56-hpmud_support.rules call hp-mkuri to make it work with newer udev
+	# Upstream bug: None
+	epatch "${FILESDIR}"/${PN}-3.11.12-udev-rules.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 black stripes on pcl5c printouts
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/561264
+	epatch "${FILESDIR}"/${PN}-3.11.12-black-stripes-pcl5c.patch
+
+	# Fix parallel port cpu usage
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/750796
+	epatch "${FILESDIR}"/${PN}-3.11.12-fast-pp.patch
+
+	# Fix minmal/hpijs_only/hpcups_only install
+	# Upstream bug:
+	epatch "${FILESDIR}"/${P}-minimal.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 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 \
+		--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"
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}