loki_val 09/05/14 19:54:42
Modified: ChangeLog xpdf-3.02-r2.ebuild
Removed: xpdf-3.02-r1.ebuild
Log:
Fix bug 269546, FTBFS w/poppler-0.11.0, patch from Alexis Ballier, the magnificent. Move poppler-0.10.0.patch to ${P}-poppler-0.10.0.patch for consistency. Delete old.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Revision Changes Path
1.180 app-text/xpdf/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/ChangeLog?rev=1.180&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/ChangeLog?rev=1.180&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/ChangeLog?r1=1.179&r2=1.180
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- ChangeLog 7 Apr 2009 10:07:45 -0000 1.179
+++ ChangeLog 14 May 2009 19:54:42 -0000 1.180
@@ -1,6 +1,14 @@
# ChangeLog for app-text/xpdf
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.179 2009/04/07 10:07:45 rbu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.180 2009/05/14 19:54:42 loki_val Exp $
+
+ 14 May 2009; Peter Alfredsen <loki_val@g.o>
+ -files/poppler-0.10.0.patch, -xpdf-3.02-r1.ebuild, xpdf-3.02-r2.ebuild,
+ +files/xpdf-3.02-poppler-0.10.0.patch,
+ +files/xpdf-3.02-poppler-0.11.0.patch:
+ Fix bug 269546, FTBFS w/poppler-0.11.0, patch from Alexis Ballier, the
+ magnificent. Move poppler-0.10.0.patch to ${P}-poppler-0.10.0.patch for
+ consistency. Delete old.
02 Apr 2009; Markus Meier <maekke@g.o> xpdf-3.02-r2.ebuild:
amd64 stable (bug #242930)
1.8 app-text/xpdf/xpdf-3.02-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild?r1=1.7&r2=1.8
Index: xpdf-3.02-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xpdf-3.02-r2.ebuild 2 Apr 2009 21:56:53 -0000 1.7
+++ xpdf-3.02-r2.ebuild 14 May 2009 19:54:42 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild,v 1.7 2009/04/02 21:56:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild,v 1.8 2009/05/14 19:54:42 loki_val Exp $
EAPI=2
@@ -40,10 +40,11 @@
}
src_prepare() {
- use nodrm && \
- epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
+ use nodrm && epatch "${FILESDIR}/${P}-poppler-nodrm.patch"
has_version '>=virtual/poppler-0.10.0' && \
- epatch "${FILESDIR}"/poppler-0.10.0.patch
+ epatch "${FILESDIR}/${P}-poppler-0.10.0.patch"
+ has_version '>=virtual/poppler-0.11.0' && \
+ epatch "${FILESDIR}/${P}-poppler-0.11.0.patch"
epatch "${FILESDIR}/${P}-as-needed.patch"
}
|
