Version bump, remove old

Package-Manager: portage-2.2.0_alpha118/cvs/Linux x86_64

5 files changed, 23 insertions, 112 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 829f2da9a575..5aff4a09823f 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.325 2012/06/19 22:00:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.326 2012/07/14 16:11:44 reavertm Exp $
+
+*poppler-0.20.2 (14 Jul 2012)
+
+  14 Jul 2012; Maciej Mrozowski <reavertm@gentoo.org> +poppler-0.20.2.ebuild,
+  -poppler-0.16.7.ebuild, -poppler-0.20.1.ebuild, metadata.xml:
+  Version bump, remove old
 
   19 Jun 2012; Maciej Mrozowski <reavertm@gentoo.org>
   files/poppler-0.20.1-lcms-automagic.patch, poppler-0.20.1.ebuild:
@@ -1352,4 +1358,3 @@
 
   14 Mar 2005; Heinrich Wendel <lanius@gentoo.org> +poppler-0.1.2.ebuild:
   initial commit
-
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c6ca515a4cdf..cf187ea30a0c 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX poppler-0.18.4-newline.patch 529 SHA256 9bcd45cb6f13caedc01a2c95faccea750a8fc80718fbd2a7c0f991e389c0d40c SHA512 2091cedcc8b4de8ed481db3c647b4996e56780fd95a6840ff8212869e94ad44a872ebee264168a8a7082ed9fd1ad94eb6fd337c453a0ede5cc1647e11bb4aeed WHIRLPOOL 994ebb2a2288ddc67e5f1de6ea9f55fa6a6e99887c52590caa61627a37be9f143a4169d5f7d16336fb73f7377538a63c2e826b18547de0c4f5095068e5503dbf
 AUX poppler-0.20.1-lcms-automagic.patch 4393 SHA256 2a75cd5955fe976d1b052839297561853e6c597256610cf1ebcf6aba28e1b81c SHA512 5c3af759aeaf1a3be534bc2f90dde3674e4967c7257cc2499505cef014d1c7570eaa53cc1ee9e4b079302085130dbb8215c1795cbd701a0c057273310a32bee5 WHIRLPOOL 2657072b71f916f94f8a1e1c2dd4348334aaa8df2369d5e6aa47d5c27493d32cdf6124d643c91681e65ac5d6d3ac0df01524b683e19bed6c96bc5d7097f13471
-DIST poppler-0.16.7.tar.gz 1952179 SHA256 fab4e8af2d34d4142a718819fd747d40930b71ef520ee0e6bcc94e2c44f22bcd SHA512 a0f16f392f9f5703eef00b6c11e78e8cf21bf596c27d621fe824efe75cc0cf0637c4175469cb9214d5ba7de666c3131a5ef6040ba8ea9185e6120f92a59aaccc WHIRLPOOL 66cc3c88b0ff7bb75dd1994277aaa637e2dcd93f011b05ffece73891440a045fed9c709dcf94b152c8f2ceb7082ecfb5a087621556e8a14f4603fdf33079e336
 DIST poppler-0.18.4.tar.gz 1992993 SHA256 33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e SHA512 dc7a8f059b6d0b1a73160a40226efc7b9d058806cc62c7b59e868453fef679dd92095629d26462f3697e96e6b16f95ce5425b7b96985f04b4d2db83e432e5216 WHIRLPOOL af4b8889aa0005dff5d4dae0414e2c1468e9a5bf58365425dae5cc96ae6afa8c2943cfc632a23781ac558df54e71f55d3195e8219f1410f026aebaf7cb62ba23
