Version bump.

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

3 files changed, 252 insertions, 5 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 3ab84eb0627f..aa07ff665924 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # 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.240 2012/10/03 17:55:40 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.241 2012/10/05 16:28:51 billie Exp $
+
+*hplip-3.12.10 (05 Oct 2012)
+
+  05 Oct 2012; Daniel Pielmeier <billie@gentoo.org> +hplip-3.12.10.ebuild:
+  Version bump.
 
 *hplip-3.12.9-r2 (03 Oct 2012)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 57138ab9896f..2b4a73bfc716 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -9,21 +9,24 @@ AUX hplip-3.9.10-browser.patch 1447 SHA256 0e3b3b251ff4cf73032f4c78b6c0495b2d95f
 AUX hplip-3.9.12-cupsddk.patch 1265 SHA256 3050221f497c14ae3a7a093043018d55f4deb2b2ebd81840a8285cec4eb7759d SHA512 761ac5f14ca17c3beca6a46c32aafcd5180582d24810b9b2f2c636a19997ae4fe777c011eddfa4a03341854f99c492552d946cc843d2cada05a5d54d2cd61530 WHIRLPOOL 32684fcc8adf2fb0bd2775f98e976a8e04e7e00151b3ab7f3d7c7b0fe67149ad0f7bac7f571c341163266ef94d30dd31ddc80ea5ddab49f257eb2b44220a2a54
 AUX hplip-3.9.12-systray.patch 795 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719 SHA512 808795411e334fda023be54b52856d4068c3c016bc1b05eeccf93a24d82c7c9289a2a775017cf2962154a52c5ca19778d075e70f93e07c2e7a03fce30f9322a9 WHIRLPOOL e3d52948ca910077bc588c00303fc7b6b8ec07806a529dd020d03a6d6ab4877f24d4db33b295c95cce7527bbb3622eda6ef57b210859f2cebebba5b05c732d16
 DIST hplip-3.11.10.tar.gz 21419965 SHA256 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81
+DIST hplip-3.12.10-patches-1.tar.xz 10496 SHA256 7b8f10c1e58ca60778c5c240e51d68472237a45235a03f0b54cd1ffc9dac9632 SHA512 4947077b17bc9f4714302c99917d359cc7dda728393c8fe88d21f26e923dcb5d0535fc56c403920fce359be2951e6ac0c92cb5ba3a659bca452e08f83d8a09a8 WHIRLPOOL f759953c8495eddd0df0bbb3f2ad29e28004659d39f1d415c89604fdebf6729e914ab6830c540ff9c3f693ceb609aff882265bc0ff8a8d1e2637285d7d51158f
+DIST hplip-3.12.10.tar.gz 21832868 SHA256 66c159421c6941e20c88e9372ad2885248b0fc0546c1896cfbfce7ff840faa08 SHA512 213c9dc8d4649c08800b68f6acf4bf4e839c6a5e9aba9cc89ab7ca7c3e3bc9a6eadb3354b1fc707e3964871bde2302b71fc71ad7e7c363b9b1aa280dcff22d2b WHIRLPOOL b1845a5603efada201092bfe3aa898465645d1b8d6a0289232ea20f0352aa065c27584425299b5de5eea55085bf717bcc3bb1e8df6dacc88ec239e991a45b1da
 DIST hplip-3.12.4-patches-1.tar.xz 9048 SHA256 88924b3a7bca2350de57e7f1eca5632cb423ea105e8d2f958971d905a3882eba
 DIST hplip-3.12.4.tar.gz 20603723 SHA256 350375c78d79adf635a59a448b27b3fe9ab7ac622637c47125fe5f7d8a537fff
 DIST hplip-3.12.9-patches-2.tar.xz 10328 SHA256 d992fdf42bbcde92de9f4256308b3b35b74e3fcae50704d59eaf26bd2beab5b4 SHA512 846b9cc96b1eefcbc0960c312a60ab8913b6db109bfa828d19f1e9cdfccc47e193d582767d828437dbebc9ec1c0617a590e8f3f2e744d9f5bddb6056d43fe6a7 WHIRLPOOL 5d63763f11d8f91a6506301ec2c7e37c1f9e5693c83d818f67129a42c7489fd9ed09c0a06f216af72c21f488cefc6f2b455a010fc504e3fc7b12b877190e9d9b
 DIST hplip-3.12.9-patches-3.tar.xz 10672 SHA256 ce3408eb7d2e4ca0e322747df5fd1e65cea1791558b0e7bcb6b96f56478e0a05 SHA512 78d42e709522101e9adf750271e35bed20986fb6bff6dfc9d549b06d7d1cb00b65ce03fe994ffc256bbc8dcc7f26a4a28a7ddf6f05eeecd8a1d7707fcdbdbf96 WHIRLPOOL ecce11fab7fe1c79fc6235024af4e98d52e688f8c7e263eb337b7e20ee554e36041627a2623352671f6f70445ebf0f6300822b0debf465d29036c0f93fbf9c70
 DIST hplip-3.12.9.tar.gz 21314003 SHA256 e7361b9d6e968ce3306dc438e622a4412156e7c2d71b2a6face5952cf52e23c4 SHA512 bf0f498d7516c4b7653799c043dd6336a620be31680e1419bf09f9fd52492fc92f59e030df5110f89615c16d27ecad0169c83c938651a7fa7257057ccf5d30eb WHIRLPOOL 1059cf4216b60752c4f6da299f2dd86bdb26be7171275107280953225a9d1d729b135ba0f7990a8ed757fd52880612718bd846abb68ecbf61652923db88ca425
 EBUILD hplip-3.11.10.ebuild 7512 SHA256 9968a0bdd0c83f7c7b89baa36dbb3d4d0b5455ca04a3af60e43b8f2070569508 SHA512 a706992d67f47de06912cb34c6ceedca2a561842a7ea2a511e29f11e36f86c1ceb5ddafb181eea648d688b83fdf197c1d7d8e01a73de56bc8d9bafdade0afcd6 WHIRLPOOL 865c37d29d7e20f7cca00d3f41725ec3868aee9068f3136426e7906e0294bfaa2aeef4f5d9157c4576ffdfe3098342019ec0e9ac5a3b9be844b1547a290f8f9f
