1.6.6-r1 version bump - use 1.6.6a tarball from upstream. Also, cleaning up old ebuilds.

(Portage version: 2.1-r1)
 (Unsigned Manifest commit)

5 files changed, 18 insertions, 303 deletions

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index ff433d54b49d..c52008ee1a8c 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,60 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX hplip.init.d 948 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c SHA1 bc9c9a8767c5f253cd9c0dd40bb7e4248cd13b0b SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c files/hplip.init.d 948
 SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95 files/hplip.init.d 948
-DIST foomatic-db-hpijs-1.5-20051126.tar.gz 87836
-DIST foomatic-db-hpijs-1.5-20060211.tar.gz 97873 RMD160 267fba7b83525042cd3198aa54f6d1cc22fd97dc SHA1 05305a71fd1568a6f38d82de031489598cc299ce SHA256 3c95566ef9c4c149325b09dac235b4dacbc28b6c8602016b3a2c702b4df131db
+DIST foomatic-db-hpijs-1.5-20051126.tar.gz 87836 RMD160 c7073520c3f19d90d19cabf91562e6f97789f5a7 SHA1 2fecef6febbdf38a04d38fae450b6deb2e99ed72 SHA256 250933116f2517346df609256a7af67d5363c45ac8043eb00f4f2a7aff8bbe2f
 DIST foomatic-db-hpijs-20060615.tar.gz 98297 RMD160 d73b78424259953e1c01dbc11115e93c2dd3c4b9 SHA1 35128a6d929408f243b568f6963e9f4c9f833bcc SHA256 e21455a8e2f976118e6cabef633b23fedaa367abe9c1c610008cb3343a10bc6d
-DIST hplip-0.9.11-2.patch 10260 RMD160 1ea139b7e90120c528ce60ce360bb3dc327d4a01 SHA1 e1afee2afad72ae36d7fffa154fc70728496fc6f SHA256 1b5da9a28f02d55b7e3669e2d9f6f6b83c4680015df7a5bdec6541da8ce5344c
-DIST hplip-0.9.11.tar.gz 9924094 RMD160 c544b61bcdea20a18e76b5bd1072518f16e74e2b SHA1 23fbaa34667ff187e8a91c75c9bad67ccc2b7d05 SHA256 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42
-DIST hplip-0.9.7-2.patch 25718
-DIST hplip-0.9.7.tar.gz 9705231
-DIST hplip-0.9.8-4.patch 31429 RMD160 ebbc0d557fa00a70f8945e51924a3078ded810df SHA1 b10957f66ac4a61866873f653b44ea17433ef929 SHA256 e28ed1fa1aaa3b55c10ac36ce4c539cb2fa97b5fde59dc6844b044ff000556b3
-DIST hplip-0.9.8.tar.gz 9298145 RMD160 6f3fb9af7bedd3de375554d71ce77bb6cd6a3f3a SHA1 4280ceba70d841906c3df9c4ab1abc0677c9bcdb SHA256 b573e31499920a787f2d6b3eb1e0de732e48d7ba00cb0e7ecd5d3e860e48662a
+DIST hplip-0.9.7-2.patch 25718 RMD160 1b29ff9ffe77dd95f6202302e5c26fd18593af24 SHA1 825a134734cee1fc9a06c8de60cfe1825d47fa54 SHA256 7d406c7d77aa4825d4401c3d5c52b6564d49854fc8cf34ba84ce291b5429eb4c
+DIST hplip-0.9.7.tar.gz 9705231 RMD160 5c742564fa42a99fddf0f46ea177a28c22fe7cf6 SHA1 b354a6cf8f5b81f9242c3978c2ab22c752e4f77d SHA256 1aaa494d4297c598dfd85632d55e0942995b44011b580166e5c30df82a749ff6
 DIST hplip-1.6.6.tar.gz 10429794 RMD160 84171d39677e132915169cb4c687271325777f25 SHA1 613f54cc41df367fd9497e6a5788e69e940b561a SHA256 cb148342ef56de7426290a8556114de440ff01ed36008ab81ea64755828701d0
