Revision bump. Update ebuild to use newer python eclass related functions. Add a patch which fixes plugin installation from bug #274538. Remove unused patch.

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

5 files changed, 282 insertions, 29 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index dc0b7ec58517..1b2526d193ee 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.150 2010/03/16 17:48:47 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.151 2010/03/20 18:25:31 billie Exp $
+
+*hplip-3.10.2-r1 (20 Mar 2010)
+
+  20 Mar 2010; Daniel Pielmeier <billie@gentoo.org>
+  -files/hplip-3.9.4+glibc-2.10.patch, +hplip-3.10.2-r1.ebuild,
+  +files/hplip-3.10.2-plugin.patch:
+  Revision bump. Update ebuild to use newer python eclass related functions.
+  Add a patch which fixes plugin installation from bug #274538. Remove
+  unused patch.
 
   16 Mar 2010; Daniel Pielmeier <billie@gentoo.org> -hplip-2.8.6b.ebuild,
   -hplip-3.9.8-r3.ebuild, metadata.xml:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index e001994c8123..bc1be4c7319e 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,14 +1,15 @@
 AUX 70-hpmud.rules 763 RMD160 b8326b26658b8e8355ae3d74423b51e2e15001e2 SHA1 fdb6b4937a814db50dc3ac3ca9b9c04cb44a6590 SHA256 6e7f2a0fd5a2111505066a412daea0d29c1ce858f09dbbaa489bb5a2f231e837
+AUX hplip-3.10.2-plugin.patch 358 RMD160 a76e1bee114cc26a9af0d031414aed7f7c453712 SHA1 957a10944194c52fbd1346e201bbad9f06bd97bf SHA256 5f85766990d74a1c26685abfe95b46dc87d7ebc52c9b595f994a81af89284494
 AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207d04 SHA1 67eec05d9b29445a98a16d496e671cd0f29e1471 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95fefd53d9fd8897faf6528ddd2875
 AUX hplip-3.9.10-cupsddk.patch 1128 RMD160 de693684826251f595a54c32ac31ab1e1ff082ef SHA1 c95ed5c2313c951b543c1df58b179ee0f1290bd2 SHA256 80b09b3b6e24860aebdd856384261b7f7e1887a7779dec668693dcf10a1c159a
 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
 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
-AUX hplip-3.9.4+glibc-2.10.patch 1023 RMD160 9571a0c34421432f892a1535ff0bf6533dc3883c SHA1 1254a4c2b9f5d2e6a488b3b0567f7edda3ab7a26 SHA256 4ab1cde2cb9a405011faa5c3c3bf9d7c52ce97653a28aa056e01c71909d08b3b
 DIST hplip-3.10.2.tar.gz 21446275 RMD160 4483bd497bbc272812c31db574b75f6e5c03b391 SHA1 7cdbb879cc122152aa9e3d5dc2d7dd3baf3b0604 SHA256 bb9a3aeda9a8d31f0cc790e629f14d2122f9bff111b0d3cc97ac19a8607d7956
 DIST hplip-3.9.12.tar.gz 21371447 RMD160 f1717e8bad043b54497489fa1a2764b3ac548094 SHA1 d4d659ae52f01055bfc7060e0d4e3c7354c1dee3 SHA256 1c53febe3101b3718d43c9176c08826a1a46c49a79c9f6445cd16981fbf2a12a
+EBUILD hplip-3.10.2-r1.ebuild 7851 RMD160 4218c61256e33ade79a5b87f0cfded64865a3ac7 SHA1 fea2de29560a588861a0a816f5b18f5fb05e2b25 SHA256 1877e355d3e8d8215cb8556bc5cbbbb3d4b7132360ba5643caa7bcf4a0606ce3
 EBUILD hplip-3.10.2.ebuild 7568 RMD160 cdbbc568a56dca290cedbb8f93a6249fe19e9aa4 SHA1 4833099366e43895c4580c84117b1ec87d10b590 SHA256 2e820ee692618aaa5a2a4e61350f8d178cbcad39fca7139fc6ce6b72162f304f
 EBUILD hplip-3.9.12-r1.ebuild 8273 RMD160 8574eb70cddf9e2674eafa502eb7b789fb5b0f7c SHA1 d388576e5511bef896d1fb124aa956b8ab1eefec SHA256 4674b6fa5e1d53e2bac0af0f935cb67adf55d337127f4858dcb6f8f3adb2dc5a
-MISC ChangeLog 26034 RMD160 3a251d0d60c4ad14b708a3f3f159567965c11e2b SHA1 9d617ef0ee80bf0934f91ed6b8e55182c3f45a27 SHA256 a8560ed357665e6224d9c6118fbbd1e7d5dc1cacc077fdc91523cb855c2b58b0
+MISC ChangeLog 26383 RMD160 eedaed2c8a484053ee383af37148777c5c59b2eb SHA1 1a832241694cc1cf7543b4faf701bbdb9ea60ae7 SHA256 89715afbcc768fd1c0d8ce2dc6cd5c7a4c0e1e75b371754def12078c2a6f3507
 MISC metadata.xml 2039 RMD160 bd9dc1def4196adc557ea33ce4dd808412fdbbfc SHA1 06ac684e6ba4b5ae416f5e2b06823fa52a3cb151 SHA256 6f7fe846747cf8188cb01453bfd332eeac30c5c589883e471a7af8085fab0c79
