Remove old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

3 files changed, 18 insertions, 337 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 7eb288a02335..8d1f0b696d31 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.611 2014/05/14 16:10:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.612 2014/05/14 17:46:09 dilfridge Exp $
+
+  14 May 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.7.1.ebuild:
+  Remove old
 
   14 May 2014; Agostino Sarubbo <ago@gentoo.org> cups-1.7.1-r1.ebuild:
   Stable for sparc, wrt bug #507696
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 7dfffb5e9669..e654c722412e 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -12,26 +12,25 @@ DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516
 DIST cups-1.7.2-source.tar.bz2 8754601 SHA256 315cdff436924c4efe04cb110b145fb1a6e038e2eed8445359052f86e9e95676 SHA512 441256bdfbe4a720244143d229f12e0a3e2e27e6298baee3ddca9f7f6bd3e3c2818136c90a110bebbbf9b034a48f8bd1af06788c25258e61aa3bc524e492a912 WHIRLPOOL b3c977275a89c6c8b2773bddf615168bcc6f2379bf49f991e0141eb5db482035e0e611d22d6c99351dc1e41e003470322dedabcc37244289c237671bae5f792c
 EBUILD cups-1.7.1-r1.ebuild 9367 SHA256 c53c059d2b73d4daf6c55e3d152bcc4d8a7956f8f95673bd3974af8119bf6e9c SHA512 f4410d2923ed7cd0a64db20eee1b73a5c1103b0425f02959a0c7aa36d2201d1b9846f0afea7d12a3169c42df9a292510eafb675672989187eede14032a01ac98 WHIRLPOOL 142be888cad5bfae60c4075fe9f04093b0408ea8b28c9b355b6a9ed87c1cd3a847d7af1a6a4e40dabcbb0f0ac71276b643c783f714910d158d2e67c6cd573c1e
 EBUILD cups-1.7.1-r2.ebuild 10169 SHA256 f0451b7d35eccf86530363dc024f3fbe9a45d4a98445e99269a983b440d78540 SHA512 86265688a0d90995653c3bfc79ea159cdf0287762119d4b255e1e4fc2cdce34b3feaf5922c4f35134849d7d951e88f7b07c5e7e345c26d95bfd3a70a528d6469 WHIRLPOOL 544d2ff37b77230077e0d031a228f69ea849dc4569b480c4ba9c867543d4a73f7e0428c84f5fa7077dbc68143dd1f2a0035a3113bac870234207bf0ca8cf4ad9
-EBUILD cups-1.7.1.ebuild 9236 SHA256 aa03e3d61ee332799dace86f969c82ba68a76ec9aff2f39d7b67c198f1e21b94 SHA512 e9fbe6287cac20d06b4278e99013fba7bf15f1e7f23f037115373f4193320faf5fe96e86338bb181a9f084606c757f30a711754bc3df746bb27f07fb79a0aa15 WHIRLPOOL 46353815cc0df8ffcd0d9eb1b0026ee0db234bb74f81d5195caebbd8241004a768b154e38e09d918a75c7875f1e69756165c2cf6218e4a7b59d19941385cad54
 EBUILD cups-1.7.2-r1.ebuild 10107 SHA256 10f7e6eb99a41da9d63a2cacc2296db7f10153cef5a224f8155936eb9fc9870b SHA512 8e5834a127cb38975260f79410e7003399000b25cc9340d1d18def16de7136b9660fd7eed51eedb3bfad0093555727a5fedcca4661c15e67b4e4156154ab2660 WHIRLPOOL f1000d896545d0d24bbb8b52985c052fc7d0250c20880bf04f20ede0e8ca3d306d710387c863c5c3ed0afbc2bb7264b359f6fb42fa0b8f58c4645b014e4d6056
 EBUILD cups-1.7.2.ebuild 9316 SHA256 45fe7e8a5a85e239d22dff7fcc9aaeb03872722093c05d57f25ddb05b3f32b4c SHA512 8dcba2b955614693a04b8fd452732c084fc7f548ec0349f6694f6d2b1d535407242565e826d2c93675f9431ddf3d13bdef29b71c36c5e0582d8f007916df3b55 WHIRLPOOL 8cbeba452f75000c7760bfda0ae9521552d62890b2ef62d279b3e2ac4e8067d346137de5982447b4d03f49f23f620f9fab640712f67cdfb2e8fa05925a1500dd
 EBUILD cups-9999.ebuild 10090 SHA256 b72581d4dd02f12168afeacb446d43d203396e00caf8b1cff39fe7e76fd1f8d3 SHA512 a137d09fea53770c86858bd57f115630aa01f7c6870a1a65e81d7df3ac1e6d0429535f731ef77c85ac4cf1153daec24268ab9d14ea34b014435568052596c82c WHIRLPOOL df9455eb4dc0afb6d2c7e05750275164812807f63eec9c40d80d1c0ca3f864b2ba3da7830b43bc4f834d084997a17d8945cfcd2c86b756a12e3d602301e8ba7e
