Post-stabilization cleanup.

(Portage version: 2.1.4_rc11)

8 files changed, 7 insertions, 462 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 275784ac347c..32776dd40fb7 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.92 2007/12/26 09:46:05 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.93 2007/12/27 21:27:27 calchan Exp $
+
+  27 Dec 2007; Denis Dupeyron <calchan@gentoo.org>
+  -files/hplip-1.7.4a-subprocess_replacement.patch,
+  -files/hplip-2.7.9-subprocess_replacement.patch, -files/hplip.init.d,
+  -hplip-1.7.4a-r2.ebuild, -hplip-2.7.9-r1.ebuild:
+  Post-stabilization cleanup.
 
   26 Dec 2007; Samuli Suominen <drac@gentoo.org> hplip-2.7.10.ebuild:
   amd64 stable wrt #202916
diff --git a/net-print/hplip/files/digest-hplip-1.7.4a-r2 b/net-print/hplip/files/digest-hplip-1.7.4a-r2
deleted file mode 100644
index 5fae59ecf518..000000000000
--- a/net-print/hplip/files/digest-hplip-1.7.4a-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252
-RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252
-SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252
-MD5 210e948d1f1f376426a2cca0ed9d1e6c hplip-1.7.4a.tar.gz 13566965
-RMD160 e2777b8b065abe385bfe557b9eed86848029e2c9 hplip-1.7.4a.tar.gz 13566965
-SHA256 903957b1b1aa86438d546a205a3d526a600b1e56754a5ba5ce99228a26cc475e hplip-1.7.4a.tar.gz 13566965
diff --git a/net-print/hplip/files/digest-hplip-2.7.9-r1 b/net-print/hplip/files/digest-hplip-2.7.9-r1
deleted file mode 100644
index 46ad4669e85f..000000000000
--- a/net-print/hplip/files/digest-hplip-2.7.9-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a05aeb5679c3ce429bea7f3335609aee hplip-2.7.9.tar.gz 14488632
-RMD160 007a4c888bde277e86b1a78628062774a43ff2f7 hplip-2.7.9.tar.gz 14488632
-SHA256 e8867529434411f6c44ef6224405f92fd6be25f04513946621bf209b2e81baaf hplip-2.7.9.tar.gz 14488632
diff --git a/net-print/hplip/files/hplip-1.7.4a-subprocess_replacement.patch b/net-print/hplip/files/hplip-1.7.4a-subprocess_replacement.patch
deleted file mode 100644
index ca1b022a1ce1..000000000000
--- a/net-print/hplip/files/hplip-1.7.4a-subprocess_replacement.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -urN hplip-1.7.4a.orig/hpssd.py hplip-1.7.4a/hpssd.py
---- hplip-1.7.4a.orig/hpssd.py	2007-10-18 15:20:16.000000000 +0200
-+++ hplip-1.7.4a/hpssd.py	2007-10-18 15:54:34.000000000 +0200
-@@ -53,7 +53,7 @@
- 
- # Std Lib
- import sys, socket, os, os.path, signal, getopt, glob, time, select
--import popen2, threading, re, fcntl, pwd, tempfile
-+import subprocess, threading, re, fcntl, pwd, tempfile
- #from asyncore import dispatcher, loop
- 
- from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
-@@ -562,21 +562,23 @@
- 
-         if sendmail:
-             sendmail = os.path.join(sendmail, 'sendmail')
--            sendmail += ' -t -r %s' % self.from_address
-+            cmd = [sendmail,'-t','-r',self.from_address]
- 
--            log.debug(sendmail)
--            std_out, std_in, std_err = popen2.popen3(sendmail) 
--            log.debug(repr(self.message))
--            std_in.write(self.message)
--            std_in.close()
--
--            r, w, e = select.select([std_err], [], [], 2.0)
--
--            if r:
--                err = std_err.read()
--                if err:
--                    log.error(repr(err))
--                    self.result = ERROR_TEST_EMAIL_FAILED
-+            log.debug(repr(cmd))
-+            err = None
-+            try:
-+                sp = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+                std_out, std_err = sp.communicate(self.message)
-+                log.debug(repr(self.message))
-+                if std_err != '':
-+                    err = std_err
-+
-+            except OSError, e:
-+                err = str(e)
-+
-+            if err:
-+                log.error(repr(err))
-+                self.result = ERROR_TEST_EMAIL_FAILED
- 
-         else:
-             log.error("Mail send failed. sendmail not found.")
diff --git a/net-print/hplip/files/hplip-2.7.9-subprocess_replacement.patch b/net-print/hplip/files/hplip-2.7.9-subprocess_replacement.patch
deleted file mode 100644
index 15b386e227f5..000000000000
--- a/net-print/hplip/files/hplip-2.7.9-subprocess_replacement.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -urNad hplip-2.7.7.dfsg.1~/hpssd.py hplip-2.7.7.dfsg.1/hpssd.py
---- hplip-2.7.7.dfsg.1~/hpssd.py	2007-10-04 12:45:29.000000000 -0700
-+++ hplip-2.7.7.dfsg.1/hpssd.py	2007-10-04 12:46:39.000000000 -0700
-@@ -53,7 +53,7 @@
- 
- # Std Lib
- import sys, socket, os, os.path, signal, getopt, time, select
--import popen2, threading, tempfile
-+import subprocess, threading, tempfile
- 
- from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
-      ENOTCONN, ESHUTDOWN, EINTR, EISCONN
-@@ -560,21 +560,23 @@
- 
-         if sendmail:
-             sendmail = os.path.join(sendmail, 'sendmail')
--            sendmail += ' -t -r %s' % self.from_address
-+            cmd = [sendmail,'-t','-r',self.from_address]
- 
--            log.debug(sendmail)
--            std_out, std_in, std_err = popen2.popen3(sendmail) 
--            log.debug(repr(self.message))
--            std_in.write(self.message)
--            std_in.close()
-+            log.debug(repr(cmd))
-+            err = None
-+            try:
-+                sp = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+                std_out, std_err = sp.communicate(self.message)
-+                log.debug(repr(self.message))
-+                if std_err != '':
-+                    err = std_err
- 
--            r, w, e = select.select([std_err], [], [], 2.0)
-+            except OSError, e:
-+                err = str(e)
- 
--            if r:
--                err = std_err.read()
--                if err:
--                    log.error(repr(err))
--                    self.result = ERROR_TEST_EMAIL_FAILED
-+            if err:
-+                log.error(repr(err))
-+                self.result = ERROR_TEST_EMAIL_FAILED
- 
-         else:
-             log.error("Mail send failed. sendmail not found.")
-diff -urNad hplip-2.7.7.dfsg.1~/scan.py hplip-2.7.7.dfsg.1/scan.py
---- hplip-2.7.7.dfsg.1~/scan.py	2007-10-04 12:45:14.000000000 -0700
-+++ hplip-2.7.7.dfsg.1/scan.py	2007-10-04 12:46:48.000000000 -0700
-@@ -782,7 +782,7 @@
-     from scan import sane
-     import scanext
-     import cStringIO
--    import popen2
-+    import subprocess
- 
-     try:
-         import Image
-@@ -1139,26 +1139,21 @@
- 
-             if sendmail:
-                 sendmail = os.path.join(sendmail, 'sendmail')
--                sendmail += ' -t -r %s' % email_from
--
--                log.debug(sendmail)
--                std_out, std_in, std_err = popen2.popen3(sendmail) 
--                std_in.write(msg.as_string())
--                std_in.close()
--
--                while True:
--                    update_spinner()
--                    r, w, e = select.select([std_err], [], [], 1.0)
--
--                    if r:
--                        break
-+                cmd = [sendmail,'-t','-r',email_from]
- 
-+                log.debug(repr(cmd))
-+                err = None
-+                try:
-+                    sp = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+                    std_out, std_err = sp.communicate(msg.as_string())
-+                    if std_err != '':
-+                        err = std_err
-+                except OSError, e:
-+                    err = str(e)
-                 cleanup_spinner()
- 
--                if r:
--                    err = std_err.read()
--                    if err:
--                        log.error(repr(err))
-+                if err:
-+                    log.error(repr(err))
- 
-             else:
-                 log.error("Mail send failed. 'sendmail' not found.")
diff --git a/net-print/hplip/files/hplip.init.d b/net-print/hplip/files/hplip.init.d
deleted file mode 100644
index e65375b00c6c..000000000000
--- a/net-print/hplip/files/hplip.init.d
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/files/hplip.init.d,v 1.2 2006/01/14 18:53:41 vanquirius Exp $
-
-depend() {
-	before cupsd
-	after hotplug
-	use net
-}
-
-start() {
-	ebegin "Starting hpiod"
-	start-stop-daemon --start --quiet --exec /usr/sbin/hpiod
-	eend $?
-
-	ebegin "Starting hpssd"
-	start-stop-daemon --quiet --start --exec /usr/share/hplip/hpssd.py \
-		--pidfile /var/run/hpssd.pid --name "python /usr/share/hplip/hpssd.py" \
-		>/dev/null 2>&1
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping hpiod"
-	start-stop-daemon --stop --quiet -n hpiod
-	eend $?
-
-	ebegin "Stopping hpssd"
-	start-stop-daemon --stop --pidfile /var/run/hpssd.pid
-	RETVAL=$?
-	for PIDFILE in /var/run/*; do
-		case "$( basename $PIDFILE )" in
-			hpguid-*.pid)
-				read PID < $PIDFILE
-				kill $PID
-				rm $PIDFILE
-		esac
-	done
-	eend $RETVAL
-}
diff --git a/net-print/hplip/hplip-1.7.4a-r2.ebuild b/net-print/hplip/hplip-1.7.4a-r2.ebuild
deleted file mode 100644
index e95fff9c43cc..000000000000
--- a/net-print/hplip/hplip-1.7.4a-r2.ebuild
+++ /dev/null
@@ -1,138 +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-1.7.4a-r2.ebuild,v 1.5 2007/10/23 08:15:36 calchan Exp $
-
-inherit eutils
-
-DB_V=20060720
-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 ~ppc64 x86"
-IUSE="cups fax foomaticdb parport ppds qt3 scanner snmp X"
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	dev-libs/openssl
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	net-print/cups
-	dev-libs/libusb
-	>=dev-lang/python-2.2
-	net-print/foomatic-filters
-	fax? ( >=dev-lang/python-2.3
-		dev-python/reportlab )
-	foomaticdb? ( net-print/foomatic-db-engine )
-	snmp? ( net-analyzer/net-snmp )
-	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	scanner? (
-		>=media-gfx/sane-backends-1.0.9
-		X? ( || (
-			>=media-gfx/xsane-0.89
-			>=media-gfx/sane-frontends-1.0.9
-			) )
-		!X? ( || (
-			>=media-gfx/sane-frontends-1.0.9
-			>=media-gfx/xsane-0.89
-			) )
-	)"
-RDEPEND="${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}"
-
-	# Fix bug #195565
-	epatch "${FILESDIR}"/${P}-subprocess_replacement.patch
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		hpssd.py
-}
-src_compile() {
-	econf \
-		$(use_enable cups cups-install) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable ppds foomatic-install) \
-		$(use_enable qt3 gui-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		|| 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
-		dodir /usr/$(get_libdir)/sane
-		for i in libsane-hpaio.{la,so{,.1{,.0.0}}}; do
-			dosym /usr/$(get_libdir)/${i} /usr/$(get_libdir)/sane/${i}; done
-	else
-		rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.{la,so{,.1{,.0.0}}}
-		rm -f "${D}"/etc/sane.d/dll.conf
-	fi
-
-	# bug 106035
-	if ! use qt3 ; then
-		rm -f "${D}"/usr/{bin/hp-,share/hplip/}{print,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
-
-	# Fix a symlink collision, see bug #172341
-	rm -f "${D}"/usr/share/cups/model/foomatic-ppds
-}
-
-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 >> "${T}"/dll.conf
-		doins "${T}"/dll.conf
-	fi
-}
-
-pkg_postinst() {
-	if ! use qt3 ; then
-		elog "You need to enable the qt3 useflag to use the GUI"
-	fi
-}
diff --git a/net-print/hplip/hplip-2.7.9-r1.ebuild b/net-print/hplip/hplip-2.7.9-r1.ebuild
deleted file mode 100644
index ff6272039288..000000000000
--- a/net-print/hplip/hplip-2.7.9-r1.ebuild
+++ /dev/null
@@ -1,124 +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.9-r1.ebuild,v 1.3 2007/11/18 16:05:18 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"
-
-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
-	virtual/ghostscript
-	>=media-libs/jpeg-6b
-	net-print/foomatic-filters
-	!minimal? (
-		>=net-print/cups-1.2
-		dev-libs/libusb
-		scanner? ( >=media-gfx/sane-backends-1.0.9 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		) )"
-
-RDEPEND="${DEPEND}
-	!minimal? ( !<sys-fs/udev-114
-		fax? ( dev-python/reportlab )
-		scanner? ( X? ( >=media-gfx/xsane-0.89 )
-			!X? ( >=media-gfx/sane-frontends-1.0.9 ) )
-		X? ( >=dev-python/PyQt-3.14 ) )"
-
-CONFIG_CHECK="PARPORT"
-ERROR_PARPORT="Please make sure Device Drivers -> Parallel port support is enabled in your kernel"
-
-pkg_setup() {
-	if ! use ppds ; then
-		ewarn "Not installing built-in PPD files, which is probably not what you want."
-		ewarn "You need USE=ppds if you want to install them."
-	fi
-	if use minimal ; then
-		ewarn "Installing hpijs driver only, make sure you know what you are doing."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-
-	# 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}"
-
-	# Fix bug #195565
-	epatch "${FILESDIR}"/${P}-subprocess_replacement.patch
-
-	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"
-
-	# 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"
-
-	# bug 186906, makes udev-rules work also for kernel-2.6.22
-	sed -i -e "s/usb_device/usb|usb_device/" -e "s/SYSFS/ATTRS/g" \
-		data/rules/55-hpmud.rules || die "Patching 55-hpmud.rules failed"
-}
-
-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
-
-	use minimal && rm -rf "${D}"/usr/lib
-}
-
-pkg_preinst() {
-	if ! use minimal && 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 >> "${T}"/dll.conf
-		doins "${T}"/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 "This release doesn't use an init script anymore, so you should probably do a"
-	elog "'rc-update del hplip' if you are updating."
-}