Revision bump to remove filters useflag and dependency on foomatic-filters

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x84AD142F

3 files changed, 330 insertions, 16 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index f85a4867b466..3e499c289f3f 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/cups
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.577 2013/12/29 18:18:32 dilfridge Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.578 2014/01/01 19:15:40 dilfridge Exp $
+
+*cups-1.7.0-r1 (01 Jan 2014)
+
+  01 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> +cups-1.7.0-r1.ebuild:
+  Revision bump to remove filters useflag and dependency on foomatic-filters
 
   29 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-9999.ebuild:
   Depend on newer cups-filters that integrate foomatic, and drop filters useflag
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index de8d612271d6..2908bc696930 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -16,24 +16,25 @@ DIST cups-1.7.0-source.tar.bz2 8421353 SHA256 cf15b8caa9dab4638b628427ef309ab381
 EBUILD cups-1.6.2-r5.ebuild 8950 SHA256 62b61bdb510ed6be19602a1be3a5f7f38de0930706076eaaab13d534b77538b0 SHA512 82896c9597e929ce23b0abbf1b093f981fc00896f663b129de34a403548a9eb9b2ef6f11c55840dc154719e44676ade9b2c265f35218e7f105a49115fe486ff5 WHIRLPOOL 834ebf4dab854b84bd90ed749a2d0f0af8a5d9425f3f9afd77f0538784830258c1e02af8592fcb43767e46d6587d30171edab99f65b3644827277a8cca422f3c
 EBUILD cups-1.6.4.ebuild 9037 SHA256 6bc57c839899ba182130d6953c55e9166a54ff9bcd3ff3c67872755cf3e30b94 SHA512 e5ba57a582bb84bdf2e4068e65e07e9fa83788452784fe876abcbf4fc382de163045d815c566e95c438812ad4391e256eb215b17208fb14e0baa5d0f81521f56 WHIRLPOOL 21723af98511fd808c2c9b53b4790ad5c6a77f766a46bd19d4a572ad0f73710ee29414a7de76faa761657e86059ffc57fbb6922f7a7f97b4a485ead97c49e013
 EBUILD cups-1.6.9999.ebuild 9098 SHA256 b1a840074d6cbae0b1c5e0bc3002f80651181641aac011b48e4a5d9dfdc2f00b SHA512 be8f749a411fd12e0698a72c8345d05b6b8e27b9d84e8de8295574b06c0ccc52d9ebcd811da3a70e4be89381efe7164381d01ad9ed4645dfcb754a3e9c6bf6ba WHIRLPOOL 0e66ee6a43f305b91c0ea5fe0dee260cbfb2b3f09d67ce0c4dfab377f12cb6a1d017b29df38d977493b0536b3276c43ec4c5f68c3d7fe599702652c2577b139a
+EBUILD cups-1.7.0-r1.ebuild 9056 SHA256 300074d4c67084036fd2ee1d3b559a9edbe308691991121a3301c28d8e7d8bf6 SHA512 7314c8c42f0111fee15b18a8ed82314fc93fb724c66d82bfaf261308f35e5cc6d5942cbd8677b25932016a00720472bb8f498146122fe4f2ae72e03392766b70 WHIRLPOOL 55026c2d63dd8ef45f63f2cd31cbb1259d3e1fc5e7c0aaeecb0dbacf2b6e27f5e2b25342fbad575f016e11b10095f137561bf177704989df1d697fb17be6dd94
 EBUILD cups-1.7.0.ebuild 9103 SHA256 9d887f3e844dae6004c43404178ae7349346c1e6df6fc4106063956644e25a02 SHA512 23786e8694b4c152ce910acf6ea8f37fe59fd862b3b40dc9182b101409fac87515cf2a5f6f903bbfe99056d7ccd058ee8e86f4102009ad398e9ee327d0948e92 WHIRLPOOL a5f5a7912a0d5fdadd7e95aa86e0e18fe4ceff73823e2819f6bb6dd76af77597ecf698b55396ee74d4e6b4e0767b244562cf878c94d407998f77f3960f720fcd
 EBUILD cups-9999.ebuild 9053 SHA256 246650fb2053d82badd63a94a704a3f7aab255740e052cc431feab0efd27d13b SHA512 37a9ca3412390c1997e6ea6dd3287a5f9431d1f18080557fccb19c1a4a25420e97ea90a1042a0725e04894f2d7c47ea90bb71eca9281d778676474d0dac3001e WHIRLPOOL 992d31ef7c334467c6ae6b6443c9ad0a64f7fd980778622766ecc7fc757bab58b6f94d985db4f0cb9d2e9bb92de6447073c75bf55b7e3765bc3b37e0e1977ca6
