add support for new pam eclass, use external xpdf

Package-Manager: portage-2.0.51.19

4 files changed, 161 insertions, 5 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 6da56347a226..3b9d4f2eb819 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.130 2005/05/14 14:17:09 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.131 2005/05/21 20:27:42 lanius Exp $
+
+*cups-1.1.23-r3 (21 May 2005)
+
+  21 May 2005; Heinrich Wendel <lanius@gentoo.org> +cups-1.1.23-r3.ebuild:
+  add support for new pam eclass, use external xpdf
 
   14 May 2005; Heinrich Wendel <lanius@gentoo.org> files/cupsd.rc6:
   remove use vmware, bug #89956
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index b56b8adb02e6..55d6a1b241a0 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -3,7 +3,8 @@ Hash: SHA1
 
 MD5 9ed3d5f241e1c197d5cc8b4518b9ca08 cups-1.1.23-r2.ebuild 4025
 MD5 e36ac7a30dd61a5a58142aaec1fc6ddb cups-1.1.23-r1.ebuild 3916
-MD5 9ca7bf413a94bd3103bca4a14a3a5c82 ChangeLog 16995
+MD5 0e2a1df4ce34978d5f7274b7f0e33812 cups-1.1.23-r3.ebuild 4266
+MD5 c0ff33c3797548a312c7d1ffa50f22d3 ChangeLog 17154
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301
 MD5 a097b6a9c53c9ef50a6f3662d802cdfa files/xpdf-pl3.patch 348
@@ -11,6 +12,7 @@ MD5 0720c522b5c2bcef05d42cd4977f8702 files/cupsd.rc6 515
 MD5 7242b8a2000fe4c5a2b398e6602f7f1c files/cups.pam 234
 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r1 72
 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r2 72
+MD5 22c70e955df5567e6ed03f3992bd0128 files/digest-cups-1.1.23-r3 125
 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
@@ -18,7 +20,7 @@ MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFChglKevY57Fted3ERAl1TAKCtZu/syfo1Ti/QM1FQMHee0xYYQQCdGNPH
-UIrCtv7Mv/PCAQDb59fQ1hU=
-=e20U
+iD8DBQFCj5nXevY57Fted3ERAkGKAJ46wmI7B5lwKZLKtMQh1zzUWp8E2gCgmhAH
+xDpW10kQBKHvNOc1fjG9fw0=
+=9YM/
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.1.23-r3.ebuild b/net-print/cups/cups-1.1.23-r3.ebuild
new file mode 100644
index 000000000000..1cca0f798c09
--- /dev/null
+++ b/net-print/cups/cups-1.1.23-r3.ebuild
@@ -0,0 +1,147 @@
+# 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-r3.ebuild,v 1.1 2005/05/21 20:27:42 lanius Exp $
+
+inherit eutils flag-o-matic pam
+
+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
+http://www.srz.de/Members/bla/cups/filter/pdftops/pdftops.pl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ssl slp pam samba nls cjk"
+
+DEP="pam? ( virtual/pam )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	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/xpdf"
+PDEPEND="samba? ( >=net-fs/samba-3.0.8 )"
+PROVIDE="virtual/lpr"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/disable-strip.patch
+	epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791
+	WANT_AUTOCONF=2.5 autoconf || die
+
+	# disable builtin xpdf
+	sed -i -e "s:pdftops::" Makefile
+}
+
+src_compile() {
+
+	local myconf
+	use amd64 && replace-flags -Os -O2
+	use pam || myconf="${myconf} --disable-pam"
+	use ssl || myconf="${myconf} --disable-ssl"
+	use slp || myconf="${myconf} --disable-slp"
+	use nls || myconf="${myconf} --disable-nls"
+
+	./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/$(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
+	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
+
+	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.conv
+
+	# Let foreign charset PDF's print. (Bug: 67493)
+	dosym /etc/xpdfrc /etc/cups/pdftops.conf
+
+	# install pdftops filter
+	exeinto /usr/lib/cups/filter/
+	newexe ${DISTDIR}/pdftops.pl pdftops
+	dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops
+}
+
+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 "appt-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-r3 b/net-print/cups/files/digest-cups-1.1.23-r3
new file mode 100644
index 000000000000..e2b40a0ffe53
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.23-r3
@@ -0,0 +1,2 @@
+MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
+MD5 f6149424fd2880c5017da501e876de59 pdftops.pl 5630