respect cflags, bug #529645; fix live ebuild

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

5 files changed, 88 insertions, 9 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 1c11960de55c..b24467efa23f 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.436 2014/11/21 14:09:55 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.437 2014/12/03 20:57:38 tamiko Exp $
+
+  03 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+  +files/poppler-0.28.1-respect-cflags.patch, poppler-0.28.1.ebuild,
+  poppler-9999.ebuild:
+  respect cflags, bug #529645; fix live ebuild
 
   21 Nov 2014; Tobias Klausmann <klausman@gentoo.org> poppler-0.26.5.ebuild:
   Stable on alpha, bug 523164
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index acdfee34244a..698973d0c870 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,10 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX poppler-0.26.0-qt5-dependencies.patch 1112 SHA256 f32f81e4fa0b39799acc5f4c3b36ffdf9d1674b8da902e14b1ff7e5ea01eec56 SHA512 94353b0c94b9385496074888e04e11e2349a9e1c60131c661bfb4c7df3df3c5c2494761b94b2bd47f8fe69c17aab4ea3c3d0812df6491554085001148d70477b WHIRLPOOL ef6e1b94a0d5f1085723ae3c80684772b4a30ae0628fe69548bb61468df14c17ae16e4a562f4edbd0dd41f28453657e3b17213ee97ba3907e396745b0738fa55
+AUX poppler-0.28.1-respect-cflags.patch 2733 SHA256 f654924d669cc61ac5be0d3d6075e835ae8b5d5c9c849ad73e86f7996833383d SHA512 f36671cb51cd6c45f2db5fedcae73763b300067f732d8c546d3f0b30af6aa7fcdcfe07e5349d43d93cee0f0a420f85c031b3482ce8bc514a5180e1c968bb465a WHIRLPOOL 53b1ef9d4f052fc0cafaa3a645d11f9a615861d505abec4412721b4a8a9d93c7fa624d8be676f248f81a4d4094826e36ab6c1f2f84577fd54c17be9bc89465b4
 DIST poppler-0.24.5.tar.xz 1512476 SHA256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84 SHA512 dfb40f7d864614f4ad7e8729334931c4b40c48c0dc3d7a8c33b14134cf13c61f8a562cc790a08bee4a43c2c29e587a9d26330437858d465e18ceafd69521250c WHIRLPOOL 066924beb46e58c2906a3b278e617438bd966e2b7bd884e110949f0d149d2cca0bf6326f2fa8c99e3a2c0f2d3cb3f145c8eeee4f060d17e3dded501ef8ec7f33
 DIST poppler-0.26.5.tar.xz 1595232 SHA256 de7de5fa337431e5d1f372e8577b3707322f1dbc1dc28a70f2927476f134d1ee SHA512 c374865809ed0c0ba43b4218f1e2185d1692a74a16aef722b2c6388bed7fbd8eef6e809f10fa061b90e8e35f28be2a5858d7dd6bf9d1c0c6e3c23ed8026688cc WHIRLPOOL 1e11d34d3a5f9a41f81609c65a3bbeb0e81b789d4d8b08ec9781e389284cf333ac959b6e510a490c98e28eb280fae2cf4362198456113a0a324efe2ce58226ff
 DIST poppler-0.28.1.tar.xz 1600332 SHA256 2ccf6e234209aa5082ba99d3547e6798cd8758e7a921c72c00aedf0d5793fd06 SHA512 11fb99c34eb1b00af1c67e5607cd6dae9fcf98fb6b11d90e1074e7364b3cce7f8be06a7cfab99158a6b115841963b0c05381f668d117c871fe30b16627989222 WHIRLPOOL f9dbd055039cc54a08f6887157ad7b315d55bf02c68c2ae30dbbbea2baa1b6d09ad0da82befbc4272ff56586a7bacee2eb1003c1e75968f79f472b45a8a1a24c
 EBUILD poppler-0.24.5.ebuild 2700 SHA256 839735037cc6fe4b54843027742f7a97254c838132d9e2dbbf03c0c7447c9431 SHA512 f0e7d3a804ac6569577a120717ca2a3e4331cdcacd345db2c733df95e7e56a2d9d99e09872f1e3ec56236c27fa31e37865ec97e31b325090898f41c2d4648d2e WHIRLPOOL 5fdb4db49ff52a87d53210bd8c525b7270000ab7d72f7811532e34f556ef0f46f4224866ab0eb60e1a0497accbdab3d5ee58c20eb029ff0e255898511c188c2b
 EBUILD poppler-0.26.5.ebuild 2675 SHA256 bf88d48392e67d00101609b434ea5f05270fe006f5b45ef6e599c18b1affcedd SHA512 5560f530382701363f0971b4c34da505ccc70efa1a52ee1dc9fe94fd00e3678a29e7e45f8f23a53ef77a48ef2e40867ed7c8ab8697f73e87625dfc36726c8d6d WHIRLPOOL 9fa619bcdffee592891c6018120ac8c4922e3ba0318d64982246b70bec3e1f342e8b10345cd244e704d9f3776adebb6df1deec227a2cb0476cba53f1c27b027d
