Make cups dep on poppler. Bug #115863

(Portage version: 2.1_pre2)

4 files changed, 180 insertions, 1 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index cf10062bddfd..771557c4c95b 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.147 2005/12/25 22:17:08 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.148 2005/12/27 19:11:55 dang Exp $
+
+*cups-1.1.23-r7 (27 Dec 2005)
+
+  27 Dec 2005; <dang@gentoo.org> +cups-1.1.23-r7.ebuild:
+  Make cups dep on poppler. Bug #115863
 
   25 Dec 2005; Stefan Schweizer <genstef@gentoo.org> files/cupsaddsmb.patch:
   Remove cvs Ids from patch, #116728
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 2764b5f3826d..a15ee91e3233 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -5,6 +5,7 @@ MD5 e6a4dd8cb2896885c0de6bb7129368ec cups-1.1.23-r3.ebuild 4537
 MD5 377407a66d89ce94f1c7cd57322c4100 cups-1.1.23-r4.ebuild 4652
 MD5 c91aced69b6a77c69445b5f500ea78c1 cups-1.1.23-r5.ebuild 4670
 MD5 1bbc34f4f33232d4e0b4c9785597bf64 cups-1.1.23-r6.ebuild 4710
+MD5 d1f15fc019006e04175800adb0d584c4 cups-1.1.23-r7.ebuild 4724
 MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301
 MD5 b22c12cb42113ddc40988cfbe93e3519 files/cups-1.1.23-bindnow.patch 2087
 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
@@ -20,6 +21,7 @@ MD5 22c70e955df5567e6ed03f3992bd0128 files/digest-cups-1.1.23-r3 125
 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r4 72
 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r5 72
 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r6 72
+MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r7 72
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
 MD5 f6149424fd2880c5017da501e876de59 files/pdftops.pl 5630
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
diff --git a/net-print/cups/cups-1.1.23-r7.ebuild b/net-print/cups/cups-1.1.23-r7.ebuild
new file mode 100644
index 000000000000..87c5c0287b55
--- /dev/null
+++ b/net-print/cups/cups-1.1.23-r7.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2005 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-r7.ebuild,v 1.1 2005/12/27 19:11:55 dang Exp $
+
+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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ssl slp pam samba nls cjk gnutls"
+
+DEP="pam? ( virtual/pam )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.6b )
+		gnutls? ( net-libs/gnutls )
+		)
+	slp? ( >=net-libs/openslp-1.0.4 )
+	nls? ( sys-devel/gettext )
+	>=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
+	>=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
+	eautoconf
+
+	# 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:" \
+		${D}/etc/cups/cupsd.conf
+
+	pamd_mimic_system cups auth account
+
+	newinitd ${FILESDIR}/cupsd.rc6 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
+
+	# Let foreign charset PDF's print. (Bug: 67493)
+	dosym /etc/xpdfrc /etc/cups/pdftops.conf
+
+	# install pdftops filter
+	exeinto /usr/lib/cups/filter/
+	newexe ${FILESDIR}/pdftops.pl pdftops
+	dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops
+}
+
+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."
+
+	if useq cjk ; then
+		einfo
+		einfo "If you want CJK support on PDF's you'll need to re-emerge"
+		einfo "app-text/xpdf with your LINGUAS variable set instead of"
+		einfo "the CJK flag. (Bug: 67493)"
+	fi
+}
diff --git a/net-print/cups/files/digest-cups-1.1.23-r7 b/net-print/cups/files/digest-cups-1.1.23-r7
new file mode 100644
index 000000000000..64352b8bc3d5
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.23-r7
@@ -0,0 +1 @@
+MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521