Remove old.

(Portage version: 2.1.7.17/cvs/Linux i686)

4 files changed, 5 insertions, 427 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index f33abec411ec..dc0b7ec58517 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.149 2010/03/04 22:15:35 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.150 2010/03/16 17:48:47 billie Exp $
+
+  16 Mar 2010; Daniel Pielmeier <billie@gentoo.org> -hplip-2.8.6b.ebuild,
+  -hplip-3.9.8-r3.ebuild, metadata.xml:
+  Remove old.
 
   04 Mar 2010; Daniel Pielmeier <billie@gentoo.org> hplip-3.9.12-r1.ebuild,
   hplip-3.10.2.ebuild:
diff --git a/net-print/hplip/hplip-2.8.6b.ebuild b/net-print/hplip/hplip-2.8.6b.ebuild
deleted file mode 100644
index 45fd99fc3e1f..000000000000
--- a/net-print/hplip/hplip-2.8.6b.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-2.8.6b.ebuild,v 1.13 2010/01/02 23:31:50 yngwin Exp $
-
-EAPI="1"
-
-inherit eutils linux-info python
-
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
-HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="cupsddk dbus doc fax minimal parport ppds qt4 scanner snmp"
-
-# Note : libusb-compat untested (calchan 20090516)
-
-DEPEND="!net-print/hpijs
-	!net-print/hpoj
-	app-text/ghostscript-gpl
-	>=media-libs/jpeg-6b
-	>=net-print/foomatic-filters-3.0.20080507
-	!minimal? (
-		>=net-print/cups-1.2
-		dev-libs/libusb:0
-		cupsddk? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
-		dbus? ( >=sys-apps/dbus-1.0.0 )
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
-	)"
-
-RDEPEND="${DEPEND}
-	!minimal? (
-		!<sys-fs/udev-114
-		scanner? (
-			dev-python/imaging
-			qt4? ( >=media-gfx/xsane-0.89 )
-			!qt4? ( >=media-gfx/sane-frontends-1.0.9 )
-		)
-		qt4? ( dev-python/PyQt4
-			dbus? ( >=dev-python/dbus-python-0.80 )
-			fax? ( dev-python/reportlab )
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
-
-pkg_setup() {
-	if ! use ppds && ! use cupsddk; then
-		ewarn "Installing neither static (USE=-ppds) nor dynamic (USE=-cupsddk) PPD files,"
-		ewarn "which is probably not what you want. You will almost certainly not be able to "
-		ewarn "print (recommended: USE=\"cupsddk -ppds\")."
-	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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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"
-
-	# Replace udev rules, see bug #197726.
-	rm data/rules/55-hpmud.rules
-	cp "${FILESDIR}"/70-hpmud.rules data/rules
-	sed -i -e "s/55-hpmud.rules/70-hpmud.rules/g" Makefile.* */*.html || die "sed failed"
-
-	# Use system foomatic-rip instead of foomatic-rip-hplip
-	sed -i -e 's/foomatic-rip-hplip/foomatic-rip/' ppd/*.ppd || die "sed failed"
-
-	# Qt4 is still undocumented by upstream, so use with caution
-	local QT_VER
-	use qt4 && QT_VER="4"
-	sed -i \
-		-e "s/%s --force-startup/%s --force-startup --qt${QT_VER}/" \
-		-e "s/'--force-startup'/'--force-startup', '--qt${QT_VER}'/" \
-		base/device.py || die "sed failed"
-	sed -i \
-		-e "s/Exec=hp-systray/Exec=hp-systray --qt${QT_VER}/" \
-		hplip-systray.desktop.in || die "sed failed"
-}
-
-src_compile() {
-	if use qt4 ; then
-		local GUI_BUILD="--enable-gui-build"
-	else
-		local GUI_BUILD="--disable-gui-build"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		--disable-cups11-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--disable-foomatic-rip-hplip-install \
-		${GUI_BUILD} \
-		$(use_enable doc doc-build) \
-		$(use_enable cupsddk foomatic-drv-install) \
-		$(use_enable dbus dbus-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable minimal hpijs-only-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable ppds foomatic-ppd-install) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		|| die "econf failed"
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	rm -f "${D}"/etc/sane.d/dll.conf
-
-	# bug 106035
-	use qt4 || rm -Rf "${D}"/usr/share/applications
-
-	use minimal && rm -rf "${D}"/usr/lib
-}
-
-pkg_preinst() {
-	# 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
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-
-	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 from an old version."
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/net-print/hplip/hplip-3.9.8-r3.ebuild b/net-print/hplip/hplip-3.9.8-r3.ebuild
deleted file mode 100644
index 45bd40499200..000000000000
--- a/net-print/hplip/hplip-3.9.8-r3.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.7 2010/01/10 15:21:40 maekke Exp $
-
-EAPI="2"
-
-inherit fdo-mime linux-info python autotools
-
-DESCRIPTION="HP Linux Imaging and Printing System. Includes printer, scanner, fax drivers and service tools."
-HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt4 scanner snmp static-ppds -udev-acl"
-
-# Note : libusb-compat untested (calchan 20090516)
-
-COMMON_DEPEND="
-	app-text/ghostscript-gpl
-	media-libs/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
-	udev-acl? ( >=sys-fs/udev-145[extras] )
-	!minimal? (
-		net-print/cups
-		virtual/libusb:0
-		>=dev-lang/python-2.4.4[threads,xml]
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	!minimal? (
-		kernel_linux? ( >=sys-fs/udev-114 )
-		scanner? (
-			dev-python/imaging
-			gtk? ( media-gfx/xsane )
-			!gtk? ( media-gfx/sane-frontends )
-		)
-		fax? (
-			dev-python/reportlab
-			sys-apps/dbus
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			dev-python/pygobject
-			libnotify? (
-				dev-python/notify-python
-			)
-			policykit? (
-				sys-auth/policykit
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
-
-pkg_setup() {
-	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	use scanner && ! use gtk && ewarn "You need USE=gtk for the scanner GUI."
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-		ewarn "Recommended USE flags: USE=\"hpcups -hpijs\")."
-	fi
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e "s/'skipstone']/'skipstone', 'epiphany']/" \
-		-e "s/'skipstone': ''}/'skipstone': '', 'epiphany': '--new-window'}/" \
-		base/utils.py  || die "Sed base/utils.py failed"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" hpssd.py || die "Sed 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 installer/core_install.py failed"
-
-	# SYSFS deprecated - https://bugs.launchpad.net/hplip/+bug/346390
-	sed -i -e "s/SYSFS/ATTRS/g" -e "s/sysfs/attrs/g" data/rules/56-hpmud_support.rules \
-		data/rules/55-hpmud.rules || die "Sed 55-hpmud.rules 56-hpmud_support.rules failed"
-
-	sed -i \
-		-e s:/usr/lib/cups/driver:$(cups-config --serverbin)/driver:g \
-		installer/core_install.py || die "Sed installer/core_install.py failed"
-
-	# Use system foomatic-rip instead of foomatic-rip-hplip
-	local i
-	for i in ppd/{hpcups,hpijs}/*.ppd.gz
-	do
-		rm -f ${i}.temp
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die "Sed *.ppd.gz failed"
-		mv ${i}.temp ${i}
-	done
-
-	local qt_ver
-	if use qt4 ; then
-		qt_ver="4"
-		sed -i \
-			-e "s/%s --force-startup/%s --force-startup --qt${qt_ver}/" \
-			-e "s/'--force-startup'/'--force-startup', '--qt${qt_ver}'/" \
-			base/device.py || die "Sed base/device.py failed"
-		sed -i \
-			-e "s/Exec=hp-systray/Exec=hp-systray --qt${qt_ver}/" \
-			hplip-systray.desktop.in || die "Sed hplip-systray.desktop.in failed"
-	fi
-
-	# htmldocs are not installed under docdir/html
-	# the following sed enables --htmldir configure switch in src_configure
-	if use doc ; then
-			sed -i -e 's/www\([0-9]\)dir = $(docdir)/www\1dir = $(htmldir)/g' Makefile.am || die "Sed Makefile.am failed"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local drv_build gui_build myconf
-
-	if use qt4 ; then
-		gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
-		if use policykit ; then
-			myconf="--enable-policykit"
-		else
-			myconf="--disable-policykit"
-		fi
-	else
-		gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
-	fi
-
-	if use fax || use qt4 ; then
-		myconf="${myconf} --enable-dbus-build"
-	else
-		myconf="${myconf} --disable-dbus-build"
-	fi
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-new-hpcups \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--htmldir=/usr/share/doc/${P}/html \
-		${drv_build} \
-		${gui_build} \
-		${myconf} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable minimal hpijs-only-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable udev-acl udev-acl-rules)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Emake install failed"
-
-	# Bug #201023
-	rm -f "${D}"/etc/sane.d/dll.conf
-
-	# bug 106035/259763
-	if ! use qt4 ; then
-		rm -r "${D}"/usr/share/applications "${D}"/etc/xdg
-	fi
-
-	# kde3 autostart hack
-	if [[ -d /usr/kde/3.5/share/autostart ]] && use !minimal ; then
-		insinto /usr/kde/3.5/share/autostart
-		doins hplip-systray.desktop
-	fi
-}
-
-pkg_preinst() {
-	# 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 "${ROOT}"/usr/libexec/cups/backend/hp{,fax}
-	fi
-}
-
-pkg_postinst() {
-	use !minimal && python_mod_optimize /usr/share/${PN}
-	fdo-mime_desktop_database_update
-
-	elog "You should run hp-setup as root if you are installing hplip for the first time,"
-	elog "and may also 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"
-	elog "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 from an old version."
-	elog
-	elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
-	elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
-	elog "If you prefer the SLP method you have to choose this when configuring the"
-	elog "device."
-}
-
-pkg_postrm() {
-	use !minimal && python_mod_cleanup /usr/share/${PN}
-	fdo-mime_desktop_database_update
-}
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index b4d1173ba0db..b2794055ec41 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/metadata.xml
@@ -21,10 +21,6 @@
 
   <use>
     <flag name="doc">Build documentation</flag>
-    <flag name="cupsddk">Add support for <pkg>net-print/cupsddk</pkg> which
-    enables dynamic PPD files (recommended)</flag>
-    <flag name="dbus">Add support for <pkg>sys-apps/dbus</pkg> which enables
-    better communications with your device (recommended)</flag>
     <flag name="fax">Enable fax on multifunction devices which support
     it</flag>
     <flag name="gtk">Enable GTK+ dependencies, currently only the scanner GUI
@@ -40,8 +36,6 @@
     it</flag>
     <flag name="policykit">Enable sys-auth/policykit authentication
     support</flag>
-    <flag name="ppds">Use precompiled PPD files (obsolete, use cupsddk
-    instead)</flag>
     <flag name="qt4">Enable graphical interface using Qt 4</flag>
     <flag name="scanner">Enable scanner on multifunction devices which support
     it</flag>