-EBUILD hplip-0.9.11-r1.ebuild 3337 RMD160 c874a2909180283c09d5c51b109442aa3c08b93b SHA1 dc24e6b2d2d1a48cce323d571fdb618726aac192 SHA256 ccb021e8a7debcf2518e48e952bb138045d42257283d23c97edb8d0febc4af4c
-MD5 b753026d752c95ed57d8ce94a75698b1 hplip-0.9.11-r1.ebuild 3337
-RMD160 c874a2909180283c09d5c51b109442aa3c08b93b hplip-0.9.11-r1.ebuild 3337
-SHA256 ccb021e8a7debcf2518e48e952bb138045d42257283d23c97edb8d0febc4af4c hplip-0.9.11-r1.ebuild 3337
+DIST hplip-1.6.6a.tar.gz 10447071 RMD160 546d4f86c715f760aebff57ba59f08ef4bd20e36 SHA1 899b2c9ac61e2ee5d00432ff1a5142180f73c9a3 SHA256 e87ab9bc4e4a3229dafc154f91d9860a9ae15532118bfad7fb791331340a9d8d
 EBUILD hplip-0.9.7-r3.ebuild 3340 RMD160 a4572e28563351444d27c2f47cb40278b4e77bd7 SHA1 83a924ce9c380c81484c05bd0f2416634d4c080e SHA256 604da063ec27ab779d7b5edd67286016a328db5c9c3a2fd7af5f67d1845fd810
 MD5 2a697d2ed8239bac96c2ce2cf6627bfc hplip-0.9.7-r3.ebuild 3340
 RMD160 a4572e28563351444d27c2f47cb40278b4e77bd7 hplip-0.9.7-r3.ebuild 3340
 SHA256 604da063ec27ab779d7b5edd67286016a328db5c9c3a2fd7af5f67d1845fd810 hplip-0.9.7-r3.ebuild 3340
-EBUILD hplip-0.9.8-r2.ebuild 3328 RMD160 b29e4c313ad6c4f06f00ab5e4adefb038f2534cc SHA1 7eb91e3e365363244c559a72b8dfba81c5221a99 SHA256 86b9928a277dfa2250e10907dcbd87d934cbb8381a3ed9102b4110dc8b53ed94
-MD5 96e1e05a66e40e518b2cb7a2dd7bcf68 hplip-0.9.8-r2.ebuild 3328
-RMD160 b29e4c313ad6c4f06f00ab5e4adefb038f2534cc hplip-0.9.8-r2.ebuild 3328
-SHA256 86b9928a277dfa2250e10907dcbd87d934cbb8381a3ed9102b4110dc8b53ed94 hplip-0.9.8-r2.ebuild 3328
+EBUILD hplip-1.6.6-r1.ebuild 3340 RMD160 35574577aa0378ef13bb8b0fc3171bdb73c599b8 SHA1 8bdb61d150f286d796dba1ffec6f7010f514737c SHA256 11b5bfd306bf7257f8feafaba77f6874b7dc5abcc750fdf33279989976d12609
+MD5 426b00e8a5540961c459b45b36b183fc hplip-1.6.6-r1.ebuild 3340
+RMD160 35574577aa0378ef13bb8b0fc3171bdb73c599b8 hplip-1.6.6-r1.ebuild 3340
+SHA256 11b5bfd306bf7257f8feafaba77f6874b7dc5abcc750fdf33279989976d12609 hplip-1.6.6-r1.ebuild 3340
 EBUILD hplip-1.6.6.ebuild 3296 RMD160 dca7709b1d4fd2e86c293ce090e420835e4bd4c7 SHA1 8046f3033f531b473bfed6697af8ad17f3be68a0 SHA256 f85b2aed25a15cea258259cd7d5d5e0c7b6e536df1deae9274861eeddde8cc3d
 MD5 457589cac5897489b7739b562bf2628d hplip-1.6.6.ebuild 3296
 RMD160 dca7709b1d4fd2e86c293ce090e420835e4bd4c7 hplip-1.6.6.ebuild 3296
 SHA256 f85b2aed25a15cea258259cd7d5d5e0c7b6e536df1deae9274861eeddde8cc3d hplip-1.6.6.ebuild 3296
