Add cups-1.3.3.ebuild, fixes bug #188993 and also has a patch applied for bug #192294.

Package-Manager: portage-2.1.3.12

6 files changed, 340 insertions, 5 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 9abbec8cfd2b..12036c3b8166 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.248 2007/10/09 18:46:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.249 2007/10/10 21:07:17 tgurr Exp $
+
+*cups-1.3.3 (10 Oct 2007)
+
+  10 Oct 2007; Timo Gurr <tgurr@gentoo.org> +files/cups-1.3.0-bindnow.patch,
+  +files/cups-1.3.0-configure.patch, +cups-1.3.3.ebuild:
+  Add cups-1.3.3.ebuild, fixes bug #188993 and also has a patch applied for
+  bug #192294.
 
 *cups-1.2.12-r1 (09 Oct 2007)
 
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 55948f42d085..d6e43f5ff407 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -14,6 +14,14 @@ AUX cups-1.2.0-bindnow.patch 2178 RMD160 cdf51a6734c7a38fab33f270c7c374445a93432
 MD5 17610ba395fa28cc46fe4be7d45c0a44 files/cups-1.2.0-bindnow.patch 2178
 RMD160 cdf51a6734c7a38fab33f270c7c374445a934321 files/cups-1.2.0-bindnow.patch 2178
 SHA256 0fffd86557fdfbf85e32781d1b77f9696e5f0ed7eb30a78fb57ca82cfafdc190 files/cups-1.2.0-bindnow.patch 2178
+AUX cups-1.3.0-bindnow.patch 1919 RMD160 8ee1c27c0236b64df1cfc2a71f59370137768cc1 SHA1 16151a09d7b4a1fc431987191bdb09b92dd9631b SHA256 871d92fb8c6f658d1035a3ff058b5186131dfe295f54ecdcd4bc630b517eee4b
+MD5 f0dfe7ed0d04d09c47a223a8b838629f files/cups-1.3.0-bindnow.patch 1919
+RMD160 8ee1c27c0236b64df1cfc2a71f59370137768cc1 files/cups-1.3.0-bindnow.patch 1919
+SHA256 871d92fb8c6f658d1035a3ff058b5186131dfe295f54ecdcd4bc630b517eee4b files/cups-1.3.0-bindnow.patch 1919
+AUX cups-1.3.0-configure.patch 651 RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a SHA1 101bf1893b56640d9fa82078e29319fbbd1449c7 SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736
+MD5 b27d2eb4d81529a5fe9bdda12b3fabfa files/cups-1.3.0-configure.patch 651
+RMD160 e4c7f45d7ddc28157433bf025c7f946c7e3b6d6a files/cups-1.3.0-configure.patch 651
+SHA256 d6e5e60a982a3c093c0d0f89cf865e2b4c36290f5b1e188b7bf305d210070736 files/cups-1.3.0-configure.patch 651
 AUX cups-gcc4-amd64.patch 566 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b SHA1 9e23ed973685c279edfee76fc0a7a9c6fd94a103 SHA256 e5d7cfb3a96731362008ff7e103cb3156059b0b86031564cc0a3e4bf9ea334fa
 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b files/cups-gcc4-amd64.patch 566
@@ -45,6 +53,7 @@ SHA256 aeaca40973d4a4df2212e73820f96272923e23717a69b0bf738896a5fc04df25 files/pd
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
 DIST cups-1.2.10-source.tar.bz2 3618084 RMD160 85b3bbd46a6fc097891c571ffad8e5e46693743f SHA1 241d7a3c52370fb08ed2ffc3fd8f59673d158299 SHA256 601b3b9256c55361477427c3e8db56c9ee4e141762814aea590bcf110a95bb36
 DIST cups-1.2.12-source.tar.bz2 3788301 RMD160 598270e37ff8a9b9ff1e667066d6f7e120493e32 SHA1 11a540f76a1d3164b6636bf8ba47928803ad9356 SHA256 b4ff8e934da7db32d5654360ea9068faa0ed5a00fde02161ae53c2052510d00f
+DIST cups-1.3.3-source.tar.bz2 4077262 RMD160 b1c34cdcfb79a5b04ffd3174c35d07beea678cb1 SHA1 9603e9ddba78a6103c48a9f917ea35ebd05ef7e0 SHA256 5e9e5670777055293e309cb0cbb2758df9c1275bf648df70478b7389c2d804de
 EBUILD cups-1.1.23-r8.ebuild 5009 RMD160 b1cb7d5c2ede0fb359c96168f53a1518ad459736 SHA1 2730b6d204679da7aa4e70a916432e93cee48411 SHA256 47a824972575230e3f2a19f5919a8dc09f43f0b3df8ab3a1213b91891b6f0d8b
 MD5 f2397cdb3da6d12ef0f5f2fb9b70b44a cups-1.1.23-r8.ebuild 5009
 RMD160 b1cb7d5c2ede0fb359c96168f53a1518ad459736 cups-1.1.23-r8.ebuild 5009
