remove old, thanks jakub

Package-Manager: portage-2.1.1

8 files changed, 4 insertions, 338 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 58f26adda514..e7a70c3dddcb 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,7 +1,3 @@
-AUX cups-1.1.22-xpdf2-underflow.patch 2301 RMD160 d8f9f74f97ff380ee0552ab2e1f5499af99ee829 SHA1 05c8a1299819ba157a1e30d49acdeb267daa9cc7 SHA256 b400d696742a95040bf6734fca01f5b49481d3610dd5cf6b63786bd1f35e1dd6
-MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301
-RMD160 d8f9f74f97ff380ee0552ab2e1f5499af99ee829 files/cups-1.1.22-xpdf2-underflow.patch 2301
-SHA256 b400d696742a95040bf6734fca01f5b49481d3610dd5cf6b63786bd1f35e1dd6 files/cups-1.1.22-xpdf2-underflow.patch 2301
 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
@@ -30,14 +26,6 @@ AUX cups-gentooalt.patch 966 RMD160 4b4e92e80a74fc4c1d90a2d980af3421290c0408 SHA
 MD5 5f90c7ea48cd8de22145e264ef4ea192 files/cups-gentooalt.patch 966
 RMD160 4b4e92e80a74fc4c1d90a2d980af3421290c0408 files/cups-gentooalt.patch 966
 SHA256 f4ef204d8dfa6bad2f9a870c0cbd927cd8f112de49d36efc64359b1682a79d2d files/cups-gentooalt.patch 966
-AUX cups-lppasswd-setXid.patch 417 RMD160 4e2605e3986441e67c1e1976fa26cbc573941735 SHA1 041c746045f589c03dbbd880401f15cdfcd5ef82 SHA256 57685211227a4f888158c37bc1079a09d41d37b0d1b44a723c2486450cd38dda
-MD5 974925d56d58ecc44c6370754d519dcb files/cups-lppasswd-setXid.patch 417
-RMD160 4e2605e3986441e67c1e1976fa26cbc573941735 files/cups-lppasswd-setXid.patch 417
-SHA256 57685211227a4f888158c37bc1079a09d41d37b0d1b44a723c2486450cd38dda files/cups-lppasswd-setXid.patch 417
-AUX cups.pam 234 RMD160 9a7a82e0b106b7c4d4f4651a37001c2494c88f50 SHA1 f5517b3956ee744f1f1fb27dc5beb1b2188cba46 SHA256 aa68435a4dd8c51e8e861c90aa88326b2c76cfef3e3bb3094d08a0584308863b
-MD5 7242b8a2000fe4c5a2b398e6602f7f1c files/cups.pam 234
-RMD160 9a7a82e0b106b7c4d4f4651a37001c2494c88f50 files/cups.pam 234
-SHA256 aa68435a4dd8c51e8e861c90aa88326b2c76cfef3e3bb3094d08a0584308863b files/cups.pam 234
 AUX cups.xinetd 368 RMD160 b89d527df3f37817e79cef5f8ccf2bb5c563ad8e SHA1 4d8bb1e2d61b0b661c4b7d9a3751d0cf381285f2 SHA256 9af6fd6a735e0edde71800bca2c7a93ea8a20688a702b97b187cbec34f44ef5d
 MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368
 RMD160 b89d527df3f37817e79cef5f8ccf2bb5c563ad8e files/cups.xinetd 368
@@ -62,21 +50,9 @@ AUX pdftops.pl 5624 RMD160 17b481f70cb47acff4272ec143261e920459d0bd SHA1 52a9b41
 MD5 24d215a1cf4e63bc56e89755e90f3645 files/pdftops.pl 5624
 RMD160 17b481f70cb47acff4272ec143261e920459d0bd files/pdftops.pl 5624
 SHA256 60fc863f11c5b114b5bfd8bbba905abca5526c92581f7a5b5570e8723a4aeebc files/pdftops.pl 5624
