Version bump 0.14.1, remove old

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

3 files changed, 19 insertions, 24 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index c0ef878d09f2..38096882e8cf 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # 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.243 2010/06/24 21:40:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.244 2010/07/08 22:02:57 reavertm Exp $
+
+*poppler-0.14.1 (08 Jul 2010)
+
+  08 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -poppler-0.14.0-r1.ebuild, +poppler-0.14.1.ebuild:
+  Version bump 0.14.1, remove old
 
   24 Jun 2010; Pacho Ramos <pacho@gentoo.org> poppler-0.12.4-r3.ebuild:
   stable amd64, bug 323271
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f0c42ca84608..1ea32594ca8e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX poppler-0.12.3-cairo-downscale.patch 17313 RMD160 6c2068605e195c2ec27636634613482a181195a9 SHA1 1df4c48520c53ef289d92b2208a5b55140443204 SHA256 643ab8d6d747a9e1484d132be43ee674e5ccae38c79792a8be01ed2df82e8067
 AUX poppler-0.12.3-cmake-disable-tests.patch 2121 RMD160 3edded24926076c9c0ef42d0f1f295a8d46cafdb SHA1 fd22bdf1d887bcedd83673992fd182bfdb3bfcb0 SHA256 182489ee0d76a38c6d2570721a6777d78077ace4249bbeac7dad8d29b075c01b
 AUX poppler-0.12.3-config.patch 3468 RMD160 de39ce760cca5b811e1c21efc893731fbcfbc22b SHA1 e7dd1b86d2d5312c5610b02101d5551bece21b10 SHA256 909a1626b8800b3e796c24e3c2a5b6140cd626a28b6c627bd212d6a4a9a12aef
@@ -14,16 +11,9 @@ AUX poppler-0.12.4-strings_h.patch 927 RMD160 f1bbe64a295a78ba3596b1ad834cd14859
 AUX poppler-0.12.4-xopen_source.patch 1878 RMD160 13541fb85dec76297d1d35c9591c1f7b6b720a62 SHA1 b98a3a25f867000aa937e1b9e1e39cec7a7b829d SHA256 2c6877e6bf886d7fbda08cdf2f7a0716c876bb6f5406b8919986306b5e589758
 DIST poppler-0.12.3.tar.gz 1616883 RMD160 a8fd07ec4dc918cc17390a5236aff9a43e1f7253 SHA1 bce8b675fb7c22d507b1965efa7bd71d9ce09460 SHA256 7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc
 DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b SHA1 306507e0fbf47736b456218618f043a216c263ef SHA256 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a
-DIST poppler-0.14.0.tar.bz2 887492 RMD160 a90ff77a186afa096bebc2d04af1c3d49a146898 SHA1 cd3505688435f9288bdb4b8384c60dc5adac822f SHA256 a5d64d5d0d416c7130694993acc68e3c96e4aeb070b9d12dc6ab6cb3b75cc720
+DIST poppler-0.14.1.tar.gz 1782771 RMD160 7b8d084b05ccc374e9add9771b781a88948907a7 SHA1 28229f897451feba5682d74defe7d67361eeee11 SHA256 efe59b33585791ef6714fa33a6d62b8746d6352c4f57a093f03364b0979bfa3e
 EBUILD poppler-0.12.3-r3.ebuild 2747 RMD160 3b9629709338dc993c64423268f90af4d530421a SHA1 272b0a771c3a713d1ec925d3d715f17445e1ec53 SHA256 e4e21785e8ddb4b693ad12a0a59a1aad1fa1d4f61267b5b884cb7dca8f873ab1
 EBUILD poppler-0.12.4-r3.ebuild 3601 RMD160 fa2ef1656443d57fb25f1bd1072bdf2ed8b2ec4a SHA1 faae4ad405f297c6e889dfc39d2a8d1dbfb9e3a2 SHA256 5ce91d22c533ad271de8c6e39c2413280e140ef661d617f9cb6ced33f5ee5d0d
-EBUILD poppler-0.14.0-r1.ebuild 2750 RMD160 140049b15332edc7ceba420dd5deff9409eae078 SHA1 3b61d84f115878a0f2bbe0801b2a09db32316fe3 SHA256 6b002f42c81e033322c71c676a9641384ed607252f2bb97f6afb191484386e90
-MISC ChangeLog 34787 RMD160 d3428ff6dfecc9966b81b884d77624e2b9f89171 SHA1 efb2ec8e34bd3d092691ef1b6046aa35f172cc9d SHA256 1ecb47e19e004f99654579888382d76d59b59cc0dc0d2d04977963b5fe6c85da
+EBUILD poppler-0.14.1.ebuild 2740 RMD160 2bfad8554fd8f0ae2f9b577d8f991a04ab2ea604 SHA1 eb1dac531694b6bc5f1448c32db940fd168dc234 SHA256 80417713d9822100173403036b74d25d5931fd428076f74b8a243a30d68600bd
+MISC ChangeLog 34963 RMD160 a35efcded94ee87c695588465c03484231605c9b SHA1 522f80641f6d79ebc4244934de71276520eee4cc SHA256 79ace5d0c73597772112bb30c10e1ef4157e7743bdccbb5beb8fec3826d22c58
 MISC metadata.xml 564 RMD160 078af3bfc173aeaf994a9886723d7ca9a73f9b3f SHA1 2288b78748160193bc62d30bb458a26afd031f04 SHA256 3be05c7573d0473701d0589caac0ed0c7bf4f738bf33d6e9bda47166d6ad7ace
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwj0PEACgkQCaWpQKGI+9SdwgCeNJHs1qtLbITcSeR9eHJgahW4
-lJ4An3CtHe04mTrPQL9TGcE5SpChF2Jf
-=0IkA
------END PGP SIGNATURE-----
diff --git a/app-text/poppler/poppler-0.14.0-r1.ebuild b/app-text/poppler/poppler-0.14.1.ebuild
index c89a2de374fd..3543ddc70b3c 100644
--- a/app-text/poppler/poppler-0.14.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.14.1.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.4 2010/06/21 15:32:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.1.ebuild,v 1.1 2010/07/08 22:02:57 reavertm Exp $
 
 EAPI="2"
 
@@ -8,13 +8,12 @@ inherit cmake-utils
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
 
 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 exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
-# doc, see src_install
+IUSE="+abiword cairo cjk curl cxx debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
 
 # No test data provided
 RESTRICT="test"
@@ -51,7 +50,7 @@ RDEPEND="${COMMON_DEPEND}
 	cjk? ( >=app-text/poppler-data-0.2.1 )
 "
 
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
+DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
 
 src_configure() {
 	mycmakeargs=(
@@ -82,11 +81,11 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-# 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
+	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
 }
 
 pkg_preinst() {