Restore 1.6.2-r3 as requested by dillfridge.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 325 insertions, 15 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index f094b76de225..93e153cddbe4 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.535 2013/05/12 15:52:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.536 2013/05/14 16:04:04 scarabeus Exp $
+
+*cups-1.6.2-r3 (14 May 2013)
+
+  14 May 2013; Tomáš Chvátal <scarabeus@gentoo.org> +cups-1.6.2-r3.ebuild:
+  Restore 1.6.2-r3 as requested by dillfridge.
 
   12 May 2013; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.3.ebuild,
   cups-1.6.2-r4.ebuild, cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 816a44c34792..a16857026f35 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -29,24 +29,25 @@ DIST cups-1.6.2-source.tar.bz2 8363773 SHA256 37a3ebd305e76cfd4c9c53013e89c0f7a4
 EBUILD cups-1.5.0.ebuild 8250 SHA256 0e7967449e58ad9c385154c93c7dd35cd211f8dd0624a7409843601e3ab6802f SHA512 725b0b632a55a227177ee6313d8ce21ff49ede6aa2cdecc62448069ad85dd979a8643e49054ee695408c66c46de7eb2d42c37cf411363be0fe638d1ad68d6829 WHIRLPOOL c11ebd1fa34492e7af49e8e0e3e131abd244529e7331c7a3421cce84777b44108f3e924fbaf7a86f3e031a0b8579f0e14580993e5063f3e6672d8d2b37e2badf
 EBUILD cups-1.5.2-r4.ebuild 8363 SHA256 5962ac89342b0430eb663dbd012af6ad02f836d712496088b65af28817a241c3 SHA512 dd1cb9a9c570d51e376c71c784a3c6dfff38e07a2594792666cbcded73ba3dc5301393fc59c01113cc6461fd1e63371348df015be9cd3d2aa50859ad296535b6 WHIRLPOOL 2a69b6d45f64b191dabb4b6a4f112c7a9975a356c28999e50a413e6ab73a7f292e00a5995d9008419420063ee769ee11879267acd69a12a2c81deb0ab00829f0
 EBUILD cups-1.5.3.ebuild 8623 SHA256 0a7ce20dfd2db91a6ed81c54bea74f57c2b416f245b33798fab8df01f8c3a2c6 SHA512 8e58e10a2c3c0cacc22bf2fb234ececcc6e9dc2c9a17d2babc7c491e0a956e8d42a29abc2d5e196b82593b593139430278fd83f27b6a6148f733aa65ea44a311 WHIRLPOOL 65af0f97161198ab8699da209f9de93d397d4d754258821ce29e5f772465906d4aeadae48a26dbee412ff5953eedc6e50d6b9da76d54626d1922fb1b55e2ec71
+EBUILD cups-1.6.2-r3.ebuild 8922 SHA256 4275ed53ca9aec23a415f95e214b83ccf83bb0c1566ec46bcd0fc855892f4c4b SHA512 e61aee93408fa21707f602dba03e7487d8eb286a2f2c30a9194f6c82f3d4689e89c91908603fb742caff595e32647132703fb3afe93da281acfcb29fc485e54a WHIRLPOOL 3d62981aba362fa3ccf5a8c6c63c9df5d90288479d423ca2e0b2010ce0beb753562dc938ca728108c9c586ee5b49bc5f630bf43fe9247e7e95b918e52519bbd0
 EBUILD cups-1.6.2-r4.ebuild 9007 SHA256 83c50432499130649ca9696a8e7888fa314a03fb88ad5ef70e2e191ee26057dd SHA512 ac5083068a495eb85e75b10b2d9deb9b0c778ab3dc5163db46fb4b1ed585f2a08fa19e7f861f6cc4b4013e042dc763a50aa9df4df74a89c8bd5dfbf6c7e78f0e WHIRLPOOL 58b20fe77d55bb2acd72bc9b744a2e4089e8869b2f4e028d0b6b94e56933695ccad308c39c781020c79a383cfec9046ea9f08aa871d1e371936921bf32edceb0
 EBUILD cups-9999.ebuild 9004 SHA256 4364cbc83fc584fba94f8614b86afa59bb74961eee84f57b2c849d56deda3224 SHA512 91c89d78229e9cce831ab569aa368dd417b017bf6964e361150b5c952546ed198d44df604d53346982f0ced81d09a0423e96a9c2bdf1364835a018b82bd969d1 WHIRLPOOL de261422e963f828361aa3cb1f7a6a443c253f64c8cfb1746c50848f357f2f87fb4183b9e6937c45501e2565e06f8db8d965b522fc2d6f8ca5dc416b1dbf4018
