Remove old.

Package-Manager: portage-2.1.12.2/cvs/Linux i686
Manifest-Sign-Key: 0x215AD14D

3 files changed, 8 insertions, 276 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index bf961ce6bce3..00dedd7bd03e 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.271 2013/05/18 08:07:20 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.272 2013/06/07 14:46:04 billie Exp $
+
+  07 Jun 2013; Daniel Pielmeier <billie@gentoo.org> -hplip-3.13.4.ebuild:
+  Remove old.
 
 *hplip-3.13.5 (18 May 2013)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 45a3351f8edb..0625c8ab6306 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,18 +3,16 @@ Hash: SHA256
 
 DIST hplip-3.12.10-patches-1.tar.xz 10496 SHA256 7b8f10c1e58ca60778c5c240e51d68472237a45235a03f0b54cd1ffc9dac9632 SHA512 4947077b17bc9f4714302c99917d359cc7dda728393c8fe88d21f26e923dcb5d0535fc56c403920fce359be2951e6ac0c92cb5ba3a659bca452e08f83d8a09a8 WHIRLPOOL f759953c8495eddd0df0bbb3f2ad29e28004659d39f1d415c89604fdebf6729e914ab6830c540ff9c3f693ceb609aff882265bc0ff8a8d1e2637285d7d51158f
 DIST hplip-3.12.10a.tar.gz 21827613 SHA256 616a30f260407f959874d35d351eaf73c74f7f8f016a7826286c88d923a4b1fc SHA512 870a794fdd729aa69b392c3d5cba764ee77141be16313adaf43089c82de397b64517e88d986ecc6f1766cdd5381fa103528ee214358e7b9398f7d4bd70d5f33c WHIRLPOOL 45d2831f593b609b4e4e774c0bf446dd98cb8ad4eba797baafbc43d8af4897764973066348dde08f97ae90635becbe3e91419fbc080d4fdb0a3771b8e63d3c89
-DIST hplip-3.13.4.tar.gz 20680774 SHA256 1adad3b15578bf81eae93d554f877fea78c734f4b4f2e34606230b2fe62d6956 SHA512 4b1b02f4cf3b0f7d7e030b8981d72f4dae03cf9b2b0515c05d1ab83cefb8d69c446cd9825aadf2625d53a0e51ae45287e0c546ea998737a030bb93a1703900d8 WHIRLPOOL 6ff3949fa7cf8f3b4acc0e722686197a868bd6fd248bc55f8b86f20cbd0a255915ed90ff5c3f596692a2918620bc8fa3614a54981e99e9f1c4e25bea3065383a
 DIST hplip-3.13.5-patches-1.tar.xz 10200 SHA256 72d2b5d455c56bf97401298419c18bb21824a84785a7c05eb047139aa17efb93 SHA512 e2dc03689c09a4cc473391d0593c699e8c7affbf553fe0190488a86533d6deaeb8a108ecc0a58a97ffdac15770923d03803977aa59c0ce762f9ea17b8eeee862 WHIRLPOOL 410995e1564eea0d2982f957613a1d5862ca0c87dd524a053a69f603ad6b53c4837cbd88394610c3aa4883b8893cf3d99712a409f921a5e682cc97537fc0dbdd
 DIST hplip-3.13.5.tar.gz 20737422 SHA256 cf50cb93353b142fa0e2aa18f6c97e1f46b7f462d3187ed7a3800aef924cd474 SHA512 928d22d746103cf83c1ea59b9a05e63ec581d3c1f77ec1bfe3742f3aabdba4b265cbaad9291bdbdcea62a5352e2a06018454cb2a0316567a92678bd16f0b2941 WHIRLPOOL d0cce0c66e27fa96e1437600ebf8d883d0f7abd5e75f6374f67e569c535108db6173d4a19e3ed09f8f3d79de590f18f0866ab6b1804437f96f39a3d4794a435b
 EBUILD hplip-3.12.10a.ebuild 6774 SHA256 0bbe59d0b90af08c9b9ba92c75a80b7864755e222514cf3ec5f02697b4857701 SHA512 7088959016734bf194fbae687f96881ebcbf712a89054fd0e883f51e7fd70a28989cb84d07eabb3613a1c77887b335be241acd3e789395bb078873ac27533987 WHIRLPOOL f8eb2628b67872e55c72b1923c522716a23524b4e8592707a713653e435a3051cd999e033eaae39ecea9dc68c167d349edccc0910797b8693e08db042ef47002
-EBUILD hplip-3.13.4.ebuild 8016 SHA256 720cfe04c6d413db714a2722512a181d56bbb956beb247dd0a6170974201a865 SHA512 a7f53f9ee98a6b90345c586a33e64fce809683ea00af3abde41eca1bbab3bbfb59f1e23622f29394f3878ea1e686369784ec4ad15c319fb9cda0d5dc707b91ab WHIRLPOOL 5f1647f4182c0b553d51ee81bed092fcbda2ef9cc9bae97b77c92e28fdf4b88810d769d0233dacab3b81c42249666bc30b680145641c803a6f4570e02a3bb170
 EBUILD hplip-3.13.5.ebuild 8015 SHA256 cf3f79b04e4756f884d3efec5942e2e8c2ed2af6595c24df312774264f68a858 SHA512 6913d55db3e29a8211e88c8ebf91f12641a225595dafd5b074c6736cd035de7372b467ca889e295e550f4847f58c26e07f7f5b2ced9d7d1a9db6c2f522e541fc WHIRLPOOL fce14fb0c116b6db7298bbfc62167e30edfeb916924c6e902e751b1b26b63e82a27a6068cc6ce3d197cb8774aa9b7a45163a39be0679ff50a067a18347c1432a
