Fix pdftops with poppler-0.6 thanks to Christian Aistleitner <tmgisi@gmx.at> in bug 195278

Package-Manager: portage-2.1.3.12

11 files changed, 27 insertions, 522 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 25112cbc3f44..9abbec8cfd2b 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.247 2007/08/07 11:59:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.248 2007/10/09 18:46:50 genstef Exp $
+
+*cups-1.2.12-r1 (09 Oct 2007)
+
+  09 Oct 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/cups-1.2.1-ssldir.patch, -files/cups-1.2.5.patch, files/pdftops.pl,
+  -cups-1.2.9.ebuild, -cups-1.2.11.ebuild, -cups-1.2.12.ebuild,
+  +cups-1.2.12-r1.ebuild:
+  Fix pdftops with poppler-0.6 thanks to Christian Aistleitner <tmgisi@gmx.at>
+  in bug 195278
 
   07 Aug 2007; Raúl Porcel <armin76@gentoo.org> cups-1.2.10-r1.ebuild:
   ia64 stable wrt #180906
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 0cbd7ec52faa..55948f42d085 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cups-1.1.23-bindnow.patch 2087 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 SHA1 6f3c24500c50016c0bb2f1913b7c3cb6384c6b21 SHA256 fb932b7e9d04dfe7d52bd455f3514818a3bba1eaa3a3342b5c6b840bf957e67b
 MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087
 RMD160 35c18c1bbeb7c79f9207ecbd69c004f2ddf68f80 files/cups-1.1.23-bindnow.patch 2087
@@ -17,14 +14,6 @@ AUX cups-1.2.0-bindnow.patch 2178 RMD160 cdf51a6734c7a38fab33f270c7c374445a93432
 MD5 17610ba395fa28cc46fe4be7d45c0a44 files/cups-1.2.0-bindnow.patch 2178
 RMD160 cdf51a6734c7a38fab33f270c7c374445a934321 files/cups-1.2.0-bindnow.patch 2178
 SHA256 0fffd86557fdfbf85e32781d1b77f9696e5f0ed7eb30a78fb57ca82cfafdc190 files/cups-1.2.0-bindnow.patch 2178
-AUX cups-1.2.1-ssldir.patch 509 RMD160 bc0f4927e4260b57bb898f55d5f4215489d94a71 SHA1 f846dfaf10426129918b1de7b42a5fcf2c7516db SHA256 e536ae455fdbee0fdea6bae2a800060c81c66ff7ab007ecd317b99b8b9552be7
-MD5 4cfb62e82b82ffc2291f3bdfcc21e600 files/cups-1.2.1-ssldir.patch 509
-RMD160 bc0f4927e4260b57bb898f55d5f4215489d94a71 files/cups-1.2.1-ssldir.patch 509
-SHA256 e536ae455fdbee0fdea6bae2a800060c81c66ff7ab007ecd317b99b8b9552be7 files/cups-1.2.1-ssldir.patch 509
-AUX cups-1.2.5.patch 1208 RMD160 7bae5ce8ae2266be441a3373283e30ffbd8d1279 SHA1 3b0b1fe7654adf0ac3b8abcc713d4c1a4f68279a SHA256 8613ee1343489b5324c09e363ff6dde00e51fb43f04b80b714f2470d48f9740f
-MD5 f66a1efa00c0c292e8eb896e61c6066f files/cups-1.2.5.patch 1208
-RMD160 7bae5ce8ae2266be441a3373283e30ffbd8d1279 files/cups-1.2.5.patch 1208
-SHA256 8613ee1343489b5324c09e363ff6dde00e51fb43f04b80b714f2470d48f9740f files/cups-1.2.5.patch 1208
 AUX cups-gcc4-amd64.patch 566 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b SHA1 9e23ed973685c279edfee76fc0a7a9c6fd94a103 SHA256 e5d7cfb3a96731362008ff7e103cb3156059b0b86031564cc0a3e4bf9ea334fa
 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b files/cups-gcc4-amd64.patch 566
