commit: 26316fb66c942f4e13eae2f01baff6ed5f3653c9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 18:33:28 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 18:39:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26316fb6
net-print/foomatic-filters: Remove last-rited pkg, #568980
net-print/foomatic-filters/Manifest | 1 -
.../files/foomatic-filters-4.0.9-multilib.patch | 41 --------------
.../foomatic-filters-4.0.17-r1.ebuild | 66 ----------------------
net-print/foomatic-filters/metadata.xml | 8 ---
profiles/arch/m68k/package.use.force | 5 +-
profiles/package.mask | 6 --
6 files changed, 1 insertion(+), 126 deletions(-)
diff --git a/net-print/foomatic-filters/Manifest
b/net-print/foomatic-filters/Manifest
deleted file mode 100644
index 992f0dc..00000000
--- a/net-print/foomatic-filters/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST foomatic-filters-4.0.17.tar.gz 266276 SHA256
a2e2e53e502571e88eeb9010c45a0d54671f15707ee104f5c9c22b59ea7a33e3 SHA512
f07d2ac64a28e9353418deb9dd2009f5ef7676ab268af211edfcd012c231c9081516dae450f2b7910b687f75f7e53c8198fda2508f3fd527120940b4905292dd
WHIRLPOOL
c9ea6456df64aa92f0b1dbbf74b03406d9f5487b1b0df11c3c354f813db32a3953371ffdd0fcfab5369ca46123280a5a68bab034c90c0d0c612001ff99242e40
diff --git
a/net-print/foomatic-filters/files/foomatic-filters-4.0.9-multilib.patch
b/net-print/foomatic-filters/files/foomatic-filters-4.0.9-multilib.patch
deleted file mode 100644
index 0659e08..00000000
--- a/net-print/foomatic-filters/files/foomatic-filters-4.0.9-multilib.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index acd2f0c..9b333b9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -81,24 +81,24 @@ if test -n "$CUPS_SERVERBIN"; then
- AC_SUBST(CUPS_FILTERS)
- AC_SUBST(CUPS_BACKENDS)
- else
-- # Check for /usr/lib/cups
-- FM_PATH_DIR(CUPS,cups,/usr/lib/cups,$SERVERBIB$LIBSEARCHPATH)
-+ # Check for ${libdir}/cups
-+ FM_PATH_DIR(CUPS,cups,${libdir}/cups,$SERVERBIB$LIBSEARCHPATH)
-
-- # Check for /usr/lib/cups/filter
--
FM_PATH_DIR(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$FILTERS$LIBSEARCHPATH)
-+ # Check for ${libdir}/cups/filter
-+
FM_PATH_DIR(CUPS_FILTERS,cups/filter,${libdir}/cups/filter,$FILTERS$LIBSEARCHPATH)
-
-- # Check for /usr/lib/cups/backend
--
FM_PATH_DIR(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$BACKENDS$LIBSEARCHPATH)
-+ # Check for ${libdir}/cups/backend
-+
FM_PATH_DIR(CUPS_BACKENDS,cups/backend,${libdir}/cups/backend,$BACKENDS$LIBSEARCHPATH)
- fi
-
--# Check for /usr/lib/ppr
--FM_PATH_DIR(PPR,ppr,/usr/lib/ppr,$LIBSEARCHPATH)
-+# Check for ${libdir}/ppr
-+FM_PATH_DIR(PPR,ppr,${libdir}/ppr,$LIBSEARCHPATH)
-
--# Check for /usr/lib/ppr/interfaces
--FM_PATH_DIR(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
-+# Check for ${libdir}/ppr/interfaces
-+FM_PATH_DIR(PPR_INTERFACES,ppr/interfaces,${libdir}/ppr/interfaces,$LIBSEARCHPATH)
-
--# Check for /usr/lib/ppr/lib
--FM_PATH_DIR(PPR_LIB,ppr/lib,/usr/lib/ppr/lib,$LIBSEARCHPATH)
-+# Check for ${libdir}/ppr/lib
-+FM_PATH_DIR(PPR_LIB,ppr/lib,${libdir}/ppr/lib,$LIBSEARCHPATH)
-
- AC_CHECK_HEADERS([ghostscript/ierrors.h ghostscript/iapi.h])
- AC_CHECK_LIB(gs, gsapi_new_instance)
diff --git a/net-print/foomatic-filters/foomatic-filters-4.0.17-r1.ebuild
b/net-print/foomatic-filters/foomatic-filters-4.0.17-r1.ebuild
deleted file mode 100644
index 63bac1f..00000000
--- a/net-print/foomatic-filters/foomatic-filters-4.0.17-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils versionator
-
-DESCRIPTION="Foomatic wrapper scripts"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html";
-SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-fbsd ~x86-fbsd"
-IUSE="cups dbus"
-
-RDEPEND="
- dev-lang/perl
- app-text/ghostscript-gpl
- !=net-print/cups-filters-1.0.43
- !>=net-print/cups-filters-1.0.43-r1[foomatic]
- cups? (
- >=net-print/cups-1.6.0 net-print/cups-filters
- )
- !cups? (
- || (
- app-text/enscript
- app-text/a2ps
- app-text/mpage
- )
- )
- dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- if use cups; then
- CUPS_SERVERBIN="$(cups-config --serverbin)"
- else
- CUPS_SERVERBIN=""
- fi
-
- # Search for libs in ${libdir}, not just /usr/lib
- epatch "${FILESDIR}"/${PN}-4.0.9-multilib.patch
- eautoreconf
-
- export CUPS_BACKENDS=${CUPS_SERVERBIN}/backend \
- CUPS_FILTERS=${CUPS_SERVERBIN}/filter CUPS=${CUPS_SERVERBIN}/
-}
-
-src_configure() {
- econf $(use_enable dbus)
-}
-
-src_install() {
- default
-
- dosym /usr/bin/foomatic-rip /usr/bin/lpdomatic
-
- if use cups; then
- dosym /usr/bin/foomatic-rip
"${CUPS_SERVERBIN}/filter/cupsomatic"
- else
- rm -r "${ED}"/${CUPS_SERVERBIN}/filter
- rm -r "${ED}"/${CUPS_SERVERBIN}/backend
- fi
-}
diff --git a/net-print/foomatic-filters/metadata.xml
b/net-print/foomatic-filters/metadata.xml
deleted file mode 100644
index 8223018..00000000
--- a/net-print/foomatic-filters/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Printing Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/profiles/arch/m68k/package.use.force
b/profiles/arch/m68k/package.use.force
index d63ba76..2cf2b3c 100644
--- a/profiles/arch/m68k/package.use.force
+++ b/profiles/arch/m68k/package.use.force
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -9,6 +9,3 @@ dev-libs/efl oldlua
# Ulrich Müller <[email protected]> (10 Aug 2013)
# Building from source requires TeX Live as dependency
app-doc/pms binary
-
-# We need to force-enable cups due to KEYWORDS
-net-print/foomatic-filters cups
diff --git a/profiles/package.mask b/profiles/package.mask
index 08ce7d3..474f003 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -345,12 +345,6 @@ dev-qt/qtopenvg
# Keep shotwell development series masked.
>=media-gfx/shotwell-0.25
-# Manuel Rüger <[email protected]> (05 Nov 2016)
-# Masked for removal in 30 days, bug #568980
-# Unmaintained and deprecated.
-# Use net-print/cups-filters as a replacement
-net-print/foomatic-filters
-
# Tim Harder <[email protected]> (03 Nov 2016)
# Masked for testing
=sys-fs/fuse-3.0.0*
