summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2013-08-14 10:37:28 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2013-08-14 10:37:28 +0000
commitef610f3a94b71cd0cabc0a94f139e8565e32f3ec (patch)
treec2839033ae5303158f58e81f95cf3f0dfe0c5702 /net-print
parentRevert to ~alpha (diff)
downloadgentoo-2-ef610f3a94b71cd0cabc0a94f139e8565e32f3ec.tar.gz
gentoo-2-ef610f3a94b71cd0cabc0a94f139e8565e32f3ec.tar.bz2
gentoo-2-ef610f3a94b71cd0cabc0a94f139e8565e32f3ec.zip
Add temporary workaround for bug 480942
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 94BFDF4484AD142F)
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups-filters/ChangeLog9
-rw-r--r--net-print/cups-filters/cups-filters-1.0.36-r1.ebuild (renamed from net-print/cups-filters/cups-filters-1.0.36.ebuild)5
-rw-r--r--net-print/cups-filters/cups-filters-9999.ebuild5
3 files changed, 16 insertions, 3 deletions
diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index dd0d0a463223..a3e0f0474d7f 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-print/cups-filters
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.73 2013/08/13 21:37:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.74 2013/08/14 10:37:28 dilfridge Exp $
+
+*cups-filters-1.0.36-r1 (14 Aug 2013)
+
+ 14 Aug 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ +cups-filters-1.0.36-r1.ebuild, -cups-filters-1.0.36.ebuild,
+ cups-filters-9999.ebuild:
+ Add temporary workaround for bug 480942
*cups-filters-1.0.36 (13 Aug 2013)
diff --git a/net-print/cups-filters/cups-filters-1.0.36.ebuild b/net-print/cups-filters/cups-filters-1.0.36-r1.ebuild
index 01b41d4cf935..e0a9bc19ba08 100644
--- a/net-print/cups-filters/cups-filters-1.0.36.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.36-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.36.ebuild,v 1.1 2013/08/13 21:37:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.36-r1.ebuild,v 1.1 2013/08/14 10:37:28 dilfridge Exp $
EAPI=5
@@ -85,6 +85,9 @@ src_install() {
popd > /dev/null
fi
+ # remove duplicate files until they are gone in ghostscript, bug 480942
+ rm -fv "${ED}"/usr/libexec/cups/filter/{gstoraster,gstopxl}
+
prune_libtool_files --all
cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index df594e37a87b..4e74824ce476 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.38 2013/08/11 17:51:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-9999.ebuild,v 1.39 2013/08/14 10:37:28 dilfridge Exp $
EAPI=5
@@ -85,6 +85,9 @@ src_install() {
popd > /dev/null
fi
+ # remove duplicate files until they are gone in ghostscript, bug 480942
+ rm -fv "${ED}"/usr/libexec/cups/filter/{gstoraster,gstopxl}
+
prune_libtool_files --all
cp "${FILESDIR}"/cups-browsed.init.d "${T}"/cups-browsed || die