Preview version of cups-1.2, masked for now

(Portage version: 2.1_pre10-r2)

6 files changed, 134 insertions, 2 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 2d17e29db6e3..a65d61d4c7e1 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.161 2006/04/02 16:30:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.162 2006/05/05 05:28:53 genstef Exp $
+
+*cups-1.2.0_pre (05 May 2006)
+
+  05 May 2006; Stefan Schweizer <genstef@gentoo.org> files/pdftops.pl,
+  +cups-1.2.0_pre.ebuild:
+  Preview version of cups-1.2, masked for now
 
   02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> cups-1.1.23-r7.ebuild:
   Fix nls dependencies and add ~x86-fbsd keyword.
diff --git a/net-print/cups/cups-1.2.0_pre.ebuild b/net-print/cups/cups-1.2.0_pre.ebuild
new file mode 100644
index 000000000000..88c382930bc8
--- /dev/null
+++ b/net-print/cups/cups-1.2.0_pre.ebuild
@@ -0,0 +1,121 @@
+# 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.2.0_pre.ebuild,v 1.1 2006/05/05 05:28:54 genstef Exp $
+
+inherit eutils flag-o-matic pam autotools subversion
+
+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"
+ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.1
+	>=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_compile() {
+	eaclocal
+	_elibtoolize --copy --force
+	eautoconf
+	eautomake
+	elibtoolize
+	local myconf
+
+	use ssl && \
+		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
+
+	setenv DSOFLAGS ${LDFLAGS}
+	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) \
+		--enable-libpaper \
+		--enable-threads \
+		--enable-static \
+		--disable-pdftops \
+		${myconf} \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+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() {
+	make BUILDROOT=${D} install || die "make install failed"
+
+	dodoc {CHANGES,CREDITS,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*
+
+	# Do not export all our printers
+	sed -i -e "s:^\(SystemGroup\).*:\1 lp:" \
+		-e "s:^BrowseAllow.*:#\0:" \
+		${D}/etc/cups/cupsd.conf
+
+	pamd_mimic_system cups auth account
+
+	# install pdftops filter
+	exeinto /usr/lib/cups/filter/
+	newexe ${FILESDIR}/pdftops.pl pdftops
+
+	fowners lp:lp /var/log/cups /var/run/cups/certs /var/cache/cups \
+		/var/spool/cups/tmp /var/spool/cups /etc/cups/{,interfaces,ppd}
+	keepdir /var/log/cups /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
+}
+
+pkg_preinst() {
+	# cleanups
+	[ -n "${PN}" ] && rm -fR /usr/share/doc/${PN}-*
+}
+
+pkg_postinst() {
+	einfo "Export printers in the network: uncomment BrowseAllow @LOCAL in 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."
+	einfo
+	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
+}
diff --git a/net-print/cups/files/digest-cups-1.1.23-r1 b/net-print/cups/files/digest-cups-1.1.23-r1
index 64352b8bc3d5..368d38b252b6 100644
--- a/net-print/cups/files/digest-cups-1.1.23-r1
+++ b/net-print/cups/files/digest-cups-1.1.23-r1
@@ -1 +1,3 @@
 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-r4 b/net-print/cups/files/digest-cups-1.1.23-r4
index 64352b8bc3d5..368d38b252b6 100644
--- a/net-print/cups/files/digest-cups-1.1.23-r4
+++ b/net-print/cups/files/digest-cups-1.1.23-r4
@@ -1 +1,3 @@
 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.2.0_pre b/net-print/cups/files/digest-cups-1.2.0_pre
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.2.0_pre
@@ -0,0 +1 @@
+
diff --git a/net-print/cups/files/pdftops.pl b/net-print/cups/files/pdftops.pl
index 8c6637f8df17..cabf60552a0b 100644
--- a/net-print/cups/files/pdftops.pl
+++ b/net-print/cups/files/pdftops.pl
@@ -64,7 +64,7 @@
 #
 # Site specific parameters - modify as needed
 # ------------------------------------------------------------------------------
-$pdftops_path = "/usr/local/bin/pdftops";	# path to the xpdf utility
+$pdftops_path = "/usr/bin/pdftops";	# path to the xpdf utility
 # ------------------------------------------------------------------------------
 
 use File::Copy;