-EBUILD poppler-0.28.1.ebuild 2746 SHA256 a9d96b3a7e6c71b76e64ddbe1751b6556ce198cb7d75973b2186f87cac6d9970 SHA512 d83cd7a5c0c7498661766bb6148e0d13596b8813bac9aec0ef00a2c36fd42566bdd8e5caf7430e0a12b5cc6d80077dfa9a7d561fff8708cb27d95323378ebf53 WHIRLPOOL e7f3b550e3f44cc64b9c27da0c55a3824e4fc78a3c10a7c1d783e53fcd19704b418fa6e16025e2601e9870fbd15a9e5ceb40127240dba76201f11a64d6cba81b
-EBUILD poppler-9999.ebuild 2744 SHA256 d071958ab46f6704fa281e53983f0a433bd1ecd7dc55df027859667558bdbe25 SHA512 8eb4e46a58d9b0cc7b635f23a5ea89dfe3aa19c0e8dc9adf36e0d7562a987aa3b0df8d0582eacf415d2c9f6914edd8d8ceb7db638e0bc21833795f5644f2a9b3 WHIRLPOOL 206eb968e7713475fc8fc1798c769f809d9b64277252b6bf991d16d77399174a399bbb1ca581fb8c2c358c3a6cf0fb5becef63a21e58851de4c905f7b5230c52
-MISC ChangeLog 60524 SHA256 80197f1c642490edaeb8f68acbdf8902e73335bfc6e84639829041aac7dbc73a SHA512 bdc03146ab87b71a584e1cf7df75eb40587dc6fd467d2f1ecd3396aa34aa2f9b2fea87e97a0f907e9f8cd7d9a22522a7238dc061ba6bf9d8f2a3e7f88f0d6e5e WHIRLPOOL 684f18fb1ee87fd23cf6d4d7796ef7f758deb0de5b3ce78b9c31d8cace55aed82526c591b80b36771a940a740b19b1b8bc4082ab4ea46c50ac96caba17518426
+EBUILD poppler-0.28.1.ebuild 2785 SHA256 fc912c6e4c084b01b0e3fd8bb5f0b0031daf9fa42f07d54894f0a538ba3a049d SHA512 28ed861761fc44e4b640ca09a5f36e60c784d290f8f4c41b771714e9e36893951219a8d434dbd91349fa99be34c1c87bce837214adcf96a4b48a50a310c15f49 WHIRLPOOL 2d696cc7012631f41baf094c39ee91bb6f674f3c9becc23fe2810451169b39449d999416a3949a72c4ec5c04ad0ea2dee9398ab78c42e733a704e5361052cf1e
+EBUILD poppler-9999.ebuild 2871 SHA256 ddc1abf5394eaf85b577ba2d0765385f931fb953b58ab2bed3bb8d8fa08ef497 SHA512 313da9063539193f0a65d1619442fccfa29670be42284c5aa3e50b3c54638aeade1e1467906f37d5e938ca4e387a3abfca70a7d2d20de4863f647c0e57d7cd62 WHIRLPOOL ed3b61d71b00fc86118476bcd22be3217d983585d39c864fe60d077326fd52e4dfd7a6570bcc407e2d2bd4f3ec7dbfeccfa9997f48f8aeffc1085d2a264c3372
+MISC ChangeLog 60712 SHA256 3cf625d2fd1aa92a23fda59d7f4c673b291ab65616d8184b015c4b0b7dcf18c6 SHA512 154e241fbbb5caf40cfc77187d532b741964bc8ef32e1d12384c0448339199f15f5637a6ea8bb557fb94251f8ebd2bc728fd6772e79bbb943822ce1831fda8df WHIRLPOOL 1a798d2eb6956888b0d7df23812f3b18c897f7769263ea2946977685c14c24b0cc32be94f7763c0e1af7bec16f6985c1f970b5b6c996d0e61384fc23f75ca86c
 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.1
