diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-11-04 23:29:39 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2013-11-04 23:29:39 +0000 |
| commit | a70de76295c87b57132a28478c8023acddcb200b (patch) | |
| tree | b4d8818fca5f1cd0d83987cf88ba00c721220cbe /net-print | |
| parent | Version bump (diff) | |
| download | gentoo-2-a70de76295c87b57132a28478c8023acddcb200b.tar.gz gentoo-2-a70de76295c87b57132a28478c8023acddcb200b.tar.bz2 gentoo-2-a70de76295c87b57132a28478c8023acddcb200b.zip | |
Fix parallel build, bug 490218. Newer versions already contain this change.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'net-print')
4 files changed, 23 insertions, 3 deletions
diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog index ca682b473b77..4038431b0340 100644 --- a/net-print/cups-filters/ChangeLog +++ b/net-print/cups-filters/ChangeLog @@ -1,6 +1,11 @@ # 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.86 2013/11/04 23:21:09 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.87 2013/11/04 23:29:39 dilfridge Exp $ + + 04 Nov 2013; Andreas K. Huettel <dilfridge@gentoo.org> + cups-filters-1.0.36-r1.ebuild, cups-filters-1.0.36-r2.ebuild, + +files/cups-filters-1.0.36-parallel.patch: + Fix parallel build, bug 490218. Newer versions already contain this change. *cups-filters-1.0.41 (04 Nov 2013) diff --git a/net-print/cups-filters/cups-filters-1.0.36-r1.ebuild b/net-print/cups-filters/cups-filters-1.0.36-r1.ebuild index 4c2b8833cd82..5347f055e268 100644 --- a/net-print/cups-filters/cups-filters-1.0.36-r1.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-r1.ebuild,v 1.11 2013/11/03 06:23:01 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.36-r1.ebuild,v 1.12 2013/11/04 23:29:39 dilfridge Exp $ EAPI=5 @@ -42,6 +42,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${P}-parallel.patch" ) + src_prepare() { base_src_prepare sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die diff --git a/net-print/cups-filters/cups-filters-1.0.36-r2.ebuild b/net-print/cups-filters/cups-filters-1.0.36-r2.ebuild index 9878553fbd02..8fdc73d73445 100644 --- a/net-print/cups-filters/cups-filters-1.0.36-r2.ebuild +++ b/net-print/cups-filters/cups-filters-1.0.36-r2.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-r2.ebuild,v 1.2 2013/08/27 15:27:57 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.36-r2.ebuild,v 1.3 2013/11/04 23:29:39 dilfridge Exp $ EAPI=5 @@ -42,6 +42,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${P}-parallel.patch" ) + src_prepare() { base_src_prepare sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die diff --git a/net-print/cups-filters/files/cups-filters-1.0.36-parallel.patch b/net-print/cups-filters/files/cups-filters-1.0.36-parallel.patch new file mode 100644 index 000000000000..a4d3e12ecc14 --- /dev/null +++ b/net-print/cups-filters/files/cups-filters-1.0.36-parallel.patch @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2013-07-30 12:41:42.000000000 -0400 ++++ Makefile.am 2013-11-02 22:38:39.487043030 -0400 +@@ -474,7 +474,7 @@ + -I$(srcdir)/cupsfilters/ + gstoraster_LDADD = \ + $(CUPS_LIBS) \ +- -lcupsfilters ++ libcupsfilters.la + + imagetopdf_SOURCES = \ + cupsfilters/image.h \ |