Remove old.

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

4 files changed, 9 insertions, 488 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index bfb37e4722b9..b7bc7120b382 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.237 2012/09/22 13:52:14 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.238 2012/10/01 16:21:06 billie Exp $
+
+  01 Oct 2012; Daniel Pielmeier <billie@gentoo.org> -hplip-3.12.6-r1.ebuild,
+  -hplip-3.12.9.ebuild:
+  Remove old.
 
 *hplip-3.12.9-r1 (22 Sep 2012)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 911184deed04..da74f39491ba 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -11,22 +11,17 @@ AUX hplip-3.9.12-systray.patch 795 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b
 DIST hplip-3.11.10.tar.gz 21419965 SHA256 1d84fd0e8cf27771b11efa05692e8764fdd758b544df60f23f0c274afea9af81
 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.6-patches-2.tar.xz 11324 SHA256 c1923ed3f5d0256e42907f631a185135de67c13efc849fc5550ce70da39191cb SHA512 f2de0a62c7a7204e14c8cdce7f22ebcfda2bde344afdae2e257fc45ca59cdf245f0ef9c726cf92f67f1ea6b727c514b14119e0edf9ce31fbac3864414826b323 WHIRLPOOL 6b7fb2a6aa0e79a2a8e277a8dbe464cfb1e12508e92c0b38a45202d80de9493b95ced9401c02c96265398d10d7b9c6772e86906800105adae16778fb263e3ebe
-DIST hplip-3.12.6.tar.gz 21227044 SHA256 54578000792969adb583e75efeacb9c46ab69659ec7e9424de390613f3595775 SHA512 39fefb59e01739aeffb013690e514ee73a93b2d26e1ee03c77d9c28b80de7fdb10496a1d1295328ea0b0948bfdc5b0bf0c67b6dd94b532290524a023bb7e4283 WHIRLPOOL 0564044242be8f6c98ac0cf256ded022378d076d0fbd04568a7ec120b85c80e4892a67a03dad145a58c9853bca6a31edf4293d2ccbb81f3d1d4746aab71c56a5
-DIST hplip-3.12.9-patches-1.tar.xz 10128 SHA256 a3a81a5c918aa5342b603843805eb582a882d1f6ef6d4d66a6b5426814e9adf7 SHA512 43739e2bbdb06168f7d2629b6deff4b7eb530e8ff7b14fc8bf701ececc187ccceac215ed1cb78d9a8c849085415f58fdd7a4b65ccdb5c8cdbba35a2dc674361c WHIRLPOOL b34b1db897d328f87288e359e05af7a59ee9feea6b2d5bc43840e22867e4cee296b2049a8ef1fa5fead9ee39606021a1163e681c2240550249065a3e9456e560
 DIST hplip-3.12.9-patches-2.tar.xz 10328 SHA256 d992fdf42bbcde92de9f4256308b3b35b74e3fcae50704d59eaf26bd2beab5b4 SHA512 846b9cc96b1eefcbc0960c312a60ab8913b6db109bfa828d19f1e9cdfccc47e193d582767d828437dbebc9ec1c0617a590e8f3f2e744d9f5bddb6056d43fe6a7 WHIRLPOOL 5d63763f11d8f91a6506301ec2c7e37c1f9e5693c83d818f67129a42c7489fd9ed09c0a06f216af72c21f488cefc6f2b455a010fc504e3fc7b12b877190e9d9b
 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.4.ebuild 6419 SHA256 ca2de34f09f990df2af5d7ac9a0e24c7a6368eaf65400bdb35da0d7742095f85 SHA512 032d6368162c66a971e892d53429ad36f7e605ab5103a0aa57bf563661f909fda80a16c8651c489211b74df3caa218eadc682e3d0e4dd2b733aaaf606edd2229 WHIRLPOOL cc71a7703c7838dde94346c0a255999a3e5f478db634056a7a56f7512488a089356d047bf3f09c5ba891bf596bc14a2ec67f18808b0bfdb24225963e293e31c5
