remove old

Package-Manager: portage-2.1.2_pre2-r9

3 files changed, 8 insertions, 216 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 9399b13aac26..c09596c39be6 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -47,24 +47,19 @@ MD5 24d215a1cf4e63bc56e89755e90f3645 files/pdftops.pl 5624
 RMD160 17b481f70cb47acff4272ec143261e920459d0bd files/pdftops.pl 5624
 SHA256 60fc863f11c5b114b5bfd8bbba905abca5526c92581f7a5b5570e8723a4aeebc files/pdftops.pl 5624
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
-DIST cups-1.2.2-source.tar.bz2 3527322 RMD160 f0faa978ae50c5a0cf9bff43f72ab5ca2d530a3e SHA1 c392e216e1eaa0d5dee437056d70c3457a93e35c SHA256 16dad788e7d2060a3b59778edb1c39c2354c800c127fe6768f8005580533e776
 DIST cups-1.2.4-source.tar.bz2 3546082 RMD160 eb8414dafa5e8a108ae6644a1a62f68ae8cfdc13 SHA1 4a6cb772cf64242b71a716711896c004c3636ad7 SHA256 707910641f5dc30253e548ac32033fe23a70e4e0ac589ce956ee0b8869279dcd
 EBUILD cups-1.1.23-r8.ebuild 4985 RMD160 e01cbcb4bd77aa3e2b232253235e185129167ee6 SHA1 78928d8874e21abfa07a6dc315182e7b201207a0 SHA256 37605ea842c753d35a37cc36f651dad3e6cc6fae9c3cb1c832a689b3f3961321
 MD5 54a99ab704429d053d41ff1fe558188e cups-1.1.23-r8.ebuild 4985
 RMD160 e01cbcb4bd77aa3e2b232253235e185129167ee6 cups-1.1.23-r8.ebuild 4985
 SHA256 37605ea842c753d35a37cc36f651dad3e6cc6fae9c3cb1c832a689b3f3961321 cups-1.1.23-r8.ebuild 4985
-EBUILD cups-1.2.2.ebuild 5850 RMD160 b5f34bdaeb2306c3178d83cffe5994304ac5fcbd SHA1 fae2fa38e8cf396d1dba32d99068ea7b40ebef49 SHA256 dbb6c560bf4507c44336bdf9962bc01d3bcea853929a170960b14a329a1369b4
-MD5 da07d9b2f53019a793c0e3d3e9b8be40 cups-1.2.2.ebuild 5850
-RMD160 b5f34bdaeb2306c3178d83cffe5994304ac5fcbd cups-1.2.2.ebuild 5850
-SHA256 dbb6c560bf4507c44336bdf9962bc01d3bcea853929a170960b14a329a1369b4 cups-1.2.2.ebuild 5850
-EBUILD cups-1.2.4.ebuild 5768 RMD160 34e0634563b917b5886e29e79e2444c8fe24e25e SHA1 9c29fafbdd104fe78d9884c06275caddec3594de SHA256 d4b21d315ac8ffe32c122f77311388243ba009c4856d1a985ee32894fcce1fb9
-MD5 a5a4ea4ead9c219291d55de7d0a42f96 cups-1.2.4.ebuild 5768
-RMD160 34e0634563b917b5886e29e79e2444c8fe24e25e cups-1.2.4.ebuild 5768
-SHA256 d4b21d315ac8ffe32c122f77311388243ba009c4856d1a985ee32894fcce1fb9 cups-1.2.4.ebuild 5768
-MISC ChangeLog 29213 RMD160 8b13c3a6756a04960f8e991558a511ebdd384a47 SHA1 e09b48d2ae243e2a51a17399c829d5e43ca5a725 SHA256 a3dd90e2087f4250acae49f25e6ebd454498673452f189bbcdac3ca25f6236cd
-MD5 c29ab71faed23d63b5f1dbbcbd8f8015 ChangeLog 29213
-RMD160 8b13c3a6756a04960f8e991558a511ebdd384a47 ChangeLog 29213
-SHA256 a3dd90e2087f4250acae49f25e6ebd454498673452f189bbcdac3ca25f6236cd ChangeLog 29213
+EBUILD cups-1.2.4.ebuild 5773 RMD160 2c82eb2856a5181a9f43186f5ae8ddaa8dc46bc7 SHA1 9f54e036ce0b9075c61ada7f3f26d2365c805810 SHA256 f7b22f451504285ae8ec682a266e92fbdded94f7c2649ec0af35b1a1e9c49e4d
+MD5 f6e97369ce895f13c3d864fa0267deab cups-1.2.4.ebuild 5773
+RMD160 2c82eb2856a5181a9f43186f5ae8ddaa8dc46bc7 cups-1.2.4.ebuild 5773
+SHA256 f7b22f451504285ae8ec682a266e92fbdded94f7c2649ec0af35b1a1e9c49e4d cups-1.2.4.ebuild 5773
+MISC ChangeLog 29321 RMD160 91a05ef11f8a7c4b1f8b710aeb162e39006ad5e7 SHA1 c8b8c5569f5077737cb6b3e5d02ff0d8eff57f00 SHA256 d22eb98208a6c9a7667c64a2078e75b2760037cd8c86b186c2cb3c65cc9b65d6
+MD5 db2c4f9f9d95bb2503d0b327d5302ad3 ChangeLog 29321
+RMD160 91a05ef11f8a7c4b1f8b710aeb162e39006ad5e7 ChangeLog 29321
+SHA256 d22eb98208a6c9a7667c64a2078e75b2760037cd8c86b186c2cb3c65cc9b65d6 ChangeLog 29321
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -72,9 +67,6 @@ SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata
 MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r8 262
 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r8 262
 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r8 262