-MISC ChangeLog 92519 SHA256 8970d70364515369069da4f1c6b74b52b0d5f58257d9af58cb25b9f0b76dceae SHA512 86cba023e33a70ccd40a82c3e6cdd28cf5f0a8b4ef52f8266330775078fa9233eeb5d474afb65e33ca21043caa59534ba53be9debc355b41d27f67da6909f627 WHIRLPOOL 0b8b1fa3c47d571feebd8a894e40a4c060c900a1d750f155bdd974d965332dc9dfb3cdee46ef9df8b50d2368dff758976b9fa725595f90ccc027d23f89258538
+MISC ChangeLog 92616 SHA256 cf7817e887e8059ef2fc2acaf4cb77736c2cc408bd8240b28439f0895fc755c9 SHA512 18ac68979faafdfd29a02862df6c88669cbb8975ad54a498a2ab437372f8fe8ca05b54242fae84eb6f3cf8a3af82a9b6fa0966303fc2c71e5b989f5964017bf7 WHIRLPOOL e457e828a6819d42953b29ab731334dc5cebc26b175f09a5c6af4a9d8687de9c5374a4654a6baf25fcde357e111bcdcb0055c2d254bb83ec21e8d87c75699c55
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTc5WPAAoJELp701BxlEWfW6UP/jiiVljuPAeNg53YJPRYsr2a
-IAbrePpyjLDTTZZ8oCtIg5j+kpyoH85KjcQmHJBb1duL4crYuUavstl7BbHe5LFd
-42hP5NaXfjLKJ6+sZhzlcXGDrrh02V80utzQQh/Hv0u00Y4wMjI6DL2lBxt0azFp
-ZJ2iN4tnvz4GiNQ9C4/IozND6A9w9F7lR/uLxmctxAKuw5cQPd+QH7exe9NHTBV5
-7jkBjXUsLeU4lg7Sfafprhq9V5l9UTkFl8RdSKG5/XKeAi7cjd2E1HVOcrBULFza
-tA9/Z9+kbsIvsBtorfNZa1Q14A9NdglgqIl6y2HBe2zhnewzuG2kCEJXDQsUyhqp
-QuMlnnrJn1gV18C2xiQQqs8Hfejw1z4q4Q8Y8TsEaJ4FXqxFLGRnViyWr21JWeUP
-oBw+6GWJKl0YIK6mTH0EeI4/1rZr6BFOctoeay7Nj+cEPUjgrzincU8wsM7SkHIq
-9Z77tEsCVXJ4qKnKQ0qXyg7aEIbUJJbB4NnGupXYoG50rXZ5R0DjOzUcU8WAmVAK
-3DNLrjRc8Vic1P/xkqMPWU1yYCLFrrzbogCnf+g/xdGIK0fTzZUq9c2ihFk4e1Fs
-XtSY2DRDWT6yejtdA7KLzq2oTUnCqrV1WiHU88Em/c4o+KS4Mmj0zbgY24Kv4Ljk
-Dki+LNyMO0RBkwRkPKlU
-=RgVd
+iQIcBAEBCAAGBQJTc6z2AAoJEJS/30SErRQvYIkQAIzNB2YDXnsge5ee9XsrjNPw
+UwxDFpPbqfaaCep4d6fyF+6YGfOPgtVYiA+YSUsfxnbc6vmhnHz9qlSglZA59tb2
+x03/7Hj3DL4n83dwizyJ20HHeglN/slvBsLvWotDjetnR1Pu9Z2ONJGKB1GVzBmf
+ILQNCZRKMm755ZGiuBhHXMaPbWBvPyvFTnJgEbhHNNCkcd4u4stLqASrKc9VThoF
+LSRyhMb3Wzd9lhynnjvuFHchTC3PZ8zrT3Krdnzys1KZdJMhonHt2mj+EJbT4rXx
+e6aFAFyOXDfOKtTJoWTkEO1h+aB9hLZOZZUVvDZgndcXZlYdqbogP8MBLAwiahI9
+yRfaaMZWwAuCezS6ZO2jJ2mEVSNeyy0VGXhRSztBS1K42ued3ZXO2VRG8E+LVASy
+tWzlouUYvsZsRlR0NWe+Jsu1c6S+46qHLL+40WHclDTt7oz/v2zKceNwuLdUlLYz
+nG0KmL3yjFYUnBaA4T+uMi0AZbI5YCuQPCwjC6Ln6M0EovZ7OyApzrf3OX3bYbx+
+VqqrkdSiLHvU68pdgg95yaYIO5kPGTsOmOrdxorrmQ+cVui3exm4/H7KWVUe+xlO
+Yb8Z85B5st/cj/90P09Sgn+1n7TJt9ZfZDui9xc5Cx8NuNbibWDoUz2S3tWnDDxz
+a022nUc7RRYSkUWmomqe
+=smiE
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.1.ebuild b/net-print/cups/cups-1.7.1.ebuild
deleted file mode 100644
index 4dfe0fa2f0bb..000000000000
--- a/net-print/cups/cups-1.7.1.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1.ebuild,v 1.14 2014/03/01 22:33:47 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
-	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd \
-	toolchain-funcs
-
-MY_P=${P/_rc/rc}
-MY_P=${MY_P/_beta/b}
-MY_PV=${PV/_rc/rc}
-MY_PV=${MY_PV/_beta/b}
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="http://www.cups.org/cups.git"
-	if [[ ${PV} != 9999 ]]; then
-		EGIT_BRANCH=branch-${PV/.9999}
-	fi
-	KEYWORDS=""
-else
-	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
-fi
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
-	python selinux +ssl static-libs +threads usb X xinetd zeroconf"
-
-LANGS="ca es fr it ja ru"
-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 )
-	kerberos? ( virtual/krb5 )
-	!lprng-compat? ( !net-print/lprng )
-	pam? ( virtual/pam )
-	python? ( ${PYTHON_DEPS} )
-	selinux? ( sec-policy/selinux-cups )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:0
-			net-libs/gnutls
-		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g )
-	)
-	usb? ( virtual/libusb:1 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	app-text/poppler[utils]
-	>=net-print/cups-filters-1.0.43
-"
-
-REQUIRED_USE="
-	gnutls? ( ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
-	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
-	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"	# systemd support
-)
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-	enewgroup lpadmin 106
-
-	use python && python-single-r1_pkg_setup
-
-	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() {
-	base_src_prepare
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-}
-
-src_configure() {
-	export DSOFLAGS="${LDFLAGS}"
-
-	einfo LANGS=\"${LANGS}\"
-	einfo LINGUAS=\"${LINGUAS}\"
-
-	local myconf
-	if use ssl ; then
-		myconf+="
-			$(use_enable gnutls)
-			$(use_enable !gnutls openssl)
-		"
-	else
-		myconf+="
-			--disable-gnutls
-			--disable-openssl
-		"
-	fi
-
-	if tc-is-static-only; then
-		myconf+="
-			--disable-shared
-		"
-	fi
-
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--localstatedir="${EPREFIX}"/var \
-		--with-rundir="${EPREFIX}"/run/cups \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--with-docdir="${EPREFIX}"/usr/share/cups/html \
-		--with-languages="${LINGUAS}" \
-		--with-system-groups=lpadmin \
-		$(use_enable acl) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable debug debug-guards) \
-		$(use_enable kerberos gssapi) \
-		$(use_enable pam) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(use_enable usb libusb) \
-		--disable-dnssd \
-		$(use_with java) \
-		--without-perl \
-		--without-php \
-		$(use_with python python "${PYTHON}") \
-		$(use_with xinetd xinetd /etc/xinetd.d) \
-		--enable-libpaper \
-		--with-systemdsystemunitdir="$(systemd_get_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\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
-	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
-	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
-}
-
-src_install() {
-	# Fix install-sh, posix sh does not have 'function'.
-	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
-
-	emake BUILDROOT="${D}" install
-	dodoc {CHANGES,CREDITS,README}.txt
-
-	# move the default config file to docs
-	dodoc "${ED}"/etc/cups/cupsd.conf.default
-	rm -f "${ED}"/etc/cups/cupsd.conf.default
-
-	# clean out cups init scripts
-	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
-
-	# install our init script
-	local neededservices
-	use zeroconf && neededservices+=" avahi-daemon"
-	use dbus && neededservices+=" dbus"
-	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
-	cp "${FILESDIR}"/cupsd.init.d-r1 "${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:" \
-			"${ED}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
-		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
-			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/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 "${ED}"/etc/xinetd.d
-	fi
-
-	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/log/cups /var/spool/cups/tmp
-
-	keepdir /etc/cups/{interfaces,ppd,ssl}
-
-	use X || rm -r "${ED}"/usr/share/applications
-
-	# create /etc/cups/client.conf, bug #196967 and #266678
-	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
-
-	# the following files are now provided by cups-filters:
-	rm -r "${ED}"/usr/share/cups/banners || die
-	rm -r "${ED}"/usr/share/cups/data/testprint || die
-
-	# the following are created by the init script
-	rm -r "${ED}"/var/cache/cups || die
-	rm -r "${ED}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -fv "${ED}"/usr/bin/{lp*,cancel}
-		rm -fv "${ED}"/usr/sbin/lp*
-		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
-		rm -fv "${ED}"/usr/share/man/man8/lp*
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
-}
-
-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
-
-	# not slotted - at most one value
-	if ! [[ "${REPLACING_VERSIONS}" ]]; then
-		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
-	fi
-
-	if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
-		echo
-		elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
-		elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
-		elog "You will have to find printers using zeroconf/avahi instead, enter"
-		elog "the location manually, or run cups-browsed from net-print/cups-filters"
-		elog "which re-adds that functionality as a separate daemon."
-		echo
-	fi
-
-	if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
-		ewarn
-		ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
-		ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
-		ewarn
-	fi
-}
-
-pkg_postrm() {
-	# Update desktop file database and gtk icon cache (bug 370059)
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-}