-EBUILD hplip-3.12.6-r1.ebuild 6602 SHA256 4f29bc530e0fa36d4927644661f997e5244252908e236a36fbbf68de5b9c7dec SHA512 28b89b62d730beeced98c5f484ae5b7beaa7f83c02be6e15f1cf7446aaf926002e75b5eed6282c48fd7c7802ccb77663a139b6e9c2e244ddf0013f3bda01977e WHIRLPOOL 3bd89a2dbeee05a6d38cf40919607dedb85038959ffd5ec94abb959cbc52ef18647f2e661afee7bf89c7c1afa559d0161f084055b5678a026d51e841ab59e4d9
 EBUILD hplip-3.12.9-r1.ebuild 6602 SHA256 3eef186982c602952977d8002220ed1fb65f41fc5529fdd8a1cdc5bc3e584bf5 SHA512 01f995994faa347071f494718194832734f8b4774c4308e5a6e6ddc51835ba60c01fb75d5146853ebc291f06cff145af825248a3636b7e1ea1c548d119446aa3 WHIRLPOOL f88054c43eed77636996ce6c14d46c342a25e6229177434bbc832872211905b8a06a3d97635575901aa5da1330f5b03ff7843d66632898744fa659f23e130294
-EBUILD hplip-3.12.9.ebuild 6599 SHA256 4f6779724874d0ceada96ac2dde9e901d2c311d8575a620027c5d404c0e62a4c SHA512 8edba07431f0c40476ab7e1dd929840a1f0e6c6d7052cac586f230ebb31461625976e5f3c77c10565426ad5505a03b59635e61b0552ddff699a09682fb6cfa53 WHIRLPOOL c97c9435b8f7a07ab57ff17e9c4808b0ecf8f2f5a8d6b94c7f887972f910a96d35f4212025cd8c2670875dc676a0bf118b2384b16def188055ed75cd09fc517c
-MISC ChangeLog 41497 SHA256 f6d5a637e1de543b235d7bce57ed7e0862e1b9eec8cef7db87524deb43f11db7 SHA512 15bd9dd796fc5b6eb5eae4e99f278aaf4dbc025ad3e7a48e399001791a90fc511afb1e1fddd445c33a86a2bd2b35d6bc44e0c6a6c8a2a03fb6862e13d7b62be5 WHIRLPOOL f2e8b4057a8dc96fa713414472bf942e62b0a352a9fb440ba7da3f54fd20f71078562b70f0b7a94d61e0a7bf1c3c722ac1c66f2fc025c788aa4127ca97f82237
+MISC ChangeLog 41613 SHA256 97c11ce38f038fe97735fca8c8d5e9cfcc741521c515b339c77703f232e12610 SHA512 f949a6f8dcc13c28e6aafe4c9f3379fd12ae7c8e00ed0dee06b8baaaebb1469776f70f529897cd6da919c6b4081952f8d052fc73d28a54cafe8dd053806d2388 WHIRLPOOL 29abb7eb7cff48038ee9e8e1d7bbfd8ceb48fe0197c637539a0218655812b2f5f19a4bc6878b62f64b44e12b411f0858e938126cfd4df104fafbb682a255e7e5
 MISC metadata.xml 1610 SHA256 8f874244f74e21bd6eee94f72feb0a4f2e957be45983a4ef17ab2887bfc9f44f SHA512 75a643ef3a029c3ccf4ebb66e27040a338979fcb59a5cbda801ca0f7d5323b05e37d55394d00f44d5922e2e465677ac2569c0d0b4f5280cb362126087424e762 WHIRLPOOL a4d67347f6f3d25cfc105578493a09dc00c30b8867e387caba797f22267ea183cf9f44934f49a68a950a6bb418439c0aad3ec6476a98ec348d604731483323a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBdwpkACgkQlcuUeyFa0U2NwgCg7Tkw6eUEhckN1DrHKNrnFHZS
-680AnRVhVex3EPjdj3v1m12zrjWMMoun
-=MKgd
+iEYEAREIAAYFAlBpwvQACgkQlcuUeyFa0U261QCeODR5w4/uS852q9+KYocH24b3
+AhcAnj07KuueLbncSWa6cLyOElNqZSwW
+=mDTJ
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.12.6-r1.ebuild b/net-print/hplip/hplip-3.12.6-r1.ebuild
deleted file mode 100644
index 6cda4fc10a3a..000000000000
--- a/net-print/hplip/hplip-3.12.6-r1.ebuild
+++ /dev/null
@@ -1,239 +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.6-r1.ebuild,v 1.3 2012/09/18 18:10:42 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-2.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
-}
diff --git a/net-print/hplip/hplip-3.12.9.ebuild b/net-print/hplip/hplip-3.12.9.ebuild
deleted file mode 100644
index 93e453d92f23..000000000000
--- a/net-print/hplip/hplip-3.12.9.ebuild
+++ /dev/null
@@ -1,239 +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.9.ebuild,v 1.2 2012/09/18 18:10:42 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
-}