johu 15/06/21 11:59:03
Modified: poppler-9999.ebuild poppler-0.33.0-r1.ebuild
ChangeLog
Removed: poppler-0.33.0.ebuild
Log:
Replace nonfatal usage with live version check, bug #551158. Sync live.
Remove old.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
0x295445CE)
Revision Changes Path
1.10 app-text/poppler/poppler-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-9999.ebuild?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-9999.ebuild?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-9999.ebuild?r1=1.9&r2=1.10
Index: poppler-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- poppler-9999.ebuild 29 May 2015 13:00:45 -0000 1.9
+++ poppler-9999.ebuild 21 Jun 2015 11:59:02 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.9
2015/05/29 13:00:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.10
2015/06/21 11:59:02 johu Exp $
EAPI=5
@@ -66,6 +66,16 @@
"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
)
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if [[ ${CC} == clang ]] ; then
+ sed -i -e 's/-fno-check-new//'
cmake/modules/PopplerMacros.cmake || die
+ fi
+}
+
src_configure() {
local mycmakeargs=(
-DBUILD_GTK_TESTS=OFF
@@ -103,10 +113,10 @@
src_install() {
cmake-utils_src_install
- if use cairo && use doc; then
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != 9999 ]]; then
# For now install gtk-doc there
insinto /usr/share/gtk-doc/html/poppler
- # nonfatal, because live version doesn't provide html
documentation.
- nonfatal doins -r "${S}"/glib/reference/html/*
+ doins -r "${S}"/glib/reference/html/*
fi
}
1.5 app-text/poppler/poppler-0.33.0-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?r1=1.4&r2=1.5
Index: poppler-0.33.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- poppler-0.33.0-r1.ebuild 1 Jun 2015 19:54:32 -0000 1.4
+++ poppler-0.33.0-r1.ebuild 21 Jun 2015 11:59:02 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v
1.4 2015/06/01 19:54:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v
1.5 2015/06/21 11:59:02 johu Exp $
EAPI=5
@@ -113,10 +113,10 @@
src_install() {
cmake-utils_src_install
- if use cairo && use doc; then
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != 9999 ]]; then
# For now install gtk-doc there
insinto /usr/share/gtk-doc/html/poppler
- # nonfatal, because live version doesn't provide html
documentation.
- nonfatal doins -r "${S}"/glib/reference/html/*
+ doins -r "${S}"/glib/reference/html/*
fi
}
1.463 app-text/poppler/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.463&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.463&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.462&r2=1.463
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -r1.462 -r1.463
--- ChangeLog 1 Jun 2015 19:54:32 -0000 1.462
+++ ChangeLog 21 Jun 2015 11:59:02 -0000 1.463
@@ -1,6 +1,11 @@
# ChangeLog for app-text/poppler
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.462
2015/06/01 19:54:32 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.463
2015/06/21 11:59:02 johu Exp $
+
+ 21 Jun 2015; Johannes Huber <[email protected]> -poppler-0.33.0.ebuild,
+ poppler-0.33.0-r1.ebuild, poppler-9999.ebuild:
+ Replace nonfatal usage with live version check, bug #551158. Sync live.
Remove
+ old.
01 Jun 2015; Fabian Groffen <[email protected]> poppler-0.33.0-r1.ebuild:
Fix compilation with Clang
