version bump

(Portage version: 2.1.2_pre1-r1)
 (Unsigned Manifest commit)

4 files changed, 12 insertions, 260 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index e7a70c3dddcb..201c826af9be 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -30,10 +30,6 @@ AUX cups.xinetd 368 RMD160 b89d527df3f37817e79cef5f8ccf2bb5c563ad8e SHA1 4d8bb1e
 MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368
 RMD160 b89d527df3f37817e79cef5f8ccf2bb5c563ad8e files/cups.xinetd 368
 SHA256 9af6fd6a735e0edde71800bca2c7a93ea8a20688a702b97b187cbec34f44ef5d files/cups.xinetd 368
-AUX cupsDirRead-dont-end-on-failed-stat.patch 1261 RMD160 30cbe2c0c82419a3b70c71853acc0cc0cd317848 SHA1 6de27ed961a0a1402cad5353c68212f928e46b7f SHA256 628289f65bd2bf31e5babd085790d9ad897e2539be7bd6d24e382dc949dbc9bd
-MD5 f23ee1316a84ed8e8554d17766164b52 files/cupsDirRead-dont-end-on-failed-stat.patch 1261
-RMD160 30cbe2c0c82419a3b70c71853acc0cc0cd317848 files/cupsDirRead-dont-end-on-failed-stat.patch 1261
-SHA256 628289f65bd2bf31e5babd085790d9ad897e2539be7bd6d24e382dc949dbc9bd files/cupsDirRead-dont-end-on-failed-stat.patch 1261
 AUX cupsaddsmb.patch 1790 RMD160 7053477570fb95c703a17d1e37b7fa875ff99cf7 SHA1 e1f9733425ef613f4abef648d53d4fb28671c1a5 SHA256 dc44e6643a8d4b697b9d376761bcd5f5d3a975bd52141b1c7fed698291d550a1
 MD5 cdcb941ffd27a1f5ce7fb758cbd40968 files/cupsaddsmb.patch 1790
 RMD160 7053477570fb95c703a17d1e37b7fa875ff99cf7 files/cupsaddsmb.patch 1790
@@ -52,7 +48,7 @@ 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.3-source.tar.bz2 3544888 RMD160 1d232ea83c684723c05977733e73ecff2c398f0a SHA1 acba5fab912654bd2202d1a3c3d55264048ec108 SHA256 5acc3e9490cda60dc243961698d303eba4f20cd61784fa3ada7fdf8b0770b821
+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
@@ -61,14 +57,14 @@ EBUILD cups-1.2.2.ebuild 5850 RMD160 b5f34bdaeb2306c3178d83cffe5994304ac5fcbd SH
 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.3.ebuild 5933 RMD160 da9a0ebb215394d92d3e55ff4e351c4b974274d0 SHA1 1e3445cba764aea9b5bdb07d3eb1ea9832a99474 SHA256 22340faaa21b59a05f6144cc1f69675f6ec14e2b9c14c02812d32cb7d706a91a
-MD5 0199e958dd972de2d45c9e1a781bf0d4 cups-1.2.3.ebuild 5933
-RMD160 da9a0ebb215394d92d3e55ff4e351c4b974274d0 cups-1.2.3.ebuild 5933
-SHA256 22340faaa21b59a05f6144cc1f69675f6ec14e2b9c14c02812d32cb7d706a91a cups-1.2.3.ebuild 5933
-MISC ChangeLog 28915 RMD160 337fb8c8d616c6887603272f6396905a6d2a78d9 SHA1 b416bc57a4a3359c2aad3eb4ae9432295070c80c SHA256 e53a7c8c96f7ac42e39bc1f4bf0b7bc9224abac7fb81f6c2a0c07563bee02ae6
-MD5 36edeb6192e6aeb3ce0eb9481e71004b ChangeLog 28915
-RMD160 337fb8c8d616c6887603272f6396905a6d2a78d9 ChangeLog 28915
-SHA256 e53a7c8c96f7ac42e39bc1f4bf0b7bc9224abac7fb81f6c2a0c07563bee02ae6 ChangeLog 28915
+EBUILD cups-1.2.4.ebuild 5763 RMD160 fa19648637fd986b09e9777c266d0bfad50b26e4 SHA1 cd47f935934c346e1482db4695a0e1d5eefcf6d2 SHA256 a85d10d133aa335a319d3a1386d018d5b9213b41abf7d6759be351b86aa7bcef
+MD5 5dadf48a07196ee238562077447e5d9a cups-1.2.4.ebuild 5763
+RMD160 fa19648637fd986b09e9777c266d0bfad50b26e4 cups-1.2.4.ebuild 5763
+SHA256 a85d10d133aa335a319d3a1386d018d5b9213b41abf7d6759be351b86aa7bcef cups-1.2.4.ebuild 5763
+MISC ChangeLog 29105 RMD160 2d22cdf56650930c5df9e2c8a43fbc348a156f69 SHA1 140a0036f57bf232daaaca2e1ca8b89e762d056d SHA256 a3a7b10f88ee68ceb884acdef40792fa7552fa91482d9b22ff8722a77b716971
+MD5 40271745c558ca7e4bfb43b16925b21d ChangeLog 29105
+RMD160 2d22cdf56650930c5df9e2c8a43fbc348a156f69 ChangeLog 29105
+SHA256 a3a7b10f88ee68ceb884acdef40792fa7552fa91482d9b22ff8722a77b716971 ChangeLog 29105
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -79,6 +75,6 @@ SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/di
 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 822f1013350a461a4478fb9b7ccd000d files/digest-cups-1.2.3 259
