Change the cups-1.1 ebuild to be only a pointer to newer ebuilds. We cannot remove it because the mips stable tree would break then

(Portage version: 2.1.3.17)

14 files changed, 27 insertions, 765 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 12da60d1d06a..eb8addea1b24 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.256 2007/11/05 19:11:14 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.257 2007/11/05 19:42:39 genstef Exp $
+
+  05 Nov 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/cups-1.1.23-image-png.patch, -files/cups-1.1-str2561-v2.patch,
+  -files/cups-1.1.23-bindnow.patch, -files/cups-1.1.23-respectldflags.patch,
+  -files/cups.xinetd, -files/cups-gcc4-amd64.patch,
+  -files/cups-gentooalt.patch, -files/cupsaddsmb.patch,
+  -files/disable-strip.patch, cups-1.1.23-r8.ebuild, -cups-1.1.23-r9.ebuild:
+  Change the cups-1.1 ebuild to be only a pointer to newer ebuilds. We cannot
+  remove it because the mips stable tree would break then
 
 *cups-1.3.4 (05 Nov 2007)
 *cups-1.2.12-r2 (05 Nov 2007)
diff --git a/net-print/cups/cups-1.1.23-r8.ebuild b/net-print/cups/cups-1.1.23-r8.ebuild
index 9ba886a8144a..db7e36b5bdd2 100644
--- a/net-print/cups/cups-1.1.23-r8.ebuild
+++ b/net-print/cups/cups-1.1.23-r8.ebuild
@@ -1,183 +1,32 @@
 # 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.1.23-r8.ebuild,v 1.8 2007/05/01 12:20:07 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r8.ebuild,v 1.9 2007/11/05 19:42:39 genstef Exp $
 
-WANT_AUTOMAKE=latest
+# This ebuild is just kept here to not break the tree for mips stable
 
-inherit eutils flag-o-matic pam autotools
-
-MY_P=${P/_/}
+# UNMAINTAINED
+# UNMAINTAINED
+#  _  _ _  _ _  _ ____ _ _  _ ___ ____ _ _  _ ____ ___  
+#  |  | |\ | |\/| |__| | |\ |  |  |__| | |\ | |___ |  \ 
+#  |__| | \| |  | |  | | | \|  |  |  | | | \| |___ |__/ 
+# UNMAINTAINED
+# UNMAINTAINED
 
 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"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k 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-1.2.10
-	>=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"
+KEYWORDS="mips"
+IUSE=""
 
 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
-	epatch ${FILESDIR}/${P}-image-png.patch
-
-	# 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."
-
-	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
+	eerror
+	eerror "this version is unmaintained, old, and has many bugs - not only security bugs"
+	eerror
+	eerror "It does not work, please use a newer version"
+	die "Please use newer version"
 }
