Remove old.

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

4 files changed, 11 insertions, 537 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 31f19e097bd9..7b2e5275b5c8 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # 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.217 2012/03/20 10:39:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.218 2012/04/07 13:48:12 billie Exp $
+
+  07 Apr 2012; Daniel Pielmeier <billie@gentoo.org> -hplip-3.11.5.ebuild,
+  -hplip-3.12.2-r1.ebuild:
+  Remove old.
 
   20 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> hplip-3.11.5.ebuild,
   hplip-3.11.10.ebuild, hplip-3.12.2-r1.ebuild, hplip-3.12.2-r2.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index f7eb3e6fbcf5..22b67a76400f 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX hplip-3.10.9-cve-2010-4267.patch 405 RMD160 0be8b7d90180d38420dc9991ada4c3b0b19b72d2 SHA1 449062383eb96dcf971a25f37565aadeebc7f451 SHA256 2280fb55a03d61edbd8ff928ae016c2e58e77bede83226f3d8e627e95fa6103f
 AUX hplip-3.11.1-desktop.patch 506 RMD160 eb55a4cbe136fc2105eb6cad21d5fdd69a8539e6 SHA1 14b591e3fab7342d4ddae80c6aaf9819d864f0b4 SHA256 557faf17a05f3707e2918673ed5eff56954feab0d5555b535236c938306f4523
@@ -15,22 +15,15 @@ AUX hplip-3.9.10-browser.patch 1447 RMD160 0276eacae608821b6b900c9fb27dbd20fb207
 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.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.12.2.tar.gz 20579749 RMD160 99893258300446bab8ae6d4198cc2f0b62197fbe SHA1 bdf3e37a344f5b57b62425f755c4293d6d4ae875 SHA256 6eaa0cc6f255cc3ebeddb73dee208e6bdc22ba467e3b1da943844ae266d3c314
 EBUILD hplip-3.11.10.ebuild 7569 RMD160 ff06c88f7f7d05e21954debdd4c3847c4594f0c0 SHA1 2f3dc17357a7b1ed0344d658fc955520e435d428 SHA256 5d44d3339a9466c6f493ad09d0850710f47c054002041c3c0927daf3e2f2b603
-EBUILD hplip-3.11.5.ebuild 7567 RMD160 ecbaee2c0a09dcbb38a42982c982ec8ea4aa52f5 SHA1 3d8e04096e4cf438740c44152d29dfeb877e7336 SHA256 8c26280f9f1a7139e3501361d8a413b56e88587605aea9eb79dcd0cb9aa825f2
-EBUILD hplip-3.12.2-r1.ebuild 7612 RMD160 6c06679116f20629b323d828c56d82a44949e60c SHA1 bc305a522dab974476940a6deae46ebfa48c4d68 SHA256 a6bd954e06ac774484db353e161a64b572ae9ad3dab1f22660ee859bf8ecaab3
 EBUILD hplip-3.12.2-r2.ebuild 7796 RMD160 d082683bcfbe58dd34fa3d74c37d6ffe56c17935 SHA1 a973c3d5413ddaaa3829c6f792bddf9149b2acd4 SHA256 7783dc95c306578d202da13bbaa12a7f9e67a2bfa2760e1b3e8a3a6d326cfd03
-MISC ChangeLog 37792 RMD160 17716d6819ce58fb16886def63a71f602884611f SHA1 65af0539378ffec4871c05d630f405387ab40a5b SHA256 41906112be8f839426299b5791ce4609f76231ce4826e35848ae010e2ed4d4bb
+MISC ChangeLog 37905 RMD160 1e21bd0d804b97f85c654868db59377605ba45c5 SHA1 e5ff23d8b090cdd1acad99b043a154f2d8996906 SHA256 f781bbeffeedc193f5ff9f1662c091e91f5feb4e9faa5c3fd87d14a51ed5faa1
 MISC metadata.xml 1711 RMD160 f1bca4a627afc912e6175e5ae158ad8a8051b1a6 SHA1 33c520c95e8a0af0ccf296195ed0e98a6e77f618 SHA256 7859a09f81f31df3e3b1bc2281f69936856ea8b81f381bea85d84d77f389ccc4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPaF5YAAoJEEdUh39IaPFNrT0H/RKqOIOPIM5MLmCxdwW+71nG
-zpAHuj/XJ/CTVCBEE+5sFXTg1EIiW9XJXrweVm1KJ2fsvw996MQl0t9p024IhJvj
-HHPYHETvhbu7oD4fwQFpIB+1QfPmKD08AE6ydvLm6h2Gj0XGmKHsGeBBlsHNWSC2
-lHuiYqLpoAxFJvulZroGcehNftXi7n/3UF+uIoAC1Sef1MdpnGbzaeRkjJCHihxv
-HhTDUEjqPuZlsaKMqzb1Flo6iBvYaNPpIVQe/jGLNC7XQgol027lGCztq4938div
-S0cetc13h84IU+n6bJPa2rBl39WuVrb5qxhkO5rVGMLbe/1rm2xvJJHDcmyK7ug=
-=pPUN
+iEYEAREIAAYFAk+ARawACgkQlcuUeyFa0U2H1gCglHb9OG0ABJPBHknCAQzR4JXW
+KisAoIjEboMx/BEF3OeE1CxXfI1p5ayY
+=e/vJ
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.11.5.ebuild b/net-print/hplip/hplip-3.11.5.ebuild
deleted file mode 100644
index 32b5f9e6adbf..000000000000
--- a/net-print/hplip/hplip-3.11.5.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# 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.11.5.ebuild,v 1.9 2012/03/20 10:39:43 ssuominen Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit fdo-mime linux-info python autotools multilib
-
-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-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[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.1-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
-}
-
-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.12.2-r1.ebuild b/net-print/hplip/hplip-3.12.2-r1.ebuild
deleted file mode 100644
index edf3acc7406b..000000000000
--- a/net-print/hplip/hplip-3.12.2-r1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# 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.2-r1.ebuild,v 1.2 2012/03/20 10:39:43 ssuominen Exp $
-
-EAPI=4
-
-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"
-
-REQUIRED_USE="|| ( hpijs hpcups )"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) )
-	!minimal? (
-		>=net-print/cups-1.4.0
-		virtual/libusb:0
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	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 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 .
-
-	# Fix for Gentoo bug #345725
-	sed -i -e "s|/etc/udev/rules.d|/lib/udev/rules.d|" \
-		$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
-		|| die
-
-	# 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
-
-	# Let 56-hpmud_support.rules call hp-mkuri to make it work with newer udev
-	# Upstream bug: None
-	epatch "${FILESDIR}"/${PN}-3.11.12-udev-rules.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
-
-	# Fix black stripes on pcl5c printouts
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/561264
-	epatch "${FILESDIR}"/${PN}-3.11.12-black-stripes-pcl5c.patch
-
-	# Fix parallel port cpu usage
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/750796
-	epatch "${FILESDIR}"/${PN}-3.11.12-fast-pp.patch
-
-	# Fix minmal/hpijs_only/hpcups_only install
-	# Upstream bug:
-	epatch "${FILESDIR}"/${P}-minimal.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 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 \
-		--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 acl udev-acl-rules) \
-		$(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"
-}
-
-pkg_postrm() {
-	use !minimal && python_mod_cleanup /usr/share/${PN}
-	fdo-mime_desktop_database_update
-}