remove foomatic depend, it is not a depend and remove unused ebuilds

(Portage version: 2.1_rc4)
 (Signed Manifest commit)

5 files changed, 49 insertions, 259 deletions

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 7a7a2010fc03..fa259222a771 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,13 +1,51 @@
-MD5 c87b8d2847fbd4cefbbe15820116c4a7 ChangeLog 5558
-MD5 e4208fa1c1cf5636ca1dc524fdad0ee7 files/digest-hplip-0.9.10-r1 209
-MD5 b6b331bf8521c5aae23e53327b411b25 files/digest-hplip-0.9.11-r1 210
-MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208
-MD5 7bd172767b3400cad05526d58630944b files/digest-hplip-0.9.8-r2 762
-MD5 01f28409596071bcd91355ee676d714d files/digest-hplip-0.9.9 145
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX hplip.init.d 948 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c SHA1 bc9c9a8767c5f253cd9c0dd40bb7e4248cd13b0b SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
-MD5 4bbbef16c67839b41baa5e5b0a5d7ca3 hplip-0.9.10-r1.ebuild 3313
-MD5 0a29d21d2d32ddffce8f012f16d180af hplip-0.9.11-r1.ebuild 3327
-MD5 4755a63c48b335af440eeb06fa4e722b hplip-0.9.7-r3.ebuild 3329
-MD5 4820c6f2d8fd822eb6ae052f2398bcea hplip-0.9.8-r2.ebuild 3318
-MD5 0f488bfce40521153acd4dfd71552546 hplip-0.9.9.ebuild 3230
+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 SHA256 3c95566ef9c4c149325b09dac235b4dacbc28b6c8602016b3a2c702b4df131db
+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 SHA256 e28ed1fa1aaa3b55c10ac36ce4c539cb2fa97b5fde59dc6844b044ff000556b3
+DIST hplip-0.9.8.tar.gz 9298145 RMD160 6f3fb9af7bedd3de375554d71ce77bb6cd6a3f3a SHA256 b573e31499920a787f2d6b3eb1e0de732e48d7ba00cb0e7ecd5d3e860e48662a
+EBUILD hplip-0.9.11-r1.ebuild 3288 RMD160 0b7f4e542e283e42636a7e1dd75c756fb70b0f7e SHA1 7a7bb21a79f309cbed0909f3eecf928fd0f50c8a SHA256 19378d77493c4670a1382b0134c9d74e0fdc93910be06f8c017e3ead7e147ea3
+MD5 c9f16814e09050127d3d6f48d728a3bd hplip-0.9.11-r1.ebuild 3288
+RMD160 0b7f4e542e283e42636a7e1dd75c756fb70b0f7e hplip-0.9.11-r1.ebuild 3288
+SHA256 19378d77493c4670a1382b0134c9d74e0fdc93910be06f8c017e3ead7e147ea3 hplip-0.9.11-r1.ebuild 3288
+EBUILD hplip-0.9.7-r3.ebuild 3290 RMD160 7eaa233e037fe18700e82fffa394fc5a1de4df41 SHA1 0ece14e6e975b8a6d150a7d36bd1fd6f6f1724a7 SHA256 85ca7334212c68f7af00e9f217606505d0961150c8f3857cf5a2b6d14b28e965
+MD5 46fd79715cb9ac196eb14b763aee7487 hplip-0.9.7-r3.ebuild 3290
+RMD160 7eaa233e037fe18700e82fffa394fc5a1de4df41 hplip-0.9.7-r3.ebuild 3290
+SHA256 85ca7334212c68f7af00e9f217606505d0961150c8f3857cf5a2b6d14b28e965 hplip-0.9.7-r3.ebuild 3290
+EBUILD hplip-0.9.8-r2.ebuild 3279 RMD160 dea344dab163a274b187b576e9bb0c4eb944d417 SHA1 8f638395f1bb2b0c7bd3973d636940ca3d7b0179 SHA256 e2338ed0a1b726ba706a7f34a46d0fdbb575f263bed09f83d7659bcbb297998b
+MD5 23f8b62b360ce2b6ace4dde623526590 hplip-0.9.8-r2.ebuild 3279
+RMD160 dea344dab163a274b187b576e9bb0c4eb944d417 hplip-0.9.8-r2.ebuild 3279
+SHA256 e2338ed0a1b726ba706a7f34a46d0fdbb575f263bed09f83d7659bcbb297998b hplip-0.9.8-r2.ebuild 3279
+MISC ChangeLog 5800 RMD160 f52af9fc41ba1e787037171c3b34191f6ba435af SHA1 769b57a171b9503d4a76bd2b9fc3b3b7ac64ab77 SHA256 72d772a32cf51e36b5c36aada2e0d2ea4698d21ac776d6e5a09d808391e6a5f3
+MD5 bd8435899436b888e9bdace981ffa168 ChangeLog 5800
+RMD160 f52af9fc41ba1e787037171c3b34191f6ba435af ChangeLog 5800
+SHA256 72d772a32cf51e36b5c36aada2e0d2ea4698d21ac776d6e5a09d808391e6a5f3 ChangeLog 5800
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEguWsNJowsmZ/PzARAq+EAKCzerW6jv0CJ38YbnvCzodNUvkDAQCgwt39
+IC3IucJNHjl3ABeBGAsWsmY=
+=G+BQ
+-----END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/digest-hplip-0.9.10-r1 b/net-print/hplip/files/digest-hplip-0.9.10-r1
deleted file mode 100644
index c1f586da013b..000000000000
--- a/net-print/hplip/files/digest-hplip-0.9.10-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1bf699ebd394c9822086c1fef2937836 foomatic-db-hpijs-1.5-20060211.tar.gz 97873
-MD5 c8e28b832a05d7e9dd2fa21af0899eff hplip-0.9.10-2.patch 3048
-MD5 349489b10fb44d1bf105b04ff5352551 hplip-0.9.10.tar.gz 9296866
diff --git a/net-print/hplip/files/digest-hplip-0.9.9 b/net-print/hplip/files/digest-hplip-0.9.9
deleted file mode 100644
index edddc14ca7a3..000000000000
--- a/net-print/hplip/files/digest-hplip-0.9.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1bf699ebd394c9822086c1fef2937836 foomatic-db-hpijs-1.5-20060211.tar.gz 97873
-MD5 836affd511fd4831e6904b4f7f079c7d hplip-0.9.9.tar.gz 9285704
diff --git a/net-print/hplip/hplip-0.9.10-r1.ebuild b/net-print/hplip/hplip-0.9.10-r1.ebuild
deleted file mode 100644
index 80a94e77b4c1..000000000000
--- a/net-print/hplip/hplip-0.9.10-r1.ebuild
+++ /dev/null
@@ -1,123 +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.10-r1.ebuild,v 1.2 2006/04/23 17:09:28 vanquirius 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
-	mirror://sourceforge/hpinkjet/${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 qt 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
-		)
-	)
-	qt? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	>=dev-libs/libusb-0.1.10a
-	sys-apps/hotplug
-	foomaticdb? ( net-print/foomatic )
-	net-print/cups
-	>=net-print/foomatic-filters-3.0.2
-	${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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 qt ; 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 qt; 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.9.ebuild b/net-print/hplip/hplip-0.9.9.ebuild
deleted file mode 100644
index d3de41008b31..000000000000
--- a/net-print/hplip/hplip-0.9.9.ebuild
+++ /dev/null
@@ -1,120 +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.9.ebuild,v 1.4 2006/04/23 17:09:28 vanquirius 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 )"
-	#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 qt 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
-		)
-	)
-	qt? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	>=dev-libs/libusb-0.1.10a
-	sys-apps/hotplug
-	foomaticdb? ( net-print/foomatic )
-	net-print/cups
-	>=net-print/foomatic-filters-3.0.2
-	${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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 qt ; 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 qt; then
-		dodir /usr/share/applications
-		mv "${D}"/usr/share/hplip/data/hplip.desktop \
-		"${D}"/usr/share/applications
-	fi
-}