+EBUILD hplip-3.12.10.ebuild 6600 SHA256 00bcbdeceead066400f05a382ce893854692444127e730f07855c24666f4a3d6 SHA512 3ce4d33d8a3895898ad5a816c1ecd3888ca43190fd4a4cf83181e955874c938a0af7dbf839b79a4c40e5b4e926ba3d375cd355bbb3cdbbadc2515d89c513160e WHIRLPOOL e48f0589282cb17dfb1f1598f67e2e2f79d4660219ff256bf96949d75eac32e2c28fce8ec6aef763144b8a3e8ad2c80c636f8f9b9ca52385c432ae8af784ca48
 EBUILD hplip-3.12.4.ebuild 6419 SHA256 ca2de34f09f990df2af5d7ac9a0e24c7a6368eaf65400bdb35da0d7742095f85 SHA512 032d6368162c66a971e892d53429ad36f7e605ab5103a0aa57bf563661f909fda80a16c8651c489211b74df3caa218eadc682e3d0e4dd2b733aaaf606edd2229 WHIRLPOOL cc71a7703c7838dde94346c0a255999a3e5f478db634056a7a56f7512488a089356d047bf3f09c5ba891bf596bc14a2ec67f18808b0bfdb24225963e293e31c5
 EBUILD hplip-3.12.9-r1.ebuild 6598 SHA256 012d36618497fc95c6734215e29cf1a4f175266b29e3698e01f825bb51bde22a SHA512 e153e447a3fadd5800e5227d66ac41ca75e6b374ab77c78ca17ac31b8b0299b7bc784dec6f1c36d395e33ef6c9970bf66dcf2cac8cb0b0899b33bc25376e259e WHIRLPOOL ee5758c22d6da7dbdf76755fefb33451550dd040eccc97341aa18760a881e1ece3999512fab193b52917bf70d24cbeff3faa284cd36adc72ef18e6fc0bdd7ee5
 EBUILD hplip-3.12.9-r2.ebuild 6602 SHA256 98f9996e16ac9f8124982739198cc21b439fd3d8e96ca365276cbd6e341829b0 SHA512 1a8d153780bb70a64f1afe993bd4b395ab21492186ee53b6506fb0da515ccc99437b7da76053de3f606f9ef048a530a6379138929cb4498cabc323d7b823d5b2 WHIRLPOOL f0df3a734ba9e980674d4c94bb15da996625063c7019604bab1bd494307ccfe83b21d1e30b54954c3ff9de0ccbef91cd0f1ea270989f4f7988ef1f7dddc73fdd
