Remove old

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 18 insertions, 313 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index d095770aa883..d14810ebf256 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.462 2012/04/23 22:16:48 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.463 2012/04/23 22:17:54 dilfridge Exp $
+
+  23 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.5.2-r2.ebuild:
+  Remove old
 
   23 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.2-r3.ebuild,
   +files/cups-1.5.2-threads.patch, +files/cups-1.5.2-threads2.patch:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 2f79ad9ffe06..e0d8a153180f 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -25,24 +25,23 @@ DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467ae
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
 EBUILD cups-1.4.8-r1.ebuild 7242 RMD160 bf1997ca1d9b9b11066c2bb963cc8b54ea5c8f2a SHA1 a15340529eecbbc8a95392d2f1b508cfb4caa47e SHA256 77271eb2ea0dd120801a4b1e5381ea4859e80375d9587f83ec3f4c37ab8868c8
 EBUILD cups-1.4.8-r23.ebuild 8852 RMD160 c50b3b77403cf6c724fcfd05c8ef173808066629 SHA1 c4aa7016bb5a1279bf446f41c09b9a93d5b87ff2 SHA256 1798aed0e2760c6a92a7c4e3631170989d984ac36908b369c37c43bfdab3cd6d
-EBUILD cups-1.5.2-r2.ebuild 8175 RMD160 b8043f29843c75c2b55085417cfc21a1db9db503 SHA1 a196e7c91ff5ea81b2ea2dfb4d598ea6541a24a8 SHA256 7a9a31d4b3a48ca207f9292255d3601f08981fdb4c276db712ffe87e6b1dc5b0
 EBUILD cups-1.5.2-r3.ebuild 8582 RMD160 df1dd83f03d51d9aea267a5a0b153097febdd0ba SHA1 6ffb03f119afe631d5f91b0f15ba04e302ec23ba SHA256 0d1c5f9327882c58121230ae36cbb75a91b4d93b6a3e97813a5ea5a5c295ba2b