-DIST poppler-0.20.1.tar.gz 2141147 SHA256 b4620f645319f4a8790465730bc472d5745155d0780809406fb29c62316d49a8 SHA512 601a9d15d56d0241ebdfdb4314bd185fac3fcca78ca994d378b124e50400dcd0417bd60c822bd8d7adf245c9ce4ea4f28cf78b05b8275837706d7c436b72e0da WHIRLPOOL be4ed4c63cd55cfb439e0aa6cec2d5f7dee51348dac95fdae950d3fbd77c0b08a663d3b5072d74e2d70e93eac61045c57f945b1b6e9e0f5089162734b939c517
-EBUILD poppler-0.16.7.ebuild 2841 SHA256 0295e086d652bc68348629a04d32d1094fbb454e95a6661177158c375dc374eb SHA512 4c1ba5e3c66cbd29bf1172d5f0938ac8c700bf4eb484cfdb15d02e4137ac366760b042a3d6f8d6e139310ef4a55f1a83f120a8bc01c05f92748cc50d9bfddf3a WHIRLPOOL 8ab230f1b276fae325daadde350a8ea674f5c1e27419e5a7aebdfa37747585b7d3b1e8163ea61c7608fea4056d353f89a633647df58ce5c55d9ffbb678734b8d
+DIST poppler-0.20.2.tar.gz 2146312 SHA256 2debc5034e0e85402957d84fb2674737658a3dbe8a3c631e1792e3f8c88ce369 SHA512 7a9a9e94298be025d8ee2dcba2be61c9d6bf167cee238a2599e211999ce0dcb59b5ef3418c5f3a6ddc8f1600e7ef2954c53f4a4149742a8a87879b1c58e77bed WHIRLPOOL 3c614eec3e054439a0733d00904fb27788c09ad41735397a5283ca74be0ec80b4f5ea77cf02a1a6706a2d0adf7cef2835eefe0e84f976aefcc8bbedd2e7e0430
 EBUILD poppler-0.18.4-r1.ebuild 2704 SHA256 57140d5c35dc153f10db2054a03d9260f28199eef4b6b967c51e8d2c5a1fd1a6 SHA512 96d0b1a1de6eb5664c16e8c409f6ed9af750a6c8b5e02248ba79bc591649cc5220fd3617c16bbe152e8050fbe441d157d9411cf32708de815aa7538cd6a1980a WHIRLPOOL 8db25773e0a98137c2d2a52d6702c226711552d5befe2d26f9a218d2dfd28f01f89b9a1e1cda917f55531f4df075127b44349cc966447349373cc76601c9727c
-EBUILD poppler-0.20.1.ebuild 2781 SHA256 3a5546b3edb1620d1ed6d538c2296b08c6b5d65b69ab43791ad0071222cb6d6e SHA512 613785988d6e8e3f527d3ea280b9950856bf95b0d1c003f5ab860ddb9d59c87a9ee37e777fcd81f4610f7554d38128453e367a24dfe5c4b892ba697af04fd491 WHIRLPOOL 1650ed9bdb1f2bf55b5df402881525da77ea7c6807871b0a5017223c3953fdc62779561ce921b1dae1cfee492b80432b22dc061b6e60d931de57f43ac3662baa
-MISC ChangeLog 46025 SHA256 e7e4cc25969724f32acf20e6f85e9d4524fa7fb416068a99802321d81d0a1b63 SHA512 8072398af2fd2150c8cdd5c3c197b3085aa25bf7822f790c449cd911363daedee950ef39ce5e1863b53fd2d9031be9f26d4a1560de2dc897928d0569531d23b2 WHIRLPOOL 05330dae66199b63f1e8ee8e6e71d99664fbeed79699e25cd4abed10986a4bc0beb1cf00fd63d08c3268586c8b41b78b47cc3c66a04fbdb14dd503ba47999524
-MISC metadata.xml 531 SHA256 afef403de543eb24d44ec80c5353f932dffd16c5cd805f311a82089cdb4f4a99 SHA512 d655f5ebf2545fb6c82694557dca9fe5ec780e2766924f72b200523a974d93c3eee2835fffea5b782ac81fdbc9c4344958145e8112f2dc5ee4013a14eeadd09d WHIRLPOOL b07274686279440440ce8ae1146d8592e2d2078adaa814f294742a04975a37d472312e595d0e38ca1e662d4f9385e38527d2a9c4cb29dafbbbae2c8d5a2c908a
+EBUILD poppler-0.20.2.ebuild 2789 SHA256 b3641754f63e8510d7df51a191193223a66d5b21698d3cb491eb96e3d55d3678 SHA512 fc6fd74325590a09a157dbcc59072d9cfab70392492c56f846dc721468c4a6ce1e4187f12e823cbd7337bc62a07da2b1bbe2ac8de930e3ce12c20c90303e16fa WHIRLPOOL d79f03afcf1ed6c065a04f82cc11bd2326fd518c2a71a417cc848c225cda9eed017b0b5133e4a393a3dd77d8a99495361f8aaa196310f51011a9198c33441c25
+MISC ChangeLog 46225 SHA256 ad7e5d96b2887be493fbbc5d4796fd28eff3eb2ad62e0b475bc6b87d5b77b398 SHA512 4bd9f3a0b763761ade5f4fd273674fe86cb13b54ca6c46a1c1156a15475c64fb4ed469b7ef9425775443634723c6f94abb86c5073050f8cf0279286e0818ea65 WHIRLPOOL a2aaf2cbadf124d2c9dcb450b6db5b9be5697ad8a66288426529f1465ed8241792d24c0107712d9cd2f762e1ed18a49ccf23b837eab515f5fd76b53b995e21f0
+MISC metadata.xml 471 SHA256 3aa4080929d6187ab9b4579d3d99bcf483593010be27b04e524e19c3292d86fb SHA512 830f8f21e131c4552b383fd4a3c95c6e6fcfd9c6aae4855e71d2c92fa9a3f461e3bf9d66f775d191ac196af692ca9aec5950c7ca7bc7a69cbcd4f864a2011238 WHIRLPOOL 996874d4891b26298e57b4083c03bb1bcd40734941d9aea268cd3cec0a0cf53e47c1a2975fe4631fe351a0ac4db80f0727e5a87ff7272bfd15f79bfe6988e63f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlABmjUACgkQFuHa/bHpVdv/oACcCRLY01S5a8rFlTtbTtb3+r/F
+JpoAoJxuoJw+eUbW+tvMHBVKyNao8nei
+=QA8B
+-----END PGP SIGNATURE-----
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index f938028802cf..88264d0e62b3 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -8,7 +8,6 @@
 	<name>Maciej Mrozowski</name>
 </maintainer>
 <use>
