[gentoo-commits] repo/gentoo:master commit in: net-print/cups-filters/, net-print/cups-filters/files/

[Lars Wendler]

commit:     f741a074aa96355505b511ee21e46bae0eefe234
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 19:58:21 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 19:59:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f741a074

net-print/cups-filters: Removed old.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-print/cups-filters/Manifest                    |   1 -
 .../cups-filters/cups-filters-1.8.1-r1.ebuild      | 120 -------------
 net-print/cups-filters/cups-filters-1.8.1.ebuild   | 118 -------------
 net-print/cups-filters/cups-filters-1.8.2.ebuild   | 115 -------------
 ...s-filters-1.8.1-allow-disable-ghostscript.patch | 187 ---------------------
 5 files changed, 541 deletions(-)

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index afd3694..2616b22 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,5 +1,4 @@
 DIST cups-filters-1.5.0.tar.xz 1375588 SHA256 f22a8864e8d5b693795605a31345c08cc68f85120ebde9a0aa7bc27639815932 SHA512 81574f8368aaef61aeee4369caa394f2c8cdc717b03687d8a17c7927892f07cff68f1efb8d674757cb97001b55fd58fa5c14784a510ce9d31e385b1a73cd18c7 WHIRLPOOL 4201d08a2bb76d349a6b9f7220eb48dea86bb81c0cedbe8dcb8796c49ce26f67f6a7c49677b4fc7b6f865eb20e3c806746f565668e9f9e1e3935630621d032cd
 DIST cups-filters-1.6.0.tar.xz 1377952 SHA256 39e53db81df7aa951507c72ced52b9b0e9e4294c3f83e8b717fb42c03a557c97 SHA512 dd7671dbb13588829337e4ae4d533dc6c1e17f75ca240a6d43bb0a30a2453fffa9a1541d7b041024a6d4cbb939790802a8c3947cd319590fa37c7ce237232b9d WHIRLPOOL 297ec0aeebd336a583f410099711cd6449b7b765fb29099b1ba5fd2d6a4c5dd7fd2824eb7aa26ca59070d7b866a68966d609729a3f58c07e1e13011af7e7e33e
-DIST cups-filters-1.8.1.tar.xz 1372152 SHA256 4e7d8953f910b7a992471d641590964c20f26da5d94c10de932dde4f5c03e91e SHA512 9b254dbcc90df335b8162495f5c2846f77c8006128458e54753877d0b5e6b1d696ae28378b4b9a8275626d7f537651e1cb55aac67588ee5fa319898912dd9e08 WHIRLPOOL 7a41fdeed84ee1f0f18aa201633ce5e77040499bf7a2ac5cf324f45876ca2a8072ddf5b947d8ac6526839bcd15c351324d556967d4e303d6b96aaf5bd44c2ed3
 DIST cups-filters-1.8.2.tar.xz 1372508 SHA256 06d1c2a65e45d92d0e2dc854d13161d01072094efe4fadc23319700c9a259c69 SHA512 71cd08b7955a334fa04834e99365ac8e83d34ba71a4de8a4a3e7cf7fd50768332d1a0588b963b9301f5a88170d3c700c36cf596a45497032202f3e5f18f93f2e WHIRLPOOL eae8c0c7ec83d131e91d89ace89ad12b76ac323e44f395e83cdb39340c9228a1e9436b2ccbe2c32ac02b2b868bce204a28f48261f71d8a2fccd4b7cfaff27814
 DIST cups-filters-1.8.3.tar.xz 1373028 SHA256 e1e786f1fbcd3a203d87ebb4106a0ba8d579953cbe22056d12d4ee8143f5341a SHA512 5c3648670ae141038a373c4e800e81a7584759e3caf8c4e4468cb0da11c0ff521ac80678e603856c7209da6638673400305c38903cb27e3b4d792d17947e2af4 WHIRLPOOL 0c0ff9b767f35a61f4b9b2f57392d1a6afce35decf9216e77f7503b62bd67da0fa05f9ed507518599e03d27de50458823499989bf6bfd8d3a3da162292819157

