Remove old.

Package-Manager: portage-2.1.11.9/cvs/Linux i686

3 files changed, 8 insertions, 245 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 6a96e91fac5e..7be3d9a81cdd 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,9 @@
 # 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.233 2012/08/18 08:31:27 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.234 2012/09/13 18:50:32 billie Exp $
+
+  13 Sep 2012; Daniel Pielmeier <billie@gentoo.org> -hplip-3.12.6.ebuild:
+  Remove old.
 
   18 Aug 2012; Daniel Pielmeier <billie@gentoo.org> hplip-3.12.6.ebuild,
   hplip-3.12.6-r1.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 52805d43fb76..d79c9e99e114 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -16,13 +16,12 @@ DIST hplip-3.12.6.tar.gz 21227044 SHA256 54578000792969adb583e75efeacb9c46ab6965
 EBUILD hplip-3.11.10.ebuild 7632 SHA256 564a6f920494bc5be3154e488212d8b3cf65b3541415f3998bca16ec838e0a1e SHA512 d3e2044e506a89ab31c847bd5f5b7b6c306c221e1b5dde88a8a860092dff81038716829da6c881a42bb3d5e2b5acb6add16eace7d8970fe5e7fd6dc89b2720d0 WHIRLPOOL cca2400af07091e43c4792ddd58e7019fdcd243fe0df0c5726d9a6d6d68096251a2594492953c3644e7103f0cf3a68aa541fd8cb37a2a5e1d6de677aad55525e
 EBUILD hplip-3.12.4.ebuild 6539 SHA256 d5e1808bb0f3a57277c718c3485f47ebfc4f3aae5209189203e01003ba228b03 SHA512 31e2034113274afb15cb6f5090e99795a5eda98e02be8040a655c7737572b471115630bd53859cf9209875bad63bcf760c0992e3f02507c01048e738194926ab WHIRLPOOL 32a207ccd041cd3ae80dc05db9736de7ead7e381a807c93b8c438397a830d8d52ee768324f2d37e780362a7c0db1adada5873f4c0373c7820dea85d30c582373
 EBUILD hplip-3.12.6-r1.ebuild 6861 SHA256 92167e80dfaf8ae40023e4e949c068f575cf499cde3c1f154a2da42179f00b9a SHA512 e233b513676bbeea26b829d191871ddc656ecc0a91377cd95af6753b7485b55a9bca8b4ee59503841b0bbf0e74cbc67bab7eec4024ec6f038d0320d196653b4c WHIRLPOOL 2170b1f89110f8fef97ead5f274c92bf5369838e6f0eb2a6e411008068a9c6b7f3ada3ce745da80edb16c28da87dfe7a3681f48d9d0e6a2458356633138375b9
-EBUILD hplip-3.12.6.ebuild 6628 SHA256 e666b264a8111f5f0b56297be148bfac7ef4504540a08a9ddafc7ce96c7f9f16 SHA512 28e36eb7a133838867bd515f868ac31b8d98c6aa19a8207ee51bd3e66dcd92c4b4f79e170d9ec32681bbf850a359145a5f74683079d679ad0824c24ec178c2e2 WHIRLPOOL fa87c7443725f86fe92f9c1a9b63b019e08d8b0d470a4cb7b9a42dc151fa31b85ac0d746e4604cb100cc5a096cd6c01718a5c870c0a0ad3ac8cf8fa1dc37b99c
-MISC ChangeLog 40741 SHA256 5dea15cbd7097898117197a7061866bac6a39f449bad28ebb7c125977a4f969f SHA512 d3d7177818229a6c4971ebcfcdead21fb5ff85ceff8a1416b3cb5b932870c5f25fe6e4d4afd7c8df35ed76adff2fc3a6b56e2befddc15e5431e0e97767e59b06 WHIRLPOOL abcbbe645206a46a106a3d11dcf9553157da790eb362c6fe585c907b98bb690009cb473cdd66c3b814f67f8624abfbdf9058abce6e46f873999dcfbf50c92f92
+MISC ChangeLog 40830 SHA256 7dff226f17084dbd33288fef7321041ae4615bed4c60c34676b15b96f23930db SHA512 fc529d4ea55687402e9692ce764dc9979a31dc81c13c6ed28b76f8df7b8ceb1a4c47b0229a440b0e6badf2f4984f167bf858984b21fb2b612b940c0f0b17f327 WHIRLPOOL db356040c5f9d89f737ab7dd707dc42a98532e78e079867ceefbed8c36db36d0809eaea57e063e1372896adf6f1406361c679bdfdb748b1d1322eb6d471b592d
 MISC metadata.xml 1711 SHA256 7859a09f81f31df3e3b1bc2281f69936856ea8b81f381bea85d84d77f389ccc4 SHA512 ee7c3bb53561df1b81738e8a8b2f8beb8fad570bc4db910e72054b4115d1bd7797569d692a3b4b28a076e9797290c1b501ddb4a37ebded914f0093d61b6a1c8c WHIRLPOOL 63c67c317f97f7ca3c3d1450733765551adae4bfc4b4c3ff342de695953e5bbc9cda53235c2b0e3a489d29cd8734685500989076489708fdaa0529a94de8c5aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAvUusACgkQlcuUeyFa0U1gEACgjM8AMtO0ljWpM7uQ0rdpsQtd
-4sUAoK9tvj0L74Ufah9gLQOXw7sNK28W
-=3D/a
+iEYEAREIAAYFAlBSKv4ACgkQlcuUeyFa0U1hsQCfeMMAF5fp+llKukLMhNmY4fSH
+NQQAoJBePRmKZBtuWbyJZnoSRgXFJ+g0
+=81Ul
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.12.6.ebuild b/net-print/hplip/hplip-3.12.6.ebuild
deleted file mode 100644
index 38aa0b2ee221..000000000000
--- a/net-print/hplip/hplip-3.12.6.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.ebuild,v 1.4 2012/08/18 08:31:27 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
-
-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 -acl X"
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) )
-	!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
-		)
-	)"
-
-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
-	sed -i -e "s|/etc/udev/rules.d|/lib/udev/rules.d|" \
-		$(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
-		|| 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 \
-		--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 acl udev-acl-rules) \
-		$(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
-}