diff --git a/net-print/cups/cups-1.1.23-r9.ebuild b/net-print/cups/cups-1.1.23-r9.ebuild
deleted file mode 100644
index 354f2d9ece62..000000000000
--- a/net-print/cups/cups-1.1.23-r9.ebuild
+++ /dev/null
@@ -1,185 +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.1.23-r9.ebuild,v 1.1 2007/11/05 19:11:14 tgurr Exp $
-
-WANT_AUTOMAKE=latest
-
-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 ~m68k ~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-1.2.10
-	>=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
-	# CVE-2007-4351 security patch, bug #196736
-	epatch "${FILESDIR}"/${PN}-1.1-str2561-v2.patch
-	eautoconf
-
-	# 1.2.10 compat thanks to kojiro in bug 136346
-	epatch "${FILESDIR}"/${P}-image-png.patch
-
-	# 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."
-
-	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
-}
diff --git a/net-print/cups/files/cups-1.1-str2561-v2.patch b/net-print/cups/files/cups-1.1-str2561-v2.patch
deleted file mode 100644
index 3db85798f542..000000000000
--- a/net-print/cups/files/cups-1.1-str2561-v2.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-Index: ipp.c
-===================================================================
---- cups-1.1.23.orig/cups/ipp.c	(revision 7023)
-+++ cups-1.1.23/cups/ipp.c	(working copy)
-@@ -1,5 +1,5 @@
- /*
-- * "$Id: cups-1.1-str2561-v2.patch,v 1.1 2007/11/05 19:11:14 tgurr Exp $"
-+ * "$Id: cups-1.1-str2561-v2.patch,v 1.1 2007/11/05 19:11:14 tgurr Exp $"
-  *
-  *   Internet Printing Protocol support functions for the Common UNIX
-  *   Printing System (CUPS).
-@@ -1119,6 +1119,12 @@
- 	  {
- 	    case IPP_TAG_INTEGER :
- 	    case IPP_TAG_ENUM :
-+		if (n != 4)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 4) < 4)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read integer value!");
-@@ -1131,6 +1137,12 @@
-                 value->integer = n;
- 	        break;
- 	    case IPP_TAG_BOOLEAN :
-+		if (n != 1)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 1) < 1)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read boolean value!");
-@@ -1148,6 +1160,12 @@
- 	    case IPP_TAG_CHARSET :
- 	    case IPP_TAG_LANGUAGE :
- 	    case IPP_TAG_MIMETYPE :
-+		if (n >= sizeof(buffer))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
-                 value->string.text = calloc(n + 1, 1);
- 
- 	        if ((*cb)(src, (ipp_uchar_t *)value->string.text, n) < n)
-@@ -1160,6 +1178,12 @@
- 		              value->string.text));
- 	        break;
- 	    case IPP_TAG_DATE :
-+		if (n != 11)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, value->date, 11) < 11)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to date integer value!");
-@@ -1167,6 +1191,12 @@
- 		}
- 	        break;
- 	    case IPP_TAG_RESOLUTION :
-+		if (n != 9)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 9) < 9)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read resolution value!");
-@@ -1183,6 +1213,12 @@
- 		    (ipp_res_t)buffer[8];
- 	        break;
- 	    case IPP_TAG_RANGE :
-+		if (n != 8)
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
- 	        if ((*cb)(src, buffer, 8) < 8)
- 		{
- 	          DEBUG_puts("ippReadIO: Unable to read range value!");
-@@ -1198,7 +1234,7 @@
- 	        break;
- 	    case IPP_TAG_TEXTLANG :
- 	    case IPP_TAG_NAMELANG :
--	        if (n > sizeof(buffer) || n < 4)
-+	        if (n >= sizeof(buffer) || n < 4)
- 		{
- 		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
- 		  return (IPP_ERROR);
-@@ -1224,18 +1260,28 @@
- 
- 		n = (bufptr[0] << 8) | bufptr[1];
- 
-+		if ((bufptr + 2 + n) >= (buffer + sizeof(buffer)))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
-                 value->string.charset = calloc(n + 1, 1);
- 
--		memcpy(value->string.charset,
--		       bufptr + 2, n);
-+		memcpy(value->string.charset, bufptr + 2, n);
- 
-                 bufptr += 2 + n;
- 		n = (bufptr[0] << 8) | bufptr[1];
- 
-+		if ((bufptr + 2 + n) >= (buffer + sizeof(buffer)))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
-                 value->string.text = calloc(n + 1, 1);
- 
--		memcpy(value->string.text,
--		       bufptr + 2, n);
-+		memcpy(value->string.text, bufptr + 2, n);
- 	        break;
- 
-             case IPP_TAG_BEGIN_COLLECTION :
-@@ -1287,6 +1333,12 @@
- 		break;
- 
-             default : /* Other unsupported values */
-+		if (n > sizeof(buffer))
-+		{
-+		  DEBUG_printf(("ippReadIO: bad value length %d!\n", n));
-+		  return (IPP_ERROR);
-+		}
-+
-                 value->unknown.length = n;
- 	        if (n > 0)
- 		{
-@@ -2557,5 +2609,5 @@
- 
- 
- /*
-- * End of "$Id: cups-1.1-str2561-v2.patch,v 1.1 2007/11/05 19:11:14 tgurr Exp $".
-+ * End of "$Id: cups-1.1-str2561-v2.patch,v 1.1 2007/11/05 19:11:14 tgurr Exp $".
-  */
-
diff --git a/net-print/cups/files/cups-1.1.23-bindnow.patch b/net-print/cups/files/cups-1.1.23-bindnow.patch
deleted file mode 100644
index cfed45cd7ac4..000000000000
--- a/net-print/cups/files/cups-1.1.23-bindnow.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN cups-1.1.23.orig/config-scripts/cups-setXid.m4 cups-1.1.23/config-scripts/cups-setXid.m4
---- cups-1.1.23.orig/config-scripts/cups-setXid.m4	1969-12-31 19:00:00.000000000 -0500
-+++ cups-1.1.23/config-scripts/cups-setXid.m4	2005-12-14 14:30:10.000000000 -0500
-@@ -0,0 +1,9 @@
-+dnl
-+dnl   Copyright 1999-2005 Gentoo Foundation
-+dnl   Distributed under the terms of the GNU General Public License v2
-+dnl
-+
-+AC_ARG_WITH(bindnow, [  --with-bindnow          Set linker flags for force-binding setuid binaries],
-+	BINDNOW_FLAGS="$withval",
-+	BINDNOW_FLAGS="")
-+AC_SUBST(BINDNOW_FLAGS)
-diff --exclude-from=/home/dang/.diffrc -u -ruN cups-1.1.23.orig/configure.in cups-1.1.23/configure.in
---- cups-1.1.23.orig/configure.in	2005-01-03 14:29:44.000000000 -0500
-+++ cups-1.1.23/configure.in	2005-12-14 14:30:36.000000000 -0500
-@@ -40,6 +40,7 @@
- sinclude(config-scripts/cups-pam.m4)
- 
- sinclude(config-scripts/cups-scripting.m4)
-+sinclude(config-scripts/cups-setXid.m4)
- 
- AC_OUTPUT(Makedefs cups.list cups.sh cups-config conf/cupsd.conf conf/pam.std)
- 
-diff --exclude-from=/home/dang/.diffrc -u -ruN cups-1.1.23.orig/Makedefs.in cups-1.1.23/Makedefs.in
---- cups-1.1.23.orig/Makedefs.in	2005-01-03 14:29:44.000000000 -0500
-+++ cups-1.1.23/Makedefs.in	2005-12-14 13:55:48.000000000 -0500
-@@ -93,6 +93,7 @@
- DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
- IMGLIBS		=	@IMGLIBS@ -lm
- LDFLAGS		=	-L../cups -L../filter $(RC_CFLAGS) @LDFLAGS@ $(OPTIM)
-+BINDNOW_FLAGS	=	@BINDNOW_FLAGS@
- LINKCUPS	=	@LINKCUPS@
- LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
- LIBS		=	$(LINKCUPS) $(NETLIBS) @LIBS@ $(COMMONLIBS)
-diff --exclude-from=/home/dang/.diffrc -u -ruN cups-1.1.23.orig/systemv/Makefile cups-1.1.23/systemv/Makefile
---- cups-1.1.23.orig/systemv/Makefile	2005-01-03 14:29:59.000000000 -0500
-+++ cups-1.1.23/systemv/Makefile	2005-12-14 13:55:09.000000000 -0500
-@@ -174,7 +174,7 @@
- 
- lppasswd:	lppasswd.o ../cups/$(LIBCUPS)
- 	echo Linking $@...
--	$(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
-+	$(CC) $(LDFLAGS) $(BINDNOW_FLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
- 
- 
- #
diff --git a/net-print/cups/files/cups-1.1.23-image-png.patch b/net-print/cups/files/cups-1.1.23-image-png.patch
deleted file mode 100644
index 726317ac9017..000000000000
--- a/net-print/cups/files/cups-1.1.23-image-png.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- filter/image-png.c.orig	2005-01-03 14:29:57.000000000 -0500
-+++ filter/image-png.c	2006-07-03 11:40:25.000000000 -0400
-@@ -252,7 +252,8 @@
-     }
-
-   png_read_end(pp, info);
--  png_read_destroy(pp, info, NULL);
-+  png_destroy_read_struct(&pp, &info, NULL);
-+  //png_read_destroy(pp, info, NULL);
-
-   fclose(fp);
-   free(in);
diff --git a/net-print/cups/files/cups-1.1.23-respectldflags.patch b/net-print/cups/files/cups-1.1.23-respectldflags.patch
deleted file mode 100644
index 073000f2f9a5..000000000000
--- a/net-print/cups/files/cups-1.1.23-respectldflags.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: cups-1.1.23/cups/Makefile
-===================================================================
---- cups-1.1.23.orig/cups/Makefile
-+++ cups-1.1.23/cups/Makefile
-@@ -109,7 +109,7 @@ installhdrs:
- 
- libcups.so.2 libcups.sl.2:	$(LIBOBJS) ../Makedefs
- 	echo Linking $@...
--	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
-+	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS)
- 	$(RM) `basename $@ .2`
- 	$(LN) $@ `basename $@ .2`
- 
-@@ -120,7 +120,7 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS) ..
- 
- libcups.2.dylib:	$(LIBOBJS) ../Makedefs
- 	echo Linking $@...
--	$(DSO) $(DSOFLAGS) -o $@ \
-+	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ \
- 		-install_name $(libdir)/$@ \
- 		-current_version 2.7.0 \
- 		-compatibility_version 2.0.0 \
-@@ -137,7 +137,7 @@ libcups_s.a:	$(LIBOBJS) ../Makedefs
- 	echo Creating $@...
- 	$(RM) libcups_s.exp
- 	(echo _ipp_add_attr; echo _ipp_free_attr) >libcups_s.exp
--	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm
-+	$(DSO) $(LDFLAGS) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) -lm
- 	$(RM) $@
- 	$(AR) $(ARFLAGS) $@ libcups_s.o
- 
-@@ -148,7 +148,7 @@ libcups_s.a:	$(LIBOBJS) ../Makedefs
- 
- libcups.la:    $(LIBOBJS) ../Makedefs
- 	echo Linking $@...
--	$(DSO) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-+	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
- 		-version-info 2:7 $(SSLLIBS) $(COMMONLIBS)
- 
- 
-Index: cups-1.1.23/filter/Makefile
-===================================================================
---- cups-1.1.23.orig/filter/Makefile
-+++ cups-1.1.23/filter/Makefile
-@@ -130,7 +130,7 @@ hpgltops:	$(HPGLOBJS) common.o ../Makede
- 
- libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS) ../Makedefs
- 	echo Linking $@...
--	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
-+	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm
- 	$(RM) `basename $@ .2`
- 	$(LN) $@ `basename $@ .2`
- 
-@@ -141,7 +141,7 @@ libcupsimage.so.2 libcupsimage.sl.2:	$(I
- 
- libcupsimage.2.dylib:	$(IMAGEOBJS) ../Makedefs
- 	echo Linking $@...
--	$(DSO) $(DSOFLAGS) -o $@  \
-+	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@  \
- 		-install_name $(libdir)/$@ \
- 		-current_version 2.1.0 \
- 		-compatibility_version 2.0.0 \
-@@ -156,7 +156,7 @@ libcupsimage.2.dylib:	$(IMAGEOBJS) ../Ma
- 
- libcupsimage_s.a:	$(IMAGEOBJS) ../Makedefs
- 	echo Linking $@...
--	$(DSO) $(DSOFLAGS) -Wl,-berok -o libcupsimage_s.o $(IMAGEOBJS) \
-+	$(DSO) $(LDFLAGS) $(DSOFLAGS) -Wl,-berok -o libcupsimage_s.o $(IMAGEOBJS) \
- 		$(DSOLIBS) -lm
- 	$(RM) $@
- 	$(AR) $(ARFLAGS) $@ libcupsimage_s.o
-@@ -168,7 +168,7 @@ libcupsimage_s.a:	$(IMAGEOBJS) ../Makede
- 
- libcupsimage.la:       $(IMAGEOBJS) ../Makedefs
- 	echo Linking $@...
--	$(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
-+	$(DSO) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
- 		-rpath $(LIBDIR) -version-info 2:1
- 
- 
diff --git a/net-print/cups/files/cups-gcc4-amd64.patch b/net-print/cups/files/cups-gcc4-amd64.patch
deleted file mode 100644
index 4cb8692255ee..000000000000
--- a/net-print/cups/files/cups-gcc4-amd64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Npaur cups-1.1.23/pdftops/GfxFont.cxx cups-1.1.23-patched/pdftops/GfxFont.cxx
---- cups-1.1.23/pdftops/GfxFont.cxx	2004-02-02 23:41:09.000000000 +0100
-+++ cups-1.1.23-patched/pdftops/GfxFont.cxx	2005-01-28 02:04:15.613249488 +0100
-@@ -969,7 +969,7 @@ Gushort *Gfx8BitFont::getCodeToGIDMap(Tr
-   if ((nameToGID = ff->getNameToGID())) {
-     for (i = 0; i < 256; ++i) {
-       if (!map[i] && (charName = enc[i])) {
--	map[i] = (Gushort)(int)nameToGID->lookup(charName);
-+	map[i] = (Gushort)(long)nameToGID->lookup(charName);
-       }
-     }
-     delete nameToGID;
diff --git a/net-print/cups/files/cups-gentooalt.patch b/net-print/cups/files/cups-gentooalt.patch
deleted file mode 100644
index 199c81ab531e..000000000000
--- a/net-print/cups/files/cups-gentooalt.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur cups-1.1.23/config-scripts/cups-directories.m4 cups-1.1.23-gentooalt/config-scripts/cups-directories.m4
---- cups-1.1.23/config-scripts/cups-directories.m4	2005-01-03 20:29:45.000000000 +0100
-+++ cups-1.1.23-gentooalt/config-scripts/cups-directories.m4	2005-05-28 12:12:25.310622960 +0200
-@@ -173,21 +173,10 @@
- 	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$logdir")
- fi
- 
--dnl See what directory to put server executables...
--case "$uname" in
--	*BSD* | Darwin*)
--		# *BSD and Darwin (MacOS X)
--		INSTALL_SYSV=""
--		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
--		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
--		;;
--	*)
--		# All others
--		INSTALL_SYSV="install-sysv"
--		CUPS_SERVERBIN="$libdir/cups"
--		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups")
--		;;
--esac
-+# Gentoo: directly!
-+INSTALL_SYSV="install-sysv"
-+CUPS_SERVERBIN="$libdir/cups"
-+AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups")
- 
- AC_SUBST(INSTALL_SYSV)
- AC_SUBST(CUPS_SERVERROOT)
diff --git a/net-print/cups/files/cups.xinetd b/net-print/cups/files/cups.xinetd
deleted file mode 100644
index 6eb93cf62ee7..000000000000
--- a/net-print/cups/files/cups.xinetd
+++ /dev/null
@@ -1,13 +0,0 @@
-# default: off
-# description: The cups-lpd mini daemon accepts jobs from a remote LPD client.
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/files/cups.xinetd,v 1.3 2004/07/18 04:18:17 dragonheart Exp $
-
-service printer
-{
-	socket_type = stream
-	protocol    = tcp
-	wait        = no
-	user        = lp
-	server      = /usr/lib/cups/daemon/cups-lpd
-	disable     = yes
-}
diff --git a/net-print/cups/files/cupsaddsmb.patch b/net-print/cups/files/cupsaddsmb.patch
deleted file mode 100644
index 77e0d72761b1..000000000000
--- a/net-print/cups/files/cupsaddsmb.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Naur cups-1.1.23.orig/systemv/cupsaddsmb.c cups-1.1.23/systemv/cupsaddsmb.c
---- cups-1.1.23.orig/systemv/cupsaddsmb.c	2005-01-03 14:29:59.000000000 -0500
-+++ cups-1.1.23/systemv/cupsaddsmb.c	2005-11-02 12:50:27.000000000 -0500
-@@ -625,7 +625,7 @@
-     * See if we also have the CUPS driver files; if so, use them!
-     */
- 
--    snprintf(file, sizeof(file), "%s/drivers/cupsdrv6.dll", datadir);
-+    snprintf(file, sizeof(file), "%s/drivers/cupsps6.dll", datadir);
-     if (!access(file, 0))
-     {
-      /*
-@@ -633,9 +633,10 @@
-       */
- 
-       snprintf(subcmd, sizeof(subcmd),
--               "put %s/drivers/cupsdrv6.dll W32X86/cupsdrv6.dll;"
-+               "put %s/drivers/cups6.ini W32X86/cups6.ini;"
-+               "put %s/drivers/cupsps6.dll W32X86/cupsps6.dll;"
- 	       "put %s/drivers/cupsui6.dll W32X86/cupsui6.dll",
--	       datadir, datadir);
-+	       datadir, datadir, datadir);
- 
-       if ((status = do_samba_command(command, subcmd)) != 0)
-       {
-@@ -652,8 +653,9 @@
-       snprintf(subcmd, sizeof(subcmd),
-                "adddriver \"Windows NT x86\" \"%s:"
- 	       "pscript5.dll:%s.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:"
--	       "cupsdrv6.dll,cupsui6.dll,pscript.ntf\"",
--	       dest, dest);
-+	       "pscript5.dll,%s.ppd,ps5ui.dll,pscript.hlp,pscript.ntf,"
-+	       "cups6.ini,cupsps6.dll,cupsui6.dll\"",
-+	       dest, dest, dest);
-     }
-     else
-     {
-@@ -665,8 +667,8 @@
-       snprintf(subcmd, sizeof(subcmd),
-                "adddriver \"Windows NT x86\" \"%s:"
- 	       "pscript5.dll:%s.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:"
--	       "pscript.ntf\"",
--	       dest, dest);
-+	       "pscript5.dll,%s.ppd,ps5ui.dll,pscript.hlp,pscript.ntf\"",
-+	       dest, dest, dest);
-     }
- 
-     snprintf(command, sizeof(command), "rpcclient %s", SAMBAServer);
diff --git a/net-print/cups/files/digest-cups-1.1.23-r8 b/net-print/cups/files/digest-cups-1.1.23-r8
index 368d38b252b6..e69de29bb2d1 100644
--- a/net-print/cups/files/digest-cups-1.1.23-r8
+++ b/net-print/cups/files/digest-cups-1.1.23-r8
@@ -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.1.23-r9 b/net-print/cups/files/digest-cups-1.1.23-r9
deleted file mode 100644
index 368d38b252b6..000000000000
--- a/net-print/cups/files/digest-cups-1.1.23-r9
+++ /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/disable-strip.patch b/net-print/cups/files/disable-strip.patch
deleted file mode 100644
index 0ebc1f215d28..000000000000
--- a/net-print/cups/files/disable-strip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur cups-1.1.14.orig/Makedefs.in cups-1.1.14/Makedefs.in
---- cups-1.1.14.orig/Makedefs.in	Wed May  1 22:53:49 2002
-+++ cups-1.1.14/Makedefs.in	Wed May  1 22:54:02 2002
-@@ -46,7 +46,7 @@
- # Installation programs...
- #
- 
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 -s
-+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
- INSTALL_DATA	=	$(INSTALL) -m 644
- INSTALL_DIR	=	$(INSTALL) -d
- INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755