3 files changed, 5 insertions, 479 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index bfb37e4722b9..b7bc7120b382 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.237 2012/09/22 13:52:14 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.238 2012/10/01 16:21:06 billie Exp $
+
+  01 Oct 2012; Daniel Pielmeier <billie@gentoo.org> -hplip-3.12.6-r1.ebuild,
+  -hplip-3.12.9.ebuild:
+  Remove old.
 
 *hplip-3.12.9-r1 (22 Sep 2012)
 
diff --git a/net-print/hplip/hplip-3.12.6-r1.ebuild b/net-print/hplip/hplip-3.12.6-r1.ebuild
deleted file mode 100644
index 6cda4fc10a3a..000000000000
--- a/net-print/hplip/hplip-3.12.6-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.6-r1.ebuild,v 1.3 2012/09/18 18:10:42 billie Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit fdo-mime linux-info python autotools toolchain-funcs
-
-DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
-HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		http://dev.gentoo.org/~billie/distfiles/${P}-patches-2.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!minimal? (
-		>=net-print/cups-1.4.0
-		virtual/libusb:1
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl:0
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	dev-python/dbus-python
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		dev-python/pygobject:2
-		kernel_linux? ( >=sys-fs/udev-114 )
-		scanner? (
-			dev-python/imaging
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			dev-python/reportlab
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			libnotify? (
-				dev-python/notify-python
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-pkg_setup() {
-	if ! use minimal; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	use scanner && ! use X && ewarn "You need USE=X 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."
-	fi
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use !minimal && python_convert_shebangs -q -r 2 .
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Fix for Gentoo bug #345725
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i}
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	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"
-		drv_build="${drv_build} --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
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-libusb01_build \
-		--disable-udev_sysfs_rules \
-		--disable-udev-acl-rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
-		$(use_enable qt4) \
-		$(use_enable policykit)
-}
-
-src_install() {
-	default
-
-	# Installed by sane-backends
-	# Gentoo Bug: #201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${D}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -exec rm -rf {} + || die
-}
-
-pkg_postinst() {
-	use !minimal && python_mod_optimize /usr/share/${PN}
-	fdo-mime_desktop_database_update
-
-	elog "For more information on setting up your printer please take"
-	elog "a look at the hplip section of the gentoo printing guide:"
-	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-	elog
-	elog "Any user who wants to print must be in the lp group."
-}
-
-pkg_postrm() {
-	use !minimal && python_mod_cleanup /usr/share/${PN}
-	fdo-mime_desktop_database_update
-}
diff --git a/net-print/hplip/hplip-3.12.9.ebuild b/net-print/hplip/hplip-3.12.9.ebuild
deleted file mode 100644
index 93e453d92f23..000000000000
--- a/net-print/hplip/hplip-3.12.9.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.9.ebuild,v 1.2 2012/09/18 18:10:42 billie Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="!minimal? 2"
-PYTHON_USE_WITH="threads xml"
-PYTHON_USE_WITH_OPT="!minimal"
-
-inherit fdo-mime linux-info python autotools toolchain-funcs
-
-DESCRIPTION="HP Linux Imaging and Printing. Includes printer, scanner, fax drivers and service tools."
-HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		http://dev.gentoo.org/~billie/distfiles/${P}-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-# zeroconf does not work properly with >=cups-1.4.
-# Thus support for it is also disabled in hplip.
-IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!minimal? (
-		>=net-print/cups-1.4.0
-		virtual/libusb:1
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( sys-apps/dbus )
-		snmp? (
-			net-analyzer/net-snmp
-			dev-libs/openssl:0
-		)
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ghostscript-gpl-8.71-r3
-	dev-python/dbus-python
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		dev-python/pygobject:2
-		kernel_linux? ( >=sys-fs/udev-114 )
-		scanner? (
-			dev-python/imaging
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			dev-python/reportlab
-			dev-python/dbus-python
-		)
-		qt4? (
-			dev-python/PyQt4[dbus,X]
-			libnotify? (
-				dev-python/notify-python
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-pkg_setup() {
-	if ! use minimal; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
-
-	use scanner && ! use X && ewarn "You need USE=X 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."
-	fi
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-	else
-		use parport && linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use !minimal && python_convert_shebangs -q -r 2 .
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Fix for Gentoo bug #345725
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	local i
-	for i in ppd/hpijs/*.ppd.gz ; do
-		rm -f ${i}.temp
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i}
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf drv_build minimal_build
-
-	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"
-		drv_build="${drv_build} --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
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-	fi
-
-	econf \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-libusb01_build \
-		--disable-udev_sysfs_rules \
-		--disable-udev-acl-rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		${myconf} \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
-		$(use_enable parport pp-build) \
-		$(use_enable scanner scan-build) \
-		$(use_enable snmp network-build) \
-		$(use_enable qt4 gui-build) \
-		$(use_enable qt4) \
-		$(use_enable policykit)
-}
-
-src_install() {
-	default
-
-	# Installed by sane-backends
-	# Gentoo Bug: #201023
-	rm -f "${D}"/etc/sane.d/dll.conf || die
-
-	rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${D}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -exec rm -rf {} + || die
-}
-
-pkg_postinst() {
-	use !minimal && python_mod_optimize /usr/share/${PN}
-	fdo-mime_desktop_database_update
-
-	elog "For more information on setting up your printer please take"
-	elog "a look at the hplip section of the gentoo printing guide:"
-	elog "http://www.gentoo.org/doc/en/printing-howto.xml"
-	elog
-	elog "Any user who wants to print must be in the lp group."
-}
-
-pkg_postrm() {
-	use !minimal && python_mod_cleanup /usr/share/${PN}
-	fdo-mime_desktop_database_update
-}