-MD5 6ca104f41098627aed8831c9c787c6f2 files/digest-cups-1.2.2 259
-RMD160 5816b73bced2a425eadfd3ee49d3022e42c4741f files/digest-cups-1.2.2 259
-SHA256 dacf58f7bf93d749bdd7330f57e43ab53d507c143f509920c9a5c4aa106a1c6b files/digest-cups-1.2.2 259
 MD5 64e535db8d839184a0b4e3a3c7bc9571 files/digest-cups-1.2.4 259
 RMD160 b6fb48422caa94e5e43e654b5dff450e1ba0d940 files/digest-cups-1.2.4 259
 SHA256 a7c03e62e92a4a9a394acd423c6cce5af8e0c6a6afae5b44686c21858e79ec52 files/digest-cups-1.2.4 259
diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild
deleted file mode 100644
index 11b4aa409ee5..000000000000
--- a/net-print/cups/cups-1.2.2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.8 2006/09/04 10:30:43 vapier Exp $
-
-inherit autotools eutils flag-o-matic multilib pam
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
-#ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl slp pam samba nls dbus tiff png ppds jpeg X"
-
-DEP="pam? ( virtual/pam )
-	ssl? ( net-libs/gnutls )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	dbus? ( || ( sys-apps/dbus-core sys-apps/dbus ) )
-	png? ( >=media-libs/libpng-1.2.1 )
-	tiff? ( >=media-libs/tiff-3.5.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	app-text/libpaper"
-DEPEND="${DEP}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEP}
-	nls? ( virtual/libintl )
-	!virtual/lpr
-	>=app-text/poppler-0.4.3-r1
-	X? ( x86? ( x11-misc/xdg-utils ) )
-	"
-PDEPEND="
-	ppds? ( || (
-		(
-			net-print/foomatic-filters-ppds
-			net-print/foomatic-db-ppds
-		)
-		net-print/foomatic-filters-ppds
-		net-print/foomatic-db-ppds
-		net-print/hplip
-		media-gfx/gimp-print
-		net-print/foo2zjs
-		net-print/cups-pdf
-	) )
-	"
-	# keywording xdg-utils in bug 144345
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )
-	virtual/ghostscript"
-PROVIDE="virtual/lpr"
-
-# upstream includes an interactive test which is a nono for gentoo.
-# therefore, since the printing herd has bigger fish to fry, for now,
-# we just leave it out, even if FEATURES=test
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-
-	enewgroup lpadmin 106
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
-
-	# upstream has refused to fix this for me
-	sed -i -e "s:#if defined(__linux) && defined(LP_POUTPA):#if 0:" backend/usb-unix.c
-
-	# cups does not use autotools "the usual way" and ship a static config.h.in
-	eaclocal
-	eautoconf
-}
-
-src_compile() {
-	export DSOFLAGS="${LDFLAGS}"
-	econf \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-system-groups=lpadmin \
-		--localstatedir=/var \
-		--with-docdir=/usr/share/cups/html \
-		--with-bindnow=$(bindnow-flags) \
-		$(use_enable pam) \
-		$(use_enable ssl) \
-		--enable-gnutls \
-		$(use_enable slp) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		$(use_enable png) \
-		$(use_enable jpeg) \
-		$(use_enable tiff) \
-		--enable-libpaper \
-		--enable-threads \
-		--enable-static \
-		--disable-pdftops \
-		|| die "econf failed"
-
-	# Install in /usr/libexec always, instead of using /usr/lib/cups, as that
-	# makes more sense when facing multilib support.
-	sed -i -e 's:SERVERBIN.*:SERVERBIN = $(BUILDROOT)/usr/libexec/cups:' Makedefs
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake BUILDROOT=${D} install || die "emake install failed"
-	dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt
-
-	# clean out cups init scripts
-	rm -rf ${D}/etc/{init.d/cups,rc*,pam.d/cups}
-	# install our init scripts
-	newinitd ${FILESDIR}/cupsd.init cupsd
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	# correct path
-	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd
-	# it is safer to disable this by default, bug 137130
-	grep -w 'disable' ${D}/etc/xinetd.d/cups-lpd || \
-		sed -i -e "s:}:\tdisable = yes\n}:" ${D}/etc/xinetd.d/cups-lpd
-
-	# install pdftops filter
-	exeinto /usr/libexec/cups/filter/
-	newexe ${FILESDIR}/pdftops.pl pdftops
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
-
-	# .desktop handling. X useflag. xdg-open from freedesktop is preferred
-	if use X; then
-		sed -i -e "s:htmlview:xdg-open:" ${D}/usr/share/applications/cups.desktop
-	else
-		rm -r ${D}/usr/share/applications
-	fi
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR ${ROOT}/usr/share/doc/${PN}-*
-}
-
-pkg_postinst() {
-	einfo "Remote printing: change "
-	einfo "Listen localhost:631"
-	einfo "to"
-	einfo "Listen *:631"
-	einfo "in /etc/cups/cupsd.conf"
-	einfo
-	einfo "For more information about installing a printer take a look at:"
-	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
-
-	local good_gs=false
-	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
-		if has_version ${x} && built_with_use ${x} cups; then
-			good_gs=true
-			break
-		fi
-	done;
-	if ! ${good_gs}; then
-		ewarn
-		ewarn "You need to emerge ghostscript with the cups-USEflag turned on"
-	fi
-	if has_version =net-print/cups-1.1*; then
-		ewarn
-		ewarn "The configuration changed with cups-1.2, you may want to save the old"
-		ewarn "one and start from scratch:"
-		ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
-		ewarn
-		ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.2"
-	fi
-	if [ -e ${ROOT}/usr/lib/cups ]; then
-		ewarn
-		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
-		ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
-		ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
-		ewarn
-		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
-		ewarn "symlinks installed by this package, it wont be needed on later merges."
-		ewarn "You should also run revdep-rebuild"
-
-		# place symlinks to make the update smoothless
-		for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do
-			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ]; then
-				ln -s ${i} ${i/lib/libexec}
-			fi
-		done
-	fi
-}
diff --git a/net-print/cups/files/digest-cups-1.2.2 b/net-print/cups/files/digest-cups-1.2.2
deleted file mode 100644
index f0387ee528ad..000000000000
--- a/net-print/cups/files/digest-cups-1.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 091de9109c9252cb37427859e90190ad cups-1.2.2-source.tar.bz2 3527322
-RMD160 f0faa978ae50c5a0cf9bff43f72ab5ca2d530a3e cups-1.2.2-source.tar.bz2 3527322
-SHA256 16dad788e7d2060a3b59778edb1c39c2354c800c127fe6768f8005580533e776 cups-1.2.2-source.tar.bz2 3527322