Fix preserve_old_lib wrt #323519. Remove USE="doc" (only for this release) wrt #323409.

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

3 files changed, 17 insertions, 15 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 4f3db9d5c365..32f1d5db8c10 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,10 +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.241 2010/06/21 09:57:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.242 2010/06/21 15:32:14 ssuominen Exp $
 
   21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   poppler-0.14.0-r1.ebuild:
-  Restrict media-libs/lcms depend to old version.
+  Fix preserve_old_lib wrt #323519. Remove USE="doc" (only for this release)
+  wrt #323409. Restrict media-libs/lcms depend to old version.
 
   20 Jun 2010; Raúl Porcel <armin76@gentoo.org> poppler-0.12.4-r3.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #323271
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c6a2ff04668b..29a7dd815da1 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -14,6 +14,6 @@ DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb
 DIST poppler-0.14.0.tar.bz2 887492 RMD160 a90ff77a186afa096bebc2d04af1c3d49a146898 SHA1 cd3505688435f9288bdb4b8384c60dc5adac822f SHA256 a5d64d5d0d416c7130694993acc68e3c96e4aeb070b9d12dc6ab6cb3b75cc720
 EBUILD poppler-0.12.3-r3.ebuild 2747 RMD160 3b9629709338dc993c64423268f90af4d530421a SHA1 272b0a771c3a713d1ec925d3d715f17445e1ec53 SHA256 e4e21785e8ddb4b693ad12a0a59a1aad1fa1d4f61267b5b884cb7dca8f873ab1
 EBUILD poppler-0.12.4-r3.ebuild 3603 RMD160 d30cf148fcca446f44b25c1fa71eac469260862b SHA1 000dca41b950f6f3c7fd4872a689e173ae1c347f SHA256 a766e9380993c637b0ea80026610a4e26b65a1ae94254cd8fe34e97f03952c28
-EBUILD poppler-0.14.0-r1.ebuild 2749 RMD160 0f6c680dbd98192bc6e86ec8468dae28b99784ed SHA1 249a594ba2bb78438ac6593a816b77dfee5a8f92 SHA256 241a1ffe494191788e003680d393fce1db366b52a8b6f1476e28afc02dd58621
-MISC ChangeLog 34601 RMD160 abdc8a31fd5f60df660d088c789430174106b81d SHA1 ab2dcdc54edbbc436fd0ef92011cf5cc97f7f4bc SHA256 6755078e599646c3cfe5137a6e6f0a7a716214f5b5398b53c47daddefda28127
+EBUILD poppler-0.14.0-r1.ebuild 2750 RMD160 140049b15332edc7ceba420dd5deff9409eae078 SHA1 3b61d84f115878a0f2bbe0801b2a09db32316fe3 SHA256 6b002f42c81e033322c71c676a9641384ed607252f2bb97f6afb191484386e90
+MISC ChangeLog 34691 RMD160 2f7346f07d30a740842c5504f31d7d6c7cc5c5be SHA1 5ce146e4ba27dfece663ad17adf251de3d5549ea SHA256 7789d2303c6c15de20e88ebb15d5a0d99ecfc910829a4a215cf4c526b8754a1a
 MISC metadata.xml 564 RMD160 078af3bfc173aeaf994a9886723d7ca9a73f9b3f SHA1 2288b78748160193bc62d30bb458a26afd031f04 SHA256 3be05c7573d0473701d0589caac0ed0c7bf4f738bf33d6e9bda47166d6ad7ace
diff --git a/app-text/poppler/poppler-0.14.0-r1.ebuild b/app-text/poppler/poppler-0.14.0-r1.ebuild
index deb67a4755b8..c89a2de374fd 100644
--- a/app-text/poppler/poppler-0.14.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.14.0-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.14.0-r1.ebuild,v 1.3 2010/06/21 09:57:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.4 2010/06/21 15:32:14 ssuominen Exp $
 
 EAPI="2"
 
@@ -13,7 +13,8 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
-IUSE="+abiword cairo cjk curl cxx debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
+IUSE="+abiword cairo cjk curl cxx debug exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
+# doc, see src_install
 
 # No test data provided
 RESTRICT="test"
@@ -81,19 +82,19 @@ src_configure() {
 src_install() {
 	cmake-utils_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/* || die 'failed to install API documentation'
-	fi
+# Restore with 0.14.1 per http://bugs.gentoo.org/323409
+#	if use cairo && use doc; then
+#		insinto /usr/share/doc/${PF}/html
+#		doins -r "${S}"/glib/reference/html/* || die
+#	fi
 }
 
 pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libpoppler-glib.so.5
-	preserve_old_lib /usr/$(get_libdir)/libpoppler.so.6
+	preserve_old_lib /usr/$(get_libdir)/libpoppler-glib.so.4
+	preserve_old_lib /usr/$(get_libdir)/libpoppler.so.5
 }
 
 pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler-glib.so.5
-	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler.so.6
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler-glib.so.4
+	preserve_old_lib_notify /usr/$(get_libdir)/libpoppler.so.5
 }