Add proper patch instead of workaround for missing headers installation. Thanks to Maciej Mrozowski.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 67 insertions, 14 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 2f5ec14f6fbe..c42600a452c2 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.204 2010/01/24 16:06:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.205 2010/01/24 17:24:05 yngwin Exp $
+
+  24 Jan 2010; Ben de Groot <yngwin@gentoo.org> poppler-0.12.3-r1.ebuild,
+  +files/poppler-0.12.3-fix-headers-installation.patch:
+  Add proper patch instead of workaround for missing headers installation.
+  Thanks to Maciej Mrozowski.
 
 *poppler-0.12.3-r1 (24 Jan 2010)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c7291e4530fd..f2a025f6be16 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,5 +1,6 @@
 AUX poppler-0.10.5-xpdf-3.02pl3.patch 23613 RMD160 3fc822a157c30475a20cb2b37f33bab324935ece SHA1 87f5fe73588727c23b9308ea6a934cef2bd14e02 SHA256 896fa93da3e7448b42932ee8e292bb816da6c5a59fc68341fc822d287787328e
 AUX poppler-0.12.3-cmake-disable-tests.patch 2121 RMD160 3edded24926076c9c0ef42d0f1f295a8d46cafdb SHA1 fd22bdf1d887bcedd83673992fd182bfdb3bfcb0 SHA256 182489ee0d76a38c6d2570721a6777d78077ace4249bbeac7dad8d29b075c01b
+AUX poppler-0.12.3-fix-headers-installation.patch 1403 RMD160 f5fa19a401825ec3697211628d6d45c1386c0377 SHA1 7c16f6a4788da7d6dbf0687bc95e31aacbf5a3bc SHA256 204793906b3a189faaee9a869ce36f275e845e760b63f6a8f65da568a26a1fb0
 AUX poppler-0.6.1-xpdf-3.02pl2.patch 17438 RMD160 c8a4bd0eda87f94b183fe0d0aa6d8864f3f9c569 SHA1 fc17401fea3cbe73687cce9ddb9185018fdb859e SHA256 5c6fd90b752f3f40a3d3e9d63fdc5ac0220841a88a05f5551054edd78f1f0f9d
 AUX poppler-0.8.3-page-init.patch 400 RMD160 9e2a4aa31e862996d7227084a46357c8fdd7a299 SHA1 edb7be8791b0e19119714c68f60cc3bf1cb6446d SHA256 9a44ccad42dcb2644713921c9e3dac2b757e54a81d313653345e176b6a36a158
 AUX poppler-CVE-2009-1188.patch 390 RMD160 2c3dee7856ad81c1d7989ac7db3d14e77a905c2d SHA1 bbda66e3d4f5cb3ca0e47ddecdf083843933b514 SHA256 78e2ea204b2b1640adff9cf24b4c6ad9c97da9698f5760bbbc89987918b10937
@@ -10,8 +11,8 @@ DIST poppler-0.8.7.tar.gz 1469587 RMD160 ea03cdf88a432e5748988e3576110a2989aa79e
 EBUILD poppler-0.10.4.ebuild 1418 RMD160 998207af8466d72972f37661fb525cc0dc518811 SHA1 83f3da4fec479c16724034aba94af580d89e64aa SHA256 d4fe10a324f4cb84f5bbd2a904d16f7a4d354a20d8401d0234a0b442d7201746
 EBUILD poppler-0.10.5-r1.ebuild 1546 RMD160 b9d0b20562af0d922165378047ca0987edbc7276 SHA1 9fccb0470523c28ef9c94b4a133c9d0a4e8a07c1 SHA256 4965bf856f18a03f010bdf83cc5c362e3997b315ee6f3ae971415e1f7ac37179
 EBUILD poppler-0.10.5.ebuild 1429 RMD160 fdfdc4ff982718d4d66764be55a85f2b9d2864da SHA1 e614256ddba20ecb13634e7c29fc0a8eb62d1cf7 SHA256 f427a65911cb9d5fa525db9cc3543b4bb6eb68d83f53637dc3a174450651b62f
-EBUILD poppler-0.12.3-r1.ebuild 2404 RMD160 88f31f5badd10e4d5eb25b5d94aeff5c0aea8c84 SHA1 478a156da8443df852d201ce193bc6e1fb0a1ad6 SHA256 4c089a0de6c95f07081c509fbc65aadff0efd7a68624bf1c4832bc4851e936d4
+EBUILD poppler-0.12.3-r1.ebuild 2345 RMD160 58821d16d8b07f957854715545691faa14ad7839 SHA1 b631796799c1bfd4cea0488e5b273b674274d62a SHA256 8737d4b54ee0c2730749ba4e0b8a885035768637c4c64f3bf9c863f1c1c7c2da
 EBUILD poppler-0.12.3.ebuild 2280 RMD160 394ac46dafe005448d43e4670978082749da91db SHA1 e2b4ce3b90cd5935afeedde85d95c80e032fe1ce SHA256 76255939ee3f04e337e1deb0fa841792be9afc786cfdd97d2a376b3c2bbb9249
 EBUILD poppler-0.8.7.ebuild 1322 RMD160 cfc3c9100cc5d55013f238401731ec8b077c8111 SHA1 e5b2a4cd1755ba77088b0c06e7382c16d31a3aef SHA256 cae06f6ee6a9a6d611123f0feed6956206345cc38fae84a24d837c4b7ecac27e