-MISC ChangeLog 46814 SHA256 009990eb876ec6b40bc1f1ad8f1264eafd6f960694809e11f7829865ed5bfcd6 SHA512 c52cab56f365e584fbb3f7e4c10e53537d8f5bb93b1658c8544f43e024f3463d289b525e7a8e1d5ef938a2150436ea744cffa88041b947ef436c7bb21e7308cd WHIRLPOOL 231c1863dbcca62144d89033c4435a65d54004f7c84d573a1726fca69da3ab757bf4ffc01ef20f0154786504b54c4244a7c3551a8da53a958766e578abd1f8e3
+MISC ChangeLog 46903 SHA256 a0087d5673a55c88933d9235b6c0079ec19f8ac58ed8328116c6ab151415ec9f SHA512 bb6a851c3371fe9ee7bf60b953b9df10b8019647a25c33b096f3df72498c952258a730bc0c28b5c4029af3702273152527190bfb8257517e97230d3e49d58f5e WHIRLPOOL 72661a1d70466762b6fa48c90d9ffe62be0851779461ff083c0d38ab13ddc7a0ab4b0c45f6d0aa9a957aa93683df6293cecb0c622a34a764266b371eeb8df15b
 MISC metadata.xml 1742 SHA256 75145099056e78b169dc2684c98d359678512eba66b44620d9a8dd0bb035d01b SHA512 d87dda6d978108e0cc166e6985494d8dfb2e4a4637e205766da37f99ec208c99fd76f7892ac1f971626f9c671d73ce3f2faddc6cf834abb04a59331267fe68d4 WHIRLPOOL d38f75f8dc2925babd8ebd09f8ed527e1980e991d863b2533980f01b62d593f75bb1cb6ebc5886018659c0079b9c7476abea367fa9abe7986b7dfc7ce1561a99
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGXNrkACgkQlcuUeyFa0U1JxACdEXLQvuW2uBAa+9eSMUWHOjXz
-9+YAn00OF2kTp6QmrSOwKiLlN6ST1Giz
-=sB/c
+iEYEAREIAAYFAlGx8i0ACgkQlcuUeyFa0U2b4QCfR5377KTcNb1G+UxcjTvUXYra
+JiUAoOsKZ/MOhzbptydxygH8j5scMt7Y
+=31Zw
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.13.4.ebuild b/net-print/hplip/hplip-3.13.4.ebuild
deleted file mode 100644
index 58c1e247be97..000000000000
--- a/net-print/hplip/hplip-3.13.4.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.13.4.ebuild,v 1.1 2013/04/12 15:39:45 billie Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="threads,xml"
-
-inherit eutils fdo-mime linux-info python-single-r1 udev 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/${PN}-3.12.10-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 -libusb0 minimal parport policykit qt4 scanner snmp static-ppds X"
-
-# TODO: check if net-print/cups, net-analyzer/net-snmp
-# are migrated to python-r1
-
-COMMON_DEPEND="
-	virtual/jpeg
-	hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
-	!minimal? (
-		${PYTHON_DEPS}
-		>=net-print/cups-1.4.0
-		!libusb0? ( virtual/libusb:1 )
-		libusb0? ( virtual/libusb:0 )
-		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
-		fax? ( >=sys-apps/dbus-1.6.8-r1 )
-		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-1.1.1-r1[${PYTHON_USEDEP}]
-	policykit? (
-		sys-auth/polkit
-	)
-	!minimal? (
-		>=dev-python/pygobject-2.28.6-r53:2[${PYTHON_USEDEP}]
-		kernel_linux? ( virtual/udev !<sys-fs/udev-114 )
-		scanner? (
-			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=dev-python/imaging-1.1.7-r2[${PYTHON_USEDEP}]
-			X? ( || (
-				kde? ( kde-misc/skanlite )
-				media-gfx/xsane
-				media-gfx/sane-frontends
-			) )
-		)
-		fax? (
-			>=dev-python/reportlab-2.6[${PYTHON_USEDEP}]
-			>=dev-python/dbus-python-1.1.1-r1[${PYTHON_USEDEP}]
-		)
-		qt4? (
-			>=dev-python/PyQt4-4.9.6-r2[dbus,X,${PYTHON_USEDEP}]
-			libnotify? (
-				>=dev-python/notify-python-0.1.1-r3[${PYTHON_USEDEP}]
-			)
-		)
-	)"
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-pkg_setup() {
-	use !minimal && python-single-r1_pkg_setup
-
-	! 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() {
-	if use !minimal ; then
-		python_export EPYTHON PYTHON
-		python_fix_shebang .
-	fi
-
-	EPATCH_SUFFIX="patch" \
-	EPATCH_FORCE="yes" \
-	epatch "${WORKDIR}"
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(udev_get_udevdir)
-	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 || die
-		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-			gzip > ${i}.temp || die
-		mv ${i}.temp ${i} || die
-	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 libusb0 ; then
-		myconf="${myconf} --enable-libusb01_build"
-	else
-		myconf="${myconf} --disable-libusb01_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-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: https://bugs.gentoo.org/show_bug.cgi?id=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
-
-	if use !minimal ; then
-		python_export EPYTHON PYTHON
-		python_optimize "${D}"/usr/share/hplip
-	fi
-}
-
-pkg_preinst() {
-	# remove temporary directory so it is recreated with correct permissions
-	# this ensures correct permissions when upgrading from vulnerable versions
-	# remove this after some time
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=452586
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1016507
-	if [[ $(stat -c '%A' /var/lib/hp/) =~ w.$ ]] ; then
-		rm -rf "${ROOT%/}/var/log/hp"
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		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."
-	fi
-}