commit: 84cc842875931641ddd423925cf06e26c2db3545
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 06:29:15 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 06:29:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84cc8428
net-print/cups-filters: drop old <1.5.0 versions
net-print/cups-filters/Manifest | 1 -
net-print/cups-filters/cups-filters-1.0.71.ebuild | 122 ---------------------
.../files/cups-filters-1.0.53-uclibc.patch | 16 ---
.../files/cups-filters-1.0.65-poppler0310.patch | 65 -----------
.../files/cups-filters-1.0.71-poppler0340.patch | 38 -------
5 files changed, 242 deletions(-)
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index f37bd62..616bd64 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,4 +1,3 @@
-DIST cups-filters-1.0.71.tar.xz 1339116 SHA256
3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512
dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01
WHIRLPOOL
4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d
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
diff --git a/net-print/cups-filters/cups-filters-1.0.71.ebuild
b/net-print/cups-filters/cups-filters-1.0.71.ebuild
deleted file mode 100644
index 8e6f1b4..0000000
--- a/net-print/cups-filters/cups-filters-1.0.71.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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";
-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-0.35.0:=[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 )
- perl? ( dev-lang/perl:= )
- png? ( media-libs/libpng:0= )
- tiff? ( media-libs/tiff:0 )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.71-poppler0340.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/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/files/cups-filters-1.0.53-uclibc.patch
b/net-print/cups-filters/files/cups-filters-1.0.53-uclibc.patch
deleted file mode 100644
index 88e6c34..0000000
--- a/net-print/cups-filters/files/cups-filters-1.0.53-uclibc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- cups-filters-1.0.53/filter/foomatic-rip/foomaticrip.c
-+++ cups-filters-1.0.53-uclibc/filter/foomatic-rip/foomaticrip.c
-@@ -736,8 +736,13 @@ int main(int argc, char** argv)
- debug = 1;
-
- if (debug) {
-+#ifdef __UCLIBC__
-+ sprintf(tmp, "%s-log-XXXXXX", LOG_FILE);
-+ int fd = mkstemp (tmp);
-+#else
- sprintf(tmp, "%s-XXXXXX.log", LOG_FILE);
- int fd = mkstemps (tmp, 4);
-+#endif
- if (fd != -1)
- logh = fdopen(fd, "w");
- else
diff --git a/net-print/cups-filters/files/cups-filters-1.0.65-poppler0310.patch
b/net-print/cups-filters/files/cups-filters-1.0.65-poppler0310.patch
deleted file mode 100644
index 569d835..0000000
--- a/net-print/cups-filters/files/cups-filters-1.0.65-poppler0310.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Source: http://www.linuxfromscratch.org/blfs/view/svn/pst/cups-filters.html
-
-Submitted By: Armin K. <krejzi at email dot com>
-Date: 2015-02-10
-Initial Package Version: 1.0.62
-Upstream Status: Submitted
-Origin: Self
-Description: Fixes building when using Poppler 0.31.x.
-
---- a/filter/pdftoijs.cxx 2013-12-10 22:20:15.000000000 +0100
-+++ b/filter/pdftoijs.cxx 2015-02-10 21:51:32.700190378 +0100
-@@ -436,7 +436,11 @@
- }
-
- out = new SplashOutputDev(cmode,rowpad/* row padding */,
-- reverseVideo,paperColor,gTrue,gFalse);
-+ reverseVideo,paperColor,gTrue
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
-+ ,gFalse
-+#endif
-+ );
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
- out->startDoc(doc);
- #else
---- a/filter/pdftoopvp/OPVPOutputDev.cxx 2014-03-10 12:19:19.000000000
+0100
-+++ b/filter/pdftoopvp/OPVPOutputDev.cxx 2015-02-10 21:52:09.092847693
+0100
-@@ -278,7 +278,11 @@
- gFalse,
- gFalse,
- #endif
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
- globalParams->getAntialias());
-+#else
-+ gFalse);
-+#endif
- for (i = 0; i < nT3Fonts; ++i) {
- delete t3FontCache[i];
- }
---- a/filter/pdftoopvp/pdftoopvp.cxx 2013-12-10 22:20:15.000000000 +0100
-+++ b/filter/pdftoopvp/pdftoopvp.cxx 2015-02-10 21:51:32.701190397 +0100
-@@ -614,7 +614,9 @@
- ok = gFalse;
- }
- }
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
- globalParams->setAntialias("no");
-+#endif
- if (quiet) {
- globalParams->setErrQuiet(quiet);
- }
---- a/filter/pdftoraster.cxx 2014-09-26 18:23:04.000000000 +0200
-+++ b/filter/pdftoraster.cxx 2015-02-10 21:51:32.701190397 +0100
-@@ -2100,7 +2100,11 @@
- }
-
- out = new SplashOutputDev(cmode,rowpad/* row padding */,
-- gFalse,paperColor,gTrue,gFalse);
-+ gFalse,paperColor,gTrue
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR <= 30
-+ ,gFalse
-+#endif
-+ );
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
- out->startDoc(doc);
- #else
diff --git a/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch
b/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch
deleted file mode 100644
index ac0cae3..0000000
--- a/net-print/cups-filters/files/cups-filters-1.0.71-poppler0340.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Hack to make this build against poppler-0.34. Just disables color management
in some places.
-We should probably find a better solution. [email protected]
-
-
-diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx
cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx
---- cups-filters-1.0.71.orig/filter/pdftoopvp/OPVPOutputDev.cxx
2015-06-26 17:45:26.000000000 +0200
-+++ cups-filters-1.0.71/filter/pdftoopvp/OPVPOutputDev.cxx 2015-07-14
19:02:51.666737621 +0200
-@@ -1812,9 +1812,15 @@
- maskSplash->drawImage(&imageSrc, &imgMaskData,
- splashModeMono8, gFalse, maskWidth, maskHeight, mat);
- #else
-+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
- maskSplash->drawImage(&imageSrc, &imgMaskData,
- splashModeMono8, gFalse, maskWidth, maskHeight,
- mat,gFalse);
-+#else
-+ maskSplash->drawImage(&imageSrc, NULL, &imgMaskData,
-+ splashModeMono8, gFalse, maskWidth, maskHeight,
-+ mat,gFalse);
-+#endif
- #endif
- delete imgMaskData.imgStr;
- maskStr->close();
-diff -ruN cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx
cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx
---- cups-filters-1.0.71.orig/filter/pdftoopvp/oprs/OPRS.cxx 2015-06-26
17:45:26.000000000 +0200
-+++ cups-filters-1.0.71/filter/pdftoopvp/oprs/OPRS.cxx 2015-07-14
19:00:20.655740720 +0200
-@@ -241,7 +241,11 @@
- #if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 ||
(POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
- return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
- #else
-+#if POPPLER_VERSION_MAJOR <= 0 && POPPLER_VERSION_MINOR <= 33
- return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
-+#else
-+ return
splash->drawImage(src,NULL,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
-+#endif
- #endif
- } else {
- return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
