Add missing foomatic USE flag in IUSE for old version; new ebuild by Daniel Pielmeier (billie), see bug #287005.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 294 insertions, 6 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 052c67a29d33..ced74c9a41d5 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.125 2009/09/24 19:55:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.126 2009/10/14 15:45:05 flameeyes Exp $
+
+*hplip-3.9.8-r1 (14 Oct 2009)
+
+  14 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +hplip-3.9.8-r1.ebuild, metadata.xml:
+  Add missing foomatic USE flag in IUSE for old version; new ebuild by
+  Daniel Pielmeier (billie), see bug #287005.
 
 *hplip-3.9.8 (24 Sep 2009)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 107de9a209ff..6991f836ad1b 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -9,13 +9,14 @@ DIST hplip-3.9.4b.tar.gz 15712313 RMD160 bfed762c59b8dc2210d450ba86a5636773831cc
 DIST hplip-3.9.8.tar.gz 15715640 RMD160 8b06537176bfb32d32ae20eec1cfa6765609ecc0 SHA1 bcf0d1d8d6a006dd00224b4f90c208c21af28e55 SHA256 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
 EBUILD hplip-2.8.6b.ebuild 5223 RMD160 b22ab30c66893db8aa5b66844a38fefbdbcf80fa SHA1 3e402dbc955fe3c7ea98be5980d2e747600e4845 SHA256 0d1e993376b31bd5f2ddaa2d051fc927d6ebf38ae0d7e336061d1d3d24320719
 EBUILD hplip-3.9.4b-r1.ebuild 6450 RMD160 ee06e2af71f51ef1d6d67be04a25d5bfb01ec6af SHA1 2869085220ce59defb512e96c06016560ab7afac SHA256 fb80576ee4cba069386cfa34ce87caacc2529d780af181faea5c58bfd3a8ca4c
+EBUILD hplip-3.9.8-r1.ebuild 7599 RMD160 b92dc2a44bf36c356d6ff174e5d4f7953fd92c0c SHA1 c9f19037f14297064dca5de2aca774bb362cb570 SHA256 593c320352e29ccc465223c9ba6816a1243b926bdcad746dcbdb7c4796b00aee
 EBUILD hplip-3.9.8.ebuild 6787 RMD160 9e4a51424e034910296eaf6b50088c0362c8c5d2 SHA1 f4825530681f89b07f39470a08a8eca92107a034 SHA256 a1f7ff46febfcf918f22785d3e0c7fb2afc7872f08dd20e7a72ace2d396d860f