@@ -49,15 +38,13 @@ AUX disable-strip.patch 422 RMD160 981a3cfc11f856a6bd49685933f27883552f77a3 SHA1
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
 RMD160 981a3cfc11f856a6bd49685933f27883552f77a3 files/disable-strip.patch 422
 SHA256 78a7cd0c41b8e6c50301bfe8739faa775f14e8e63dfcc45ec0821f870220001a files/disable-strip.patch 422
-AUX pdftops.pl 5624 RMD160 17b481f70cb47acff4272ec143261e920459d0bd SHA1 52a9b41fb384b5b06212537dde136298bafac569 SHA256 60fc863f11c5b114b5bfd8bbba905abca5526c92581f7a5b5570e8723a4aeebc
-MD5 24d215a1cf4e63bc56e89755e90f3645 files/pdftops.pl 5624
-RMD160 17b481f70cb47acff4272ec143261e920459d0bd files/pdftops.pl 5624
-SHA256 60fc863f11c5b114b5bfd8bbba905abca5526c92581f7a5b5570e8723a4aeebc files/pdftops.pl 5624
+AUX pdftops.pl 5552 RMD160 8c73e4a5bb5ae5a7eafb59b25ec483279dad90d4 SHA1 9c57044a5e1c716fb4b6cdb70d827c35bc0e82c1 SHA256 aeaca40973d4a4df2212e73820f96272923e23717a69b0bf738896a5fc04df25
+MD5 768f46bf3324308e2cf45c8a68aa7408 files/pdftops.pl 5552
+RMD160 8c73e4a5bb5ae5a7eafb59b25ec483279dad90d4 files/pdftops.pl 5552
+SHA256 aeaca40973d4a4df2212e73820f96272923e23717a69b0bf738896a5fc04df25 files/pdftops.pl 5552
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
 DIST cups-1.2.10-source.tar.bz2 3618084 RMD160 85b3bbd46a6fc097891c571ffad8e5e46693743f SHA1 241d7a3c52370fb08ed2ffc3fd8f59673d158299 SHA256 601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36
-DIST cups-1.2.11-source.tar.bz2 3774113 RMD160 c5471c205a6ebb7ba0c2067b89769282e1a044a1 SHA1 4635dc423e3fc061df10d6af5ba60aaceb03d34b SHA256 c313e34a79af84e92609428d31ab292c04a4db69596ad9b264dd0ea719e2ecb0
 DIST cups-1.2.12-source.tar.bz2 3788301 RMD160 598270e37ff8a9b9ff1e667066d6f7e120493e32 SHA1 11a540f76a1d3164b6636bf8ba47928803ad9356 SHA256 b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f
-DIST cups-1.2.9-source.tar.bz2 3617594 RMD160 8af1323a8006c3736a15c25c89773292a129161d SHA1 58e67800103e699b4699f17db41da33ddea360fb SHA256 9764a76adf41d72ad4142df8f8a0117507092623a58212a463dfb8a2dced7f09
 EBUILD cups-1.1.23-r8.ebuild 5009 RMD160 b1cb7d5c2ede0fb359c96168f53a1518ad459736 SHA1 2730b6d204679da7aa4e70a916432e93cee48411 SHA256 47a824972575230e3f2a19f5919a8dc09f43f0b3df8ab3a1213b91891b6f0d8b
 MD5 f2397cdb3da6d12ef0f5f2fb9b70b44a cups-1.1.23-r8.ebuild 5009
 RMD160 b1cb7d5c2ede0fb359c96168f53a1518ad459736 cups-1.1.23-r8.ebuild 5009