-MISC ChangeLog 28028 RMD160 3b775fa6658892c7ae90123ff87eff3bc8dbb8d3 SHA1 afa64031f3726ad5d8e3ed4f77b89a639cd232a9 SHA256 00e445abe71710d42b1cda3e96e2f87c3bebca79d551342acbeba6e51e06dbb4
+MISC ChangeLog 28264 RMD160 bce4606cae036205ee32bd1266a9572224cee474 SHA1 8cc9b570c053f3b07a2bf658c6f8c3f873ea7744 SHA256 9da28ee79c9f7f287c0f26c824b2e3e6ce792a112bb15b1ed9718642a4540d80
 MISC metadata.xml 720 RMD160 ea0d90d63ccc0e6a918e3259d07f6020a2957675 SHA1 d9a6c0578b9965e5b2f25e8c8f8b54370dd47c8e SHA256 230a9312f7867d64a2d2aa713df88e72b43b99a8aaf1fabfa3f05081a5482319
diff --git a/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch b/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch
new file mode 100644
index 000000000000..9eafd877b819
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.12.3-fix-headers-installation.patch
@@ -0,0 +1,52 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0cd32df..070be33 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -363,6 +363,11 @@ if(ENABLE_XPDF_HEADERS)
+     goo/FixedPoint.h
+     goo/gstrtod.h
+     DESTINATION include/poppler/goo)
++  if(PNG_FOUND)
++    install(FILES
++      goo/PNGWriter.h
++      DESTINATION include/poppler/goo)
++  endif(PNG_FOUND)
+   install(FILES
+     fofi/FoFiBase.h
+     fofi/FoFiEncodings.h
+@@ -374,6 +379,9 @@ if(ENABLE_XPDF_HEADERS)
+     install(FILES
+       poppler/JPEG2000Stream.h
+       DESTINATION include/poppler)
++    install(FILES
++      poppler/goo/JpegWriter.h
++      DESTINATION include/poppler/goo)
+   else(LIBOPENJPEG_FOUND)
+     install(FILES
+       poppler/JPXStream.h
+diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
+index 6ed9523..9f5d0e7 100644
+--- a/glib/CMakeLists.txt
++++ b/glib/CMakeLists.txt
+@@ -30,6 +30,7 @@ set(poppler_glib_public_headers
+   poppler-attachment.h
+   poppler-form-field.h
+   poppler-annot.h
++  poppler-layer.h
+   poppler.h
+ )
+ 
+diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
+index 7e982e7..10ac221 100644
+--- a/qt4/src/Makefile.am
++++ b/qt4/src/Makefile.am
+@@ -16,8 +16,7 @@ poppler_include_HEADERS =			\
+ 	poppler-form.h				\
+ 	poppler-optcontent.h			\
+ 	poppler-export.h			\
+-	poppler-page-transition.h		\
+-	poppler-page-transition-private.h
++	poppler-page-transition.h
+ 
+ lib_LTLIBRARIES = libpoppler-qt4.la
+ 
diff --git a/app-text/poppler/poppler-0.12.3-r1.ebuild b/app-text/poppler/poppler-0.12.3-r1.ebuild
index 0c5c5906a44e..6b4406cf611b 100644
--- a/app-text/poppler/poppler-0.12.3-r1.ebuild
+++ b/app-text/poppler/poppler-0.12.3-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/app-text/poppler/poppler-0.12.3-r1.ebuild,v 1.1 2010/01/24 16:06:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.3-r1.ebuild,v 1.2 2010/01/24 17:24:05 yngwin Exp $
 
 EAPI="2"
 
@@ -39,6 +39,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-cmake-disable-tests.patch"
+	epatch "${FILESDIR}/${P}-fix-headers-installation.patch"
 }
 
 src_configure() {
@@ -67,15 +68,9 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	if use glib; then
-		# install missing header
-		insinto /usr/include/poppler/glib/
-		doins "${S}"/glib/poppler-layer.h
-
-		if use doc; then
-			# For now install gtk-doc there
-			insinto /usr/share/gtk-doc/html/poppler
-			doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
-		fi
+	if use glib && use doc; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
 	fi
 }