cleanups, bsd support, bug #93960

(Portage version: 2.0.51.19)

6 files changed, 219 insertions, 12 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 7e662f374bec..ff3fb17b998c 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # 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.132 2005/06/06 11:24:01 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.133 2005/06/06 21:05:22 lanius Exp $
+
+*cups-1.1.23-r4 (06 Jun 2005)
+
+  06 Jun 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/cups-gentooalt.patch, +files/cups-lppasswd-setXid.patch,
+  +cups-1.1.23-r4.ebuild:
+  cleanups, bsd support, bug #93960
 
   06 Jun 2005; Heinrich Wendel <lanius@gentoo.org> cups-1.1.23-r3.ebuild:
   bug #48309
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 56504c9eab20..fc3d9924c1b9 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,26 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9ed3d5f241e1c197d5cc8b4518b9ca08 cups-1.1.23-r2.ebuild 4025
+MD5 cb6c65a6e7ce9c500c785b913d993a4d cups-1.1.23-r4.ebuild 4534
 MD5 e36ac7a30dd61a5a58142aaec1fc6ddb cups-1.1.23-r1.ebuild 3916
-MD5 d1237fcb5cd9914f1074e108c40f9698 cups-1.1.23-r3.ebuild 4330
 MD5 98081c05b2ea7691544b2e313daa02b9 ChangeLog 17242
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301
 MD5 a097b6a9c53c9ef50a6f3662d802cdfa files/xpdf-pl3.patch 348
 MD5 0720c522b5c2bcef05d42cd4977f8702 files/cupsd.rc6 515
+MD5 5f90c7ea48cd8de22145e264ef4ea192 files/cups-gentooalt.patch 966
+MD5 974925d56d58ecc44c6370754d519dcb files/cups-lppasswd-setXid.patch 417
 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 22c70e955df5567e6ed03f3992bd0128 files/digest-cups-1.1.23-r4 125
 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
 MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCpDJoevY57Fted3ERAnO6AKCKoQqkvGNcw0oSUfW7s11dEl/pEQCgyQhN
-6TEC5tgVrPK68Sao+vaKd6w=
-=yZrc
------END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.1.23-r4.ebuild b/net-print/cups/cups-1.1.23-r4.ebuild
new file mode 100644
index 000000000000..7327f07b95c1
--- /dev/null
+++ b/net-print/cups/cups-1.1.23-r4.ebuild
@@ -0,0 +1,164 @@
+# 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-r4.ebuild,v 1.1 2005/06/06 21:05:22 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 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/xpdf"
+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}/cups-lppasswd-setXid.patch
+	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 ssl && \
+		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
+
+	CUPS_REQUESTS="/var/spool/cups" \
+	econf \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		$(use_enable pam) \
+		$(use_enable ssl) \
+		$(use_enable slp) \
+		$(use_enable nls) \
+		--with-logdir=/var/log/cups \
+		${myconf} \
+		|| die "econf failed"
+
+	emake || 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 ${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 ${DISTDIR}/pdftops.pl pdftops
+	dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops
+}
+
+pkg_postrm() {
+	# cleanups
+	rm -fR /usr/share/doc/${MY_PV}
+}
+
+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/cups-gentooalt.patch b/net-print/cups/files/cups-gentooalt.patch
new file mode 100644
index 000000000000..199c81ab531e
--- /dev/null
+++ b/net-print/cups/files/cups-gentooalt.patch
@@ -0,0 +1,29 @@
+diff -ur cups-1.1.23/config-scripts/cups-directories.m4 cups-1.1.23-gentooalt/config-scripts/cups-directories.m4
+--- cups-1.1.23/config-scripts/cups-directories.m4	2005-01-03 20:29:45.000000000 +0100
++++ cups-1.1.23-gentooalt/config-scripts/cups-directories.m4	2005-05-28 12:12:25.310622960 +0200
+@@ -173,21 +173,10 @@
+ 	AC_DEFINE_UNQUOTED(CUPS_LOGDIR, "$logdir")
+ fi
+ 
+-dnl See what directory to put server executables...
+-case "$uname" in
+-	*BSD* | Darwin*)
+-		# *BSD and Darwin (MacOS X)
+-		INSTALL_SYSV=""
+-		CUPS_SERVERBIN="$exec_prefix/libexec/cups"
+-		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$exec_prefix/libexec/cups")
+-		;;
+-	*)
+-		# All others
+-		INSTALL_SYSV="install-sysv"
+-		CUPS_SERVERBIN="$libdir/cups"
+-		AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups")
+-		;;
+-esac
++# Gentoo: directly!
++INSTALL_SYSV="install-sysv"
++CUPS_SERVERBIN="$libdir/cups"
++AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$libdir/cups")
+ 
+ AC_SUBST(INSTALL_SYSV)
+ AC_SUBST(CUPS_SERVERROOT)
diff --git a/net-print/cups/files/cups-lppasswd-setXid.patch b/net-print/cups/files/cups-lppasswd-setXid.patch
new file mode 100644
index 000000000000..78d2f0786201
--- /dev/null
+++ b/net-print/cups/files/cups-lppasswd-setXid.patch
@@ -0,0 +1,12 @@
+diff -ur cups-1.1.23/systemv/Makefile cups-1.1.23-setXid/systemv/Makefile
+--- cups-1.1.23/systemv/Makefile	2005-01-03 19:29:59 +0000
++++ cups-1.1.23-setXid/systemv/Makefile	2005-05-28 10:45:46 +0000
+@@ -174,7 +174,7 @@
+ 
+ lppasswd:	lppasswd.o ../cups/$(LIBCUPS)
+ 	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
++	$(CC) $(LDFLAGS) -Wl,-z,now -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
+ 
+ 
+ #
diff --git a/net-print/cups/files/digest-cups-1.1.23-r4 b/net-print/cups/files/digest-cups-1.1.23-r4
new file mode 100644
index 000000000000..e2b40a0ffe53
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.23-r4
@@ -0,0 +1,2 @@
+MD5 4ce09b1dce09b6b9398af0daae9adf63 cups-1.1.23-source.tar.bz2 8705521
+MD5 f6149424fd2880c5017da501e876de59 pdftops.pl 5630