@@ -66,22 +53,14 @@ EBUILD cups-1.2.10-r1.ebuild 6316 RMD160 396839aec0fe91130450f8c4bdc5df0598a5ae2
 MD5 683374c073f1791ca3bfe1a3447b71f8 cups-1.2.10-r1.ebuild 6316
 RMD160 396839aec0fe91130450f8c4bdc5df0598a5ae29 cups-1.2.10-r1.ebuild 6316
 SHA256 b7dc3e71cd9fa05d9f51274e6c9158ccaf4ad5558de57dbf2b34f1c5cc0de95b cups-1.2.10-r1.ebuild 6316
-EBUILD cups-1.2.11.ebuild 6803 RMD160 08f8a43dbb47d6085b23467337973346df8355bc SHA1 b4dadd678c3f41f2bd4be70d702668b24828f7c9 SHA256 0b4e201d219053360003c5e27c391b88c37c70b4af195932a4a246e44cb9c25f
-MD5 4e891eb83a6bab4fa8ddad59700feb79 cups-1.2.11.ebuild 6803
-RMD160 08f8a43dbb47d6085b23467337973346df8355bc cups-1.2.11.ebuild 6803
-SHA256 0b4e201d219053360003c5e27c391b88c37c70b4af195932a4a246e44cb9c25f cups-1.2.11.ebuild 6803
-EBUILD cups-1.2.12.ebuild 6867 RMD160 887b16aa3f041273416afbc842d2ba52b0e57901 SHA1 10a48578e3ecdb7507e4c66d321fcf362051592d SHA256 c88a89547319fa8cd2f8be86409c11dd65dfbf03ba385e20e50ae979d30dc577
-MD5 3d2829c972fbb57ed6dee1a03ecab499 cups-1.2.12.ebuild 6867
-RMD160 887b16aa3f041273416afbc842d2ba52b0e57901 cups-1.2.12.ebuild 6867
-SHA256 c88a89547319fa8cd2f8be86409c11dd65dfbf03ba385e20e50ae979d30dc577 cups-1.2.12.ebuild 6867
-EBUILD cups-1.2.9.ebuild 6113 RMD160 8c2ee9119bcdefec642f9289c0de24ab97e23be6 SHA1 3b018bcd66ab15c14069d463216cf81800098591 SHA256 1f4c57a92f460aecdcad4fee25c4addefbf287bd23f194b77a3e5666041efb92
-MD5 1b4c74f7c0ce9cddc1cf28227734244c cups-1.2.9.ebuild 6113
-RMD160 8c2ee9119bcdefec642f9289c0de24ab97e23be6 cups-1.2.9.ebuild 6113
-SHA256 1f4c57a92f460aecdcad4fee25c4addefbf287bd23f194b77a3e5666041efb92 cups-1.2.9.ebuild 6113
-MISC ChangeLog 34274 RMD160 90f2aa98fc37b0b388cde12342aa806bfdce65a4 SHA1 cdeb8a2ca9d5babb3823aca9f4f22bb8c17f40a9 SHA256 ff5b3c9f0a32612a67849c8e3a15b42e2411770d538231f6d6215a2b8d35bb5f
-MD5 c1443a91c986751acfe16761638f6127 ChangeLog 34274
-RMD160 90f2aa98fc37b0b388cde12342aa806bfdce65a4 ChangeLog 34274
-SHA256 ff5b3c9f0a32612a67849c8e3a15b42e2411770d538231f6d6215a2b8d35bb5f ChangeLog 34274
+EBUILD cups-1.2.12-r1.ebuild 6869 RMD160 0c2ae163a8831dc9bb90300f38dfda809588e29f SHA1 4ba4b896eb41f9ca03ef310cf3ca3471974ce2c5 SHA256 29b26f0f3b277fc91787418a95478ae3b1ad2facac4a571775f3e3c1cd717f1f
+MD5 d6a8de07d1cc31d0fb955b9a33bbe77e cups-1.2.12-r1.ebuild 6869
+RMD160 0c2ae163a8831dc9bb90300f38dfda809588e29f cups-1.2.12-r1.ebuild 6869
+SHA256 29b26f0f3b277fc91787418a95478ae3b1ad2facac4a571775f3e3c1cd717f1f cups-1.2.12-r1.ebuild 6869
+MISC ChangeLog 34621 RMD160 4882631b52da862038d7523509f37e17d8757ac5 SHA1 273942caf89daaf2f66ad6f78395004c687c0d94 SHA256 92b1663ad165a0c29ff2093ab38d86624b6a5f79f52259398b72723aebcd6b03
+MD5 01454e1350e74389d7950c069871c814 ChangeLog 34621
+RMD160 4882631b52da862038d7523509f37e17d8757ac5 ChangeLog 34621
+SHA256 92b1663ad165a0c29ff2093ab38d86624b6a5f79f52259398b72723aebcd6b03 ChangeLog 34621
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -92,19 +71,6 @@ SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/di
 MD5 126e6284164bd1c1cc5fc98f1b3f1089 files/digest-cups-1.2.10-r1 262
 RMD160 73673bf65cd75f7e5b15918308b45477ce244a5e files/digest-cups-1.2.10-r1 262
 SHA256 66f16eee78c2442511803e6de89563a1f32ff0150e604904a123b2b222f0e3b3 files/digest-cups-1.2.10-r1 262