-MISC ChangeLog 20832 RMD160 5b0a4e914d094d816c80592111b3fe8c836d692d SHA1 ca2ff96feee10cbcd501df313c36ac5c7a9d1ced SHA256 ddbce18ef82faafaaa9a7c7ac08a461e89fe2619752243e47ab138fdb7e082f0
-MISC metadata.xml 1726 RMD160 3b11f6188a12281015a1ba02c343456cfdad9de9 SHA1 2b0854c9d9e773d58403fd77c2bc21fdc314fbf9 SHA256 95b539e963161fd234311d9a0be30d8fd6d796ceba77de74577065c1aa2a3461
+MISC ChangeLog 21077 RMD160 b59fcb4539dc4db5f7a889392608d59e439f11d2 SHA1 9a103492c017f5041082e949a3e3f9108dbf4086 SHA256 66d92c7803756c8f006b75848361cfcdcdc7e4f91f54854e88c2e4fb3bad549a
+MISC metadata.xml 2282 RMD160 066e4e0c3d68d94a2834ec76c293c1fbc4bbbaf1 SHA1 722cae79114a81b0cd57e66598eaa5c600421720 SHA256 2d57b30724ac5311299926af90d408bc338a58c9aa981fa3fee4d6a0c40f0dcc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkq7zs8ACgkQAiZjviIA2XgnWQCgzglDgaTazd42VUrLzQpN9bp8
-B0oAnjyfafdWWnHiiPWWzDWmdAJycqUE
-=4ZEr
+iEYEARECAAYFAkrV8gYACgkQAiZjviIA2Xj6EQCgrbeF+0CXV40VXiYys0vux24D
+JlUAn1FQFVj2W+l9u/1NJFndhA++Q6oi
+=RsNc
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.9.8-r1.ebuild b/net-print/hplip/hplip-3.9.8-r1.ebuild
new file mode 100644
index 000000000000..2c8e12f13bf8
--- /dev/null
+++ b/net-print/hplip/hplip-3.9.8-r1.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r1.ebuild,v 1.1 2009/10/14 15:45:05 flameeyes Exp $
+
+EAPI="2"
+
+inherit fdo-mime linux-info python autotools
+
+DESCRIPTION="HP Linux Imaging and Printing System. Includes printer, scanner, fax drivers and service tools."
+HOMEPAGE="http://hplip.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt3 qt4 scanner snmp static-ppds +foomatic"
+
+# Note : libusb-compat untested (calchan 20090516)
+
+COMMON_DEPEND="
+	virtual/ghostscript
+	media-libs/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
+	!minimal? (
+		net-print/cups
+		virtual/libusb:0
+		>=dev-lang/python-2.4.4[threads,xml]
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	!minimal? (
+		kernel_linux? ( >=sys-fs/udev-114 )
+		scanner? (
+			dev-python/imaging
+			gtk? ( media-gfx/xsane )
+			!gtk? ( media-gfx/sane-frontends )
+		)
+		fax? (
+			dev-python/reportlab
+			sys-apps/dbus
+			dev-python/dbus-python
+		)
+		qt3? ( !qt4? (
+			dev-python/PyQt
+		) )
+		qt4? (
+			dev-python/PyQt4[dbus,X]
+			dev-python/pygobject
+			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() {
+	! use qt3 && ! use qt4 && ewarn "You need USE=qt4 or USE=qt3 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."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
+		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
+		base/utils.py  || die "Sed base/utils.py failed"
+
+	# bug 98428
+	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Sed hpssd.py failed"
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die "Sed installer/core_install.py failed"
+
+	# SYSFS deprecated - 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 \
+		|| die "Sed data/rules/56-hpmud_support.rules failed"
+
+	# Replace udev rules, see bug #197726.
+	mv data/rules/40-hplip.rules data/rules/70-hplip.rules || die
+	sed -i \
+		-e "s/40-hplip.rules/70-hplip.rules/g" \
+		Makefile.am */*.html || die "Sed Makefile.am */*.html failed"
+
+	sed -i \
+		-e s:/usr/lib/cups/driver:$(cups-config --serverbin)/driver:g \
+		installer/core_install.py || die "Sed installer/core_install.py failed"
+
+	# Use system foomatic-rip instead of foomatic-rip-hplip
+	local i
+	for i in ppd/{hpcups,hpijs}/*.ppd.gz
+	do
+		rm -f ${i}.temp
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die "Sed *.ppd.gz failed"
+		mv ${i}.temp ${i}
+	done
+
+	local qt_ver
+	if use qt3 || use qt4 ; then
+		use qt3 && qt_ver="3"
+		use qt4 && qt_ver="4"
+		sed -i \
+			-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
+			-e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
+			base/device.py || die "Sed base/device.py failed"
+		sed -i \
+			-e "s/Exec=hp-systray/Exec=hp-systray --qt${qt_ver}/" \
+			hplip-systray.desktop.in || die "Sed hplip-systray.desktop.in failed"
+	fi
+
+	# htmldocs are not installed under docdir/html
+	# the following sed enables --htmldir configure switch in src_configure
+	if use doc ; then
+			sed -i -e 's/www\([0-9]\)dir = $(docdir)/www\1dir = $(htmldir)/g' Makefile.am || die "Sed Makefile.am failed"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local drv_build gui_build myconf
+
+	if use qt3 || use qt4 ; then
+		gui_build="--enable-gui-build"
+		if use qt4 ; then
+			gui_build="${gui_build} --enable-qt4 --disable-qt3"
+			if use policykit ; then
+				myconf="--enable-policykit"
+			else
+				myconf="--disable-policykit"
+			fi
+		else
+			use qt3 && gui_build="${gui_build} --enable-qt3 --disable-qt4"
+		fi
+	else
+		gui_build="--disable-gui-build"
+	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="${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
+	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
+	fi
+
+	econf \
+		--disable-dependency-tracking \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-new-hpcups \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--htmldir=/usr/share/doc/${P}/html \
+		--enable-udev-acl-rules \
+		${drv_build} \
+		${gui_build} \
+		${myconf} \
+		$(use_enable doc doc-build) \
+		$(use_enable fax fax-build) \
+		$(use_enable minimal hpijs-only-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Emake install failed"
+	rm -f "${D}"/etc/sane.d/dll.conf
+
+	use minimal && rm -r "${D}"/usr/$(get_libdir)
+
+	# bug 106035/259763
+	if ! use qt3 && ! use qt4 ; then
+		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
+	fi
+
+	# kde3 autostart hack
+	if [[ -d /usr/kde/3.5/share/autostart ]] && use !minimal ; then
+		insinto /usr/kde/3.5/share/autostart
+		doins hplip-systray.desktop
+	fi
+}
+
+pkg_preinst() {
+	# avoid collisions with cups-1.2 compat symlinks
+	if [ -e "${ROOT}"/usr/lib/cups/backend/hp ] && [ -e "${ROOT}"/usr/libexec/cups/backend/hp ] ; then
+		rm "${ROOT}"/usr/libexec/cups/backend/hp{,fax}
+	fi
+}
+
+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, and may also"
+	elog "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 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."
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 9becc09fdb77..4fe93cd589bb 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -9,6 +9,11 @@
     <name>Denis Dupeyron</name>
   </maintainer>
 
+  <maintainer>
+    <email>flameeyes@gentoo.org</email>
+    <name>Diego Elio Pettenò</name>
+  </maintainer>
+
   <use>
     <flag name='cupsddk'>Add support for <pkg>net-print/cupsddk</pkg> which 
     enables dynamic PPD files (recommended)</flag>
@@ -36,6 +41,23 @@
     <flag name="cups">
       Build the hpcups driver for cups.
     </flag>
+    <flag name="foomatic">
+      Build the IJS/foomatic driver for cups.
+    </flag>
+
+    <flag name="hpcups">
+      Build the hpcups driver for cups (by HP).
+    </flag>
+
+    <flag name="hpijs">
+      Build the IJS driver for cups (Foomatic)
+    </flag>
+
+    <flag name="static-ppds">
+      Use statically-generated PPDs instead of Dynamic PPDs. This is
+      deprecated, and this USE flag is thus suggested to stay turned
+      off.
+    </flag>
   </use>
 
 </pkgmetadata>