bump the foomatic-db, properly name 1.6.6a

(Portage version: 2.1.1_pre3-r1)
 (Unsigned Manifest commit)

5 files changed, 12 insertions, 266 deletions

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index c52008ee1a8c..0df73e54596a 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,27 +3,22 @@ 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 RMD160 c7073520c3f19d90d19cabf91562e6f97789f5a7 SHA1 2fecef6febbdf38a04d38fae450b6deb2e99ed72 SHA256 250933116f2517346df609256a7af67d5363c45ac8043eb00f4f2a7aff8bbe2f
-DIST foomatic-db-hpijs-20060615.tar.gz 98297 RMD160 d73b78424259953e1c01dbc11115e93c2dd3c4b9 SHA1 35128a6d929408f243b568f6963e9f4c9f833bcc SHA256 e21455a8e2f976118e6cabef633b23fedaa367abe9c1c610008cb3343a10bc6d
+DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d SHA1 0e4ec08d01cd28bb751bc2e5844f0d0f7b97ba42 SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e
 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
 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-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 6575 RMD160 a60205fd2f02a900d17785ebd33762ba0e600a37 SHA1 68d1fd552f5663d6869ffdc81d86657b14a159f7 SHA256 9861f58c31fa59d956529d695035f854b0372040b51d8af3b7488ee4747caa01