-MISC ChangeLog 87778 SHA256 07c762a00bade56b2d14035dc240653516bd0e2bc2bcf8aa1648efca3b321efb SHA512 1a8d31939bb174eb691d37f1e9e7fb824a092381cb2f0249d6986ce33c8f1beda7fcb9ae814bc6c00032b8acb3b1f1f6dfbae6f8f759b1d3ffd31fd25ae19428 WHIRLPOOL f772d755a050247ed0d79dd561ca09bc7bd19ddb5c22e4a5405296ba7ac8b913d16faa7d8a1bc5a0f354016e08fefd27bd5d7352ff0f5e0144bb1d200b6ab0af
+MISC ChangeLog 87966 SHA256 3ccd170848b81d8cb1ced9baad65bd7d0115837445c305240e5fba20aefcdbf6 SHA512 4d06bbbd2df05432ec048fca3aa7db048b4e94b37aec258ab61946c5d2b73ec1524af263b153d50fe342d3c426be80c71dc14eb519fb9fe78e010e76f381d3c3 WHIRLPOOL 9afbb99b048a5d70d9257c9abd4c009cea46d6e6e51868c4163e071c526684a31ad18a8342adf618035631d4a5c31df7efc5bc6fb883075c43ea6bb3a9ee3e5a
 MISC metadata.xml 601 SHA256 9bcf6942c89c7dd963f9a34c413c1da17e25cd36489b95b708d4a89ff9659ea8 SHA512 58f0fe7d1f7b66a637013eeddb26a5c409d46915c8f4220e54850cf17cfa0cb082b3c2c5055a660857729cb4c5a53c7ac229dab6a29f801e53dae0ddc94cb573 WHIRLPOOL 55660efe3345c304742dbb12947776a97ebec51354fbab55423dd1fa7efa1b3d9321f067dfcc469462911e12446892b223ebbd3b670d1126255ffe642a64a527
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSwGgNAAoJEJS/30SErRQvQVIQAJYRvkuF4NbK+hKCL4SZpvjb
-U1OER/UGLez58MmOfgcrU4RGaFPsJyDYV5oZN40Q8M85SLxdYIFhcjfmMTnA2ETW
-RNn8+q+PAq6LAIPh2kObY9OT6t7/ROWzAelW0VqIIASvf3NtBpW3fmaKslenyfeI
-hUZLbX/1Ek5SfWdGfGc0n4T7yKBmLvRDvx+PGZu9qR7rupyZ66JclzfFb8So2EEa
-I5qARi6h+3R3HBDYMW+4Ac31cARcekozGnGZrD26higirOok63PSFwki5xExs6ma
-1OesQygaAw/GJ8j5824AyI0vWltw1ANlCiPtg7pjuXnQixvt8Pb9p/UPlsIH5bAg
-U9CMk6U/SKXOSzCXJViq43GzIoK5X3gP4wXfA2WTix9JoGpBWAxOlnRJZltpNhh0
-Is+eQd6a3TK95P+fF+28ltdnz62hcd+HwNg8ytG5XkZQpJ2pL0+/jNWAKUvWpzuH
-dhiFCxJSrHnhbqpI86DL+8N1XcW7UQdWJr0n8tir/2cl3lvBNpt6X8N9cdMzhled
-FkTPQI9my5u1J3kHC9O8YTLgt8/Rm9m3Uf1lVIXngiDZmTXzagFpDGDoNgdHTft3
-rtLsZHjbA4gbwTZg2QAFAZSi/foCkGJg1HCVMoon7tT5xrNpAJ1dSMs8SzVQp8gr
-mPIiOuB4WXZ1Dwqu4vmy
-=Z3/4
+iQIcBAEBCAAGBQJSxGn4AAoJEJS/30SErRQvkKoP/RWmbCqnJvXiLkaeAk2xbat2
+iKr8XB75m9nZu+4QRgQsjPQQSk+nKy5A8OL+JiNQdmVb/bNs8jTcNT2jsRgly3c8
+DapnIBZj5bxnylZvGgQQ4or+LrDIo7W8HprczhmZZUd8x7Ko6GEELSHZUbMUsAFt
+ZfDEO86uN5GEW1t+YWPNY2H5Y/AihOdRJHZMPYZ1cVqrVod+yMIVgtfrC96K7QLr
+Op81ah8XUlFisiXMovSdTxMBQnDwn7lBrZfN751e5ktqvqgFXul/p8jiG6zscwp+
+owXRjyQ6fzoHMSu/xYwVx/PFCA5FP2MUURwl8ZXuD7jnbd9dF8NDK716/Fqr8MQw
+tFw3slr44TMXE/VnMS/mLjeG5YNE18kkwKTELGKL2DY29kxq+B6pGA6CLxbo5q+j
+LmmQMP4HVNz50WjxmEE3UiblR0BRbVACxFVOH2Cw0zFDhI2CXSAQnX25KBJ6RBgJ
+4tDDIGzazQoUN5wG9mSwfG7FK4rk3A3t0f7CIIpTadzI4ClBPVPEMZ/fnY2ot0XY
+Jj78EIsHwPGlifAHOltCyERbgEJtQ+86XYFK2iOKcG+RLAT1U39a5zxSh5kx5c7F
+6J5yTJ8K5nNPstDtdFHhZQuv7HNYRDZ9+hMYtDm6z11rHxqb75lh7QdMZat9f8kg
+UP3TiqDACHqQRnk/efYI
+=cZpx
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.0-r1.ebuild b/net-print/cups/cups-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..a200d56dd7d0
--- /dev/null
+++ b/net-print/cups/cups-1.7.0-r1.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.0-r1.ebuild,v 1.1 2014/01/01 19:15:40 dilfridge Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \
+	multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd
+
+MY_P=${P/_rc/rc}
+MY_P=${MY_P/_beta/b}
+MY_PV=${PV/_rc/rc}
+MY_PV=${MY_PV/_beta/b}
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="http://www.cups.org/cups.git"
+	if [[ ${PV} != 9999 ]]; then
+		EGIT_BRANCH=branch-${PV/.9999}
+	fi
+	KEYWORDS=""
+else
+	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
+	python selinux +ssl static-libs +threads usb X xinetd zeroconf"
+
+LANGS="ca es fr it ja ru"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} +linguas_${X}"
+done
+
+RDEPEND="
+	app-text/libpaper
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( sys-apps/dbus )
+	java? ( >=virtual/jre-1.6 )
+	kerberos? ( virtual/krb5 )
+	!lprng-compat? ( !net-print/lprng )
+	pam? ( virtual/pam )
+	python? ( ${PYTHON_DEPS} )
+	selinux? ( sec-policy/selinux-cups )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( net-dns/avahi )
+"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	app-text/ghostscript-gpl[cups]
+	app-text/poppler[utils]
+	>=net-print/cups-filters-1.0.43
+"
+
+REQUIRED_USE="gnutls? ( ssl )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
+	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"	# systemd support
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	use python && python-single-r1_pkg_setup
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					eerror "Your usb printers will be managed via libusb. In this case, "
+					eerror "${P} requires the USB_PRINTER support disabled."
+					eerror "Please disable it:"
+					eerror "    CONFIG_USB_PRINTER=n"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        USB support  --->"
+					eerror "            [ ] USB Printer support"
+					eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+}
+
+src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LANGS=\"${LANGS}\"
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	local myconf
+	if use ssl ; then
+		myconf+="
+			$(use_enable gnutls)
+			$(use_enable !gnutls openssl)
+		"
+	else
+		myconf+="
+			--disable-gnutls
+			--disable-openssl
+		"
+	fi
+
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--localstatedir="${EPREFIX}"/var \
+		--with-rundir="${EPREFIX}"/run/cups \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--with-docdir="${EPREFIX}"/usr/share/cups/html \
+		--with-languages="${LINGUAS}" \
+		--with-system-groups=lpadmin \
+		$(use_enable acl) \
+		$(use_enable zeroconf avahi) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable debug debug-guards) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable pam) \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		$(use_enable usb libusb) \
+		--disable-dnssd \
+		$(use_with java) \
+		--without-perl \
+		--without-php \
+		$(use_with python python "${PYTHON}") \
+		$(use_with xinetd xinetd /etc/xinetd.d) \
+		--enable-libpaper \
+		--with-systemdsystemunitdir="$(systemd_get_unitdir)" \
+		${myconf}
+
+	# 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\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+}
+
+src_install() {
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+
+	emake BUILDROOT="${D}" install
+	dodoc {CHANGES,CREDITS,README}.txt
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm -f "${ED}"/etc/cups/cupsd.conf.default
+
+	# clean out cups init scripts
+	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+
+	# install our init script
+	local neededservices
+	use zeroconf && neededservices+=" avahi-daemon"
+	use dbus && neededservices+=" dbus"
+	[[ -n ${neededservices} ]] && neededservices="need${neededservices}"
+	cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die
+	sed -i \
+		-e "s/@neededservices@/$neededservices/" \
+		"${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	# install our pam script
+	pamd_mimic_system cups auth account
+
+	if use xinetd ; then
+		# correct path
+		sed -i \
+			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed"
+	else
+		rm -rf "${ED}"/etc/xinetd.d
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/cache/cups/rss /var/log/cups \
+		/var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	use X || rm -r "${ED}"/usr/share/applications
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following files are now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+	rm -r "${ED}"/usr/share/cups/data/testprint || die
+
+	# for the special case of running lprng and cups together, bug 467226
+	if use lprng-compat ; then
+		rm -fv "${ED}"/usr/bin/{lp*,cancel}
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
+		rm -fv "${ED}"/usr/share/man/man8/lp*
+		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
+		ewarn "Unless you plan to install an exotic server setup, you most likely"
+		ewarn "do not want this. Disable the useflag then and all will be fine."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	# not slotted - at most one value
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		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
+	fi
+
+	if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
+		echo
+		elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
+		elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
+		elog "You will have to find printers using zeroconf/avahi instead, enter"
+		elog "the location manually, or run cups-browsed from net-print/cups-filters"
+		elog "which re-adds that functionality as a separate daemon."
+		echo
+	fi
+
+	if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then
+		ewarn
+		ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4."
+		ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK."
+		ewarn
+	fi
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}