-MISC ChangeLog 6319 RMD160 92cf8c5959a3cb2ce560840d14317ce5f5919710 SHA1 73e902267833481fb4b8a2e344101ecff1c82a2c SHA256 54bbe2881a329236e8f628b954931f104b01d1a683549507a4cbb6c7a5087315
-MD5 f79e4f9c240a2fc75e30a62cc8a680a8 ChangeLog 6319
-RMD160 92cf8c5959a3cb2ce560840d14317ce5f5919710 ChangeLog 6319
-SHA256 54bbe2881a329236e8f628b954931f104b01d1a683549507a4cbb6c7a5087315 ChangeLog 6319
+MISC ChangeLog 6575 RMD160 a60205fd2f02a900d17785ebd33762ba0e600a37 SHA1 68d1fd552f5663d6869ffdc81d86657b14a159f7 SHA256 9861f58c31fa59d956529d695035f854b0372040b51d8af3b7488ee4747caa01
+MD5 5113e2b872375287a5ba08f06d75574d ChangeLog 6575
+RMD160 a60205fd2f02a900d17785ebd33762ba0e600a37 ChangeLog 6575
+SHA256 9861f58c31fa59d956529d695035f854b0372040b51d8af3b7488ee4747caa01 ChangeLog 6575
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 85fb640ceecd949521bef397e8e23d0b files/digest-hplip-0.9.11-r1 768
-RMD160 5be0a15eae5e2d919910baded2a70d1d9696f824 files/digest-hplip-0.9.11-r1 768
-SHA256 c9159b89ae9462b8430efca095dc5291db44a1409e61650c4ea8a8321d997001 files/digest-hplip-0.9.11-r1 768
-MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208
-RMD160 d7b115f1f976ff65f4d1ff39a4116f3b28b52c9a files/digest-hplip-0.9.7-r3 208
-SHA256 aef6c585a691ad40bab1d0822f328f0b272e11cc05803ddc3d7ce4c436fd229c files/digest-hplip-0.9.7-r3 208
-MD5 7bd172767b3400cad05526d58630944b files/digest-hplip-0.9.8-r2 762
-RMD160 c64b7394f53159c066f614b52759f07b24f0a2eb files/digest-hplip-0.9.8-r2 762
-SHA256 079f5ac90d4d00f03099796a7f307aebff27f22c546cb44b696cdf33dfb1625b files/digest-hplip-0.9.8-r2 762
+MD5 759a2fc253c81dea17ec09d6a7b77f2b files/digest-hplip-0.9.7-r3 762
+RMD160 3d451b250dadfc497f90b1551603db053c24b988 files/digest-hplip-0.9.7-r3 762
+SHA256 e04252a3484d93417d9e32f27158e97819517e2b0f7408abf49247a7f78b5387 files/digest-hplip-0.9.7-r3 762
 MD5 c0d122eabe6edd697928b8ebc16e5d00 files/digest-hplip-1.6.6 518
 RMD160 5c51391233b44dc618afe99ed23e961c960912b7 files/digest-hplip-1.6.6 518
 SHA256 c512c5108775eb02c47ffeacf8d0575acfc77d648d1a3dcc5b9a2dbc1d328847 files/digest-hplip-1.6.6 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEnMJToeSe8B0zEfwRAuv9AKCL3VMfOaJfQ6gCZkdygXY2g63fPwCfVXAP
