[gentoo-commits] gentoo-x86 commit in net-print/cups-filters: cups-filters-9999.ebuild metadata.xml ChangeLog cups-filters-1.0.43-r1.ebuild cups-filters-1.0.43.ebuild cups-filters-1.0.41.ebuild

[Andreas HAttel (dilfridge)]

dilfridge    14/01/05 21:54:10

  Modified:             cups-filters-9999.ebuild metadata.xml ChangeLog
  Added:                cups-filters-1.0.43-r1.ebuild
  Removed:              cups-filters-1.0.43.ebuild
                        cups-filters-1.0.41.ebuild
  Log:
  Introduce foomatic useflag
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

Revision  Changes    Path
1.45                 net-print/cups-filters/cups-filters-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild?r1=1.44&r2=1.45

Index: cups-filters-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cups-filters-9999.ebuild	1 Jan 2014 21:00:49 -0000	1.44
+++ cups-filters-9999.ebuild	5 Jan 2014 21:54:10 -0000	1.45
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.44 2014/01/01 21:00:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.45 2014/01/05 21:54:10 dilfridge Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="dbus jpeg perl png static-libs tiff zeroconf"
+IUSE="dbus +foomatic jpeg perl png static-libs tiff zeroconf"
 
 RDEPEND="
 	>=app-text/ghostscript-gpl-9.09
@@ -34,8 +34,8 @@
 	!<=net-print/cups-1.5.9999
 	sys-devel/bc
 	sys-libs/zlib
-	!net-print/foomatic-filters
 	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
 	jpeg? ( virtual/jpeg:0 )
 	perl? ( dev-lang/perl:= )
 	png? ( media-libs/libpng:0= )
@@ -101,6 +101,12 @@
 		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/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"
 }
@@ -111,4 +117,9 @@
 	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."
+
+	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
 }



1.2                  net-print/cups-filters/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups-filters/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	3 Apr 2012 16:02:59 -0000	1.1
+++ metadata.xml	5 Jan 2014 21:54:10 -0000	1.2
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
+  <herd>printing</herd>
+  <use>
+  <flag name='foomatic'>
+     Build the included foomatic-rip printer driver. Strongly recommended.
+  </flag>
+  </use>
 </pkgmetadata>



1.96                 net-print/cups-filters/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/ChangeLog?r1=1.95&r2=1.96

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog	1 Jan 2014 21:00:49 -0000	1.95
+++ ChangeLog	5 Jan 2014 21:54:10 -0000	1.96
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.95 2014/01/01 21:00:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.96 2014/01/05 21:54:10 dilfridge Exp $
+
+*cups-filters-1.0.43-r1 (05 Jan 2014)
+
+  05 Jan 2014; Andreas K. Huettel <dilfridge@g.o>
+  -cups-filters-1.0.41.ebuild, -cups-filters-1.0.43.ebuild,
+  +cups-filters-1.0.43-r1.ebuild, cups-filters-9999.ebuild, metadata.xml:
+  Introduce foomatic useflag
 
   01 Jan 2014; Andreas K. Huettel <dilfridge@g.o>
   cups-filters-1.0.43.ebuild, cups-filters-9999.ebuild:



1.1                  net-print/cups-filters/cups-filters-1.0.43-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/cups-filters-1.0.43-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/cups-filters-1.0.43-r1.ebuild?rev=1.1&content-type=text/plain

Index: cups-filters-1.0.43-r1.ebuild
===================================================================
# Copyright 1999-2014 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.43-r1.ebuild,v 1.1 2014/01/05 21:54:10 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 ~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 perl png static-libs tiff zeroconf"

RDEPEND="
	>=app-text/ghostscript-gpl-9.09
	app-text/poppler:=[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
	dbus? ( sys-apps/dbus )
	foomatic? ( !net-print/foomatic-filters )
	jpeg? ( virtual/jpeg:0 )
	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 dbus) \
		$(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

	# 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/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() {
	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."

	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
}