-MISC ChangeLog 41977 SHA256 2f6ea48032c7ee307d2b9d9758db23fd9edf77e508146c1f1c24bb07a6a1d6bf SHA512 acaebda666fa5f33651c957794f362b3cd3674d0f707cfdff0307c9f176236332199b185bd81e7940289366080cacbbe12c7220d81c1acd84ed3c97baf35aee7 WHIRLPOOL 3f4be5397491e597dc48366df682ee901a6be39cee37960c5dee15df568c28e7bdc77e8fc148bbec10d0d93b74ed031e8b5b0986f346a4b83d8b1c2498699359
+MISC ChangeLog 42099 SHA256 d5e89d74bda9d8ff4e68034d68b6ca8358f5f0cb70e74589f0550930c4605d64 SHA512 66580ccb710a145ebc446720affef3f1197190636c466c313704baf8f609b49b01edac48f83967a218b9ef78b23228c9316edfeb7df6e9ec695e775bd1a7c6bb WHIRLPOOL d82daeb47427fa2cd35d50f9881e95852ee4c804fab8d799a9e5c80f5352b53563f424467de4e38c59ac6348df277dee93582ab8e87a2d332036e1e0e33222d3
 MISC metadata.xml 1610 SHA256 8f874244f74e21bd6eee94f72feb0a4f2e957be45983a4ef17ab2887bfc9f44f SHA512 75a643ef3a029c3ccf4ebb66e27040a338979fcb59a5cbda801ca0f7d5323b05e37d55394d00f44d5922e2e465677ac2569c0d0b4f5280cb362126087424e762 WHIRLPOOL a4d67347f6f3d25cfc105578493a09dc00c30b8867e387caba797f22267ea183cf9f44934f49a68a950a6bb418439c0aad3ec6476a98ec348d604731483323a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBsfCcACgkQlcuUeyFa0U1lFACdFN17S7+xxg/53aMGo6zejexS
-SI0AoO7SVaLwe9Mnw8F+9LsNzh7DUiQ7
-=SFjX
+iEUEAREIAAYFAlBvCs4ACgkQlcuUeyFa0U0HEwCfR1/3gp9SDq6yTAqH0P4+BbV7
+nBgAkwadFjz871S1R3zdwlGtFtJVLDU=
+=0EQn
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.12.10.ebuild b/net-print/hplip/hplip-3.12.10.ebuild
new file mode 100644
index 000000000000..548792ce79c3
--- /dev/null
+++ b/net-print/hplip/hplip-3.12.10.ebuild
@@ -0,0 +1,239 @@
+# 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.10.ebuild,v 1.1 2012/10/05 16:28:51 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 toolchain-funcs
+
+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
+		http://dev.gentoo.org/~billie/distfiles/${P}-patches-1.tar.xz"
+
+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 X"
+
+COMMON_DEPEND="
+	virtual/jpeg
+	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
+	!minimal? (
+		>=net-print/cups-1.4.0
+		virtual/libusb:1
+		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
+		fax? ( sys-apps/dbus )
+		snmp? (
+			net-analyzer/net-snmp
+			dev-libs/openssl:0
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ghostscript-gpl-8.71-r3
+	dev-python/dbus-python
+	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 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."
+	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 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 .
+
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}"
+
+	# Fix for Gentoo bug #345725
+	local udevdir=/lib/udev
+	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || 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 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 \
+		--disable-libusb01_build \
+		--disable-udev_sysfs_rules \
+		--disable-udev-acl-rules \
+		--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 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"
+	elog
+	elog "Any user who wants to print must be in the lp group."
+}
+
+pkg_postrm() {
+	use !minimal && python_mod_cleanup /usr/share/${PN}
+	fdo-mime_desktop_database_update
+}