@@ -57,10 +66,14 @@ EBUILD cups-1.2.12-r1.ebuild 6869 RMD160 0c2ae163a8831dc9bb90300f38dfda809588e29
 MD5 d6a8de07d1cc31d0fb955b9a33bbe77e cups-1.2.12-r1.ebuild 6869
 RMD160 0c2ae163a8831dc9bb90300f38dfda809588e29f cups-1.2.12-r1.ebuild 6869
 SHA256 29b26f0f3b277fc91787418a95478ae3b1ad2facac4a571775f3e3c1cd717f1f cups-1.2.12-r1.ebuild 6869
-MISC ChangeLog 34621 RMD160 4882631b52da862038d7523509f37e17d8757ac5 SHA1 273942caf89daaf2f66ad6f78395004c687c0d94 SHA256 92b1663ad165a0c29ff2093ab38d86624b6a5f79f52259398b72723aebcd6b03
-MD5 01454e1350e74389d7950c069871c814 ChangeLog 34621
-RMD160 4882631b52da862038d7523509f37e17d8757ac5 ChangeLog 34621
-SHA256 92b1663ad165a0c29ff2093ab38d86624b6a5f79f52259398b72723aebcd6b03 ChangeLog 34621
+EBUILD cups-1.3.3.ebuild 7065 RMD160 7dc21c2204f5beabc976cc594601b9b7c34b914d SHA1 3c980bd0581c1e26ac0e4902c6185200d0869a54 SHA256 86ee784e761f91b0da95374e3135c8fbca806a2130c58deaec40286e6f49e192
+MD5 074404a4c77a7c03fd986c7e66ff98b8 cups-1.3.3.ebuild 7065
+RMD160 7dc21c2204f5beabc976cc594601b9b7c34b914d cups-1.3.3.ebuild 7065
+SHA256 86ee784e761f91b0da95374e3135c8fbca806a2130c58deaec40286e6f49e192 cups-1.3.3.ebuild 7065
+MISC ChangeLog 34872 RMD160 7eab700d3ce55d248f1e0ba07135d4446c0631bf SHA1 a20da5c867aa0e4098d05dceb2c06a76d68a69e5 SHA256 182a64994af0ea849ac00b6d26f5a3272f9f4b0f367c2551174d03997ced65c9
+MD5 e82ac672784e85ae9fb9a695fdb2d2b2 ChangeLog 34872
+RMD160 7eab700d3ce55d248f1e0ba07135d4446c0631bf ChangeLog 34872
+SHA256 182a64994af0ea849ac00b6d26f5a3272f9f4b0f367c2551174d03997ced65c9 ChangeLog 34872
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -74,3 +87,6 @@ SHA256 66f16eee78c2442511803e6de89563a1f32ff0150e604904a123b2b222f0e3b3 files/di
 MD5 01b96d03e659e7510706e0386c606199 files/digest-cups-1.2.12-r1 190
 RMD160 b080f2e97532c7e806dbfd020b02becad12bede3 files/digest-cups-1.2.12-r1 190
 SHA256 78a97edb8a4b5f8d1ee62a565f361a62b8fc0b341b43d69432f5ea9482af0921 files/digest-cups-1.2.12-r1 190