-AUX xpdf-goo-sizet.patch 1424 RMD160 c52769d3ac95b372593e22d46ad4742dc44e47d3 SHA1 a4883eaa770acca923fb48aecf72d7b68fea16b7 SHA256 d1a75bcb1764383ee1f5bd1c2d678cdadc69cd123069657f1dced0825964cbb0
-MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
-RMD160 c52769d3ac95b372593e22d46ad4742dc44e47d3 files/xpdf-goo-sizet.patch 1424
-SHA256 d1a75bcb1764383ee1f5bd1c2d678cdadc69cd123069657f1dced0825964cbb0 files/xpdf-goo-sizet.patch 1424
-AUX xpdf-pl3.patch 348 RMD160 c53bec6987551228fc3b03958a1fe7c79a4d087a SHA1 6bb4ebedc325522609bf54d9d99fea7af795180d SHA256 19a90dde4d5e5e619866d8a61bec7507a308901d6d54fe49b8bc982f5ca01f0b
-MD5 a097b6a9c53c9ef50a6f3662d802cdfa files/xpdf-pl3.patch 348
-RMD160 c53bec6987551228fc3b03958a1fe7c79a4d087a files/xpdf-pl3.patch 348
-SHA256 19a90dde4d5e5e619866d8a61bec7507a308901d6d54fe49b8bc982f5ca01f0b files/xpdf-pl3.patch 348
 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
-EBUILD cups-1.1.23-r1.ebuild 4132 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763ac SHA1 3958abd83fa55d34622b647f111086d92351965c SHA256 616fea430e4e3295a36de1d2855f3c9cd114b2c936ad9b106a71eba62b1b188b
-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 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
@@ -89,17 +65,14 @@ EBUILD cups-1.2.3.ebuild 5933 RMD160 da9a0ebb215394d92d3e55ff4e351c4b974274d0 SH
 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 28658 RMD160 4460629d4951e1e7f30fb2d1e1e06df1be7b5c7c SHA1 bd100ce8b50455e2e784dd4cff517af0833d796d SHA256 02fbaaab4cad51e4821f9ee008303368448cf787dfc3a56d604584b9fac31621
-MD5 362f0a983beb67430e62dcdbb60cb3c6 ChangeLog 28658
-RMD160 4460629d4951e1e7f30fb2d1e1e06df1be7b5c7c ChangeLog 28658
-SHA256 02fbaaab4cad51e4821f9ee008303368448cf787dfc3a56d604584b9fac31621 ChangeLog 28658
+MISC ChangeLog 28915 RMD160 337fb8c8d616c6887603272f6396905a6d2a78d9 SHA1 b416bc57a4a3359c2aad3eb4ae9432295070c80c SHA256 e53a7c8c96f7ac42e39bc1f4bf0b7bc9224abac7fb81f6c2a0c07563bee02ae6
+MD5 36edeb6192e6aeb3ce0eb9481e71004b ChangeLog 28915
+RMD160 337fb8c8d616c6887603272f6396905a6d2a78d9 ChangeLog 28915
+SHA256 e53a7c8c96f7ac42e39bc1f4bf0b7bc9224abac7fb81f6c2a0c07563bee02ae6 ChangeLog 28915
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 metadata.xml 161
-MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r1 262
-RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r1 262
-SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r1 262
 MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r8 262
 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r8 262
 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r8 262
