fix manifest, bug 144290

(Portage version: 2.1.1_pre5-r2)

5 files changed, 12 insertions, 375 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index d56347c2b2aa..9164b66c0012 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -72,18 +72,18 @@ EBUILD cups-1.1.23-r1.ebuild 4132 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763a
 MD5 b1e18a006a467d2c94dd37e0f469db56 cups-1.1.23-r1.ebuild 4132
 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763ac cups-1.1.23-r1.ebuild 4132
 SHA256 616fea430e4e3295a36de1d2855f3c9cd114b2c936ad9b106a71eba62b1b188b cups-1.1.23-r1.ebuild 4132
-EBUILD cups-1.1.23-r8.ebuild 4964 RMD160 05a4ac371f38e59caa52cdf017cf2940d78e2713 SHA1 71dcf8e8318fbf48f34c356cefaa345f5d48c14b SHA256 466a665ed60af9fd4c2bfd1d5d7413fe8055b8093e7d259d0a90c174ddcc76c5
-MD5 88c9537d567eabeea09032701020d95d cups-1.1.23-r8.ebuild 4964
-RMD160 05a4ac371f38e59caa52cdf017cf2940d78e2713 cups-1.1.23-r8.ebuild 4964
-SHA256 466a665ed60af9fd4c2bfd1d5d7413fe8055b8093e7d259d0a90c174ddcc76c5 cups-1.1.23-r8.ebuild 4964
-EBUILD cups-1.2.2.ebuild 5657 RMD160 7b9aadd19476bd6042a808fb21d7bc0b67f585fb SHA1 272fcae2f2c3a730e047f2dc1f33666862025a62 SHA256 e66318f2d705b69987d5ed5b9080e283e3123b30335b07d2f7021224631a884d
-MD5 af1e75b8c67c766c4b7352a0f5c31694 cups-1.2.2.ebuild 5657
-RMD160 7b9aadd19476bd6042a808fb21d7bc0b67f585fb cups-1.2.2.ebuild 5657
-SHA256 e66318f2d705b69987d5ed5b9080e283e3123b30335b07d2f7021224631a884d cups-1.2.2.ebuild 5657
-MISC ChangeLog 26931 RMD160 65052bd0aacb4e7b90edf52f7c4261ca5f750f72 SHA1 3d7aab41cf6c5690126c9545ec800201ef4c2a4d SHA256 5899e03d3aee2de3d6b2fb425430b6b67f38940743861c55b7abed28fc52d6cf
-MD5 f1ee16c18598b6303752b298fe9bb401 ChangeLog 26931
-RMD160 65052bd0aacb4e7b90edf52f7c4261ca5f750f72 ChangeLog 26931
-SHA256 5899e03d3aee2de3d6b2fb425430b6b67f38940743861c55b7abed28fc52d6cf ChangeLog 26931
+EBUILD cups-1.1.23-r8.ebuild 4963 RMD160 3e19f1c744dd482ce3a277288fe749fbbe5eec84 SHA1 de44c572c5e15c7e119b68c3477f3a2d79fabc8b SHA256 d314487c71ab2dfb919fee6f2be86cfd1908fbc4959d2ddc57b2edd232059b69
+MD5 1a6910f3b2a5b3f6900ac380e513f84a cups-1.1.23-r8.ebuild 4963
+RMD160 3e19f1c744dd482ce3a277288fe749fbbe5eec84 cups-1.1.23-r8.ebuild 4963
+SHA256 d314487c71ab2dfb919fee6f2be86cfd1908fbc4959d2ddc57b2edd232059b69 cups-1.1.23-r8.ebuild 4963
+EBUILD cups-1.2.2.ebuild 5657 RMD160 3a681d88358466df6a8d10b940de5225821bd586 SHA1 07ef72b313a5f740f8e24e0a19b1751fc93038d7 SHA256 57a9c1d9cd8da5f202d028537b4f221511f2721d20c0ed0fd1600ede7199f6aa
+MD5 50027b84d222c0e583cce15209bd7b4b cups-1.2.2.ebuild 5657
+RMD160 3a681d88358466df6a8d10b940de5225821bd586 cups-1.2.2.ebuild 5657
+SHA256 57a9c1d9cd8da5f202d028537b4f221511f2721d20c0ed0fd1600ede7199f6aa cups-1.2.2.ebuild 5657
+MISC ChangeLog 26931 RMD160 29e35664fc6266968acb9231879e9b6c30098677 SHA1 5e8b2147eed7e75bf2cdfd7c952e9ec0ce7ebd5e SHA256 d8e8eecc3de538b6d40d49c4350e2d609afd47df69b3d07ed728ade5e91f5467
+MD5 caeee0d92fd368f2e4aa46f3c142aa16 ChangeLog 26931
+RMD160 29e35664fc6266968acb9231879e9b6c30098677 ChangeLog 26931
+SHA256 d8e8eecc3de538b6d40d49c4350e2d609afd47df69b3d07ed728ade5e91f5467 ChangeLog 26931
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/net-print/cups/cups-1.1.23-r7.ebuild b/net-print/cups/cups-1.1.23-r7.ebuild
deleted file mode 100644
index 33c08065d57e..000000000000
--- a/net-print/cups/cups-1.1.23-r7.ebuild
+++ /dev/null
@@ -1,173 +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.1.23-r7.ebuild,v 1.19 2006/07/03 16:57:44 genstef Exp $
-
-inherit eutils flag-o-matic pam autotools
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="ftp://ftp2.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2
-ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ssl slp pam samba nls gnutls"
-
-DEP="pam? ( virtual/pam )
-	ssl? (
-		!gnutls? ( >=dev-libs/openssl-0.9.6b )
-		gnutls? ( net-libs/gnutls )
-		)
-	slp? ( >=net-libs/openslp-1.0.4 )
-	media-libs/libpng
-	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-DEPEND="${DEP}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEP}
-	nls? ( virtual/libintl )
-	!virtual/lpr
-	>=app-text/poppler-0.4.3-r1"
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
-PROVIDE="virtual/lpr"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup lp
-	enewuser lp -1 -1 -1 lp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/disable-strip.patch
-	epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791
-	epatch ${FILESDIR}/cups-gentooalt.patch
-	epatch ${FILESDIR}/${P}-bindnow.patch
-	epatch ${FILESDIR}/cupsaddsmb.patch
-	epatch ${FILESDIR}/${P}-respectldflags.patch
-	eautoconf
-
-	# 1.2.10 compat thanks to kojiro in bug 136346
-	if has_version '>=media-libs/libpng-1.2.10'; then
-		epatch ${FILESDIR}/${P}-image-png.patch
-	fi
-
-	# disable builtin xpdf
-	sed -i -e "s:pdftops::" Makefile
-}
-
-src_compile() {
-
-	local myconf
-	use amd64 && replace-flags -Os -O2
-
-	use ssl && \
-		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
-
-	econf \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--localstatedir=/var \
-		--with-bindnow=$(bindnow-flags) \
-		$(use_enable pam) \
-		$(use_enable ssl) \
-		$(use_enable slp) \
-		$(use_enable nls) \
-		${myconf} \
-		|| die "econf failed"
-
-	emake || die "compile problem"
-}
-
-src_test() {
-	# 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
-	true
-}
-
-src_install() {
-	dodir /var/spool /var/log/cups /etc/cups
-
-	make \
-	LOCALEDIR=${D}/usr/share/locale \
-	DOCDIR=${D}/usr/share/cups/docs \
-	REQUESTS=${D}/var/spool/cups \
-	SERVERBIN=${D}/usr/$(get_libdir)/cups \
-	DATADIR=${D}/usr/share/cups \
-	INCLUDEDIR=${D}/usr/include \
-	AMANDIR=${D}/usr/share/man \
-	PMANDIR=${D}/usr/share/man \
-	MANDIR=${D}/usr/share/man \
-	SERVERROOT=${D}/etc/cups \
-	LOGDIR=${D}/var/log/cups \
-	SBINDIR=${D}/usr/sbin \
-	PAMDIR=${D}/etc/pam.d \
-	EXEC_PREFIX=${D}/usr \
-	LIBDIR=${D}/usr/$(get_libdir) \
-	BINDIR=${D}/usr/bin \
-	bindir=${D}/usr/bin \
-	INITDIR=${D}/etc \
-	PREFIX=${D} \
-	install || die "install problem"
-
-	dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt
-	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
-
-	# cleanups
-	rm -rf ${D}/etc/init.d ${D}/etc/pam.d ${D}/etc/rc* ${D}/usr/share/man/cat* \
-		${D}/etc/cups/{certs,interfaces,ppd} ${D}/var
-
-	sed -i -e "s:^#\(DocumentRoot\).*:\1 /usr/share/cups/docs:" \
-		-e "s:^#\(SystemGroup\).*:\1 lp:" \
-		-e "s:^#\(User\).*:\1 lp:" \
-		-e "s:^#\(Group\).*:\1 lp:" \
-		-e "/^Port/s|Port 631|Port localhost:631|" \
-		${D}/etc/cups/cupsd.conf
-
-	pamd_mimic_system cups auth account
-
-	newinitd ${FILESDIR}/cupsd.init cupsd
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
-
-	# allow raw printing
-	dosed "s:#application/octet-stream:application/octet-stream:" /etc/cups/mime.types /etc/cups/mime.convs
-
-	# install pdftops filter
-	exeinto /usr/lib/cups/filter/
-	newexe ${FILESDIR}/pdftops.pl pdftops
-	dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops
-
-	# allow lppasswd, #107306
-	fowners root /usr/bin/lppasswd
-}
-
-pkg_preinst() {
-	# cleanups
-	[ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-*
-}
-
-pkg_postinst() {
-	install -d -m0755 ${ROOT}/var/log/cups
-	install -d -m0755 ${ROOT}/var/spool
-	install -m0700 -o lp -d ${ROOT}/var/spool/cups
-	install -m1700 -o lp -d ${ROOT}/var/spool/cups/tmp
-	install -m0711 -o lp -d ${ROOT}/etc/cups/certs
-	install -d -m0755 ${ROOT}/etc/cups/{interfaces,ppd}
-
-	einfo "If you're using a USB printer, \"emerge coldplug; rc-update add"
-	einfo "coldplug boot\" is something you should probably do. This"
-	einfo "will allow any USB kernel modules (if present) to be loaded"
-	einfo "automatically at boot."
-	einfo
-	einfo "For more information about installing a printer take a look at:"
-	einfo "http://www.gentoo.org/doc/en/printing-howto.xml."
-
-	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
-}
diff --git a/net-print/cups/cups-1.2.1-r2.ebuild b/net-print/cups/cups-1.2.1-r2.ebuild
deleted file mode 100644
index e095dd34e84f..000000000000
--- a/net-print/cups/cups-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,184 +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.1-r2.ebuild,v 1.8 2006/07/03 01:37:12 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 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl slp pam samba nls gnutls dbus tiff png ppds jpeg"
-
-DEP="pam? ( virtual/pam )
-	ssl? (
-		!gnutls? ( >=dev-libs/openssl-0.9.6b )
-		gnutls? ( net-libs/gnutls )
-		)
-	slp? ( >=net-libs/openslp-1.0.4 )
-	dbus? ( 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
-	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
-	) )"
-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
-	epatch ${FILESDIR}/cups-1.2.1-ssldir.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() {
-	local myconf
-
-	use ssl && \
-		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
-
-	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) \
-		$(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 \
-		${myconf} \
-		|| 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
-}
-
-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."
-	einfo
-	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
-	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
-		einfo "FEATURES=-collision-protect is needed to overwrite the compatibility"
-		einfo "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.1.23-r7 b/net-print/cups/files/digest-cups-1.1.23-r7
deleted file mode 100644
index 368d38b252b6..000000000000
--- a/net-print/cups/files/digest-cups-1.1.23-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
-RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 cups-1.1.23-source.tar.bz2 8705521
-SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e cups-1.1.23-source.tar.bz2 8705521
diff --git a/net-print/cups/files/digest-cups-1.2.1-r2 b/net-print/cups/files/digest-cups-1.2.1-r2
deleted file mode 100644
index 90fc088bcc11..000000000000
--- a/net-print/cups/files/digest-cups-1.2.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f804995e3f469bdefedc033510f6e6a5 cups-1.2.1-source.tar.bz2 3475342
-RMD160 84040c5ac65d4a3d13d813fb91f90cbccb211c25 cups-1.2.1-source.tar.bz2 3475342
-SHA256 10fb273b8118858fdce795608065860865432b2d9f1016b53fff1eb340385e45 cups-1.2.1-source.tar.bz2 3475342