version bump, add samba use flag, bug #52198

7 files changed, 26 insertions, 161 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 8b0765b3c1ca..a57983b6e375 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.72 2004/07/01 22:40:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.73 2004/07/05 15:31:24 lanius Exp $
+
+*cups-1.1.21_rc1 (05 Jul 2004)
+
+  05 Jul 2004; Heinrich Wendel <lanius@gentoo.org> cups-1.1.19-r1.ebuild,
+  cups-1.1.20.ebuild, cups-1.1.21_rc1.ebuild:
+  version bump, add samba use flag, bug #52198
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   cups-1.1.19-r1.ebuild, cups-1.1.20-r1.ebuild, cups-1.1.20.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 013ce2e38cda..2d9b2694e796 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,15 +1,13 @@
-MD5 88b105814bd45331951ec0005cba112e ChangeLog 9619
-MD5 d8f489849ae9528c7c6596f70a7c372b cups-1.1.19-r1.ebuild 3862
+MD5 fcb2e689c3d3741a05cdcc8e751f4004 cups-1.1.21_rc1.ebuild 3428
 MD5 80db9ac76bb5e948005bb6032044e32a cups-1.1.20-r1.ebuild 3362
-MD5 59a9134f03b98d67b0afc2e73509af9d cups-1.1.20.ebuild 3317
+MD5 88b105814bd45331951ec0005cba112e ChangeLog 9619
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 ec90893091ccb9fa45c107c08dc7152c files/configure-jpeg-buildfix.diff 308
-MD5 152f70bcd644a5da56756b8b82193d10 files/cups-1.1.20-str633.patch 268
-MD5 beaf9ffc2a24c42618be32cbd996e9bb files/cups.pam 231
-MD5 b235d7d859319a220b7797cf1cf74a2d files/cups.xinetd 365
-MD5 e8608b3605ae84d0f10dbc635d65292a files/cupsd.conf-1.1.18 20538
+MD5 b435375521c765134c93816ad7dbe742 files/digest-cups-1.1.21_rc1 75
 MD5 436a18c42f44fb1a92b1ab720d666f55 files/cupsd.rc6 521
-MD5 28180a32f4b7e4d332f17fd20c99ee91 files/digest-cups-1.1.19-r1 72
-MD5 baaa1e0bc63f959779998f5e57de6f9d files/digest-cups-1.1.20 72
+MD5 beaf9ffc2a24c42618be32cbd996e9bb files/cups.pam 231
 MD5 baaa1e0bc63f959779998f5e57de6f9d files/digest-cups-1.1.20-r1 72
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
+MD5 152f70bcd644a5da56756b8b82193d10 files/cups-1.1.20-str633.patch 268
+MD5 e8608b3605ae84d0f10dbc635d65292a files/cupsd.conf-1.1.18 20538
+MD5 ec90893091ccb9fa45c107c08dc7152c files/configure-jpeg-buildfix.diff 308
+MD5 b235d7d859319a220b7797cf1cf74a2d files/cups.xinetd 365
diff --git a/net-print/cups/cups-1.1.19-r1.ebuild b/net-print/cups/cups-1.1.19-r1.ebuild
deleted file mode 100644
index 782720781422..000000000000
--- a/net-print/cups/cups-1.1.19-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.19-r1.ebuild,v 1.16 2004/07/01 22:40:19 eradicator Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="ssl slp pam"
-
-DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="http://www.cups.org"
-
-SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2"
-PROVIDE="virtual/lpr"
-
-DEP="virtual/libc
-	pam? ( >=sys-libs/pam-0.75 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	slp? ( >=net-libs/openslp-1.0.4 )
-	>=media-libs/libpng-1.2.1
-	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-
-DEPEND="${DEP}
-	>=sys-devel/autoconf-2.58"
-
-RDEPEND="${DEP}
-	!virtual/lpr"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-
-filter-flags -fomit-frame-pointer
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	#make sure libcupsimage gets linked with libjpeg 
-	epatch ${FILESDIR}/configure-jpeg-buildfix.diff || die
-
-	epatch ${FILESDIR}/disable-strip.patch || die
-
-	WANT_AUTOCONF_2_5=1 autoconf || die
-}
-
-src_compile() {
-	local myconf
-	use pam || myconf="${myconf} --disable-pam"
-	use ssl || myconf="${myconf} --disable-ssl"
-	use slp || myconf="${myconf} --disable-slp"
-
-	./configure \
-		--with-cups-user=lp \
-		--with-cups-group=lp \
-		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-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/lib/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/lib \
-	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
-
-	#seems nobody installs it like this anymore.. security risk?
-	#fowners lp.root /usr/bin/lppasswd
-	#fperms 4755 /usr/bin/lppasswd
-
-	# 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
-
-	mv ${D}/etc/cups/cupsd.conf ${D}/etc/cups/cupsd.conf.orig
-	sed -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.orig > ${D}/etc/cups/cupsd.conf
-	rm -f ${D}/etc/cups/cupsd.conf.orig
-
-	# foomatic cups filters
-	# now provided by foomatic-scripts
-	#exeinto /usr/lib/cups/filter
-	#doexe ${FILESDIR}/cupsomatic
-	#doexe ${FILESDIR}/foomatic-gswrapper
-
-	insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
-	exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd
-	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
-
-	insinto /etc/cups; newins ${FILESDIR}/cupsd.conf-1.1.18 cupsd.conf
-}
-
-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
-	einfo "emerge virtual/ghostscript if you need to print"
-	einfo "to a non-postscript printer (after cups itself! even if it's"
-	einfo "already installed!)"
-	einfo
-
-	einfo "If you're using a USB printer, \"emerge hotplug; rc-update add"
-	einfo "hotplug 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/cups-1.1.20.ebuild b/net-print/cups/cups-1.1.21_rc1.ebuild
index 7e7352fa1bb0..6efcd1dbaa6d 100644
--- a/net-print/cups/cups-1.1.20.ebuild
+++ b/net-print/cups/cups-1.1.21_rc1.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.20.ebuild,v 1.18 2004/07/01 22:40:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.21_rc1.ebuild,v 1.1 2004/07/05 15:31:24 lanius Exp $
 
 inherit eutils flag-o-matic
 
