Version bump. Remove old.

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

4 files changed, 15 insertions, 272 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index baa3813e2ceb..d5bccd110008 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.184 2011/04/23 18:37:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.185 2011/05/18 20:21:50 billie Exp $
+
+*hplip-3.11.5 (18 May 2011)
+
+  18 May 2011; Daniel Pielmeier <billie@gentoo.org> -hplip-3.11.1-r2.ebuild,
+  -hplip-3.11.3a.ebuild, +hplip-3.11.5.ebuild:
+  Version bump. Remove old.
 
   23 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Drop me from metadata, I no longer have an HP printer.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 1e2ae5eda5db..b517603feb64 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -12,17 +12,15 @@ AUX hplip-3.9.10-htmldir.patch 4444 RMD160 7c960a3049f0b27b761c0f05c4fa9b1484dcd
 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
 DIST hplip-3.10.9.tar.gz 21818298 RMD160 37f512c73768e7a02bdf2814bb7528804cfada32 SHA1 5e145eafefbc5122bbe98345f2984fc0a55e5787 SHA256 1d34630084eccfcc80c08065becdf9313fd8f5a09a4cf523dbd9d3ec724206b9
-DIST hplip-3.11.1.tar.gz 22167916 RMD160 0ac41ed3935a050f1bcd431418fa280b853e8caf SHA1 6b06567373cadc7dff48134c6b58f90a4d72582a SHA256 2f5d988ce53c084556425ae6c5e56a9b5cfa3ac0381059eed913b4523bd1c878
-DIST hplip-3.11.3a.tar.gz 22315613 RMD160 53b8e896f8560da1ce6bf6dd7b5ea17a5915d2bd SHA1 3462f169302cd9abca0e7a0150f07f591796a0d0 SHA256 ec51d275a91fcb54e9191c0f1475d5c742e659ca94f97f0be2d507d1091be569
+DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
 EBUILD hplip-3.10.9-r1.ebuild 7555 RMD160 6826be4038a3df41fd4e13b8c69310f904e67c31 SHA1 b5a49874fc16a601ebe4e1f367907f465a3fc7ca SHA256 55e00fcef73203f11faec74c15ce1dd7a42361833a98692e53e0d13633484449
-EBUILD hplip-3.11.1-r2.ebuild 7539 RMD160 29cbb5f041924557c0289d8f7ab8f54cc49d324d SHA1 ca7ecf9e3d5184d06fee4a6db9c042c84eb483ca SHA256 bb0d22614daccba5b89fdddc6dbc71faaac05bdb162b6a2b57ce9e98074548f0
-EBUILD hplip-3.11.3a.ebuild 7561 RMD160 338d2f2febab807c9b0d5c0b99901f5f25128ab6 SHA1 5c5a9decedd392c75f412a1e516d0cbc2f23ce91 SHA256 56a42917c4b8707045f5772ef4cc290d8d71474080a69d5ba9b0c3ea996212b2
-MISC ChangeLog 31987 RMD160 50da7e6b66003e8a4c135c74f976457a8e814489 SHA1 62b3dd02d88ff268e92b1de9bd2c8156018c59ad SHA256 27125ede2bf08f615280097e718de0ee9325c1b01314989bb0135dc3936102da
+EBUILD hplip-3.11.5.ebuild 7560 RMD160 9a600615a97069e047e02a7d5840928bd2f7b52f SHA1 6290f7b00294c0e34838a28f946f5773813ceb32 SHA256 ce5282b3791ddc73b45edc586e010dafe5c78f4ab7425342abe600f1b3bb3400
+MISC ChangeLog 32166 RMD160 393e624fc439dc830d1e73208059f9a8464a5578 SHA1 79b68c47266852c454185142329cb783447c1570 SHA256 0756121e5d5878f4a0e3ca83085f337ca03868b41a6e543224f0b3e89df897bc
 MISC metadata.xml 1811 RMD160 2a20a476a9af77a0ef1bf7eed7c9c4ddc08b8bff SHA1 e4840f886e1f190e118cc2a0d88c18841d89230a SHA256 951d82b7cd8554bb1f44363dbbe1fbe99608d6b1ff7cef87878ea59e38abe02e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2zHH0ACgkQAiZjviIA2XgD7gCeM0jnagxRCNivI0iZD2bMVoZ3
-EVgAoPLsdwdRKe9QH6mWzfGp9PWLf672
-=Rd4h
+iEYEARECAAYFAk3UKmwACgkQlcuUeyFa0U0wBgCfZEbsZYt836omGWdClGewXJ5E
+PIYAni/4+qGpRu0A00rzp5QEoM7uQ3zb
+=OsRp
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.11.1-r2.ebuild b/net-print/hplip/hplip-3.11.1-r2.ebuild
deleted file mode 100644
index fa7cc8710773..000000000000
--- a/net-print/hplip/hplip-3.11.1-r2.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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.1-r2.ebuild,v 1.2 2011/02/14 19:53:23 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. 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 -udev-acl X"
-
-COMMON_DEPEND="
-	virtual/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.71-r3
-	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
-	!minimal? (
-		dev-python/pygobject
-		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}"/${P}-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}"/${P}-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}"/${P}-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 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 "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
-}
diff --git a/net-print/hplip/hplip-3.11.3a.ebuild b/net-print/hplip/hplip-3.11.5.ebuild
index adc8b97df3b2..a60a903c7ef2 100644
--- a/net-print/hplip/hplip-3.11.3a.ebuild
+++ b/net-print/hplip/hplip-3.11.5.ebuild
@@ -1,8 +1,8 @@
 # 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.3a.ebuild,v 1.1 2011/03/27 17:43:42 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.5.ebuild,v 1.1 2011/05/18 20:21:50 billie Exp $
 
-EAPI=2
+EAPI=3
 
 PYTHON_DEPEND="!minimal? 2"
 PYTHON_USE_WITH="threads xml"