Revision bump to remove la files, thanks to Agostino Sarubbo in bug #388989.

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

3 files changed, 274 insertions, 6 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index dd19d9676560..9d495bbf7cae 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # 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.196 2011/10/24 06:36:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.197 2011/11/01 12:37:10 billie Exp $
+
+*hplip-3.11.10-r1 (01 Nov 2011)
+
+  01 Nov 2011; Daniel Pielmeier <billie@gentoo.org> +hplip-3.11.10-r1.ebuild:
+  Revision bump to remove la files, thanks to Agostino Sarubbo in bug #388989.
 
   24 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org> hplip-3.11.5.ebuild,
   hplip-3.11.7.ebuild, hplip-3.11.10.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index e860a5b13e0a..e02b2893c93a 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -14,15 +14,16 @@ AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95
 DIST hplip-3.11.10.tar.gz 21419965 RMD160 d5e7bd065f1fea5f536b4bf47c8962374de95591 SHA1 716dea09c1570356b359e5b6d4a50f8b2654d760 SHA256 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81
 DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
 DIST hplip-3.11.7.tar.gz 21286283 RMD160 aa95d10384689d563ebc8eef151faa5d5b2a3c7a SHA1 82a41c3089392ab096a5d373ce8610ff50b004b2 SHA256 820d73bad6dbd8df774e1e234eb27cae9a6e797466e2261c75db51ba38e4001d
+EBUILD hplip-3.11.10-r1.ebuild 7579 RMD160 5a2a50a87e2c958004631ce51b730f7f2f8791e2 SHA1 8f328dd631aafa0c39f6782ca3967fe73952a3df SHA256 81f8eb7e8b51f70e0f1addb7b8f2539ec7e80c349fb149a78a88a730f6249102
 EBUILD hplip-3.11.10.ebuild 7523 RMD160 832907423a26f168e03c71a669c6fdda4a8d4dfb SHA1 c5a68ffab91f6f9d63c699ef15a4ace142c7f225 SHA256 c3da58011743cfbea11f3bc21aa11685d42fc3b2d060db8603113a971bb46525
 EBUILD hplip-3.11.5.ebuild 7517 RMD160 4ae37df100c2990de5b4da29684eee5ef677a5f5 SHA1 dc9f869e81014b7778e4c6aadcbaf82dc6434a5e SHA256 b3eaf951652f14975d7ba12fc16e1bd9198db86aee40e0c78624f25df658ce34
 EBUILD hplip-3.11.7.ebuild 7591 RMD160 a6a83cd0df0fa9b441a9c9468e0f87c016e4297b SHA1 7e4ddafa51a267ed58f7ab2fbe0a0c92500bebfe SHA256 ba5f5759b5c24543d5f8fb71e7912a766103eb1ce174e6e9a358014db1b49410
-MISC ChangeLog 33901 RMD160 cb5d30c53c9227595c2eb6450af67c136fb22139 SHA1 e942081d6ee3613d90e31fc9f09ccc0ff763b146 SHA256 afc70bf3703183893971ebfe5bb38dd7efbac33ace925ecf9d9ace03cdbe1899
+MISC ChangeLog 34089 RMD160 7d6938ed78cb0a4c0b5ec7418ee4bb309ee29d62 SHA1 1110d3723f1367f5f5b8c55302878843a2ca8627 SHA256 57dcf3242d9e14af3b69f8fa68bffbdfb67ed2afeff2b0296b46797d3dbef2a1
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6lB3kACgkQdjK8w9WeBnByYgD/fMOMt6xtcbntNt3eHxBUMyRo
-UvXL6ULneqTNFsNldmkA/0umCpQQbVVhUfBZt90J5W2IREEjXV7dNeJ1gI342g+U
-=O25Z
+iEYEAREIAAYFAk6v6AMACgkQlcuUeyFa0U3EhwCgjhKQ1FvC40YqW5mBEPRWDppJ
+ewkAn2YI1ek6MVrCu7QdkRXu1Qimdyck
+=k/PK
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.11.10-r1.ebuild b/net-print/hplip/hplip-3.11.10-r1.ebuild
new file mode 100644
index 000000000000..ca2edb3250de
--- /dev/null
+++ b/net-print/hplip/hplip-3.11.10-r1.ebuild
@@ -0,0 +1,262 @@
+# 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.10-r1.ebuild,v 1.1 2011/11/01 12:37:10 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-1.4.0
+		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
+	!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
+			)
+			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.10-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
+
+	# 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
+
+	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
+}