| 1 |
commit: 2143eec4103aafa440e4fe8d5e9c646b3990db6b |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 11 22:38:12 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 11 22:39:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2143eec4 |
| 7 |
|
| 8 |
net-print/cups-filters: Update live ebuild, add foomatic-rip compatibility symlink, bug 501466 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
...ers-9999.ebuild => cups-filters-1.13.3-r1.ebuild} | 20 +++++++++++++------- |
| 13 |
net-print/cups-filters/cups-filters-9999.ebuild | 20 +++++++++++++------- |
| 14 |
2 files changed, 26 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-1.13.3-r1.ebuild |
| 17 |
similarity index 85% |
| 18 |
copy from net-print/cups-filters/cups-filters-9999.ebuild |
| 19 |
copy to net-print/cups-filters/cups-filters-1.13.3-r1.ebuild |
| 20 |
index 36d27dbf55..b60a155e41 100644 |
| 21 |
--- a/net-print/cups-filters/cups-filters-9999.ebuild |
| 22 |
+++ b/net-print/cups-filters/cups-filters-1.13.3-r1.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2016 Gentoo Foundation |
| 25 |
+# Copyright 1999-2017 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
# $Id$ |
| 28 |
|
| 29 |
@@ -6,10 +6,10 @@ EAPI=6 |
| 30 |
|
| 31 |
GENTOO_DEPEND_ON_PERL=no |
| 32 |
|
| 33 |
-inherit eutils perl-module autotools systemd |
| 34 |
+inherit eutils perl-module systemd |
| 35 |
|
| 36 |
if [[ "${PV}" == "9999" ]] ; then |
| 37 |
- inherit bzr |
| 38 |
+ inherit bzr autotools |
| 39 |
EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters" |
| 40 |
else |
| 41 |
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" |
| 42 |
@@ -20,10 +20,9 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_jo |
| 43 |
|
| 44 |
LICENSE="MIT GPL-2" |
| 45 |
SLOT="0" |
| 46 |
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf" |
| 47 |
+IUSE="dbus +foomatic jpeg ldap pdf perl png +postscript static-libs tiff zeroconf" |
| 48 |
|
| 49 |
RDEPEND=" |
| 50 |
- app-text/mupdf |
| 51 |
postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) |
| 52 |
>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)] |
| 53 |
>=app-text/qpdf-3.0.2:= |
| 54 |
@@ -39,6 +38,7 @@ RDEPEND=" |
| 55 |
foomatic? ( !net-print/foomatic-filters ) |
| 56 |
jpeg? ( virtual/jpeg:0 ) |
| 57 |
ldap? ( net-nds/openldap ) |
| 58 |
+ pdf? ( app-text/mupdf ) |
| 59 |
perl? ( dev-lang/perl:= ) |
| 60 |
png? ( media-libs/libpng:0= ) |
| 61 |
tiff? ( media-libs/tiff:0 ) |
| 62 |
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND} |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
default |
| 66 |
- eautoreconf |
| 67 |
+ [[ "${PV}" == "9999" ]] && eautoreconf |
| 68 |
} |
| 69 |
|
| 70 |
src_configure() { |
| 71 |
@@ -63,6 +63,7 @@ src_configure() { |
| 72 |
$(use_enable static-libs static) \ |
| 73 |
$(use_enable foomatic) \ |
| 74 |
$(use_enable ldap) \ |
| 75 |
+ $(use_enable pdf mutool) \ |
| 76 |
$(use_enable postscript ghostscript) \ |
| 77 |
$(use_enable postscript ijs) \ |
| 78 |
--with-fontdir="fonts/conf.avail" \ |
| 79 |
@@ -90,6 +91,11 @@ src_compile() { |
| 80 |
src_install() { |
| 81 |
default |
| 82 |
|
| 83 |
+ if use foomatic; then |
| 84 |
+ # workaround: some printer drivers still require this, bug 501466 |
| 85 |
+ dosym /usr/bin/foomatic-rip /usr/libexec/cups/filter/foomatic-rip |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
if use perl; then |
| 89 |
pushd "${S}/scripting/perl" > /dev/null |
| 90 |
perl-module_src_install |
| 91 |
@@ -105,7 +111,7 @@ src_install() { |
| 92 |
|
| 93 |
prune_libtool_files --all |
| 94 |
|
| 95 |
- cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die |
| 96 |
+ cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die |
| 97 |
|
| 98 |
if ! use zeroconf ; then |
| 99 |
sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die |
| 100 |
|
| 101 |
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild |
| 102 |
index 36d27dbf55..b60a155e41 100644 |
| 103 |
--- a/net-print/cups-filters/cups-filters-9999.ebuild |
| 104 |
+++ b/net-print/cups-filters/cups-filters-9999.ebuild |
| 105 |
@@ -1,4 +1,4 @@ |
| 106 |
-# Copyright 1999-2016 Gentoo Foundation |
| 107 |
+# Copyright 1999-2017 Gentoo Foundation |
| 108 |
# Distributed under the terms of the GNU General Public License v2 |
| 109 |
# $Id$ |
| 110 |
|
| 111 |
@@ -6,10 +6,10 @@ EAPI=6 |
| 112 |
|
| 113 |
GENTOO_DEPEND_ON_PERL=no |
| 114 |
|
| 115 |
-inherit eutils perl-module autotools systemd |
| 116 |
+inherit eutils perl-module systemd |
| 117 |
|
| 118 |
if [[ "${PV}" == "9999" ]] ; then |
| 119 |
- inherit bzr |
| 120 |
+ inherit bzr autotools |
| 121 |
EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters" |
| 122 |
else |
| 123 |
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz" |
| 124 |
@@ -20,10 +20,9 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/pdf_as_standard_print_jo |
| 125 |
|
| 126 |
LICENSE="MIT GPL-2" |
| 127 |
SLOT="0" |
| 128 |
-IUSE="dbus +foomatic jpeg ldap perl png +postscript static-libs tiff zeroconf" |
| 129 |
+IUSE="dbus +foomatic jpeg ldap pdf perl png +postscript static-libs tiff zeroconf" |
| 130 |
|
| 131 |
RDEPEND=" |
| 132 |
- app-text/mupdf |
| 133 |
postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) |
| 134 |
>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils,xpdf-headers(+)] |
| 135 |
>=app-text/qpdf-3.0.2:= |
| 136 |
@@ -39,6 +38,7 @@ RDEPEND=" |
| 137 |
foomatic? ( !net-print/foomatic-filters ) |
| 138 |
jpeg? ( virtual/jpeg:0 ) |
| 139 |
ldap? ( net-nds/openldap ) |
| 140 |
+ pdf? ( app-text/mupdf ) |
| 141 |
perl? ( dev-lang/perl:= ) |
| 142 |
png? ( media-libs/libpng:0= ) |
| 143 |
tiff? ( media-libs/tiff:0 ) |
| 144 |
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND} |
| 145 |
|
| 146 |
src_prepare() { |
| 147 |
default |
| 148 |
- eautoreconf |
| 149 |
+ [[ "${PV}" == "9999" ]] && eautoreconf |
| 150 |
} |
| 151 |
|
| 152 |
src_configure() { |
| 153 |
@@ -63,6 +63,7 @@ src_configure() { |
| 154 |
$(use_enable static-libs static) \ |
| 155 |
$(use_enable foomatic) \ |
| 156 |
$(use_enable ldap) \ |
| 157 |
+ $(use_enable pdf mutool) \ |
| 158 |
$(use_enable postscript ghostscript) \ |
| 159 |
$(use_enable postscript ijs) \ |
| 160 |
--with-fontdir="fonts/conf.avail" \ |
| 161 |
@@ -90,6 +91,11 @@ src_compile() { |
| 162 |
src_install() { |
| 163 |
default |
| 164 |
|
| 165 |
+ if use foomatic; then |
| 166 |
+ # workaround: some printer drivers still require this, bug 501466 |
| 167 |
+ dosym /usr/bin/foomatic-rip /usr/libexec/cups/filter/foomatic-rip |
| 168 |
+ fi |
| 169 |
+ |
| 170 |
if use perl; then |
| 171 |
pushd "${S}/scripting/perl" > /dev/null |
| 172 |
perl-module_src_install |
| 173 |
@@ -105,7 +111,7 @@ src_install() { |
| 174 |
|
| 175 |
prune_libtool_files --all |
| 176 |
|
| 177 |
- cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die |
| 178 |
+ cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die |
| 179 |
|
| 180 |
if ! use zeroconf ; then |
| 181 |
sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die |
Archives