diff --git a/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild b/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild
deleted file mode 100644
index d3761eb..0000000
--- a/net-print/cups-filters/cups-filters-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module autotools systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
-
-RDEPEND="
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
-	>=app-text/qpdf-3.0.2:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-allow-disable-ghostscript.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable dbus) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		$(use_enable foomatic) \
-		$(use_enable ldap) \
-		$(use_enable postscript ghostscript) \
-		--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() {
-	MAKEOPTS=-j1 default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		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
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	prune_libtool_files --all
-
-	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || 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' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/cups-filters-1.8.1.ebuild b/net-print/cups-filters/cups-filters-1.8.1.ebuild
deleted file mode 100644
index cec01c8..0000000
--- a/net-print/cups-filters/cups-filters-1.8.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png static-libs tiff zeroconf"
-
-RDEPEND="
-	>=app-text/ghostscript-gpl-9.09
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
-	>=app-text/qpdf-3.0.2:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-"
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable dbus) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		$(use_enable ldap) \
-		--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() {
-	MAKEOPTS=-j1 default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		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
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	# 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
-
-	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || 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' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	if ! use foomatic ; then
-		# this needs an upstream solution / configure switch
-		rm -v "${ED}/usr/bin/foomatic-rip" || die
-		rm -v "${ED}/usr/libexec/cups/filter/foomatic-rip" || die
-		rm -v "${ED}/usr/share/man/man1/foomatic-rip.1" || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/cups-filters-1.8.2.ebuild b/net-print/cups-filters/cups-filters-1.8.2.ebuild
deleted file mode 100644
index cdb7a29..0000000
--- a/net-print/cups-filters/cups-filters-1.8.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit eutils perl-module systemd
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit bzr
-	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
-else
-	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
-fi
-DESCRIPTION="Cups PDF filters"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdfasstandardprintjobformat"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf"
-
-RDEPEND="
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)]
-	>=app-text/qpdf-3.0.2:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-"
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable dbus) \
-		$(use_enable zeroconf avahi) \
-		$(use_enable static-libs static) \
-		$(use_enable foomatic) \
-		$(use_enable ldap) \
-		$(use_enable postscript ghostscript) \
-		--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() {
-	MAKEOPTS=-j1 default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
-		perl-module_src_configure
-		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
-		perl_delete_localpod
-		popd > /dev/null
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	prune_libtool_files --all
-
-	cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || 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' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}

diff --git a/net-print/cups-filters/files/cups-filters-1.8.1-allow-disable-ghostscript.patch b/net-print/cups-filters/files/cups-filters-1.8.1-allow-disable-ghostscript.patch
deleted file mode 100644
index a9c63da..0000000
--- a/net-print/cups-filters/files/cups-filters-1.8.1-allow-disable-ghostscript.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Allow disabling ghostscript and foomatic. Pulled from upstream bzr rev 7447:
-
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1342
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -412,11 +412,14 @@ pdftopdf_LDADD = \
- # Simple filter binaries
- # ======================
- pkgfilter_SCRIPTS = \
--	filter/gstopxl \
- 	filter/imagetops \
- 	filter/pstopdf \
- 	filter/textonly \
- 	filter/texttops
-+if ENABLE_GHOSTSCRIPT
-+pkgfilter_SCRIPTS += \
-+	filter/gstopxl
-+endif
- if ENABLE_BRAILLE
- nodist_pkgfilter_SCRIPTS = \
- 	filter/braille/drivers/generic/brftoembosser \
-@@ -420,8 +423,6 @@ pdftopdf_LDADD = \
- 	bannertopdf \
- 	commandtoescpx \
- 	commandtopclx \
--	foomatic-rip \
--	gstoraster \
- 	pdftoijs \
- 	sys5ippprinter \
- 	pdftops \
-@@ -432,6 +433,14 @@ pkgfilter_PROGRAMS += \
- 	texttopdf \
- 	urftopdf \
- 	rastertopdf
-+if ENABLE_GHOSTSCRIPT
-+pkgfilter_PROGRAMS += \
-+	gstoraster
-+endif
-+if ENABLE_FOOMATIC
-+pkgfilter_PROGRAMS += \
-+	foomatic-rip
-+endif
- if ENABLE_IMAGEFILTERS
- pkgfilter_PROGRAMS += \
- 	imagetopdf \
-@@ -737,8 +746,11 @@ initrcdir = $(INITDDIR)
- initrc_SCRIPTS = utils/cups-browsed
- man_MANS = \
- 	utils/cups-browsed.8 \
--	utils/cups-browsed.conf.5 \
-+	utils/cups-browsed.conf.5
-+if ENABLE_FOOMATIC
-+man_MANS += \
- 	filter/foomatic-rip/foomatic-rip.1
-+endif
- EXTRA_DIST += utils/cups-browsed.in \
- 	$(man_MANS)
- 	utils/org.cups.cupsd.Notifier.xml
-@@ -752,9 +764,12 @@ ppd_DATA = \
- 	ppd/HP-Color_LaserJet_CM3530_MFP-PDF.ppd \
- 	ppd/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd \
- 	ppd/Ricoh-PDF_Printer-PDF.ppd \
--	ppd/pxlcolor.ppd \
--	ppd/pxlmono.ppd \
- 	ppd/textonly.ppd
-+if ENABLE_GHOSTSCRIPT
-+ppd_DATA += \
-+	ppd/pxlcolor.ppd \
-+	ppd/pxlmono.ppd
-+endif
- 
- EXTRA_DIST += $(ppd_DATA)
- 
-@@ -782,7 +797,9 @@ distclean-local:
- install-exec-hook:
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
-+if ENABLE_FOOMATIC
- 	$(LN_S) -f $(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
-+endif
- if ENABLE_BRAILLE
- 	$(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
- 	$(LN_S) -f textbrftoindexv3 $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
-@@ -806,7 +823,9 @@ if RCLINKS
- 	fi
- endif
- 	$(RM) $(DESTDIR)$(pkgcharsetdir)/pdf.utf-8
-+if ENABLE_FOOMATIC
- 	$(RM) $(DESTDIR)$(bindir)/foomatic-rip
-+endif
- if ENABLE_BRAILLE
- 	$(RM) $(DESTDIR)$(pkgfilterdir)/imagetoubrl
- 	$(RM) $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
---- a/configure.ac
-+++ b/configure.ac
-@@ -431,6 +431,11 @@ AS_IF([test x"$long_long_found" = "xyes"], [
- # ================
- # Check for pdf2ps
- # ================
-+AC_ARG_ENABLE([ghostscript],
-+	[AS_HELP_STRING([--disable-ghostscript], [Disable filters using Ghostscript.])],
-+	[enable_ghostscript="$enableval"],
-+	[enable_ghostscript=yes]
-+)
- AC_ARG_WITH([pdftops],
- 	[AS_HELP_STRING([--with-pdftops=value], [Set which pdftops to use (gs,pdftops,pdftocairo,acroread,hybrid).])],
- 	[with_pdftops="$withval"],
-@@ -471,25 +476,35 @@ AS_CASE([x$with_pdftops_maxres],
- 	[AC_MSG_ERROR([Unknown value of with-pdftops-maxres provided: $with_pdftops])]
- )
- 
--AS_IF([test "x$with_gs_path" != "xsystem"], [
--	CUPS_GHOSTSCRIPT="$with_gs_path"
--], [
--	AC_PATH_PROG(CUPS_GHOSTSCRIPT, [gs], [AC_MSG_ERROR([Required gs binary is missing. Please install ghostscript-gpl package.])])
--])
--AS_IF([test "x$CUPS_GHOSTSCRIPT" != "x"], [
--	AC_DEFINE([HAVE_GHOSTSCRIPT], [], [Define that we provide ghostscript binary])
--	AS_IF([test x"$with_pdftops" = xgs], [AC_DEFINE_UNQUOTED([CUPS_PDFTOPS_RENDERER], [GS], [Define default renderer])])
--
--	AC_MSG_CHECKING(whether gs supports the ps2write device)
--	AS_IF([`$CUPS_GHOSTSCRIPT -h 2>&1 | grep -q ps2write`], [
--		AC_MSG_RESULT([yes])
--		AC_DEFINE([HAVE_GHOSTSCRIPT_PS2WRITE], [], [gs supports ps2write])
-+CUPS_GHOSTSCRIPT=""
-+AS_IF([test "x$enable_ghostscript" != "xyes"], [
-+	AS_IF([test "x$with_gs_path" != "xsystem"], [
-+	       AC_MSG_ERROR([Cannot supply both --disable-ghostscript and --gs-path=])
- 	], [
--		AC_MSG_RESULT([no])
-+		with_gs_path=""
- 	])
- ], [
--	CUPS_GHOSTSCRIPT="gs"
-+	AS_IF([test "x$with_gs_path" != "xsystem"], [
-+		CUPS_GHOSTSCRIPT="$with_gs_path"
-+	], [
-+		AC_PATH_PROG(CUPS_GHOSTSCRIPT, [gs], [AC_MSG_ERROR([Required gs binary is missing. Please install ghostscript-gpl package.])])
-+	])
-+	AS_IF([test "x$CUPS_GHOSTSCRIPT" != "x"], [
-+		AC_DEFINE([HAVE_GHOSTSCRIPT], [], [Define that we provide ghostscript binary])
-+		AS_IF([test x"$with_pdftops" = xgs], [AC_DEFINE_UNQUOTED([CUPS_PDFTOPS_RENDERER], [GS], [Define default renderer])])
-+
-+		AC_MSG_CHECKING(whether gs supports the ps2write device)
-+		AS_IF([`$CUPS_GHOSTSCRIPT -h 2>&1 | grep -q ps2write`], [
-+			AC_MSG_RESULT([yes])
-+			AC_DEFINE([HAVE_GHOSTSCRIPT_PS2WRITE], [], [gs supports ps2write])
-+		], [
-+			AC_MSG_RESULT([no])
-+		])
-+	], [
-+		CUPS_GHOSTSCRIPT="gs"
-+	])
- ])
-+AM_CONDITIONAL(ENABLE_GHOSTSCRIPT, test "x$enable_ghostscript" = xyes)
- 
- AS_IF([test "x$with_pdftops_path" != "xsystem"], [
- 	CUPS_PDFTOPS="$with_pdftops_path"
-@@ -550,6 +565,16 @@ AC_DEFINE_UNQUOTED([CUPS_POPPLER_PDFTOCAIRO], "$CUPS_PDFTOCAIRO", [pdftocairo bi
- AC_DEFINE_UNQUOTED([CUPS_ACROREAD], "$CUPS_ACROREAD", [acroread binary to use.])
- AC_DEFINE_UNQUOTED([CUPS_PDFTOPS_MAX_RESOLUTION], [$CUPS_PDFTOPS_MAXRES], [max resolution used for pdftops when converting images])
- 
-+# ==================
-+# Check for foomatic
-+# ==================
-+AC_ARG_ENABLE([foomatic],
-+	[AS_HELP_STRING([--disable-foomatic], [Disable Foomatic-based filters.])],
-+	[enable_foomatic="$enableval"],
-+	[enable_foomatic=yes]
-+)
-+AM_CONDITIONAL([ENABLE_FOOMATIC], [test "x$enable_foomatic" = "xyes"])
-+
- # =============
- # Check for php
- # =============
-@@ -658,8 +683,10 @@ Environment settings:
- Build configuration:
- 	cups-config:     ${with_cups_config}
- 	font directory:  ${sysconfdir}/${FONTDIR}
-+	foomatic:        ${enable_foomatic}
- 	init directory:  ${INITDDIR}
- 	cups dom socket: ${CUPS_DEFAULT_DOMAINSOCKET}
-+	ghostscript:     ${enable_ghostscript}
- 	gs-path:         ${with_gs_path}
- 	imagefilters:    ${enable_imagefilters}
- 	jpeg:            ${with_jpeg}