dilfridge    15/02/14 19:48:55

  Modified:             cups-filters-9999.ebuild cups-filters-1.0.61.ebuild
                        ChangeLog cups-filters-1.0.53.ebuild
  Added:                cups-filters-1.0.65.ebuild
  Removed:              cups-filters-1.0.54.ebuild
  Log:
  Version bump, add patch for building with poppler-0.31.0 (bug 539492)
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
EBE6A336BE19039C!)

Revision  Changes    Path
1.53                 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.53&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild?rev=1.53&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild?r1=1.52&r2=1.53

Index: cups-filters-9999.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- cups-filters-9999.ebuild    13 Dec 2014 20:58:12 -0000      1.52
+++ cups-filters-9999.ebuild    14 Feb 2015 19:48:55 -0000      1.53
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.52 
2014/12/13 20:58:12 dilfridge Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.53 
2015/02/14 19:48:55 dilfridge Exp $
 
 EAPI=5
 
@@ -44,6 +44,10 @@
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+       "${FILESDIR}/${PN}-1.0.65-poppler0310.patch"
+)
+
 src_prepare() {
        base_src_prepare
        sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die



1.4                  net-print/cups-filters/cups-filters-1.0.61.ebuild

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

Index: cups-filters-1.0.61.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.61.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cups-filters-1.0.61.ebuild  13 Dec 2014 20:58:12 -0000      1.3
+++ cups-filters-1.0.61.ebuild  14 Feb 2015 19:48:55 -0000      1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.61.ebuild,v 1.3 
2014/12/13 20:58:12 dilfridge Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.61.ebuild,v 1.4 
2015/02/14 19:48:55 dilfridge Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@
 
 RDEPEND="
        >=app-text/ghostscript-gpl-9.09
-       app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+       <app-text/poppler-0.31.0:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
        >=app-text/qpdf-3.0.2:=
        media-libs/fontconfig
        media-libs/freetype:2



1.135                net-print/cups-filters/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog   13 Dec 2014 20:58:12 -0000      1.134
+++ ChangeLog   14 Feb 2015 19:48:55 -0000      1.135
@@ -1,6 +1,14 @@
 # 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.134 
2014/12/13 20:58:12 dilfridge Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.135 
2015/02/14 19:48:55 dilfridge Exp $
+
+*cups-filters-1.0.65 (14 Feb 2015)
+
+  14 Feb 2015; Andreas K. Huettel <dilfri...@gentoo.org>
+  cups-filters-1.0.53.ebuild, -cups-filters-1.0.54.ebuild,
+  cups-filters-1.0.61.ebuild, +cups-filters-1.0.65.ebuild,
+  cups-filters-9999.ebuild, +files/cups-filters-1.0.65-poppler0310.patch:
+  Version bump, add patch for building with poppler-0.31.0 (bug 539492)
 
   13 Dec 2014; Andreas K. Huettel <dilfri...@gentoo.org>
   cups-filters-1.0.53.ebuild, cups-filters-1.0.54.ebuild,



1.16                 net-print/cups-filters/cups-filters-1.0.53.ebuild

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

Index: cups-filters-1.0.53.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.53.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cups-filters-1.0.53.ebuild  13 Dec 2014 20:58:12 -0000      1.15
+++ cups-filters-1.0.53.ebuild  14 Feb 2015 19:48:55 -0000      1.16
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.53.ebuild,v 
1.15 2014/12/13 20:58:12 dilfridge Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.53.ebuild,v 
1.16 2015/02/14 19:48:55 dilfridge Exp $
 
 EAPI=5
 
@@ -25,7 +25,7 @@
 
 RDEPEND="
        >=app-text/ghostscript-gpl-9.09
-       app-text/poppler:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
+       <app-text/poppler-0.31.0:=[cxx,jpeg?,lcms,tiff?,xpdf-headers(+)]
        >=app-text/qpdf-3.0.2:=
        media-libs/fontconfig
        media-libs/freetype:2



1.1                  net-print/cups-filters/cups-filters-1.0.65.ebuild

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

Index: cups-filters-1.0.65.ebuild
===================================================================
# Copyright 1999-2015 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.65.ebuild,v 1.1 
2015/02/14 19:48:55 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.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 )
        perl? ( dev-lang/perl:= )
        png? ( media-libs/libpng:0= )
        tiff? ( media-libs/tiff )
        zeroconf? ( net-dns/avahi[dbus] )
"
DEPEND="${RDEPEND}"

PATCHES=(
        "${FILESDIR}/${P}-poppler0310.patch"
)

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() {
        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/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
}




Reply via email to