diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-07-09 05:58:34 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-07-09 05:58:34 +0000 |
| commit | c8b4c11ce18d6cc5973730a56e2b4ab0ab5e47c2 (patch) | |
| tree | 3ccf92049bd7bfb2a4ac6f2a47fec22ef88a6819 /net-print/gutenprint | |
| parent | When cleaning up generated files leave any fonts.alias from media-fonts/font-... (diff) | |
| download | gentoo-2-c8b4c11ce18d6cc5973730a56e2b4ab0ab5e47c2.tar.gz gentoo-2-c8b4c11ce18d6cc5973730a56e2b4ab0ab5e47c2.tar.bz2 gentoo-2-c8b4c11ce18d6cc5973730a56e2b4ab0ab5e47c2.zip | |
Do not install sequence.h twice by Dominik Köppl, patch by Fabian Henze (bug #317985).
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'net-print/gutenprint')
| -rw-r--r-- | net-print/gutenprint/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/gutenprint/files/gutenprint-5.2.5-Makefile.patch | 20 | ||||
| -rw-r--r-- | net-print/gutenprint/gutenprint-5.2.5-r1.ebuild | 9 |
3 files changed, 31 insertions, 5 deletions
diff --git a/net-print/gutenprint/ChangeLog b/net-print/gutenprint/ChangeLog index 7427f4c38cce..df3e20c7404d 100644 --- a/net-print/gutenprint/ChangeLog +++ b/net-print/gutenprint/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/gutenprint # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.10 2010/02/23 14:59:03 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/ChangeLog,v 1.11 2010/07/09 05:58:34 jer Exp $ + + 09 Jul 2010; Jeroen Roovers <jer@gentoo.org> gutenprint-5.2.5-r1.ebuild, + +files/gutenprint-5.2.5-Makefile.patch: + Do not install sequence.h twice by Dominik Köppl, patch by Fabian Henze + (bug #317985). *gutenprint-5.2.5-r1 (23 Feb 2010) diff --git a/net-print/gutenprint/files/gutenprint-5.2.5-Makefile.patch b/net-print/gutenprint/files/gutenprint-5.2.5-Makefile.patch new file mode 100644 index 000000000000..cf2f979b0cea --- /dev/null +++ b/net-print/gutenprint/files/gutenprint-5.2.5-Makefile.patch @@ -0,0 +1,20 @@ +--- a/include/gutenprint/Makefile.in 2010-02-12 02:04:25.000000000 +0100 ++++ b/include/gutenprint/Makefile.in 2010-07-05 16:33:39.000000000 +0200 +@@ -295,7 +295,6 @@ pkginclude_HEADERS = \ + curve-cache.h \ + curve.h \ + dither.h \ +- sequence.h \ + image.h \ + list.h \ + module.h \ +--- a/include/gutenprint/Makefile.am 2006-09-18 03:48:58.000000000 +0200 ++++ b/include/gutenprint/Makefile.am 2010-07-05 16:33:31.000000000 +0200 +@@ -36,7 +36,6 @@ pkginclude_HEADERS = \ + curve-cache.h \ + curve.h \ + dither.h \ +- sequence.h \ + image.h \ + list.h \ + module.h \ diff --git a/net-print/gutenprint/gutenprint-5.2.5-r1.ebuild b/net-print/gutenprint/gutenprint-5.2.5-r1.ebuild index 70fb02d4404a..0860b896628c 100644 --- a/net-print/gutenprint/gutenprint-5.2.5-r1.ebuild +++ b/net-print/gutenprint/gutenprint-5.2.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.5-r1.ebuild,v 1.1 2010/02/23 14:59:03 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/gutenprint/gutenprint-5.2.5-r1.ebuild,v 1.2 2010/07/09 05:58:34 jer Exp $ EAPI="2" @@ -28,8 +28,9 @@ LICENSE="GPL-2" SLOT="0" src_prepare() { - # Respect gentoo CFLAGS - epatch "${FILESDIR}/${PN}-5.2.4-CFLAGS.patch" + epatch \ + "${FILESDIR}/${PN}-5.2.4-CFLAGS.patch" \ + "${FILESDIR}/${P}-Makefile.patch" # IJS Patch sed -i -e "s:<ijs\([^/]\):<ijs/ijs\1:g" src/ghost/ijsgutenprint.c || die "sed failed" # Regen configure @@ -75,7 +76,7 @@ src_install () { dodoc AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} dohtml doc/FAQ.html - dohtml -r doc/users_guide/html doc/developer/developer-html + dohtml -r doc/gutenprintui2/html doc/gutenprint/developer-html rm -fR "${D}"/usr/share/gutenprint/doc if ! use gtk && ! use gimp; then rm -f "${D}"/usr/$(get_libdir)/pkgconfig/gutenprintui2.pc |