+MY_P=${P/_/}
+
 DESCRIPTION="The Common Unix Printing System"
 HOMEPAGE="http://www.cups.org/"
-SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2"
+SRC_URI="ftp://ftp.easysw.com/pub/cups/test/${MY_P}-source.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
 IUSE="ssl slp pam"
 
 DEP="virtual/libc
@@ -19,20 +21,20 @@ DEP="virtual/libc
 	slp? ( >=net-libs/openslp-1.0.4 )
 	>=media-libs/libpng-1.2.1
 	>=media-libs/tiff-3.5.5
-	>=media-libs/jpeg-6b"
-
+	>=media-libs/jpeg-6b
+	samba? ( net-fs/samba )"
 DEPEND="${DEP}
 	>=sys-devel/autoconf-2.58"
-
 RDEPEND="${DEP}
 	!virtual/lpr"
-
 PROVIDE="virtual/lpr"
 
+S=${WORKDIR}/${MY_P}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/disable-strip.patch || die
+	epatch ${FILESDIR}/disable-strip.patch
 	WANT_AUTOCONF=2.5 autoconf || die
 }
 
diff --git a/net-print/cups/files/digest-cups-1.1.19-r1 b/net-print/cups/files/digest-cups-1.1.19-r1
deleted file mode 100644
index 6ea23d0802d6..000000000000
--- a/net-print/cups/files/digest-cups-1.1.19-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 04cbeed9a8acfe23624f1cb6be9c3eac cups-1.1.19-source.tar.bz2 3691376
diff --git a/net-print/cups/files/digest-cups-1.1.20 b/net-print/cups/files/digest-cups-1.1.20
deleted file mode 100644
index 002ebb34be36..000000000000
--- a/net-print/cups/files/digest-cups-1.1.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09d0be2bad1b0617bc0eba6eef81f6e9 cups-1.1.20-source.tar.bz2 3741510
diff --git a/net-print/cups/files/digest-cups-1.1.21_rc1 b/net-print/cups/files/digest-cups-1.1.21_rc1
new file mode 100644
index 000000000000..49fc09e55272
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.21_rc1
@@ -0,0 +1 @@
+MD5 3cf609727cbf8d8c097d16100be58a28 cups-1.1.21rc1-source.tar.bz2 3834850