Cleanup.

Package-Manager: portage-2.1.3.9

6 files changed, 9 insertions, 266 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index ea0e7a28f2ad..d169cea94c45 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.74 2007/08/22 13:35:39 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.75 2007/09/20 08:25:31 calchan Exp $
+
+  20 Sep 2007; Denis Dupeyron <calchan@gentoo.org> -hplip-2.7.6.ebuild,
+  -hplip-2.7.7.ebuild:
+  Cleanup.
 
 *hplip-2.7.7-r2 (22 Aug 2007)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 0cff7ba46dc1..a7e16879fd55 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX hplip-2.7.7-udev-kernel.2.6.22.diff 487 RMD160 02e0a2a32d74c8961eb437b546e133c9d29df6aa SHA1 cd21b7c16e89cd3984daae2b875123f051a664c4 SHA256 f6ab12991ecc45de10285829e4afb8db9943fab266a96a5b4a3da80b205b0447
 MD5 6691606bc7791b58ad912d84c9452ed9 files/hplip-2.7.7-udev-kernel.2.6.22.diff 487
 RMD160 02e0a2a32d74c8961eb437b546e133c9d29df6aa files/hplip-2.7.7-udev-kernel.2.6.22.diff 487
@@ -12,8 +9,6 @@ SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95 files/hp
 DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d SHA1 0e4ec08d01cd28bb751bc2e5844f0d0f7b97ba42 SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e
 DIST hplip-1.6.10.tar.gz 10561620 RMD160 3608757fca36865528565c0c40571d91a936fd3f SHA1 7c877cac132fc8695c693800c7e34322bdc8d858 SHA256 45f4eafd4568a06889bf4b996a3c75ef571a157b921f56b027b567766d8e239f
 DIST hplip-1.7.4a.tar.gz 13566965 RMD160 e2777b8b065abe385bfe557b9eed86848029e2c9 SHA1 98fcb0ce13ee7d9f17cc6c61c568528dd9cbf71d SHA256 903957b1b1aa86438d546a205a3d526a600b1e56754a5ba5ce99228a26cc475e
-DIST hplip-2.7.6-1.patch 641 RMD160 8fb3653de10a49188fe067bb5b6b8b1e749b5759 SHA1 0b52f931f41b5f04a8f34e111db281b216a2ec58 SHA256 9d7d2c0bfbab48e87a7fc88c82c3a210ead2c39da54e1a6c05e8bef8ac56ca24
-DIST hplip-2.7.6.tar.gz 14025487 RMD160 3cf9b11907cd2678880b8ddfc184ba2f20227976 SHA1 9e6bcd62f81b86a700ba3613061b245c07b2ea55 SHA256 d4ec63934b13ea36b1bd10aa785ff58affcc454721f526ab059b0f399ac56ac5
 DIST hplip-2.7.7.tar.gz 14412854 RMD160 d3bc36b44b2fd07d8938fce2f508bbc9b4c47b5b SHA1 5b80ba8a62035985cbc4a0ae656df8a1779dbbdb SHA256 0804bda4dd18480597bf408351fe56412b84f737d2554b07aafaa1fb089674ba
 EBUILD hplip-1.6.10.ebuild 3675 RMD160 877081de0015019133f1031fda241b7709771b87 SHA1 c09c30009fb5a98caefe8bf1b75e856160f1be26 SHA256 583c89b73d79581d51e8ca1dff6d2139bd5a2137c4871e536c0d5d3e00f04070
 MD5 8446d1a564a05b03114e9a4cc7e35d1f hplip-1.6.10.ebuild 3675
@@ -23,22 +18,14 @@ EBUILD hplip-1.7.4a-r1.ebuild 3690 RMD160 2205bf20df3371dfb7e17600300c9b866fe746
 MD5 33e0e690f7dddf3786a73ff1ac6c19bd hplip-1.7.4a-r1.ebuild 3690
 RMD160 2205bf20df3371dfb7e17600300c9b866fe746db hplip-1.7.4a-r1.ebuild 3690
 SHA256 adae960db7d1bc4df717b8a53f9e65fcc6011938a2ed9f1526221856c3cd7c96 hplip-1.7.4a-r1.ebuild 3690
