Remove temporary workaround for bug #480942.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 5270BA51)

4 files changed, 18 insertions, 117 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index a3e0f0474d7f..9346e99af24c 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.74 2013/08/14 10:37:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.75 2013/08/23 23:21:54 tgurr Exp $
+
+*cups-filters-1.0.36-r2 (23 Aug 2013)
+
+  23 Aug 2013; <psy@gentoo.org> -cups-filters-1.0.35.ebuild,
+  -cups-filters-1.0.36-r1.ebuild, +cups-filters-1.0.36-r2.ebuild,
+  cups-filters-9999.ebuild:
+  Remove temporary workaround for bug #480942.
 
 *cups-filters-1.0.36-r1 (14 Aug 2013)
 
diff --git a/net-print/cups-filters/cups-filters-1.0.35.ebuild b/net-print/cups-filters/cups-filters-1.0.35.ebuild
deleted file mode 100644
index 20027edba8f0..000000000000
--- a/net-print/cups-filters/cups-filters-1.0.35.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.35.ebuild,v 1.3 2013/08/11 17:51:16 dilfridge Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit base eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-	KEYWORDS=""
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~s390 ~x86 ~amd64-fbsd"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="jpeg perl png static-libs tiff zeroconf"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	<app-text/poppler-0.24:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
-	>=app-text/qpdf-3.0.2:=
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>net-print/cups-1.5.9999
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	jpeg? ( virtual/jpeg )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	base_src_prepare
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		--with-fontdir="fonts/conf.avail" \
-		--with-pdftops=pdftops \
-		--enable-imagefilters \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		--with-rcdir=no \
- 		--with-browseremoteprotocols=DNSSD,CUPS \
-		--without-php
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_prep
-		perl-module_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_install
-		fixlocalpod
-		popd > /dev/null
-	fi
-
-	prune_libtool_files --all
-
-	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
-	cp "${FILESDIR}/cups-browsed.service" "${T}"/ || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${T}"/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${T}/cups-browsed.service"
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-
-	elog "This version of cups-filters includes cups-browsed, a daemon that autodiscovers"
-	elog "remote queues via avahi or cups-1.5 browsing protocol and adds them to your cups"
-	elog "configuration. You may want to add it to your default runlevel."
-}
diff --git a/net-print/cups-filters/cups-filters-1.0.36-r1.ebuild b/net-print/cups-filters/cups-filters-1.0.36-r2.ebuild
index e0a9bc19ba08..d5faf874afbb 100644
--- a/net-print/cups-filters/cups-filters-1.0.36-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.36-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.36-r1.ebuild,v 1.1 2013/08/14 10:37:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.36-r2.ebuild,v 1.1 2013/08/23 23:21:54 tgurr Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="jpeg perl png static-libs tiff zeroconf"
 
 RDEPEND="
-	app-text/ghostscript-gpl
+	>=app-text/ghostscript-gpl-9.09
 	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
 	>=app-text/qpdf-3.0.2:=
 	media-libs/fontconfig
@@ -85,8 +85,9 @@ src_install() {
 		popd > /dev/null
 	fi
 
-	# remove duplicate files until they are gone in ghostscript, bug 480942
-	rm -fv "${ED}"/usr/libexec/cups/filter/{gstoraster,gstopxl}
+	# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+	dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
+	dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
 
 	prune_libtool_files --all
 
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 4e74824ce476..ead7c4f55980 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.39 2013/08/14 10:37:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.40 2013/08/23 23:21:54 tgurr Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="jpeg perl png static-libs tiff zeroconf"
 
 RDEPEND="
-	app-text/ghostscript-gpl
+	>=app-text/ghostscript-gpl-9.09
 	app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
 	>=app-text/qpdf-3.0.2:=
 	media-libs/fontconfig
@@ -85,8 +85,9 @@ src_install() {
 		popd > /dev/null
 	fi
 
-	# remove duplicate files until they are gone in ghostscript, bug 480942
-	rm -fv "${ED}"/usr/libexec/cups/filter/{gstoraster,gstopxl}
+	# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+	dosym /usr/libexec/cups/filter/gstoraster /usr/libexec/cups/filter/pstoraster
+	dosym /usr/libexec/cups/filter/gstopxl /usr/libexec/cups/filter/pstopxl
 
 	prune_libtool_files --all