diff --git a/net-print/cups/cups-1.1.23-r1.ebuild b/net-print/cups/cups-1.1.23-r1.ebuild
deleted file mode 100644
index 8040bc59ad08..000000000000
--- a/net-print/cups/cups-1.1.23-r1.ebuild
+++ /dev/null
@@ -1,137 +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-r1.ebuild,v 1.13 2006/06/22 07:04:36 genstef Exp $
-
-inherit eutils flag-o-matic
-
-MY_P=${P/_/}
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org/"
-SRC_URI="ftp://ftp2.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2 ftp://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="ssl slp pam samba nls"
-
-DEP="virtual/libc
-	pam? ( >=sys-libs/pam-0.75 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	nls? ( sys-devel/gettext )
-	<media-libs/libpng-1.2.10
-	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-DEPEND="${DEP}
-	>=sys-devel/autoconf-2.58"
-RDEPEND="${DEP}
-	!virtual/lpr"
-PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
-PROVIDE="virtual/lpr"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/disable-strip.patch
-	use amd64 && epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791
-	( cd pdftops; epatch ${FILESDIR}/xpdf-goo-sizet.patch )
-	( cd pdftops; epatch ${FILESDIR}/cups-1.1.22-xpdf2-underflow.patch )
-	( cd pdftops; epatch ${FILESDIR}/xpdf-pl3.patch )
-	WANT_AUTOCONF=2.5 autoconf || die
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-
-	local myconf
-	use amd64 && replace-flags -Os -O2
-	use pam || myconf="${myconf} --disable-pam"
-	use ssl || myconf="${myconf} --disable-ssl"
-	use slp || myconf="${myconf} --disable-slp"
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || 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
-	rm -rf ${D}/etc/pam.d
-	rm -rf ${D}/etc/rc*
-	rm -rf ${D}/usr/share/man/cat*
-	rm -rf ${D}/etc/cups/{certs,interfaces,ppd}
-	rm -rf ${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:" \
-		${D}/etc/cups/cupsd.conf
-
-	if use pam; then
-		insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
-	fi
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.init cupsd
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
-
-	# allow raw printing
-	sed -i -e "s:#application/octet-stream:application/octet-stream" ${D}/etc/cups/mime.types
-	sed -i -e "s:#application/octet-stream:application/octet-stream" ${D}/etc/cups/mime.conv
-}
-
-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 default\" is something you should probably do. This"
-	einfo "will allow any USB kernel modules (if present) to be loaded"
-	einfo "automatically at boot."
-}
diff --git a/net-print/cups/files/cups-1.1.22-xpdf2-underflow.patch b/net-print/cups/files/cups-1.1.22-xpdf2-underflow.patch
deleted file mode 100644
index 6fffd57809f4..000000000000
--- a/net-print/cups/files/cups-1.1.22-xpdf2-underflow.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ru XRef.cxx XRef.cxx
---- XRef.cxx	2004-10-29 15:16:45.790089001 +0200
-+++ XRef.cxx	2004-10-29 15:11:54.132168025 +0200
-@@ -66,6 +66,8 @@
-   start = str->getStart();
-   pos = readTrailer();
- 
-+  entries = NULL;
-+
-   // if there was a problem with the trailer,
-   // try to reconstruct the xref table
-   if (pos == 0) {
-@@ -76,7 +78,7 @@
- 
-   // trailer is ok - read the xref table
-   } else {
--    if (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size) {
-+    if ((size < 0) || (size*sizeof(XRefEntry)/sizeof(XRefEntry) != size)) {
-       error(-1, "Invalid 'size' inside xref table.");
-       ok = gFalse;
-       errCode = errDamaged;
-@@ -181,7 +183,7 @@
-     n = atoi(p);
-     while ('0' <= *p && *p <= '9') ++p;
-     while (isspace(*p)) ++p;
--    if (p == buf) {
-+    if ((p == buf) || (n < 0)) /* must make progress */ {
-       goto err1;
-     }
-     pos1 += (p - buf) + n * 20;
-@@ -255,6 +257,10 @@
-     }
-     s[i] = '\0';
-     first = atoi(s);
-+    if (first < 0) {
-+        error(-1, "Invalid 'first'");
-+        goto err2;
-+    }
-     while ((c = str->lookChar()) != EOF && isspace(c)) {
-       str->getChar();
-     }
-@@ -266,6 +272,10 @@
-     }
-     s[i] = '\0';
-     n = atoi(s);
-+    if (n<=0) {
-+        error(-1, "Invalid 'n'");
-+        goto err2;
-+    }
-     while ((c = str->lookChar()) != EOF && isspace(c)) {
-       str->getChar();
-     }
-@@ -273,7 +283,7 @@
-     // table size
-     if (first + n > size) {
-       newSize = first + n;
--      if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+      if ((newSize < 0) || (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize)) {
-         error(-1, "Invalid 'newSize'");
-         goto err2;
-       }
-@@ -406,6 +416,10 @@
-     // look for object
-     } else if (isdigit(*p)) {
-       num = atoi(p);
-+      if (num < 0) {
-+	error(-1, "Invalid 'num' parameters.");
-+	return gFalse;
-+      }
-       do {
- 	++p;
-       } while (*p && isdigit(*p));
-@@ -425,7 +439,7 @@
- 	    if (!strncmp(p, "obj", 3)) {
- 	      if (num >= size) {
- 		newSize = (num + 1 + 255) & ~255;
--	        if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) {
-+	        if ((newSize < 0) || (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize)) {
- 	          error(-1, "Invalid 'obj' parameters.");
- 	          return gFalse;
- 	        }
diff --git a/net-print/cups/files/cups-lppasswd-setXid.patch b/net-print/cups/files/cups-lppasswd-setXid.patch
deleted file mode 100644
index 78d2f0786201..000000000000
--- a/net-print/cups/files/cups-lppasswd-setXid.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur cups-1.1.23/systemv/Makefile cups-1.1.23-setXid/systemv/Makefile
---- cups-1.1.23/systemv/Makefile	2005-01-03 19:29:59 +0000
-+++ cups-1.1.23-setXid/systemv/Makefile	2005-05-28 10:45:46 +0000
-@@ -174,7 +174,7 @@
- 
- lppasswd:	lppasswd.o ../cups/$(LIBCUPS)
- 	echo Linking $@...
--	$(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
-+	$(CC) $(LDFLAGS) -Wl,-z,now -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
- 
- 
- #
diff --git a/net-print/cups/files/cups.pam b/net-print/cups/files/cups.pam
deleted file mode 100644
index 0519fe68b4d5..000000000000
--- a/net-print/cups/files/cups.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/files/cups.pam,v 1.3 2004/07/18 04:18:17 dragonheart Exp $
-auth	required	/lib/security/pam_stack.so service=system-auth
-account	required	/lib/security/pam_stack.so service=system-auth
diff --git a/net-print/cups/files/digest-cups-1.1.23-r1 b/net-print/cups/files/digest-cups-1.1.23-r1
deleted file mode 100644
index 368d38b252b6..000000000000
--- a/net-print/cups/files/digest-cups-1.1.23-r1
+++ /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/xpdf-goo-sizet.patch b/net-print/cups/files/xpdf-goo-sizet.patch
deleted file mode 100644
index 5d90c5120bd4..000000000000
--- a/net-print/cups/files/xpdf-goo-sizet.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru xpdf-2.02pl1/goo/gmem.c xpdf-2.02pl1/goo/gmem.c
---- xpdf-2.02pl1/goo/gmem.c	2003-06-16 22:01:26.000000000 +0200
-+++ xpdf-2.02pl1/goo/gmem.c	2004-10-29 15:13:34.866919791 +0200
-@@ -53,9 +53,9 @@
- 
- #endif /* DEBUG_MEM */
- 
--void *gmalloc(int size) {
-+void *gmalloc(size_t size) {
- #ifdef DEBUG_MEM
--  int size1;
-+  size_t size1;
-   char *mem;
-   GMemHdr *hdr;
-   void *data;
-@@ -94,11 +94,11 @@
- #endif
- }
- 
--void *grealloc(void *p, int size) {
-+void *grealloc(void *p, size_t size) {
- #ifdef DEBUG_MEM
-   GMemHdr *hdr;
-   void *q;
--  int oldSize;
-+  size_t oldSize;
- 
-   if (size == 0) {
-     if (p)
-@@ -137,7 +137,7 @@
- 
- void gfree(void *p) {
- #ifdef DEBUG_MEM
--  int size;
-+  size_t size;
-   GMemHdr *hdr;
-   GMemHdr *prevHdr, *q;
-   int lst;
-diff -ru xpdf-2.02pl1/goo/gmem.h xpdf-2.02pl1/goo/gmem.h
---- xpdf-2.02pl1/goo/gmem.h	2003-06-16 22:01:26.000000000 +0200
-+++ xpdf-2.02pl1/goo/gmem.h	2004-10-29 15:13:50.864027201 +0200
-@@ -19,13 +19,13 @@
-  * Same as malloc, but prints error message and exits if malloc()
-  * returns NULL.
-  */
--extern void *gmalloc(int size);
-+extern void *gmalloc(size_t size);
- 
- /*
-  * Same as realloc, but prints error message and exits if realloc()
-  * returns NULL.  If <p> is NULL, calls malloc instead of realloc().
-  */
--extern void *grealloc(void *p, int size);
-+extern void *grealloc(void *p, size_t size);
- 
- /*
-  * Same as free, but checks for and ignores NULL pointers.
diff --git a/net-print/cups/files/xpdf-pl3.patch b/net-print/cups/files/xpdf-pl3.patch
deleted file mode 100644
index e7b33e514da1..000000000000
--- a/net-print/cups/files/xpdf-pl3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-*** XRef.cxx.orig	Wed Jan 12 17:10:53 2005
---- XRef.cxx	Wed Jan 12 17:11:22 2005
-***************
-*** 793,798 ****
---- 793,801 ----
-  	} else {
-  	  keyLength = 5;
-  	}
-+ 	if (keyLength > 16) {
-+ 	  keyLength = 16;
-+ 	}
-  	permFlags = permissions.getInt();
-  	if (encVersion >= 1 && encVersion <= 2 &&
-  	    encRevision >= 2 && encRevision <= 3) {