-EBUILD hplip-2.7.6.ebuild 3690 RMD160 89cdb47e316e56c46c2280fad7ef1bc1e44a9f51 SHA1 3cf1e28e49c17f7840e437415bf57d8150466eeb SHA256 c70f0151b8d53ac462316acf72cb8a83825db64e1fdbdebd06392fba46cd0bd5
-MD5 7da0c3f3a05f993039ae0b0ef5bb9785 hplip-2.7.6.ebuild 3690
-RMD160 89cdb47e316e56c46c2280fad7ef1bc1e44a9f51 hplip-2.7.6.ebuild 3690
-SHA256 c70f0151b8d53ac462316acf72cb8a83825db64e1fdbdebd06392fba46cd0bd5 hplip-2.7.6.ebuild 3690
 EBUILD hplip-2.7.7-r2.ebuild 3890 RMD160 f634b7b69c3438b61792a7fc7c30fe3b69fa47fc SHA1 e54dbe76bc53582e346688c21cd9b13aa0c71820 SHA256 71be7fe507c7f6d81bcfb1c4e7331505773a61f4e75fc75c7a22ccc9db7428b9
 MD5 d84c25d5daa2c7e4c7fa8c81016c5ad7 hplip-2.7.7-r2.ebuild 3890
 RMD160 f634b7b69c3438b61792a7fc7c30fe3b69fa47fc hplip-2.7.7-r2.ebuild 3890
 SHA256 71be7fe507c7f6d81bcfb1c4e7331505773a61f4e75fc75c7a22ccc9db7428b9 hplip-2.7.7-r2.ebuild 3890
-EBUILD hplip-2.7.7.ebuild 3759 RMD160 96bb907923c93c89b2c3992b83714fd173357680 SHA1 27691aed8a27468a9d6dc89ce1e348d397be3492 SHA256 30451f2900e118eba6497af4da963a2bf236df5873e1dbc0bf73136c37948f9b
-MD5 e5fb5ce31f271f67d386fc0fa890ad68 hplip-2.7.7.ebuild 3759
-RMD160 96bb907923c93c89b2c3992b83714fd173357680 hplip-2.7.7.ebuild 3759
-SHA256 30451f2900e118eba6497af4da963a2bf236df5873e1dbc0bf73136c37948f9b hplip-2.7.7.ebuild 3759
-MISC ChangeLog 12718 RMD160 b6e19e226255a794ca2fb5fbbf9bed6ee9b27a21 SHA1 ceecf85d3cc3573374c3d1476f169b0b5ff10e25 SHA256 57df5fa5a30d12daad10a95ff03fd71ecb1d2a6619e893aca6da01daf623a04b
-MD5 2e95ab36cd0f321c88974cca5918b542 ChangeLog 12718
-RMD160 b6e19e226255a794ca2fb5fbbf9bed6ee9b27a21 ChangeLog 12718
-SHA256 57df5fa5a30d12daad10a95ff03fd71ecb1d2a6619e893aca6da01daf623a04b ChangeLog 12718
+MISC ChangeLog 12828 RMD160 ce5fcb50325c2836cd0b963073d75f3c50bcb3bc SHA1 efe836690d1caa67658dbdbe2e83580d04bc9d53 SHA256 68f1b87a68ec302b66a0e4800be02b1d492dd25bc1153e240a3df2a2622f3931
+MD5 e4c6a6388c95300972c32d80b3933325 ChangeLog 12828
+RMD160 ce5fcb50325c2836cd0b963073d75f3c50bcb3bc ChangeLog 12828
+SHA256 68f1b87a68ec302b66a0e4800be02b1d492dd25bc1153e240a3df2a2622f3931 ChangeLog 12828
 MISC metadata.xml 250 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 SHA1 f91d1e6c01026cba252d042ba254f4a4bc61194a SHA256 ab106df12671f3f541e0416f8c0d5a96b6e725ed7b3b111d27af7a584c4bf164
 MD5 a7f39f5758507140c896dcc24a3e0e2f metadata.xml 250
 RMD160 00f8254bd6b52bc050cdc822b7370b3e2d2f4970 metadata.xml 250
@@ -49,19 +36,6 @@ SHA256 a6a40ef739f13c2b5baf4d46161d709d65d1770a0bef40d472cd3161562c92ef files/di
 MD5 8cdad3401711a59d614863b839c45335 files/digest-hplip-1.7.4a-r1 521
 RMD160 ac859e445b139c0789441184c5af69e1cb75d679 files/digest-hplip-1.7.4a-r1 521
 SHA256 4d98dfc9fec72da07fc2405364c623aaed10c8476d582920a75639e8499cd135 files/digest-hplip-1.7.4a-r1 521