-MD5 535f9beba5e86aa94267b23e40eb171d files/digest-cups-1.2.11 262
-RMD160 9bc38d56c88a92eae21e53e54bd54b34b18cfc3e files/digest-cups-1.2.11 262
-SHA256 16d43979bbc4d88e36a33bf34d6a3dacb94bf0c384f943cc68ec39136625689e files/digest-cups-1.2.11 262
-MD5 422be1a8808e7fb306fcc6872c874a9b files/digest-cups-1.2.12 262
-RMD160 af6b2363980a1e6323b89c87f8a25598b7730897 files/digest-cups-1.2.12 262
-SHA256 1ed8553b6b83c34074f536128d9794fdbd11070a6091353722bb0cc5d4e625df files/digest-cups-1.2.12 262
-MD5 176a666fe4ea35c61883dbca59ed67f2 files/digest-cups-1.2.9 259
-RMD160 ee7512fccc424990869d0ca44442749f90eb0a7d files/digest-cups-1.2.9 259
-SHA256 8757c4a8802841ca9ff72f5fc260d8fdddbd3970b321db43ac0416fd1b563ae1 files/digest-cups-1.2.9 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFG0D56p/wUKkr7RBoRAgzXAKDfUN3KrsnYh/xDGe8/Ys0t9VvyeACg3Y6L
-ySfyIlhpK8zJiQoqubSsd2c=
-=Vqsl
------END PGP SIGNATURE-----
+MD5 01b96d03e659e7510706e0386c606199 files/digest-cups-1.2.12-r1 190
+RMD160 b080f2e97532c7e806dbfd020b02becad12bede3 files/digest-cups-1.2.12-r1 190
+SHA256 78a97edb8a4b5f8d1ee62a565f361a62b8fc0b341b43d69432f5ea9482af0921 files/digest-cups-1.2.12-r1 190
diff --git a/net-print/cups/cups-1.2.11.ebuild b/net-print/cups/cups-1.2.11.ebuild
deleted file mode 100644
index 29b7423526a9..000000000000
--- a/net-print/cups/cups-1.2.11.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.11.ebuild,v 1.4 2007/05/10 08:46:59 genstef Exp $
-
-WANT_AUTOMAKE=latest
-
-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.funet.fi/pub/mirrors/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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ldap 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 )
-	ldap? ( net-nds/openldap )
-	dbus? ( 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}
-	!<net-print/foomatic-filters-ppds-20070501
-	!<net-print/hplip-1.7.4a-r1
-	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() {
-	if use x86 && [ -d "/usr/lib64" ]
-	then
-		eerror "You are running an x86 system, but /usr/lib64 exists, cups will install all library objects into this directory!"
-		eerror "You should remove /usr/lib64, but before you do, you should check for existing objects, and re-compile all affected packages."
-		eerror "You can use qfile (emerge portage-utils to install qfile) to get a list of the affected ebuilds:"
-		eerror "# qfile -qC /usr/lib64"
-		die "lib64 on x86 detected"
-	fi
-
-	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
-
-	# 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) \
-		$(use_enable ldap) \
-		--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
-
-	# only for gs-esp this is correct, see bug 163897
-	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then
-		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" ${D}/etc/cups/mime.convs
-	fi
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
-
-	# .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
-
-	# Fix a symlink collision, see bug #172341
-	dodir /usr/share/ppd
-	dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-}
-
-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\" USE flag 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/cups-1.2.12.ebuild b/net-print/cups/cups-1.2.12-r1.ebuild
index 441d12b04ae6..ee7e4791fc5b 100644
--- a/net-print/cups/cups-1.2.12.ebuild
+++ b/net-print/cups/cups-1.2.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12.ebuild,v 1.3 2007/07/20 08:43:31 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r1.ebuild,v 1.1 2007/10/09 18:46:50 genstef Exp $
 
 WANT_AUTOMAKE=latest
 