+MD5 38e377d61f8024d0e2bb12ef22276f7d files/digest-cups-1.3.3 259
+RMD160 88c379a5b7e3f0b95d8006c9e2b8caf09c49595b files/digest-cups-1.3.3 259
+SHA256 e8be44eb403e98a8993e178f9a3aa8ef0b32ce69a436404c53613318e4e67df3 files/digest-cups-1.3.3 259
diff --git a/net-print/cups/cups-1.3.3.ebuild b/net-print/cups/cups-1.3.3.ebuild
new file mode 100644
index 000000000000..8aa2ee031647
--- /dev/null
+++ b/net-print/cups/cups-1.3.3.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.3.ebuild,v 1.1 2007/10/10 21:07:17 tgurr Exp $
+
+inherit autotools eutils flag-o-matic multilib pam
+
+MY_P=${P/_}
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="mirror://sourceforge/cups/${MY_P}-source.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="acl bonjour bluetooth dbus java jpeg kerberos ldap nls pam perl php png ppds python samba slp ssl static tiff X"
+
+COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
+	bonjour? ( || ( net-misc/mDNSResponder net-dns/avahi ) )
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.4 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam )
+	perl? ( dev-lang/perl )
+	php? ( dev-lang/php )
+	png? ( >=media-libs/libpng-1.2.1 )
+	python? ( dev-lang/python )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	ssl? ( net-libs/gnutls )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	app-text/libpaper
+	dev-libs/libgcrypt"
+
+DEPEND="${COMMON_DEPEND}
+	!<net-print/foomatic-filters-ppds-20070501
+	!<net-print/hplip-1.7.4a-r1
+	nls? ( sys-devel/gettext )"
+
+RDEPEND="${COMMON_DEPEND}
+	!virtual/lpr
+	nls? ( virtual/libintl )
+	X? ( x11-misc/xdg-utils )
+	>=app-text/poppler-0.4.3-r1"
+
+PDEPEND="
+	bluetooth? ( net-wireless/bluez-utils )
+	ppds? ( || (
+		(
+			net-print/foomatic-filters-ppds
+			net-print/foomatic-db-ppds
+		)
+		net-print/foomatic-filters-ppds
+		net-print/foomatic-db-ppds
+		net-print/hplip
+		media-gfx/gimp-print
+		net-print/foo2zjs
+		net-print/cups-pdf
+	) )
+	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}"
+
+LANGS="de en es et fr he it ja pl sv zh_TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+
+	enewgroup lpadmin 106
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# upstream does not acknowledge bindnow as a solution
+	epatch "${FILESDIR}/${PN}-1.3.0-bindnow.patch"
+
+	# disable configure automagic for acl/attr
+	epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
+
+	# cups does not use autotools "the usual way" and ship a static config.h.in
+	eaclocal
+	eautoconf
+}
+
+src_compile() {
+
+	# locale support
+	strip-linguas ${LANGS}
+
+	if [ -z "${LINGUAS}" ] ; then
+		export LINGUAS=all
+	fi
+
+	export DSOFLAGS="${LDFLAGS}"
+	cd "${S}"
+	econf \
+		--localstatedir=/var \
+		--with-bindnow=$(bindnow-flags) \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir=/usr/share/cups/html \
+		--with-languages=${LINGUAS} \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable bonjour dnssd) \
+		$(use_enable dbus) \
+		$(use_enable jpeg) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable ldap) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable png) \
+		$(use_enable slp) \
+		$(use_enable ssl) \
+		$(use_enable static) \
+		$(use_enable tiff) \
+		$(use_with java) \
+		$(use_with perl) \
+		$(use_with php) \
+		$(use_with python) \
+		--enable-gnutls \
+		--enable-libpaper \
+		--enable-threads \
+		--disable-pdftops \
+		|| 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 || die "dodoc install failed"
+
+	# clean out cups init scripts
+	rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups}
+	# install our init scripts
+	newinitd "${FILESDIR}"/cupsd.init cupsd
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	# 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
+
+	# only for gs-esp this is correct, see bug 163897
+	if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then
+		sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs
+	fi
+
+	keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \
+		/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl
+
+	# .desktop handling. X useflag. xdg-open from freedesktop is preferred
+	if use X; then
+		sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop
+	else
+		rm -r "${D}"/usr/share/applications
+	fi
+
+	# Fix a symlink collision, see bug #172341
+	dodir /usr/share/ppd
+	dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
+}
+
+pkg_preinst() {
+	# cleanups
+	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-*
+}
+
+pkg_postinst() {
+	echo
+	elog "For information about installing a printer and general cups setup"
+	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
+	echo
+
+	local good_gs=false
+	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do
+		if has_version ${x} && built_with_use ${x} cups; then
+			good_gs=true
+			break
+		fi
+	done;
+	if ! ${good_gs}; then
+		echo
+		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on"
+		echo
+	fi
+
+	if has_version =net-print/cups-1.1*; then
+		echo
+		ewarn "The configuration changed with cups-1.3, you may want to save the old"
+		ewarn "one and start from scratch:"
+		ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups"
+		echo
+		ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.3"
+		echo
+	fi
+
+	if [ -e "${ROOT}"/usr/lib/cups ]; then
+		echo
+		ewarn "/usr/lib/cups exists - You need to remerge every ebuild that"
+		ewarn "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$::\")"
+		echo
+		ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility"
+		ewarn "symlinks installed by this package, it won't be needed on later merges."
+		ewarn "You should also run revdep-rebuild"
+		echo
+
+		# place symlinks to make the update smoothless
+		for i in "${ROOT}"/usr/lib/cups/{backend,filter}/*; do
+			if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ]; then
+				ln -s ${i} ${i/lib/libexec}
+			fi
+		done
+	fi
+}
diff --git a/net-print/cups/files/cups-1.3.0-bindnow.patch b/net-print/cups/files/cups-1.3.0-bindnow.patch
new file mode 100644
index 000000000000..aa97cd4e60fe
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.0-bindnow.patch
@@ -0,0 +1,47 @@
+diff -Naur cups-1.3.0/config-scripts/cups-setXid.m4 cups-1.3.0/config-scripts/cups-setXid.m4.new
+--- cups-1.3.0/config-scripts/cups-setXid.m4	1970-01-01 01:00:00.000000000 +0100
++++ cups-1.3.0/config-scripts/cups-setXid.m4.new	2006-05-08 23:50:22.000000000 +0200
+@@ -0,0 +1,9 @@
++dnl
++dnl   Copyright 1999-2007 Gentoo Foundation
++dnl   Distributed under the terms of the GNU General Public License v2
++dnl
++
++AC_ARG_WITH(bindnow, [  --with-bindnow          Set linker flags for force-binding setuid binaries],
++	BINDNOW_FLAGS="$withval",
++	BINDNOW_FLAGS="")
++AC_SUBST(BINDNOW_FLAGS)
+diff -Naur cups-1.3.0/configure.in cups-1.3.0/configure.in.new
+--- cups-1.3.0/configure.in        2007-07-25 01:47:12.000000000 +0200
++++ cups-1.3.0/configure.in.new    2007-08-15 10:31:58.896923749 +0200
+@@ -41,6 +41,7 @@
+ sinclude(config-scripts/cups-pap.m4)
+ sinclude(config-scripts/cups-pdf.m4)
+ sinclude(config-scripts/cups-scripting.m4)
++sinclude(config-scripts/cups-setXid.m4)
+
+ INSTALL_LANGUAGES=""
+ UNINSTALL_LANGUAGES=""
+diff -Naur cups-1.3.0/Makedefs.in cups-1.3.0/Makedefs.in.new
+--- cups-1.3.0/Makedefs.in 2007-07-18 21:49:45.000000000 +0200
++++ cups-1.3.0/Makedefs.in.new     2007-08-15 10:24:56.634342552 +0200
+@@ -132,6 +132,7 @@
+ LEGACY_BACKENDS	=	@LEGACY_BACKENDS@
+ LIBCUPSORDER	=	@LIBCUPSORDER@
+ LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
++BINDNOW_FLAGS	=	@BINDNOW_FLAGS@
+ LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
+ LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
+ LIBS		=	$(LINKCUPS) $(COMMONLIBS)
+diff -Naur cups-1.3.0/systemv/Makefile cups-1.3.0/systemv/Makefile.new
+--- cups-1.3.0/systemv/Makefile    2007-07-11 23:46:42.000000000 +0200
++++ cups-1.3.0/systemv/Makefile.new        2007-08-15 10:34:29.771906823 +0200
+@@ -212,7 +212,7 @@
+
+ lppasswd:      lppasswd.o ../cups/$(LIBCUPS)
+	echo Linking $@...
+-	$(CC) $(LDFLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
++	$(CC) $(LDFLAGS) $(BINDNOW_FLAGS) -o lppasswd lppasswd.o $(LIBZ) $(LIBS)
+
+
+ #
diff --git a/net-print/cups/files/cups-1.3.0-configure.patch b/net-print/cups/files/cups-1.3.0-configure.patch
new file mode 100644
index 000000000000..f248dfeb0298
--- /dev/null
+++ b/net-print/cups/files/cups-1.3.0-configure.patch
@@ -0,0 +1,18 @@
+diff -Naur cups-1.3.3/config-scripts/cups-common.m4 cups-1.3.3.new/config-scripts/cups-common.m4
+--- cups-1.3.3/config-scripts/cups-common.m4	2007-09-28 22:40:03.000000000 +0200
++++ cups-1.3.3.new/config-scripts/cups-common.m4	2007-10-04 14:40:49.414154416 +0200
+@@ -270,7 +270,12 @@
+ dnl See if we have POSIX ACL support...
+ SAVELIBS="$LIBS"
+ LIBS=""
+-AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
++
++AC_ARG_ENABLE(acl, [  --enable-acl            enable POSIX ACL support, default=auto])
++if test "x$enable_acl" != xno; then
++	AC_SEARCH_LIBS(acl_init, acl, AC_DEFINE(HAVE_ACL_INIT))
++fi
++
+ CUPSDLIBS="$CUPSDLIBS $LIBS"
+ LIBS="$SAVELIBS"
+ 
+
diff --git a/net-print/cups/files/digest-cups-1.3.3 b/net-print/cups/files/digest-cups-1.3.3
new file mode 100644
index 000000000000..98548d9fa278
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.3.3
@@ -0,0 +1,3 @@
+MD5 d4911e68b6979d16bc7a55f68d16cc53 cups-1.3.3-source.tar.bz2 4077262
+RMD160 b1c34cdcfb79a5b04ffd3174c35d07beea678cb1 cups-1.3.3-source.tar.bz2 4077262
+SHA256 5e9e5670777055293e309cb0cbb2758df9c1275bf648df70478b7389c2d804de cups-1.3.3-source.tar.bz2 4077262