-MD5 729b5763ff268380cc924895080bcfc8 files/digest-hplip-2.7.6 470
-RMD160 e2db31899c213148ae6bf50dd744673056eebc2a files/digest-hplip-2.7.6 470
-SHA256 8b4586dffb135b543d1d4809733ca82651d4bb523b9f4286c22cd11ed8255832 files/digest-hplip-2.7.6 470
-MD5 f2a0a963b9b861e21a85682d0c052886 files/digest-hplip-2.7.7 241
-RMD160 65b7854d37748cd9132fe9a021cd75af7324e442 files/digest-hplip-2.7.7 241
-SHA256 c0010a4a83dce3e4d7f01acb21db5cf45068c4060a7bc99f3f37554de50e9fba files/digest-hplip-2.7.7 241
 MD5 f2a0a963b9b861e21a85682d0c052886 files/digest-hplip-2.7.7-r2 241
 RMD160 65b7854d37748cd9132fe9a021cd75af7324e442 files/digest-hplip-2.7.7-r2 241
 SHA256 c0010a4a83dce3e4d7f01acb21db5cf45068c4060a7bc99f3f37554de50e9fba files/digest-hplip-2.7.7-r2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFGzDu5t2vP6XvVdOcRAgtHAJ4mfL0oLYTsWVooFjK2G8wX9vbS0QCgtrv/
