From 24d6699dff2d85399938e2caf5d48c924e15f328 Mon Sep 17 00:00:00 2001
From: Donny Davies <woodchip@gentoo.org>
Date: Fri, 25 Oct 2002 19:49:08 +0000
Subject: fixie

---
 net-print/cups/cups-1.1.17_pre20021025.ebuild      | 32 ++++++++++++++--------
 .../cups/files/digest-cups-1.1.17_pre20021025      |  3 +-
 2 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'net-print/cups')

diff --git a/net-print/cups/cups-1.1.17_pre20021025.ebuild b/net-print/cups/cups-1.1.17_pre20021025.ebuild
index d56aeb5a523a..9fc0a40f8bb0 100644
--- a/net-print/cups/cups-1.1.17_pre20021025.ebuild
+++ b/net-print/cups/cups-1.1.17_pre20021025.ebuild
@@ -1,14 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.17_pre20021025.ebuild,v 1.1 2002/10/25 18:51:32 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.17_pre20021025.ebuild,v 1.2 2002/10/25 19:49:08 woodchip Exp $
 
 IUSE="ssl slp pam"
 
 DESCRIPTION="The Common Unix Printing System"
 HOMEPAGE="http://www.cups.org"
 
-S=${WORKDIR}/${PN}
-SRC_URI="http://www.ibiblio.org/gentoo/distfiles/${P}.tbz2"
+PORIG="cups-1.1.16"
+PPATCH="cups-1.1.17_pre20021025"
+
+S=${WORKDIR}/${PORIG}
+SRC_URI="ftp://ftp.easysw.com/pub/cups/1.1.16/${PORIG}-source.tar.bz2
+	mirror://gentoo/${PPATCH}.diff.bz2"
 PROVIDE="virtual/lpr"
 
 DEPEND="virtual/glibc
@@ -24,18 +28,22 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
 
 src_unpack() {
-	unpack ${A} || die
+	unpack ${PORIG}-source.tar.bz2 || die
 	cd ${S} || die
-	WANT_AUTOCONF_2_5=1 autoconf || die
 	#make sure libcupsimage gets linked with libjpeg 
-	patch -p0 < ${FILESDIR}/configure-jpeg-buildfix-1.1.15.diff || die
-	patch -p1 < ${FILESDIR}/disable-strip.patch || die
+#	patch -p0 < ${FILESDIR}/configure-jpeg-buildfix-1.1.15.diff || die
+#	patch -p1 < ${FILESDIR}/disable-strip.patch || die
+
+	bzip2 -dc ${DISTDIR}/${PPATCH}.diff.bz2 | patch -p1 || die
+	WANT_AUTOCONF_2_5=1 autoconf || die
+
 	#known problem, probably will be fixed next release //woodchip; #9188
-	cd pdftops && cp Makefile Makefile.orig
-	sed -e 's|FTFont.o||' \
-		-e 's|SFont.o||' \
-		-e 's|T1Font.o||' \
-		-e 's|TTFont.o||' Makefile.orig > Makefile
+	#covered by above patch...
+#	cd pdftops && cp Makefile Makefile.orig
+#	sed -e 's|FTFont.o||' \
+#		-e 's|SFont.o||' \
+#		-e 's|T1Font.o||' \
+#		-e 's|TTFont.o||' Makefile.orig > Makefile
 }
 
 src_compile() {
diff --git a/net-print/cups/files/digest-cups-1.1.17_pre20021025 b/net-print/cups/files/digest-cups-1.1.17_pre20021025
index 09d8349bff00..b9ec9d78c035 100644
--- a/net-print/cups/files/digest-cups-1.1.17_pre20021025
+++ b/net-print/cups/files/digest-cups-1.1.17_pre20021025
@@ -1 +1,2 @@
-MD5 2597a404d8fa94321ec27d98475b9309 cups-1.1.17_pre20021025.tbz2 4590859
+MD5 4856f3104529341a13652142a8c176e6 cups-1.1.16-source.tar.bz2 3394088
+MD5 c85e2726ba02c85886e1e9720eba9a72 cups-1.1.17_pre20021025.diff.bz2 921966
-- 
cgit v1.2.3-65-gdbad