-MD5 5113e2b872375287a5ba08f06d75574d ChangeLog 6575
-RMD160 a60205fd2f02a900d17785ebd33762ba0e600a37 ChangeLog 6575
-SHA256 9861f58c31fa59d956529d695035f854b0372040b51d8af3b7488ee4747caa01 ChangeLog 6575
+EBUILD hplip-1.6.6a.ebuild 3301 RMD160 8fbc2e04317a249a092f96e0818cd46f1f507acc SHA1 8f98c44a87febf73705ecbf0f0a9a808debf0187 SHA256 00c2bc9af76848658155a412b3dcf377567bd54c57bffbf20ba27da178b4be5f
+MD5 99bb3ce8be6b13617073c9a5e7575604 hplip-1.6.6a.ebuild 3301
+RMD160 8fbc2e04317a249a092f96e0818cd46f1f507acc hplip-1.6.6a.ebuild 3301
+SHA256 00c2bc9af76848658155a412b3dcf377567bd54c57bffbf20ba27da178b4be5f hplip-1.6.6a.ebuild 3301
+MISC ChangeLog 6769 RMD160 84ce8cad4d5fe21b07715f8cd046c0e789e2d805 SHA1 d6859f956ada00b2e050752a58c06c56d95ef7c7 SHA256 4e7aef2b11acda21fb41f89ef45b5430e4879f6a710d7eaecf7c3f9f2579cee9
+MD5 2de620aa8b216f33d35f736ec37acf48 ChangeLog 6769
+RMD160 84ce8cad4d5fe21b07715f8cd046c0e789e2d805 ChangeLog 6769
+SHA256 4e7aef2b11acda21fb41f89ef45b5430e4879f6a710d7eaecf7c3f9f2579cee9 ChangeLog 6769
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -31,9 +26,6 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 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
-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
+MD5 533b6b1b6094d5272c8d4f3d16697b8c files/digest-hplip-1.6.6a 521
+RMD160 118c28df89cf9dc1f1f3f36cdca2f75cfeea809e files/digest-hplip-1.6.6a 521
+SHA256 07a6fcb782f75945214c2ef72bdac193a21a273c36c129dc606477859e0fa2b4 files/digest-hplip-1.6.6a 521
diff --git a/net-print/hplip/files/digest-hplip-1.6.6 b/net-print/hplip/files/digest-hplip-1.6.6
deleted file mode 100644
index 782e3d8985d3..000000000000
--- a/net-print/hplip/files/digest-hplip-1.6.6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 5aa44a363ceea0adad2c8fa5db4aa41f foomatic-db-hpijs-20060615.tar.gz 98297
-RMD160 d73b78424259953e1c01dbc11115e93c2dd3c4b9 foomatic-db-hpijs-20060615.tar.gz 98297
-SHA256 e21455a8e2f976118e6cabef633b23fedaa367abe9c1c610008cb3343a10bc6d foomatic-db-hpijs-20060615.tar.gz 98297
-MD5 292fbcc25b79d273d7280760ce797666 hplip-1.6.6.tar.gz 10429794
-RMD160 84171d39677e132915169cb4c687271325777f25 hplip-1.6.6.tar.gz 10429794
-SHA256 cb148342ef56de7426290a8556114de440ff01ed36008ab81ea64755828701d0 hplip-1.6.6.tar.gz 10429794
diff --git a/net-print/hplip/files/digest-hplip-1.6.6-r1 b/net-print/hplip/files/digest-hplip-1.6.6-r1
deleted file mode 100644
index e9b1e36b0dc0..000000000000
--- a/net-print/hplip/files/digest-hplip-1.6.6-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 5aa44a363ceea0adad2c8fa5db4aa41f foomatic-db-hpijs-20060615.tar.gz 98297
-RMD160 d73b78424259953e1c01dbc11115e93c2dd3c4b9 foomatic-db-hpijs-20060615.tar.gz 98297
-SHA256 e21455a8e2f976118e6cabef633b23fedaa367abe9c1c610008cb3343a10bc6d foomatic-db-hpijs-20060615.tar.gz 98297
-MD5 606704fc8b2fe344e49190b592b438e0 hplip-1.6.6a.tar.gz 10447071
-RMD160 546d4f86c715f760aebff57ba59f08ef4bd20e36 hplip-1.6.6a.tar.gz 10447071
-SHA256 e87ab9bc4e4a3229dafc154f91d9860a9ae15532118bfad7fb791331340a9d8d hplip-1.6.6a.tar.gz 10447071
diff --git a/net-print/hplip/hplip-1.6.6-r1.ebuild b/net-print/hplip/hplip-1.6.6-r1.ebuild
deleted file mode 100644
index df271eff1f06..000000000000
--- a/net-print/hplip/hplip-1.6.6-r1.ebuild
+++ /dev/null
@@ -1,118 +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-1.6.6-r1.ebuild,v 1.1 2006/07/01 05:25:39 vanquirius Exp $
-
-inherit eutils
-
-DB_V=20060615
-MY_P="${P}a"
-S="${WORKDIR}/${MY_P}"
-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}a.tar.gz
-	foomaticdb? ( http://gentooexperimental.org/~genstef/dist/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"
-
-DEPEND=">=dev-lang/python-2.2.0
-	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
-	!net-print/hpijs
-	!net-print/hpoj"
-
-RDEPEND="virtual/ghostscript
-	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}"
-
-pkg_setup() {
-	# avoid collisions with cups-1.2 compat symlinks
-	if [ -e ${ROOT}/usr/lib/cups/backend/hp ] && [ -e ${ROOT}/usr/libexec/cups/backend/hp ]; then
-		rm -f ${ROOT}/usr/libexec/cups/backend/hp{,fax};
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		hpssd.py
-}
-src_compile() {
-	econf \
-		$(use_enable snmp network-build) \
-		$(use_enable cups cups-install) \
-		$(use_enable ppds foomatic-install) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		emake || die "emake failed"
-	fi
-}
-
-
-src_install() {
-	# cups-1.2 installation paths, make sure that the .desktop is installed
-	sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
-		-e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
-		-e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
-		Makefile
-
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	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/applications/hplip.desktop
-		rm -f "${D}"/usr/lib/menu/hplip
-	fi
-
-	rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-}
diff --git a/net-print/hplip/hplip-1.6.6.ebuild b/net-print/hplip/hplip-1.6.6.ebuild
deleted file mode 100644
index 4b5171947651..000000000000
--- a/net-print/hplip/hplip-1.6.6.ebuild
+++ /dev/null
@@ -1,116 +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-1.6.6.ebuild,v 1.4 2006/06/24 04:40:36 cardoe Exp $
-
-inherit eutils
-
-DB_V=20060615
-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
-	foomaticdb? ( http://gentooexperimental.org/~genstef/dist/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"
-
-DEPEND=">=dev-lang/python-2.2.0
-	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
-	!net-print/hpijs
-	!net-print/hpoj"
-
-RDEPEND="virtual/ghostscript
-	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}"
-
-pkg_setup() {
-	# avoid collisions with cups-1.2 compat symlinks
-	if [ -e ${ROOT}/usr/lib/cups/backend/hp ] && [ -e ${ROOT}/usr/libexec/cups/backend/hp ]; then
-		rm -f ${ROOT}/usr/libexec/cups/backend/hp{,fax};
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		hpssd.py
-}
-src_compile() {
-	econf \
-		$(use_enable snmp network-build) \
-		$(use_enable cups cups-install) \
-		$(use_enable ppds foomatic-install) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		emake || die "emake failed"
-	fi
-}
-
-
-src_install() {
-	# cups-1.2 installation paths, make sure that the .desktop is installed
-	sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
-		-e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
-		-e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
-		Makefile
-
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	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/applications/hplip.desktop
-		rm -f "${D}"/usr/lib/menu/hplip
-	fi
-
-	rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-}