Remove old

Package-Manager: portage-2.1.10.1/cvs/Linux x86_64

3 files changed, 18 insertions, 303 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 9e22a3f54970..814d58818ce8 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.418 2011/06/18 19:59:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.419 2011/06/18 20:01:49 dilfridge Exp $
+
+  18 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.4.6-r1.ebuild:
+  Remove old
 
 *cups-1.5_rc1 (18 Jun 2011)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 594669843258..2f191690af1e 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -24,26 +24,25 @@ DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a0
 DIST cups-1.4.6-source.tar.bz2 4517061 RMD160 94c9921e03f5ec52d9c16947435622365f53aef6 SHA1 42fb1ca00ee7291561564d3072716eb2045f05d1 SHA256 f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514
 DIST cups-1.5rc1-source.tar.bz2 4083416 RMD160 380160554012912bf8e22dc6f70fe6824c16bb13 SHA1 b46b3d0255fe6ed36d516a61c397d27b5efb7d13 SHA256 04d4f1e4a5ac4c9907c2a81fcbde6b6b87f852e85e410d145a08a964434a1697
 EBUILD cups-1.3.11-r4.ebuild 8157 RMD160 8a87f90b96c08a694643df5324e7daab651daed2 SHA1 f1f3d811c3bc989046cca5981a98d3a7e47e22fc SHA256 40fd91ccb98b69279919e10c46a286ae04b839ac77c0b074a8973f0313616d7b
-EBUILD cups-1.4.6-r1.ebuild 8233 RMD160 c1e54729f812ef12b1327ae16ca5e73eb7af28b1 SHA1 fcb7e620b53ba1f05e16de310470372e6611516d SHA256 d916d0d01bb3e6c88029d8a0ecd783df0c6f542e00162087e9766ef20138ad42
 EBUILD cups-1.4.6-r2.ebuild 7238 RMD160 199c9337825a7faa08b0816460669941bb1dd6ff SHA1 0954237e9cadf11e66b3b5414feb5474af224b70 SHA256 50e0e3b70fa168fd941cad3143e26ff3c1eebec479f92c0012ff46117a107a0f
 EBUILD cups-1.4.6-r21.ebuild 8509 RMD160 6178c8831132937a82ab0c5452c6f46e3b3d1879 SHA1 3f51dd19726a31c71c3fda6def94c112974434b9 SHA256 a10216bb3af633739ac6aefa06d4e89aa88690f774768bdf66a03b7569a09b16
 EBUILD cups-1.5_rc1.ebuild 8263 RMD160 7727146c2c5689275a36ce418f11a4b946b763c7 SHA1 0c2ff34ef7e55ee3c080f17c50be1cee8a8d5f67 SHA256 3020afe678e46f54273cc4f712056829ee3bde8045ee8cded8791558f3846566
-MISC ChangeLog 62851 RMD160 67aa18b9fead4cb309e49daa39ef2de49d624cf8 SHA1 037cf8ca94ccefab209938c948e950379f0e3077 SHA256 31e844ae189d45b861166f42800a301b0495cec3a03bf4617bc14d2b35c04da3
+MISC ChangeLog 62945 RMD160 c651a890a76c2daa53eb59b88e0118a5f912d88d SHA1 113fafd75642c2146c29e5a28b1e806e41af918b SHA256 a636395da26f446712480df0f272c43e58cbe6a355fc5a9fe74c03dca0e49fd5
 MISC metadata.xml 586 RMD160 73a1f1c0096d5035dfa53207b00c125894f6822a SHA1 123501263490cab57af2b99f2336fb70c094d9b0 SHA256 3b729c497ee38452b1ca051b759f43b5f9e117f9c36c0f3b660e4bd8ab7c295b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN/QPNAAoJENwGBM22xffeNvoP+gOvs8hK6aLISkAPRhZCqnla
