revision bump to allow remote administration with USE="ssl", recommend emerge -va1 in postinst thanks to jakub

(Portage version: 2.1.1_pre1-r1)

3 files changed, 175 insertions, 1 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 2184d602ea46..40aa81ef53dc 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # 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.183 2006/06/22 07:04:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.184 2006/06/22 17:54:14 genstef Exp $
+
+*cups-1.2.1-r2 (22 Jun 2006)
+
+  22 Jun 2006; Stefan Schweizer <genstef@gentoo.org> -cups-1.2.1-r1.ebuild,
+  +cups-1.2.1-r2.ebuild:
+  revision bump to allow remote administration with USE="ssl", recommend
+  emerge -va1 in postinst thanks to jakub
 
   22 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
   +files/cups-1.2.1-ssldir.patch, +files/cupsd.init, -files/cupsd.rc6,
diff --git a/net-print/cups/cups-1.2.1-r2.ebuild b/net-print/cups/cups-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..b9ad5469627d
--- /dev/null
+++ b/net-print/cups/cups-1.2.1-r2.ebuild
@@ -0,0 +1,164 @@
+# 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.1-r2.ebuild,v 1.1 2006/06/22 17:54:14 genstef Exp $
+
+inherit eutils flag-o-matic multilib autotools
+
+MY_P=${P/_/}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2"
+#ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ssl slp pam samba nls gnutls dbus tiff png jpeg"
+
+DEP="pam? ( virtual/pam )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.6b )
+		gnutls? ( net-libs/gnutls )
+		)
+	slp? ( >=net-libs/openslp-1.0.4 )
+	dbus? ( sys-apps/dbus )
+	png? ( >=media-libs/libpng-1.2.1 )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	app-text/libpaper"
+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 )
+	virtual/ghostscript"
+PROVIDE="virtual/lpr"
+
+# 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
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+
+	enewgroup lpadmin 106
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/cups-1.2.0-bindnow.patch
+	epatch ${FILESDIR}/cups-1.2.1-ssldir.patch
+
+	# upstream has refused to fix this for me
+	sed -i -e "s:#if defined(__linux) && defined(LP_POUTPA):#if 0:" backend/usb-unix.c
+
+	# cups does not use autotools "the usual way" and ship a static config.h.in
+	eaclocal
+	eautoconf
+}
+
+src_compile() {
+	local myconf
+
+	use ssl && \
+		myconf="${myconf} $(use_enable gnutls) $(use_enable !gnutls openssl)"
+
+	export DSOFLAGS="${LDFLAGS}"
+	econf \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-system-groups=lpadmin \
+		--localstatedir=/var \
+		--with-docdir=/usr/share/cups/html \
+		--with-bindnow=$(bindnow-flags) \
+		$(use_enable pam) \
+		$(use_enable ssl) \
+		$(use_enable slp) \
+		$(use_enable nls) \
+		$(use_enable dbus) \
+		$(use_enable png) \
+		$(use_enable jpeg) \
+		$(use_enable tiff) \
+		--enable-libpaper \
+		--enable-threads \
+		--enable-static \
+		--disable-pdftops \
+		${myconf} \
+		|| die "econf failed"
+
+	# Install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:SERVERBIN.*:SERVERBIN = $(BUILDROOT)/usr/libexec/cups:' Makedefs
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake BUILDROOT=${D} install || die "emake install failed"
+	dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt
+
+	# clean out cups init scripts
+	rm -rf ${D}/etc/init.d/cups ${D}/etc/rc*
+	# install our init scripts
+	newinitd ${FILESDIR}/cupsd.init cupsd
+
+	# correct path
+	sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" ${D}/etc/xinetd.d/cups-lpd
+	# it is safer to disable this by default, bug 137130
+	grep -w 'disable' ${D}/etc/xinetd.d/cups-lpd || \
+		sed -i -e "s:}:\tdisable = yes\n}:" ${D}/etc/xinetd.d/cups-lpd
+
+	# install pdftops filter
+	exeinto /usr/libexec/cups/filter/
+	newexe ${FILESDIR}/pdftops.pl pdftops
+
+	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
+		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp
+}
+
+pkg_preinst() {
+	# cleanups
+	[ -n "${PN}" ] && rm -fR ${ROOT}/usr/share/doc/${PN}-*
+}
+
+pkg_postinst() {
+	einfo "Remote printing: change "
+	einfo "Listen localhost:631"
+	einfo "to"
+	einfo "Listen *:631"
+	einfo "in /etc/cups/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"
+	ewarn
+	ewarn "The configuration changed with cups-1.2, you may want to save the old"
+	ewarn "one and start from scratch:"
+	ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
+	ewarn
+	ewarn "If you are updating from cups-1.1.* you need to remerge every ebuild"
+	ewarn "that installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:"
+	ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")"
+	ewarn
+	einfo "FEATURES=-collision-protect is needed to overwrite the compatibility"
+	einfo "symlinks installed by this package, it wont be needed on later merges."
+	ewarn "You should also run revdep-rebuild"
+	einfo "Rebuilding kdelibs is also a good idea when you want to use it for cups"
+
+	# place symlinks to make the update smoothless
+	for i in ${ROOT}/usr/lib/cups/{backend,filter}/*; do
+		[ "${i/\*}" != "${i}" ] && continue;
+		ln -s ${i} ${i/lib/libexec}
+	done
+}
diff --git a/net-print/cups/files/digest-cups-1.2.1-r2 b/net-print/cups/files/digest-cups-1.2.1-r2
new file mode 100644
index 000000000000..90fc088bcc11
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.2.1-r2
@@ -0,0 +1,3 @@
+MD5 f804995e3f469bdefedc033510f6e6a5 cups-1.2.1-source.tar.bz2 3475342
+RMD160 84040c5ac65d4a3d13d813fb91f90cbccb211c25 cups-1.2.1-source.tar.bz2 3475342
+SHA256 10fb273b8118858fdce795608065860865432b2d9f1016b53fff1eb340385e45 cups-1.2.1-source.tar.bz2 3475342