+
+iQIcBAEBCAAGBQJUf3lDAAoJELhOzYlK7nn/JsQP/A+YXsKP7apD9VxuF3V8grNz
+iS+0HtNDCf0BSqiJbkZNKTmZmP0L25Jki3dIgLsEkr6bReRbO5YrZz69RyIUbRFk
+1E1owVIgBrSREnetNnI0rHwGZEzrUEdxRgoaMIdPm9BHvn4apj+RB51JNWt6OFYk
+RdBZcx0xrL7ruY299f3PfOXC30As1Z1bOH0o0NCoV9raDvHbySpZzxyjYdZRzvi5
+fy85SziGLfZeY20l6FV6xY7VmsMkdvXAiE76RWZNY8Ofr+0XD5lCh+37pRXU3Bi9
+05zpsnGSOr/ckH6iAxXHjcHPI3m28SPgTbPGNfflaF0YA5DRazVB9maMeiP0vZJx
+mNkFSxH4Ls8nzn5ahi7Aq29CK5w+9YLkHbQ7E0LuPq4Gt8JwrXoR/1zFhSz0fMrt
+YDjusV9ztzqKqqbbdD54U9d0r37gPIYlcWqxqYTakNYpcVLe4jQy1ld/VZ85d2wg
+hruj3iQZsRA1wHmMpNw5ct6fQci8n5X8UHeclZT1vianPHDJmE6ynDqOjpZ6peCY
+bF8L4VIe80xDSdpzN5JV+27boqT74oZy1O8L3cqXfNxNeQZzjBdsGk2vTAgNZYdo
+jrCzgjhJdeoa7JhBnMhjuFL8O8YcAlEs0HDGDbO2XFf+9TYUvGqAo35HdkJMV7gr
+JtVyhTuRRrdB9Ag0cTHv
+=oZfb
+-----END PGP SIGNATURE-----
diff --git a/app-text/poppler/files/poppler-0.28.1-respect-cflags.patch b/app-text/poppler/files/poppler-0.28.1-respect-cflags.patch
new file mode 100644
index 000000000000..0b94042c8af8
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.28.1-respect-cflags.patch
@@ -0,0 +1,48 @@
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 6cadf40..7e5e6b2 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -98,41 +98,10 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-  # set the default compile warnings
+   set(DEFAULT_COMPILE_WARNINGS_NO)
+   set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wcast-align -fno-exceptions -fno-check-new -fno-common")
+   set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ 
+-  set(CMAKE_CXX_FLAGS                "-Wnon-virtual-dtor -Woverloaded-virtual ${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-  set(CMAKE_C_FLAGS                  "-std=c99")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-
+-  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+-  if(GCC_HAS_AS_NEEDED)
+-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+-  endif(GCC_HAS_AS_NEEDED)
+-endif (CMAKE_COMPILER_IS_GNUCXX)
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign")
+-endif(CMAKE_C_COMPILER MATCHES "icc")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
+ 
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
diff --git a/app-text/poppler/poppler-0.28.1.ebuild b/app-text/poppler/poppler-0.28.1.ebuild
index 5b35396f4e4b..fe1b76e0a4bf 100644
--- a/app-text/poppler/poppler-0.28.1.ebuild
+++ b/app-text/poppler/poppler-0.28.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.28.1.ebuild,v 1.1 2014/11/10 23:16:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.28.1.ebuild,v 1.2 2014/12/03 20:57:38 tamiko Exp $
 
 EAPI=5
 
@@ -60,7 +60,9 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=(AUTHORS NEWS README README-XPDF TODO)
 
-PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${P}-respect-cflags.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 6cdea7b45f6d..e6798b41ab60 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.3 2014/11/10 23:16:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.4 2014/12/03 20:57:38 tamiko Exp $
 
 EAPI=5
 
@@ -60,7 +60,9 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=(AUTHORS NEWS README README-XPDF TODO)
 
-PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" )
 
 src_configure() {
 	local mycmakeargs=(
@@ -98,6 +100,7 @@ src_install() {
 	if use cairo && use doc; then
 		# For now install gtk-doc there
 		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
+		# nonfatal, because live version doesn't provide html documentation.
+		nonfatal doins -r "${S}"/glib/reference/html/*
 	fi
 }