-	<flag name='exceptions'>Enable exceptions throwing.</flag>
 	<flag name='introspection'>Enable GObject introspection.</flag>
 	<flag name='utils'>Install command-line PDF converters and various utilities.</flag>
 	<flag name='xpdf-headers'></flag>
diff --git a/app-text/poppler/poppler-0.16.7.ebuild b/app-text/poppler/poppler-0.16.7.ebuild
deleted file mode 100644
index f45b1618cf76..000000000000
--- a/app-text/poppler/poppler-0.16.7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.7.ebuild,v 1.10 2012/05/04 03:33:12 jdhore Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-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="cairo cjk curl cxx debug doc exceptions +introspection jpeg
-jpeg2k +lcms png qt4 +utils +xpdf-headers"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		>=x11-libs/gtk+-2.20.1:2[introspection?]
-		introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	lcms? ( =media-libs/lcms-1* )
-	png? ( >=media-libs/libpng-1.4:0 )
-	qt4? (
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!dev-libs/poppler
-	!dev-libs/poppler-glib
-	!dev-libs/poppler-qt3
-	!dev-libs/poppler-qt4
-	!app-text/poppler-utils
-	cjk? ( >=app-text/poppler-data-0.2.1 )
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
-
-src_prepare() {
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::g' CMakeLists.txt || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DWITH_Qt3=OFF
-		-DENABLE_ABIWORD=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
-		$(cmake-utils_use_enable lcms)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with cairo GTK)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use exceptions USE_EXCEPTIONS)
-	)
-
-	cmake-utils_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
-}
-
-pkg_postinst() {
-	ewarn "After upgrading app-text/poppler you may need to reinstall packages"
-	ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
-	ewarn "to run revdep-rebuild"
-}
diff --git a/app-text/poppler/poppler-0.20.1.ebuild b/app-text/poppler/poppler-0.20.2.ebuild
index 2905152b3bd9..7ae05a5139f8 100644
--- a/app-text/poppler/poppler-0.20.1.ebuild
+++ b/app-text/poppler/poppler-0.20.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.20.1.ebuild,v 1.2 2012/06/19 22:00:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.20.2.ebuild,v 1.1 2012/07/14 16:11:44 reavertm Exp $
 
 EAPI="4"
 
@@ -51,7 +51,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}/${P}-lcms-automagic.patch"
+	"${FILESDIR}/${PN}-0.20.1-lcms-automagic.patch"
 )
 
 DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)