diff --git a/net-print/hplip/files/hplip-3.10.2-plugin.patch b/net-print/hplip/files/hplip-3.10.2-plugin.patch
new file mode 100644
index 000000000000..9958cde5dcf5
--- /dev/null
+++ b/net-print/hplip/files/hplip-3.10.2-plugin.patch
@@ -0,0 +1,11 @@
+--- setup.py.old	2010-03-20 17:38:16.061877304 +0100
++++ setup.py	2010-03-20 17:40:27.328531289 +0100
+@@ -370,7 +370,7 @@
+ 
+             if hp_plugin:
+                 if prop.gui_build:
+-                    os.system("hp-plugin -i")
++                    os.system("hp-plugin --required")
+                 else:
+                     os.system("hp-plugin")
+ 
diff --git a/net-print/hplip/files/hplip-3.9.4+glibc-2.10.patch b/net-print/hplip/files/hplip-3.9.4+glibc-2.10.patch
deleted file mode 100644
index 81464599b776..000000000000
--- a/net-print/hplip/files/hplip-3.9.4+glibc-2.10.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: hplip-3.9.4/prnt/hpijs/dj3320.cpp
-===================================================================
---- hplip-3.9.4.orig/prnt/hpijs/dj3320.cpp
-+++ hplip-3.9.4/prnt/hpijs/dj3320.cpp
-@@ -403,7 +403,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE 
- {
-     DRIVER_ERROR err = NO_ERROR;
-     BYTE byDevIDBuffer[DevIDBuffSize];
--    char *pcStr = NULL;
-+    const char *pcStr = NULL;
-     BYTE byStatus1, byStatus2;
- 
-     memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer));
-Index: hplip-3.9.4/prnt/hpijs/registry.cpp
-===================================================================
---- hplip-3.9.4.orig/prnt/hpijs/registry.cpp
-+++ hplip-3.9.4/prnt/hpijs/registry.cpp
-@@ -292,7 +292,7 @@ DRIVER_ERROR DeviceRegistry::SelectDevic
-             device = eDJ3320;
-             match = TRUE;
-         }
--		char	*cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
-+		const char	*cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
- 		if (!cmdStr)
- 		{
- 			cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:");
diff --git a/net-print/hplip/hplip-3.10.2-r1.ebuild b/net-print/hplip/hplip-3.10.2-r1.ebuild
new file mode 100644
index 000000000000..924627268231
--- /dev/null
+++ b/net-print/hplip/hplip-3.10.2-r1.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.10.2-r1.ebuild,v 1.1 2010/03/20 18:25:31 billie Exp $
+
+EAPI=2
+
+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 System. 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 ~ppc ~ppc64 ~x86"
+
+# zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt4 scanner snmp static-ppds -udev-acl"
+
+COMMON_DEPEND="
+	media-libs/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	udev-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.70
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
+	!minimal? (
+		dev-python/pygobject
+		kernel_linux? ( >=sys-fs/udev-114 )
+		scanner? (
+			gtk? ( media-gfx/xsane )
+			!gtk? ( || ( media-gfx/sane-frontends dev-python/imaging ) )
+		)
+		fax? (
+			dev-python/reportlab
+			dev-python/dbus-python
+		)
+		qt4? (
+			dev-python/PyQt4[dbus,X]
+			libnotify? (
+				dev-python/notify-python
+			)
+			policykit? (
+				sys-auth/policykit
+			)
+		)
+	)"
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (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 gtk && ewarn "You need USE=gtk 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() {
+	# Do not install desktop files if there is no gui
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
+	epatch "${FILESDIR}"/${PN}-3.9.10-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.9.10-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
+
+	# Make hp-plugin work if gui_mode is disabled
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/399522
+	epatch "${FILESDIR}"/${P}-plugin.patch
+
+	# SYSFS deprecated but kept upstream for compatibility reasons
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
+	sed -i -e "s/SYSFS/ATTRS/g" -e "s/sysfs/attrs/g" data/rules/56-hpmud_support.rules \
+		data/rules/55-hpmud.rules || 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
+		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-htmldir=/usr/share/doc/${P}/html \
+		${gui_build} \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable new-hpcups new-hpcups) \
+		$(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 udev-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 "You should run hp-setup as root if you are installing hplip for the first time,"
+	elog "and may also need to run it if you are upgrading from an earlier version."
+	elog
+	elog "If your device is connected using USB, users will need to be in the lp group to"
+	elog "access it."
+	elog
+	elog "This release doesn't use an init script anymore, so you should probably do a"
+	elog "'rc-update del hplip' if you are updating from an old version."
+	elog
+	elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
+	elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
+	elog "If you prefer the SLP method you have to choose this when configuring the"
+	elog "device."
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}