diff --git a/net-print/cups/cups-1.2.9.ebuild b/net-print/cups/cups-1.2.9.ebuild
deleted file mode 100644
index efaef88a567d..000000000000
--- a/net-print/cups/cups-1.2.9.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.9.ebuild,v 1.10 2007/08/25 14:35:21 vapier Exp $
-
-WANT_AUTOMAKE=latest
-
-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.funet.fi/pub/mirrors/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="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ldap 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 )
-	ldap? ( net-nds/openldap )
-	dbus? ( 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
-
-	# 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) \
-		$(use_enable ldap) \
-		--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
-
-	# only for gs-esp this is correct, see bug 163897
-	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then
-		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" ${D}/etc/cups/mime.convs
-	fi
-
-	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
-		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
-
-	# .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\" USE flag 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/cups-1.2.1-ssldir.patch b/net-print/cups/files/cups-1.2.1-ssldir.patch
deleted file mode 100644
index 242395118062..000000000000
--- a/net-print/cups/files/cups-1.2.1-ssldir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cups-1.2.1/scheduler/Makefile.orig	2006-06-22 08:11:44.000000000 +0200
-+++ cups-1.2.1/scheduler/Makefile	2006-06-22 08:13:21.000000000 +0200
-@@ -127,6 +127,9 @@
- 	echo Creating $(SERVERROOT)/ppd...
- 	$(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd
- 	-chgrp $(CUPS_GROUP) $(SERVERROOT)/ppd
-+	echo Creating $(SERVERROOT)/ssl...
-+	$(INSTALL_DIR) -m 755 $(SERVERROOT)/ssl
-+	-chgrp $(CUPS_GROUP) $(SERVERROOT)/ssl
- 	echo Creating $(STATEDIR)...
- 	$(INSTALL_DIR) -m 755 $(STATEDIR)
- 	echo Creating $(STATEDIR)/certs...
diff --git a/net-print/cups/files/cups-1.2.5.patch b/net-print/cups/files/cups-1.2.5.patch
deleted file mode 100644
index f062e0aa0b2b..000000000000
--- a/net-print/cups/files/cups-1.2.5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur cups-1.2.5.orig/scheduler/ipp.c cups-1.2.5/scheduler/ipp.c
---- cups-1.2.5.orig/scheduler/ipp.c	2006-10-21 02:35:26.000000000 +0200
-+++ cups-1.2.5/scheduler/ipp.c	2006-10-21 02:35:41.000000000 +0200
-@@ -4020,14 +4020,14 @@
-     if ((!strcmp(system_paper, "Letter") && have_letter) ||
-         (!strcmp(system_paper, "A4") && have_a4))
-     {
--      num_defaults = ppd_add_default("PageSize", system_paper, 
--				     num_defaults, &defaults);
--      num_defaults = ppd_add_default("PageRegion", system_paper, 
--				     num_defaults, &defaults);
--      num_defaults = ppd_add_default("PaperDimension", system_paper, 
--				     num_defaults, &defaults);
--      num_defaults = ppd_add_default("ImageableArea", system_paper, 
--				     num_defaults, &defaults);
-+      num_defaults = cupsAddOption("PageSize", system_paper, 
-+				   num_defaults, &defaults);
-+      num_defaults = cupsAddOption("PageRegion", system_paper, 
-+				   num_defaults, &defaults);
-+      num_defaults = cupsAddOption("PaperDimension", system_paper, 
-+				   num_defaults, &defaults);
-+      num_defaults = cupsAddOption("ImageableArea", system_paper, 
-+				   num_defaults, &defaults);
-     }
-   }
- #endif /* HAVE_LIBPAPER */
diff --git a/net-print/cups/files/digest-cups-1.2.11 b/net-print/cups/files/digest-cups-1.2.11
deleted file mode 100644
index 9c704ef936d6..000000000000
--- a/net-print/cups/files/digest-cups-1.2.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2742f1eec38abb04472b86627da8e493 cups-1.2.11-source.tar.bz2 3774113
-RMD160 c5471c205a6ebb7ba0c2067b89769282e1a044a1 cups-1.2.11-source.tar.bz2 3774113
-SHA256 c313e34a79af84e92609428d31ab292c04a4db69596ad9b264dd0ea719e2ecb0 cups-1.2.11-source.tar.bz2 3774113
diff --git a/net-print/cups/files/digest-cups-1.2.12 b/net-print/cups/files/digest-cups-1.2.12-r1
index 8073a9a92cbd..d18b1fc2605a 100644
--- a/net-print/cups/files/digest-cups-1.2.12
+++ b/net-print/cups/files/digest-cups-1.2.12-r1
@@ -1,3 +1,2 @@
-MD5 d410658468384b5ba5d04a808f6157fe cups-1.2.12-source.tar.bz2 3788301
 RMD160 598270e37ff8a9b9ff1e667066d6f7e120493e32 cups-1.2.12-source.tar.bz2 3788301
 SHA256 b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f cups-1.2.12-source.tar.bz2 3788301
diff --git a/net-print/cups/files/digest-cups-1.2.9 b/net-print/cups/files/digest-cups-1.2.9
deleted file mode 100644
index fba5093dc262..000000000000
--- a/net-print/cups/files/digest-cups-1.2.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 73433d7e8c04b66702732928aaf087b8 cups-1.2.9-source.tar.bz2 3617594
-RMD160 8af1323a8006c3736a15c25c89773292a129161d cups-1.2.9-source.tar.bz2 3617594
-SHA256 9764a76adf41d72ad4142df8f8a0117507092623a58212a463dfb8a2dced7f09 cups-1.2.9-source.tar.bz2 3617594
diff --git a/net-print/cups/files/pdftops.pl b/net-print/cups/files/pdftops.pl
index cabf60552a0b..36932234bc14 100644
--- a/net-print/cups/files/pdftops.pl
+++ b/net-print/cups/files/pdftops.pl
@@ -104,7 +104,7 @@ if (! defined $pdffile)
 # Check the options string for options to modify the bahaviour of the pdftops utility:
 #
 @optarr = split (/\s+/, $options);
-$cmdopt = "-cfg " . $ENV{CUPS_SERVERROOT} . "/pdftops.conf";	# This cannot be changed
+$cmdopt = "";
 # The following are the (parameterless) command line options that may be used to change the 
 # defaults defiend by pdftops.conf
 $simple = 'level1|level1sep|level2|level2sep|level3|level3sep|opi|nocrop|expand|noshrink|nocenter';