-MISC ChangeLog 70438 RMD160 f11b6ff42aad8a04c535725471de306cf3dabb82 SHA1 cf92a2aa5ff7d8d9545f992cafe0b7aafa4377f6 SHA256 e10b2608f1bfd8b90f41366c80cf1348c335ecbc9862527c24aefe18d07b0a10
+MISC ChangeLog 70532 RMD160 060c7d4733aac59134d20571ec92ad993c4530b8 SHA1 3c59dd97151c9d1e5ad3225846a15b4d596eacaa SHA256 03d35fde6c3902cb0e1ff7c53ce2bd84dec306a9dd343058cc67aaab3dae7a84
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPldTxAAoJENwGBM22xffe5N8P/iGlWrOyhhfZCfkiQagM8Npu
-Y1O0CmpdCAcKjKbaI96bLoS4uUopm4/jPvjyG7Xx8puywyv/ah3+RWTODYvHKEPp
-kqjXgO9N2YiVw4HjbPwPEpZsKaeCah0ZRLf0EwPEfzN5f1xPIeZZzMRe5nDhw+dA
-9P5tYb7+KvtlrcFtPGpkDOeT9+AyUhDrT1L4OGEQZqmoHufSXdGzwiMtsYIv4oeV
-EAlVPAX5TjCD4f8Gi4cOYngSgzKPsbvHi+TS89jKUNkjtiJd5FbtQqAGfw8HLcHV
-Doqg+tqEWvgYYPf2lSKnYwjHFGSA1m9QZg3ydSPn0FPDPOob/NgZSJw2gsqjEHgr
-elIA4JjCWb4OkeDe3X+BV7daCmuIu8nfJOx1PdccMGoARSuTcls0fq3KQLgSmIDE
-5HpgjaXnft39hKyxdy8zoSJZldiJ+Q4sFYSDf/AcvK066GYbZxo8kwYX36AKtEjO
-dFJf9MP5ibv/oIDeEFYAic09a8yQ3cVHd3rcuHGTJQiPPz0+sizDDnCq5TBrKF43
-2tGQtQhgz2rbv9BI5wcCMgCaCBCVekAzaKz26NTT8Q4PpvDyicM4m7nJIozJ+u09
-Nj5CViAsvcPcnnUkpPoWXKh/TtyV9znHxiU7LDdA5RGuLYgVLMlBz3hR2ifGUzzl
-iPLCvYFIgYOqZgpU7vQd
-=U340
+iQIcBAEBCgAGBQJPldUoAAoJENwGBM22xffeGqQP/3YUeL3vXW4sIeAMqcFidf3E
+JUVNymV9fiI080b2PdOJrHMuxUsKu1uKndRAhxXthRcfpcrk7kJGuSgwynUV+u4h
+yM5BwnTcuA/slh1N1Ftr89ZvfnEdmMQXGQ8ZLq9nqsWT+h7N3Gbye5dgSk6SFviX
+35M185SzvnJziO3MtM/IeMoaf+udwaQTmbTiv79bcetLz/9HAzU+9iNrCVbq+6bY
+1hTzi9VDquZacQjTv+Ok2Eykhc8LuqLmHg7yE3BhDRoPn2K7BecEHNC6Po95WCV9
+uSeUu6n+rteiIVP9IDqXhndqDDsNkY14AjxuppblkMJj6GFb8OfhlTnS2GtN3jzd
+y/IgNrvItE0xC4KM5oEuhfyZxv54DoqQKIuKdwuFvIdrepCsAZPifoQH+3r6JWPn
+2WC+StVAwwiKoi/WGuc8DsfPd21+w8O+c9OjFSEIbMGItamG/kWqQ+o14ENnmRmc
+NYEt97Tt8VHiLpV0NU5+IS+gRMlwTScrCDDFmcKQZtfLi8jMEw+ZtpOKjA4IxHxh
+SEPHpBrTYQAGPpVBxbYv77vZQN+UxDNXZt7o/jA1hrUin6/KvaYD2Lc0eYg91sNP
+rFhE64CK6aSz9wlhuI0zPzFn5t/bTB6fEHVACdY6eqAPVzxqzlAWyI00bfBKkVlM
+rp7bozFT/tixYIoO0qiJ
+=6+r3
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.2-r2.ebuild b/net-print/cups/cups-1.5.2-r2.ebuild
deleted file mode 100644
index 57ca1251afba..000000000000
--- a/net-print/cups/cups-1.5.2-r2.ebuild
+++ /dev/null
@@ -1,297 +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/cups/cups-1.5.2-r2.ebuild,v 1.4 2012/04/19 20:22:49 dilfridge Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd
-
-MY_P=${P/_}
-MY_PV=${PV/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
-	http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
-	http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
-IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl +png python slp +ssl static-libs +threads +tiff usb X xinetd"
-
-LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="
-	app-text/libpaper
-	acl? (
-		kernel_linux? (
-			sys-apps/acl
-			sys-apps/attr
-		)
-	)
-	dbus? ( sys-apps/dbus )
-	java? ( >=virtual/jre-1.6 )
-	jpeg? ( virtual/jpeg:0 )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap[ssl?,gnutls?] )
-	pam? ( virtual/pam )
-	perl? ( dev-lang/perl )
-	png? ( >=media-libs/libpng-1.4.3:0 )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt
-			net-libs/gnutls
-		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	)
-	tiff? ( >=media-libs/tiff-3.5.5:0 )
-	usb? ( virtual/libusb:0 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-"
-
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	>=app-text/poppler-0.12.3-r3[utils]
-	filters? ( net-print/foomatic-filters )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-	enewgroup lpadmin 106
-
-	# python 3 is no-go
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Can't check the linux kernel configuration."
-			ewarn "You might have some incompatible options enabled."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use usb; then
-				if linux_chkconfig_present USB_PRINTER; then
-					eerror "Your usb printers will be managed via libusb. In this case, "
-					eerror "${P} requires the USB_PRINTER support disabled."
-					eerror "Please disable it:"
-					eerror "    CONFIG_USB_PRINTER=n"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        USB support  --->"
-					eerror "            [ ] USB Printer support"
-					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-				fi
-			else
-				#here we should warn user that he should enable it so he can print
-				if ! linux_chkconfig_present USB_PRINTER; then
-					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
-					ewarn "support in your kernel."
-					ewarn "Please enable it:"
-					ewarn "    CONFIG_USB_PRINTER=y"
-					ewarn "in /usr/src/linux/.config or"
-					ewarn "    Device Drivers --->"
-					ewarn "        USB support  --->"
-					ewarn "            [*] USB Printer support"
-					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# various build time fixes
-	epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch"
-	epatch "${FILESDIR}/${PN}-1.5.2-linkperl.patch"
-
-	# systemd support
-	epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"
-
-	# revert ipp backend to 1.4 state, as ubuntu and debian
-	epatch "${DISTDIR}/${PN}-1.5.2-ipp-r8950.patch.bz2"
-
-	# avahi support from debian
-	epatch "${DISTDIR}/${PN}-1.5.2-avahi.patch.bz2"
-
-	# browsing off by default
-	epatch "${FILESDIR}/${PN}-1.5.2-browsing.patch"
-
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-}
-
-src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	# locale support
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		export LINGUAS=none
-	fi
-
-	local myconf
-	if use ssl || use gnutls ; then
-		myconf+="
-			$(use_enable gnutls)
-			$(use_enable !gnutls openssl)
-		"
-	else
-		myconf+="
-			--disable-gnutls
-			--disable-openssl
-		"
-	fi
-
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-docdir=/usr/share/cups/html \
-		--with-languages="${LINGUAS}" \
-		--with-pdftops=/usr/bin/pdftops \
-		--with-system-groups=lpadmin \
-		$(use_enable acl) \
-		$(use_enable avahi) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable debug debug-guards) \
-		$(use_enable jpeg) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable ldap) \
-		$(use_enable pam) \
-		$(use_enable png) \
-		$(use_enable slp) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable tiff) \
-		$(use_enable usb libusb) \
-		$(use_with java) \
-		$(use_with perl) \
-		--without-php \
-		$(use_with python) \
-		$(use_with xinetd xinetd /etc/xinetd.d) \
-		--enable-libpaper \
-		--disable-dnssd \
-		$(systemd_with_unitdir) \
-		${myconf}
-
-	# 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 || die
-	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
-	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die
-}
-
-src_compile() {
-	emake
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install
-	dodoc {CHANGES,CREDITS,README}.txt
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_install
-		fixlocalpod
-	fi
-
-	# clean out cups init scripts
-	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/$neededservices/" \
-		"${T}"/cupsd || die
-	doinitd "${T}"/cupsd
-
-	# install our pam script
-	pamd_mimic_system cups auth account
-
-	if use xinetd ; then
-		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
-			"${D}"/etc/xinetd.d/cups-lpd || die
-		# 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 || die ; }
-		# write permission for file owner (root), bug #296221
-		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
-	else
-		rm -rf "${D}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/cache/cups /var/cache/cups/rss /var/log/cups \
-		/var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	use X || rm -r "${D}"/usr/share/applications
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	echo
-	elog "For information about installing a printer and general cups setup"
-	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
-	echo
-	elog "Network browsing for printers is now switched off by default in the config file."
-	elog "To (re-)enable it, edit /etc/cupsd.conf and set \"Browsing On\", "
-	elog "afterwards re-start or reload cups."
-	echo
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}