-p12jwr1lqCNZ59yjg1+G5A0=
-=w7TP
------END PGP SIGNATURE-----
diff --git a/net-print/hplip/files/digest-hplip-2.7.6 b/net-print/hplip/files/digest-hplip-2.7.6
deleted file mode 100644
index a8df550a25c1..000000000000
--- a/net-print/hplip/files/digest-hplip-2.7.6
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b623b7d06e033e1a8e8db6852b72887b hplip-2.7.6-1.patch 641
-RMD160 8fb3653de10a49188fe067bb5b6b8b1e749b5759 hplip-2.7.6-1.patch 641
-SHA256 9d7d2c0bfbab48e87a7fc88c82c3a210ead2c39da54e1a6c05e8bef8ac56ca24 hplip-2.7.6-1.patch 641
-MD5 7493f4d53ec98123d69c9b36318cc1f5 hplip-2.7.6.tar.gz 14025487
-RMD160 3cf9b11907cd2678880b8ddfc184ba2f20227976 hplip-2.7.6.tar.gz 14025487
-SHA256 d4ec63934b13ea36b1bd10aa785ff58affcc454721f526ab059b0f399ac56ac5 hplip-2.7.6.tar.gz 14025487
diff --git a/net-print/hplip/files/digest-hplip-2.7.7 b/net-print/hplip/files/digest-hplip-2.7.7
deleted file mode 100644
index 3dbaf8aeb6e1..000000000000
--- a/net-print/hplip/files/digest-hplip-2.7.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 086bd6a306fa2dfbd6e8c962fddcdef4 hplip-2.7.7.tar.gz 14412854
-RMD160 d3bc36b44b2fd07d8938fce2f508bbc9b4c47b5b hplip-2.7.7.tar.gz 14412854
-SHA256 0804bda4dd18480597bf408351fe56412b84f737d2554b07aafaa1fb089674ba hplip-2.7.7.tar.gz 14412854
diff --git a/net-print/hplip/hplip-2.7.6.ebuild b/net-print/hplip/hplip-2.7.6.ebuild
deleted file mode 100644
index fd91774f01b5..000000000000
--- a/net-print/hplip/hplip-2.7.6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.6.ebuild,v 1.4 2007/07/28 07:50:02 calchan Exp $
-
-inherit eutils linux-info
-
-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}-1.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X doc fax minimal parport ppds scanner snmp"
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	dev-libs/openssl
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	>=net-print/cups-1.2
-	dev-libs/libusb
-	>=dev-lang/python-2.2
-	net-print/foomatic-filters
-	fax? ( >=dev-lang/python-2.3 )
-	snmp? ( net-analyzer/net-snmp )"
-
-RDEPEND="${DEPEND}
-	fax? ( dev-python/reportlab )
-	X? ( >=dev-python/PyQt-3.14 )
-	scanner? (
-		X? ( >=media-gfx/xsane-0.89 )
-		!X? ( >=media-gfx/sane-frontends-1.0.9 )
-		)"
-
-CONFIG_CHECK="PARPORT"
-ERROR_PARPORT="Please make sure Device Drivers -> Parallel port support is enabled in your kernel"
-
-pkg_setup() {
-	use parport && linux-info_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
-
-	use ppds || ewarn "Not installing built-in PPD files. You need USE=ppds if you want to install them."
-	use minimal && ewarn "Installing hpijs driver only, make sure you know what you are doing."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}/${P}-1.patch"
-
-	sed -i -e "s:toolbox:toolbox.py:" hplip.desktop.in || die "Patching hplip.desktop.in failed"
-	sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
-	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
-		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
-		base/utils.py  || die "Patching base/utils.py failed"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching hpssd.py failed"
-
-	# bug 161926, until fixed by upstream probably in 2.7.7
-	sed -i -e "s:if (!localOnly):if (1):" scan/sane/hpaio.c  || die "Patching scan/sane/hpaio.c failed"
-}
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		--disable-cups11-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		$(use_enable minimal hpijs-only-build) \
-		$(use_enable doc doc-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable X gui-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable ppds foomatic-ppd-install) \
-		--disable-foomatic-xml-install \
-		|| die "econf failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	# bug 106035
-	use X || rm -Rf "${D}"/usr/share/applications
-}
-
-pkg_preinst() {
-	if use scanner; then
-		insinto /etc/sane.d
-		[ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf .
-		[ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf .
-		grep -q hpaio dll.conf || echo hpaio >> dll.conf
-		doins dll.conf
-	fi
-}
-
-pkg_postinst() {
-	elog "You should run hp-setup as root if you are installing hplip for the first time, and may also"
-	elog "need to run it if you are upgrading from an earlier version."
-	elog
-	elog "If your device is connected using USB, users will need to be in the lp group to access it."
-	einfo "This release doesn't use an init script anymore, so you should probably do a"
-	einfo "'rc-update del hplip' if you are updating."
-}
diff --git a/net-print/hplip/hplip-2.7.7.ebuild b/net-print/hplip/hplip-2.7.7.ebuild
deleted file mode 100644
index 97abf4e46d26..000000000000
--- a/net-print/hplip/hplip-2.7.7.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.7.7.ebuild,v 1.1 2007/08/08 23:28:56 genstef Exp $
-
-inherit eutils linux-info
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="X doc fax minimal parport ppds scanner snmp"
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	dev-libs/openssl
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	>=net-print/cups-1.2
-	dev-libs/libusb
-	>=dev-lang/python-2.2
-	net-print/foomatic-filters
-	fax? ( >=dev-lang/python-2.3 )
-	snmp? ( net-analyzer/net-snmp )"
-
-RDEPEND="${DEPEND}
-	fax? ( dev-python/reportlab )
-	X? ( >=dev-python/PyQt-3.14 )
-	scanner? (
-		X? ( >=media-gfx/xsane-0.89 )
-		!X? ( >=media-gfx/sane-frontends-1.0.9 )
-		)"
-
-CONFIG_CHECK="PARPORT"
-ERROR_PARPORT="Please make sure Device Drivers -> Parallel port support is enabled in your kernel"
-
-pkg_setup() {
-	use parport && linux-info_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
-
-	use ppds || ewarn "Not installing built-in PPD files. You need USE=ppds if you want to install them."
-	use minimal && ewarn "Installing hpijs driver only, make sure you know what you are doing."
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s:toolbox:toolbox.py:" hplip.desktop.in || die "Patching hplip.desktop.in failed"
-	sed -i -e "s:\$(doc_DATA)::" Makefile.in || die "Patching Makefile.in failed"
-	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
-		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
-		base/utils.py  || die "Patching base/utils.py failed"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Patching hpssd.py failed"
-
-	# bug 161926, until fixed by upstream probably in 2.7.7
-	sed -i -e "s:if (!localOnly):if (1):" scan/sane/hpaio.c  || die "Patching scan/sane/hpaio.c failed"
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die "sed core_install.py"
-}
-
-src_compile() {
-	econf \
-		--disable-cups11-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		$(use_enable minimal hpijs-only-build) \
-		$(use_enable doc doc-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable X gui-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable ppds foomatic-ppd-install) \
-		--disable-foomatic-xml-install \
-		|| die "econf failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	# bug 106035
-	use X || rm -Rf "${D}"/usr/share/applications
-}
-
-pkg_preinst() {
-	if use scanner; then
-		insinto /etc/sane.d
-		[ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf .
-		[ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf .
-		grep -q hpaio dll.conf || echo hpaio >> dll.conf
-		doins dll.conf
-	fi
-}
-
-pkg_postinst() {
-	elog "You should run hp-setup as root if you are installing hplip for the first time, and may also"
-	elog "need to run it if you are upgrading from an earlier version."
-	elog
-	elog "If your device is connected using USB, users will need to be in the lp group to access it."
-	elog
-	elog "This release doesn't use an init script anymore, so you should probably do a"
-	elog "'rc-update del hplip' if you are updating."
-}