-MISC ChangeLog 81795 SHA256 ef0792eb595196648d2cbdedd159d71e6a9d8014943d9ec63de34e1513a098ab SHA512 d9c1e09f6f4c6e26e497975a58554c480aa458a7e3b088da449df249103a83bab6d879d3a258cf229f337875b4b6d50fb8aa42a5248beb2ac931824105636609 WHIRLPOOL fe962882293fd94ee432b91f74719d41082638bdcfb739178c25c309a687dc3a0437ccef78e112b7741c09124e8b02f49c38fc3db9104a33edcc9c9e91ae61b1
+MISC ChangeLog 81951 SHA256 9cf74b91a2a4b196bdece2863b76ed767216fdc3cf621f912062637ee20841b0 SHA512 b713da90491d80c8995648e7b41ab8735450733e6b43926c8321b221ea691c755b9e92963f3825a5e8e0256f67260b18f7089ee69763d09c4d408820ac9c0a30 WHIRLPOOL 95ee38c9751f71c162093b86f4c195dc6e58eb0ed85e70c2d4dc19aae40aa1acfa6babd4451040a42e783562e57ca4b803af9158a706e35c77ed3c5682846c65
 MISC metadata.xml 888 SHA256 fc10de1798aeb6e16d8457d45abad85d39802e59a5f461d1374043a629ab8c6f SHA512 ff93d64033d5d7f3491b77af44a92553d9cefa4ea4671eb7a9380b5a2645fe7e384bf1e277a81431578524b6dce55528d6e0c1d3408c43f3f11140b21d9b623b WHIRLPOOL ab3145f58da411364c4c12e35d66c034ef02be686e8dfd696c207fffdf193ae4a4619a184364710f2409cc92b2dc3dfc75f703c29dfb5f59423b20c7dbd9fc87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRj7uoAAoJEJS/30SErRQv5zwQAIx2r5Vdtl8HbnH8Olc5EFhG