-07cP4n1BLlYTcUaKepAzuAE=
-=sN4E
------END PGP SIGNATURE-----
+MD5 26d9c29fdcf740bd4c151ec610e35853 files/digest-hplip-1.6.6-r1 521
+RMD160 557f80fed8d38042faf902b7da38874237776f17 files/digest-hplip-1.6.6-r1 521
+SHA256 e778fda0030dadc02f92e12f4140a9d92d94ad14282083a80cf595f18476ad88 files/digest-hplip-1.6.6-r1 521
diff --git a/net-print/hplip/files/digest-hplip-0.9.11-r1 b/net-print/hplip/files/digest-hplip-0.9.11-r1
deleted file mode 100644
index 3e49377d055d..000000000000
--- a/net-print/hplip/files/digest-hplip-0.9.11-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 1bf699ebd394c9822086c1fef2937836 foomatic-db-hpijs-1.5-20060211.tar.gz 97873
-RMD160 267fba7b83525042cd3198aa54f6d1cc22fd97dc foomatic-db-hpijs-1.5-20060211.tar.gz 97873
-SHA256 3c95566ef9c4c149325b09dac235b4dacbc28b6c8602016b3a2c702b4df131db foomatic-db-hpijs-1.5-20060211.tar.gz 97873
-MD5 673b28ad1e607cfb455bc4a919af49f6 hplip-0.9.11-2.patch 10260
-RMD160 1ea139b7e90120c528ce60ce360bb3dc327d4a01 hplip-0.9.11-2.patch 10260
-SHA256 1b5da9a28f02d55b7e3669e2d9f6f6b83c4680015df7a5bdec6541da8ce5344c hplip-0.9.11-2.patch 10260
-MD5 5cf362c972d5b1733af4fb8e2ade92e4 hplip-0.9.11.tar.gz 9924094
-RMD160 c544b61bcdea20a18e76b5bd1072518f16e74e2b hplip-0.9.11.tar.gz 9924094
-SHA256 9c6f39863280d74a72bdce632f2453fa5bbbfffd286b1fd0535cfba76dcf5b42 hplip-0.9.11.tar.gz 9924094
diff --git a/net-print/hplip/files/digest-hplip-0.9.8-r2 b/net-print/hplip/files/digest-hplip-0.9.8-r2
deleted file mode 100644
index 05ae8b9d55b2..000000000000
--- a/net-print/hplip/files/digest-hplip-0.9.8-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 1bf699ebd394c9822086c1fef2937836 foomatic-db-hpijs-1.5-20060211.tar.gz 97873
-RMD160 267fba7b83525042cd3198aa54f6d1cc22fd97dc foomatic-db-hpijs-1.5-20060211.tar.gz 97873
-SHA256 3c95566ef9c4c149325b09dac235b4dacbc28b6c8602016b3a2c702b4df131db foomatic-db-hpijs-1.5-20060211.tar.gz 97873
-MD5 2882c22b90c6093167f6415e7d76b684 hplip-0.9.8-4.patch 31429
-RMD160 ebbc0d557fa00a70f8945e51924a3078ded810df hplip-0.9.8-4.patch 31429
-SHA256 e28ed1fa1aaa3b55c10ac36ce4c539cb2fa97b5fde59dc6844b044ff000556b3 hplip-0.9.8-4.patch 31429
-MD5 3eae08ec7dbecdc03e7972b132dfdde6 hplip-0.9.8.tar.gz 9298145
-RMD160 6f3fb9af7bedd3de375554d71ce77bb6cd6a3f3a hplip-0.9.8.tar.gz 9298145
-SHA256 b573e31499920a787f2d6b3eb1e0de732e48d7ba00cb0e7ecd5d3e860e48662a hplip-0.9.8.tar.gz 9298145
diff --git a/net-print/hplip/hplip-0.9.11-r1.ebuild b/net-print/hplip/hplip-0.9.11-r1.ebuild
deleted file mode 100644
index faaad67e5c45..000000000000
--- a/net-print/hplip/hplip-0.9.11-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.11-r1.ebuild,v 1.4 2006/06/24 04:40:36 cardoe Exp $
-
-inherit eutils
-
-DB_V=1.5-20060211
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
-HOMEPAGE="http://hplip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-	mirror://sourceforge/hplip/${P}-2.patch
-	foomaticdb? ( mirror://gentoo/foomatic-db-hpijs-${DB_V}.tar.gz )"
-	#http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb snmp X qt3 ppds scanner cups"
-
-DEPEND="dev-lang/python
-	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
-	!net-print/hpijs
-	!net-print/hpoj"
-
-RDEPEND="virtual/ghostscript
-	>=dev-lang/python-2.2.0
-	scanner? (
-		>=media-gfx/sane-backends-1.0.9
-		|| (
-			X? ( >=media-gfx/xsane-0.89 )
-			>=media-gfx/sane-frontends-1.0.9
-		)
-	)
-	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	>=dev-libs/libusb-0.1.10a
-	sys-apps/hotplug
-	net-print/cups
-	foomaticdb? ( net-print/foomatic-db-engine )
-	>=net-print/foomatic-filters-3.0.2
-	${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# patch from upstream
-	epatch "${DISTDIR}"/${P}-2.patch
-
-	sed -i -e "s:(uint32_t)0xff000000) >> 24))):(uint32_t)0xff000000) >> 24):" \
-		"${S}"/scan/sane/mfpdtf.h
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		"${S}"/hpssd.py
-}
-src_compile() {
-	myconf="${myconf} --disable-cups-install --disable-foomatic-install"
-
-	use snmp || myconf="${myconf} --disable-network-build"
-
-	econf ${myconf} || die "Error: econf failed!"
-	emake || die "Error: emake failed!"
-}
-
-
-src_install() {
-	make DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/hplip.init.d hplip
-
-	if use scanner; then
-		insinto /etc/sane.d
-		echo "hpaio" > dll.conf
-		doins dll.conf
-
-		dodir /usr/lib/sane
-		dosym /usr/lib/libsane-hpaio.la /usr/lib/sane/libsane-hpaio.la
-		dosym /usr/lib/libsane-hpaio.so /usr/lib/sane/libsane-hpaio.so
-		dosym /usr/lib/libsane-hpaio.so.1 /usr/lib/sane/libsane-hpaio.so.1
-		dosym /usr/lib/libsane-hpaio.so.1.0.0 /usr/lib/sane/libsane-hpaio.so.1.0.0
-	else
-		rm -f "${D}"/usr/lib/libsane-hpaio.la
-		rm -f "${D}"/usr/lib/libsane-hpaio.so
-		rm -f "${D}"/usr/lib/libsane-hpaio.so.1
-		rm -f "${D}"/usr/lib/libsane-hpaio.so.1.0.0
-	fi
-
-	# bug 106035
-	if ! use qt3 ; then
-		rm -f "${D}"/usr/bin/hp-print
-		rm -f "${D}"/usr/bin/hp-toolbox
-		rm -f "${D}"/usr/share/hplip/print
-		rm -f "${D}"/usr/share/hplip/toolbox
-		rm -f "${D}"/usr/share/hplip/data/hplip.desktop
-		rm -f "${D}"/usr/share/applications/hplip.desktop
-	fi
-
-	if use ppds; then
-		dodir /usr/share
-		mv "${S}"/prnt/hpijs/ppd/* "${D}"/usr/share/ppd
-	fi
-
-	if use cups && use ppds ; then
-		dodir /usr/share/cups/model
-		dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-	fi
-
-	[ -e /usr/bin/foomatic-rip ] && rm -f "${D}"/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		make || die
-		make DESTDIR="${D}" install || die
-	fi
-
-	# desktop entry, bug 122758
-	if use qt3; then
-		dodir /usr/share/applications
-		mv "${D}"/usr/share/hplip/data/hplip.desktop \
-		"${D}"/usr/share/applications
-	fi
-}
diff --git a/net-print/hplip/hplip-0.9.8-r2.ebuild b/net-print/hplip/hplip-0.9.8-r2.ebuild
deleted file mode 100644
index fb59536c434b..000000000000
--- a/net-print/hplip/hplip-0.9.8-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.8-r2.ebuild,v 1.5 2006/06/24 04:40:36 cardoe Exp $
-
-inherit eutils
-
-DB_V=1.5-20060211
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
-HOMEPAGE="http://hpinkjet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
-	foomaticdb? ( mirror://gentoo/foomatic-db-hpijs-${DB_V}.tar.gz )
-	mirror://sourceforge/hpinkjet/${P}-4.patch"
-	#http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb snmp X qt3 ppds scanner cups usb"
-
-DEPEND="dev-lang/python
-	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
-	!net-print/hpijs
-	!net-print/hpoj"
-
-RDEPEND="virtual/ghostscript
-	>=dev-lang/python-2.2.0
-	scanner? (
-		>=media-gfx/sane-backends-1.0.9
-		|| (
-			X? ( >=media-gfx/xsane-0.89 )
-			>=media-gfx/sane-frontends-1.0.9
-		)
-	)
-	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	usb? ( >=dev-libs/libusb-0.1.10a sys-apps/hotplug )
-	net-print/cups
-	foomaticdb? ( net-print/foomatic-db-engine )
-	>=net-print/foomatic-filters-3.0.2
-	${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${DISTDIR}"/${P}-4.patch
-
-	sed -i -e "s:(uint32_t)0xff000000) >> 24))):(uint32_t)0xff000000) >> 24):" \
-		"${S}"/scan/sane/mfpdtf.h
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		"${S}"/hpssd.py
-}
-src_compile() {
-	myconf="${myconf} --disable-cups-install --disable-foomatic-install"
-
-	use snmp || myconf="${myconf} --disable-network-build"
-
-	econf ${myconf} || die "Error: econf failed!"
-	emake || die "Error: emake failed!"
-}
-
-
-src_install() {
-	make DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/hplip.init.d hplip
-
-	if use scanner; then
-		insinto /etc/sane.d
-		echo "hpaio" > dll.conf
-		doins dll.conf
-
-		dodir /usr/lib/sane
-		dosym /usr/lib/libsane-hpaio.la /usr/lib/sane/libsane-hpaio.la
-		dosym /usr/lib/libsane-hpaio.so /usr/lib/sane/libsane-hpaio.so
-		dosym /usr/lib/libsane-hpaio.so.1 /usr/lib/sane/libsane-hpaio.so.1
-		dosym /usr/lib/libsane-hpaio.so.1.0.0 /usr/lib/sane/libsane-hpaio.so.1.0.0
-	else
-		rm -f "${D}"/usr/lib/libsane-hpaio.la
-		rm -f "${D}"/usr/lib/libsane-hpaio.so
-		rm -f "${D}"/usr/lib/libsane-hpaio.so.1
-		rm -f "${D}"/usr/lib/libsane-hpaio.so.1.0.0
-	fi
-
-	# bug 106035
-	if ! use qt3 ; then
-		rm -f "${D}"/usr/bin/hp-print
-		rm -f "${D}"/usr/bin/hp-toolbox
-		rm -f "${D}"/usr/share/hplip/print
-		rm -f "${D}"/usr/share/hplip/toolbox
-		rm -f "${D}"/usr/share/hplip/data/hplip.desktop
-		rm -f "${D}"/usr/share/applications/hplip.desktop
-	fi
-
-	if use ppds; then
-		dodir /usr/share
-		mv "${S}"/prnt/hpijs/ppd "${D}"/usr/share
-	fi
-
-	if use cups && use ppds ; then
-		dodir /usr/share/cups/model
-		dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-	fi
-
-	[ -e /usr/bin/foomatic-rip ] && rm -f "${D}"/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		make || die
-		make DESTDIR="${D}" install || die
-	fi
-
-	# desktop entry, bug 122758
-	if use qt3; then
-		dodir /usr/share/applications
-		mv "${D}"/usr/share/hplip/data/hplip.desktop \
-		"${D}"/usr/share/applications
-	fi
-}