diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-01-05 22:05:27 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2014-01-05 22:05:27 +0000 |
| commit | 5a4ab5593219d6fe5c12556f605be73f7f234f38 (patch) | |
| tree | ed46767058744ba75c0b8b743539ed694c24ace6 /net-print/foomatic-filters-ppds | |
| parent | EAPI bump (diff) | |
| download | gentoo-2-5a4ab5593219d6fe5c12556f605be73f7f234f38.tar.gz gentoo-2-5a4ab5593219d6fe5c12556f605be73f7f234f38.tar.bz2 gentoo-2-5a4ab5593219d6fe5c12556f605be73f7f234f38.zip | |
EAPI bump; fix foomatic dependency
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'net-print/foomatic-filters-ppds')
3 files changed, 20 insertions, 15 deletions
diff --git a/net-print/foomatic-filters-ppds/ChangeLog b/net-print/foomatic-filters-ppds/ChangeLog index 5dced03ce1e7..a426820455c7 100644 --- a/net-print/foomatic-filters-ppds/ChangeLog +++ b/net-print/foomatic-filters-ppds/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/foomatic-filters-ppds -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/ChangeLog,v 1.28 2013/12/27 22:39:12 dilfridge Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/ChangeLog,v 1.29 2014/01/05 22:05:27 dilfridge Exp $ + + 05 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> + foomatic-filters-ppds-20070501.ebuild, foomatic-filters-ppds-20080507.ebuild: + EAPI bump; fix foomatic dependency 27 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org> foomatic-filters-ppds-20070501.ebuild, foomatic-filters-ppds-20080507.ebuild: diff --git a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild index b2bb5bae4091..4469350c7894 100644 --- a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild +++ b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild,v 1.18 2013/12/27 22:39:12 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20070501.ebuild,v 1.19 2014/01/05 22:05:27 dilfridge Exp $ + +EAPI=5 inherit eutils @@ -15,13 +17,12 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="" RDEPEND=" - || ( >=net-print/cups-filters-1.0.43 net-print/foomatic-filters ) + || ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters ) " -src_unpack() { - unpack ${A} +src_prepare() { # Fix a symlink collision, see bug #172341 - sed -i -e '/ln -s \$prefix\/share\/ppd \$destdir\$ppddir\/foomatic-ppds/d' "${S}"/install + sed -i -e '/ln -s \$prefix\/share\/ppd \$destdir\$ppddir\/foomatic-ppds/d' "${S}"/install || die # Fix building if /bin/sh isn't bash. Bug #176799 epatch "${FILESDIR}"/${P}-remove-bashisms.patch } diff --git a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild index b8231448fa7a..5eea08ecdea6 100644 --- a/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild +++ b/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild,v 1.2 2013/12/27 22:39:12 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/foomatic-filters-ppds/foomatic-filters-ppds-20080507.ebuild,v 1.3 2014/01/05 22:05:27 dilfridge Exp $ + +EAPI=5 inherit eutils @@ -15,14 +17,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar IUSE="" RDEPEND=" - || ( >=net-print/cups-filters-1.0.43 net-print/foomatic-filters ) + || ( >=net-print/cups-filters-1.0.43-r1[foomatic] net-print/foomatic-filters ) " -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { # Fix a symlink collision, see bug #172341 - sed -i -e '/ln -s \$prefix\/share\/ppd \$destdir\$ppddir\/foomatic-ppds/d' "${S}"/install + sed -i -e '/ln -s \$prefix\/share\/ppd \$destdir\$ppddir\/foomatic-ppds/d' "${S}"/install || die # Fix building if /bin/sh isn't bash. Bug #176799 epatch "${FILESDIR}/${PN}-20070501-remove-bashisms.patch" } |