-WQbWI2kBseYbRiK/my7ZWz2w+KlhtUsmkr/dpC5C/JT/SxLbhYKID8famDBCbj/d
-/v9cFhqlZ2eJf1OI7vdJ4T4JTl5sXWTl3N+jT3M5VnnFPjajPIakTs08QBq4VdfL
-9fbYS1rGIss+orcJvkK+k/BHGqeVGe/sI4s1TYRtVqDUTe3BBqdWuwcwI2u7wZnj
-2xsqb6nKo8z4Vf5Qnr29jTJI0pEVV4zvNkm/JJbh3UqlDrzcwLri8Y8dy0dzrkX3
-D6szdUaB1nJQcoZYc7vi6F9vpek9X7aiYNjO+le1m3l9u5iChAK5TF6Qa5JCIyen
-8963N7BtxsDgO6oSwsCdEnmAHzzcBOz+Ni22OEnPCjygLmkpJTnLWjcQXDcGFQwC
-7FAqLhdvmZNtetb6OsQnMrnuzRO0vO4vfhgXr0PaqkAtuve6b6nHK46+LSGhHeyQ
-/wpGZlB/UwrKMbgnzzCy78/meFtI5ZWhxuTy6yfPggmGgokJuotSRKUlFlKHzv1j
-NMsAy7AXbvoeePObEitsSHIBdmiU79FT2Lq7Q9LcBFOM7DzoH7H+CddzwUcKq8CH
-qZliaPwIwJXaWibG3FDxjDnPUZPVmYMiIb3tqSwwaruWRtmBRBlRnzbjLA8p3fTB
-raW3JsKu/X9VWlWlqHXl
-=04aL
+iQIcBAEBCAAGBQJRkmBwAAoJEOSiRoyO7jvoZ3oQAK7kStzE+lT2tkWtE7b1OtiG
+7ZmihErvhHsHUF75rn4Fwxgkg8rVl18NtPICcOU7FX89HW3OqaQ4qlQ4OU5+rqx2
+TjsIUGBxHz+1unvxqHqHWxH3NgS1dBpC6nQgh/ZGV4NxUXj9YUSpb3GX+4zIK3G9
+m/dKEtp4jYg5ZmRZrvWDCAzspHLNQ5Knfc+8KaN/IbE8OO5DBSvtnLyIMRbeQ0Dv
+ycpHbyE+qKNIokoctbzBUec7ritxYCsqjANy0/8utv+A3FpJWH16kK4OgdAOqy1q
+NcQVGmApeOZ6qBmzOq7EcB4p13ypO5Vra6exAXlJSZypcQvdTXmeGdvBFllxMnHJ
+KDkJW0aYYE3CYNjFON0BRrdKNYDZt2VqQk7YdwjJG6tJhjiIsDNvvX8DHuEoCVB/
+qlCrFZj4oonQMcee4K/WSq6PTAeYszDOSj5TzRmWvU8iaz/iJuYz4GqdM9N5D93I
+EQIuip1YiY+mR3RwJkl+0jPn/eiViI8AMHWwJd3dYdqIury9m3y5rBWSkcre6WJR
+NATHRyXTPdA84uIS3/W7rznZHVkI1QdQz2xw8hFcwuU5XjW4hi/d9ZTu5DtJkcpn
+4mtkL7mCIXdKnyKTJGbaVXQZSyFzdW+lWGT9pLqVb+YNEIFZdXoWDEn+TatkURCL
+xHGtg5juD3DeYvaetxut
+=uB5Q
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.6.2-r3.ebuild b/net-print/cups/cups-1.6.2-r3.ebuild
new file mode 100644
index 000000000000..a41b3653f5fa
--- /dev/null
+++ b/net-print/cups/cups-1.6.2-r3.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.2-r3.ebuild,v 1.4 2013/05/14 16:04:04 scarabeus Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
+
+MY_P=${P/_beta/b}
+MY_PV=${PV/_beta/b}
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+else
+	inherit subversion
+	ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="acl dbus debug +filters gnutls java kerberos lprng-compat pam
+	python selinux +ssl static-libs +threads usb X xinetd zeroconf"
+
+LANGS="ca es fr 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 )
+	selinux? ( sec-policy/selinux-cups )
+	ssl? (
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
+		!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	)
+	usb? ( virtual/libusb:0 )
+	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.30
+	filters? ( net-print/foomatic-filters )
+"
+
+REQUIRED_USE="gnutls? ( ssl )"
+
+# 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
+	"${FILESDIR}/${PN}-1.6.2-statedir.patch"
+)
+
+pkg_setup() {
+	enewgroup lp
+	enewuser lp -1 -1 -1 lp
+	enewgroup lpadmin 106
+
+	# python 3 is no-go
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	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=/usr/$(get_libdir) \
+		--localstatedir=/var \
+		--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 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) \
+		$(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)"/usr/libexec/cups:' Makedefs || die
+	sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die
+	sed -i -e 's:cups_serverbin=.*:cups_serverbin=/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 /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*
+		rm -fv "${ED}"/usr/sbin/lp*
+		rm -fv "${ED}"/usr/share/man/man1/lp*
+		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
+	elif [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6.2" ]]; then
+		echo
+		elog "Starting with net-print/cups-filters-1.0.30, that package provides"
+		elog "a daemon cups-browsed which implements printer discovery via the"
+		elog "Cups-1.5 protocol. Not much tested so far though."
+		echo
+	fi
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}