-a4BduIeiFzlQgB8FJrcbtSCAaDBFjmPQbGQ+tQJBCA3QXb43c/2wTdlCAkcivGdD
-aohZdOE41fywhBm35+UNE87apCMW8D3ogR+UmNtwuzHZNej3TxQ1YNHmOqSUEe44
-urCLjlkf+209M+sczaVKsdK8V8Px9ng4s06OTJ3F1Ucko6nGFjs0I4PLmV1+xZzI
-R9mDcGQg0NKUQcUpexO9sUun4WPaMelXxBP2kjVmPMm3l7brVlH4BhI8k/wuO2lR
-h28cKs6xoSeubAQiKTCEgoVkNo2cpfC0n5CnmRe/jrwwITO0W+OZBNs5Uf574JKS
-tywmpve5GDAm5Ifv3/XPicnJrjjQPjs0Fagw8naILhMREEwuEnBB/q00BZzJSMpn
-Dir0Ya70E3s3cUET0NN6OXFDPihbxhma3Ey9WJql6ipLIXs04sgMU5c3bxPB4aKf
-Mp7GQJKyTSWeK7TnEEmwpNLuxniqIACTBdzq+SzC7vpr8a6Wc63rIjYsmYl5hR3O
-I4NjTuqnwejD3Grcuc4LLlG9bGFvIqh3zp2wDOzFOaI7dPfGlEeLqfn00VkWnZek
-XYD2QLUMGhHKr1xSgDn1jEKOGAQjwv1LTfEBZU6HANpLzIO1bMe8fELmP5jeUv1E
-uQ3e3NpGkraToa6L1uFg
-=SrrU
+iQIcBAEBCgAGBQJN/QQzAAoJENwGBM22xffeKBsP/Amo8eP7fc7NVVJ0XwqxvI81
+d1/+hIFqKCNXb7kBi7edKk+4aesoqu0iyBOUtIv7uQ70WymB3VoMXytYXKaF412X
+GNHgor3RbWjQNpPoafQGVRPBA9aqnN7quLILhH/fe11S8YkhoRbn8ludGLL+P0X8
+IaHU+WWND6Qsg2TCYWcQGcHfOO/+gp3cM2cpxEfDO/EzBg24f48mFZjurlB9JICB
+9H72t9Sj1N+LOzqHKNZ++1Janlt1k/ala3OT6R/W1buNLBCrqYTlEU4BD14C9FhR
+xu/mFEKd86CDmtdEknaYUezhnWH3WjJEJjDZNrljqSAejjKlxskD2rJ3jxm/rrze
+eHbqU+TF4s/IyHX4VrjU4C1PzPo7dxpRPKrP73r71Ua3sXhnPifqfRgRGzxyZ1Fn
+4QoQe56uuwqhpisjPqDvSBh4I/C0mkS/cvIdMAARhaUvWUb+LwJ+oGIgKGRouyui
+hYq7l2sCMqVsoBS8uBc4fQ4Gp6yMTjxtF7+tSsHWHC11jWa89JCsmQg4jmyer3SA
+KozQ5a2VNUFWMIug/QKy47Y3MzDV1Gp4bv0iOlJs482I8AK3ugT8dyXz0TbUnCFp
+gEvaCov3/9laRagRiZ3El4C7FAtEIJtgHpNiyUH/pFj7hrTHMaOsLZpBBYGkGA2y
+jGNYi+QDqlOJiErAv/tG
+=kgBx
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.4.6-r1.ebuild b/net-print/cups/cups-1.4.6-r1.ebuild
deleted file mode 100644
index 38db0fc08005..000000000000
--- a/net-print/cups/cups-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v 1.6 2011/06/05 20:27:40 dilfridge Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
-
-MY_P=${P/_}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba 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 )
-	php? ( dev-lang/php )
-	png? ( >=media-libs/libpng-1.4.3 )
-	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 )
-	usb? ( virtual/libusb:0 )
-	X? ( x11-misc/xdg-utils )
-	xinetd? ( sys-apps/xinetd )
-	!net-print/cupsddk
-"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-"
-
-PDEPEND="
-	app-text/ghostscript-gpl[cups]
-	>=app-text/poppler-0.12.3-r3[utils]
-"
-
-# 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 usb; then
-		elog "You are going to use new libusb backed to access your usb printer."
-		elog "This interface has quite few known issues and does not report all"
-		elog "issues and just refuses to print."
-		elog "Please consider disabling usb useflag if you are having issues."
-		elog
-		elog "Please note that if you disable the usb useflag your device will be"
-		elog "still working using kernel usblp interface instead of libusb."
-		echo
-	fi
-
-	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 which collides with kernel module."
-				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)."
-				die "USB_PRINTER module enabled"
-			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 new, less-tested libusb code."
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# create a missing symlink to allow https printing via IPP, bug #217293
-	epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch"
-	# 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.4.6-force-gnutls.patch"
-	epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch"
-	# interface hangs using some browsers, bug #325871
-	epatch "${FILESDIR}/${PN}-1.4.6-web-hang.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 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) \
-		$(use_with php) \
-		$(use_with python) \
-		$(use_with xinetd xinetd /etc/xinetd.d) \
-		--enable-libpaper \
-		--disable-dnssd \
-		${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 || die "emake failed"
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_prep
-		perl-module_src_compile
-	fi
-
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake || die "emake php failed"
-	fi
-}
-
-src_install() {
-	emake BUILDROOT="${D}" install || die "emake install failed"
-	dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed"
-
-	if use perl ; then
-		cd "${S}"/scripting/perl
-		perl-module_src_install
-		fixlocalpod
-	fi
-
-	if use php ; then
-		cd "${S}"/scripting/php
-		emake DESTDIR="${D}" install || die "emake install for php bindings failed"
-	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 || die "doinitd failed"
-
-	# 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/run/cups/certs \
-		/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_postinst() {
-	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
-}