Revision bump to push out libpng change, thanks to Ian Stakenvicius <ian@syndicated-productions.com> in bug 136346, ~sparc because sparc does not yet have libpng-1.2.10 stable

Package-Manager: portage-2.1.1_pre2-r2

4 files changed, 193 insertions, 5 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 175c3f3db2f6..688392a18e7d 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.189 2006/07/03 16:57:44 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.190 2006/07/03 18:08:42 genstef Exp $
+
+*cups-1.1.23-r8 (03 Jul 2006)
+
+  03 Jul 2006; Stefan Schweizer <genstef@gentoo.org> +cups-1.1.23-r8.ebuild:
+  Revision bump to push out libpng change, thanks to Ian Stakenvicius
+  <ian@syndicated-productions.com> in bug 136346, ~sparc because sparc does
+  not yet have libpng-1.2.10 stable
 
   03 Jul 2006; Stefan Schweizer <genstef@gentoo.org>
   +files/cups-1.1.23-image-png.patch, cups-1.1.23-r7.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 7236a73179e3..c6eb71994002 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -76,14 +76,18 @@ EBUILD cups-1.1.23-r7.ebuild 4792 RMD160 011d4c05d8b76822d278c9d46059b990e2514cc
 MD5 0b8a97ef5957c7c66ae4cad82717b377 cups-1.1.23-r7.ebuild 4792
 RMD160 011d4c05d8b76822d278c9d46059b990e2514ccc cups-1.1.23-r7.ebuild 4792
 SHA256 5c80fab5157ccc7f0d1b91b514dd8ba2af9e83799a0328166cce5457454c1910 cups-1.1.23-r7.ebuild 4792
+EBUILD cups-1.1.23-r8.ebuild 4745 RMD160 ef9f441392d91e6f3b554bad624bc49b8d662653 SHA1 3fe9c6cb4cf5d8901862c2839a9e01927caa259d SHA256 08f7f1b1182d3911ef9bf4f9e76392886e823f449f549650ce023bff3a7a4329
+MD5 768af30b65135e9806a7f042075d7fcc cups-1.1.23-r8.ebuild 4745
+RMD160 ef9f441392d91e6f3b554bad624bc49b8d662653 cups-1.1.23-r8.ebuild 4745
+SHA256 08f7f1b1182d3911ef9bf4f9e76392886e823f449f549650ce023bff3a7a4329 cups-1.1.23-r8.ebuild 4745
 EBUILD cups-1.2.1-r2.ebuild 5490 RMD160 dbe3a6a0e7484bfe772eef3be57f622cc7837d74 SHA1 e8525a550999f208ce30e2cdb46318da85e109a9 SHA256 bd756abe2a45445a8af4a5a229ff70647217c1926a020557b497ca4600ffe0d2
 MD5 880b8c1c029d3f781f495e1572724463 cups-1.2.1-r2.ebuild 5490
 RMD160 dbe3a6a0e7484bfe772eef3be57f622cc7837d74 cups-1.2.1-r2.ebuild 5490
 SHA256 bd756abe2a45445a8af4a5a229ff70647217c1926a020557b497ca4600ffe0d2 cups-1.2.1-r2.ebuild 5490
-MISC ChangeLog 26155 RMD160 7db1456b15937775bfe71897a1b436d114157df4 SHA1 f979d2481d8fe18607b27fcd5aebe4bbeed0df92 SHA256 570f940a6548b0be72a7b667d3565a4bda9d32ee8bfcf82fffbbcf706aabfd44
-MD5 f3fa528b81cb7026dc2be7d51d1d6f6d ChangeLog 26155
-RMD160 7db1456b15937775bfe71897a1b436d114157df4 ChangeLog 26155
-SHA256 570f940a6548b0be72a7b667d3565a4bda9d32ee8bfcf82fffbbcf706aabfd44 ChangeLog 26155
+MISC ChangeLog 26446 RMD160 d1646f3d868aa004ad35f498b11cc98cb9c6348a SHA1 8aeadc666402ff7f1dd024d29d2c3cb2c714029c SHA256 bf1b72d9dd8e59560842bd30607a12e18242acf8f2dbfd919143e6966d0efdea
+MD5 e6d1db42041e1f5fb498d54015664ec2 ChangeLog 26446
+RMD160 d1646f3d868aa004ad35f498b11cc98cb9c6348a ChangeLog 26446
+SHA256 bf1b72d9dd8e59560842bd30607a12e18242acf8f2dbfd919143e6966d0efdea ChangeLog 26446
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -94,6 +98,9 @@ SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/di
 MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r7 262
 RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r7 262
 SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r7 262
+MD5 abdc9df96d571ef4acff9bba51363e05 files/digest-cups-1.1.23-r8 262
+RMD160 d874b0af63ed920fb5c6f2ebf457c319b6e2f752 files/digest-cups-1.1.23-r8 262
+SHA256 ac20d82dc48e47fa2124e971108c121a1e0600ae2215e4be38c138332b4c3415 files/digest-cups-1.1.23-r8 262
 MD5 a89cd5824677acfcf778dbd54cbb2664 files/digest-cups-1.2.1-r2 259
 RMD160 8aa0e96163aff3488fca924e02dc76268095cf11 files/digest-cups-1.2.1-r2 259
 SHA256 74e565ea8d6b8d416c3e8f79d8e3043d0cdf95b0784806bf48608fab744048e3 files/digest-cups-1.2.1-r2 259
diff --git a/net-print/cups/cups-1.1.23-r8.ebuild b/net-print/cups/cups-1.1.23-r8.ebuild
new file mode 100644
index 000000000000..e3f21f5de242
--- /dev/null
+++ b/net-print/cups/cups-1.1.23-r8.ebuild
@@ -0,0 +1,171 @@
+# 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.1.23-r8.ebuild,v 1.1 2006/07/03 18:08:42 genstef 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 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.10
+	>=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_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
+	epatch ${FILESDIR}/${P}-respectldflags.patch
+	eautoconf
+
+	# 1.2.10 compat thanks to kojiro in bug 136346
+	epatch ${FILESDIR}/${P}-image-png.patch
+
+	# 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:" \
+		-e "/^Port/s|Port 631|Port localhost:631|" \
+		${D}/etc/cups/cupsd.conf
+
+	pamd_mimic_system cups auth account
+
+	newinitd ${FILESDIR}/cupsd.init 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
+
+	# install pdftops filter
+	exeinto /usr/lib/cups/filter/
+	newexe ${FILESDIR}/pdftops.pl pdftops
+	dosed "s:/usr/local:/usr:" /usr/lib/cups/filter/pdftops
+
+	# allow lppasswd, #107306
+	fowners root /usr/bin/lppasswd
+}
+
+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."
+
+	einfo "You need to emerge ghostscript with the cups-USEflag turned on"
+}
diff --git a/net-print/cups/files/digest-cups-1.1.23-r8 b/net-print/cups/files/digest-cups-1.1.23-r8
new file mode 100644
index 000000000000..368d38b252b6
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.23-r8
@@ -0,0 +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