-RMD160 b0082203fbe35cf3617d75bf3237be63324019f5 files/digest-cups-1.2.3 259
-SHA256 59e4f9e24e51d20276b77a115770f089d6f1bb056173dc39b2e1492a067be742 files/digest-cups-1.2.3 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.3.ebuild b/net-print/cups/cups-1.2.3.ebuild
deleted file mode 100644
index 1f5fcfce4d09..000000000000
--- a/net-print/cups/cups-1.2.3.ebuild
+++ /dev/null
@@ -1,200 +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.3.ebuild,v 1.3 2006/09/06 15:47:10 genstef 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 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ssl slp pam php 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 )
-	php? ( dev-lang/php )
-	app-text/libpaper"
-DEPEND="${DEP}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEP}
-	nls? ( virtual/libintl )
-	!virtual/lpr
-	>=app-text/poppler-0.4.3-r1
-	X? ( 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
-	) )
-	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}
-
-	# upstream does not acknowledge bindnow as a solution
-	epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
-
-	# http://www.cups.org/str.php?L1953 - backend code ignores backends after
-	# hitting broken symbolic link
-	epatch ${FILESDIR}/cupsDirRead-dont-end-on-failed-stat.patch
-
-	# 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) \
-		$(use_with php) \
-		--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/cupsDirRead-dont-end-on-failed-stat.patch b/net-print/cups/files/cupsDirRead-dont-end-on-failed-stat.patch
deleted file mode 100644
index e99bc256a767..000000000000
--- a/net-print/cups/files/cupsDirRead-dont-end-on-failed-stat.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- cups/dir.c	2006/09/03 08:53:52	1.1
-+++ cups/dir.c	2006/09/03 08:57:17
-@@ -381,22 +381,24 @@ cupsDirRead(cups_dir_t *dp)		/* I - Dire
-     }
- 
-     DEBUG_printf(("    readdir_r() returned \"%s\"...\n", entry->d_name));
--  }
--  while (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, ".."));
- 
-- /*
--  * Copy the name over and get the file information...
--  */
-+    if (!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, ".."))
-+      continue;
- 
--  strlcpy(dp->entry.filename, entry->d_name, sizeof(dp->entry.filename));
--
--  snprintf(filename, sizeof(filename), "%s/%s", dp->directory, entry->d_name);
--  if (stat(filename, &(dp->entry.fileinfo)))
--  {
--    DEBUG_printf(("    stat() failed for \"%s\" - %s...\n", filename,
--                  strerror(errno)));
--    return (NULL);
--  }
-+   /*
-+    * Copy the name over and get the file information...
-+    */
-+
-+    strlcpy(dp->entry.filename, entry->d_name, sizeof(dp->entry.filename));
-+
-+    snprintf(filename, sizeof(filename), "%s/%s", dp->directory, entry->d_name);
-+    if (stat(filename, &(dp->entry.fileinfo)))
-+    {
-+      DEBUG_printf(("    stat() failed for \"%s\" - %s...\n", filename,
-+		    strerror(errno)));
-+      continue;
-+    }
-+  } while (0);
- 
-  /*
-   * Return the entry...
diff --git a/net-print/cups/files/digest-cups-1.2.3 b/net-print/cups/files/digest-cups-1.2.3
deleted file mode 100644
index 36bff0cd1375..000000000000
--- a/net-print/cups/files/digest-cups-1.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7f65bae0054cd8335824942595d867ef cups-1.2.3-source.tar.bz2 3544888
-RMD160 1d232ea83c684723c05977733e73ecff2c398f0a cups-1.2.3-source.tar.bz2 3544888
-SHA256 5acc3e9490cda60dc243961698d303eba4f20cd61784fa3ada7fdf8b0770b821 cups-1.2.3-source.tar.bz2 3544888