Version bump, remove old.

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

4 files changed, 14 insertions, 115 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index f4fc87cd8801..d10487374898 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.385 2013/06/13 12:23:24 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.386 2013/06/18 00:28:41 reavertm Exp $
+
+*poppler-0.22.5 (18 Jun 2013)
+
+  18 Jun 2013; Maciej Mrozowski <reavertm@gentoo.org> +poppler-0.22.5.ebuild,
+  -poppler-0.22.3.ebuild, -poppler-0.22.4.ebuild:
+  Version bump, remove old.
 
   13 Jun 2013; Michael Weber <xmw@gentoo.org> poppler-0.22.2-r2.ebuild,
   poppler-0.22.3.ebuild, poppler-0.22.4.ebuild:
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 2e6ea4ef5f07..69935b8b4a5e 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,17 +5,15 @@ AUX poppler-0.22.2-findgio.patch 1234 SHA256 acae65355d372e20c19125aca61baa4dbe8
 AUX poppler-0.22.2-interp.patch 871 SHA256 4eeb1d831049df1d2a1971d4beb7d7e1a4bf3a4dee61d5f7202dfb9c5e1fcfc9 SHA512 a25cd13f2369a90cc3284d4536c2f56badfd6e3fe31d4f54c5b94031b5096a9c2b7d0e50b096a82ba3df298cdb0b84eacb22353ad1f7f35e5d5eb6d5279e0ff8 WHIRLPOOL 3e4c1f2ca63964fadc2e0f43b2dbb6accad291c4ec15cd9c1e6ad1d7e581f2da719e4e6a0d4becb39d9a3f67ce849230a2d365d492361ea527a4a3fd3594d469
 AUX poppler-0.22.2-nojpeg.patch 1159 SHA256 be8eb19d4cda463e9aee48f3c8721e7e18fa5858b5223f83109f3d0ccc4239db SHA512 b41b878d4500b470f530e332cbce3ed9a517ce3fbcb79ca34e8b3f8fd70343012c542d8c4d03ed0a6892c67bb5075b8cfac420461e75dfd94e0a9c67b4d41c8d WHIRLPOOL e3e6e5c9d1fd91c42565147ee23aa6a3947d7157790daf38d1fe601e1378c5272620595a1e6ab80487ac2388116541e5b81a6cd5a1664aa727a19d2012acde33
 DIST poppler-0.22.2.tar.gz 2215737 SHA256 108736ef84069317f6c5beacb5268f3b799ecf401e353e239611772eae8a662d SHA512 ce962f12a87f873a46cf8d02c0620694893a6e1857ac680174c4d9388d2255b5011e62e28b34a6e0abec9c8779530bf91ac123206a619a6eba59be92adb02d42 WHIRLPOOL 80b744f1cf4687a936a1eb9ce40567602935535e8fc1faca010171e433ea4948284b8eba3fca866b6b27034319efa46d54d1e2f71ba14c8e5554ee3b137d935d
-DIST poppler-0.22.3.tar.gz 2220854 SHA256 916a931cbef951366014f13d5f4a574657ccc064ac41051df96dd58e22934431 SHA512 70a1523847a9c1afe39ce9fa85d735d8433fa7e5c8537c739cd8c396e503579b75c1c3e749638397030eb80aa3f175301aa465637bb7289e14ba2cf76e7521a3 WHIRLPOOL 4740c9e70d7dd0c2f837f69c949b39fdb63481ed5eb7552737408ea75b989a1ebf344626b131c605f5eee58910093f2c2ad757d3de9cf824a1333ed9904db058
-DIST poppler-0.22.4.tar.gz 2222528 SHA256 4f438f34e63265e2da8427f3423f940ff41c26088922a9f5d976f795c1dce13b SHA512 ca252d30748f74c734639c934dbe1a10ebaeb0ff7ac299a741c840f356e42d6ff16b44527660548edabbfa4dc316e3412a36c78b54522c5486f2eddbbb437199 WHIRLPOOL 0ea6111583ffc2137c24409c97268586e171d08257fe784fde9db776a9a0c113dd2ca8e5305819551da536e5a701520a75b0c1be05413a5aab170c71d1609629
+DIST poppler-0.22.5.tar.gz 2239107 SHA256 f742a390f1bf4a682452f59678e61add3a8f2b981024a2f6cabba7916976e818 SHA512 3da8433449ed2c74acaac385a877e214f08265c12172ec02b5f83904ebb11b7fdad4819a525f3ce140a0ed38b783112dedfc31f5e00d093d91471d1b9a0626ed WHIRLPOOL 421e1b4244d827e8122c3a7b91246708a0b0099045859a5aae2fe6ace0fee1b25ebe391f52697a38972f69167593109771c4ad1e23050465cfb9db0d1a6d62dc
 EBUILD poppler-0.22.2-r2.ebuild 3155 SHA256 ce94812eb5e8f6ff39db9e217bb27beb9a82944b0c71d08e794e9ff286592670 SHA512 08b90095c97a60fb2b6723b4c2fc6b2c9a9dc43447a6cdb3b7c7f4ca10debd221ba564742b4a78df80d8f888179a09bf0f873ec4df894bff1254c81a0f0aace9 WHIRLPOOL 42531f97573b85e8a6de47a386ba956bf287b2bda257b56f809d5c4f7d7993d7a2a13e79e3fa5d34c01e6b7ec4ef021d5b55d0be10d83d39c36bf7b6a010ac49
-EBUILD poppler-0.22.3.ebuild 3044 SHA256 0d5b6d78a877121de66c6010b769f5da682705bff8a7e6c27b5696b91e18f054 SHA512 8f0751ae47e87d27ac545ebd9ae37baaf8b931ceb21d8d452ba6ff8a692e76df8722606393aa62afc0deedbb50bbd364b028844d613e561ae6e87a1e3946d34f WHIRLPOOL 9d1e50cba6853b271e858d12d4f5739be34316cd04e7f69109115319279563d01f49e5469351b2fe97f41dc650dec5cee15af6f6c264d5c97789c278ab63e347
-EBUILD poppler-0.22.4.ebuild 3044 SHA256 190a70ad7688fa813292768a4e11d4f886259b8010e50a41ff86a7e07a33c3d4 SHA512 15019e43b16465d1bb0e3bce9df5f7476c29293bc373746a5f11e0a5206d15858c28e731ce8c68e3ce33fab4f489a96af67871e2203c81863c0dfea3f0787be6 WHIRLPOOL a62306ef149fd550f59916c2ba9771db0d3dbcacfd9107777dfc4f95fad69094a6f794f83f20fdd976551b4127564545205f0689b04d6e81b103b6b3d7bb9bbd
-MISC ChangeLog 54107 SHA256 f64ddc08b87105c1bd05d4c199ec6ecd323efb4361b28751084f07dbe2f64fd9 SHA512 be09037de3e498bd8d35eced547dffa853bb2d832d8221e01c069d19ce1d819d909b851452670469a2dfc8739ec0ae91130a7142ce9ac8eef5422869365d8559 WHIRLPOOL e2e9808c19bb82f9378db6bd1f722548d59af10f7696c8c4e105aa4a52f3edebef5f0017f9b49c6f27b508179d010c566461f3f7d9486a0f3f1c1f868d4972f1
+EBUILD poppler-0.22.5.ebuild 3049 SHA256 88df746a6d6cc031a19d5d24888de33d95f527764949e9eddee44a2d767e9fd6 SHA512 744cb4fe9399c6473ceb667e7d91260fc9068b4b29241f1b67b6b0ac36ba16505b56c23b6f74b5d70596de543250748690aa2fe1cc1783e78deb2fb5a5a886e0 WHIRLPOOL 16d8d830a3f7aba70fcdc1cf9f8bb6e21a8fe432cb4750e6410da2ba05698fffdae1a025be8804b5b42af2a5bc727c3df546c37a06635c6383b703e76924e213
+MISC ChangeLog 54300 SHA256 f97c89ef9aed732954939062effbd83942ff4a8173bb44ad76cb61a3c1a4bccf SHA512 c6c73e5656933486e0fcb3b69edff2c890f80c695471243e125c47640031a3c990433cdccfcba990b89bab971f5ae441ad61bc4f1a33d29dbe89396f695b6f8e WHIRLPOOL 73495586ac7de361f985fce109dd7b48b627958db4c176dfd5af21bea38f70e16c8803687244528ec4c947cde642eb3ce267efff391585a84da1d6cf60bb7ed8
 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG5ucAACgkQknrdDGLu8JAKsQEAg9BxZScQJNslIVmZwHQlsMLJ
-FuA/hgPm/678PoL9XykA/2+IHMDIHMBmNAgrZpXIU+FjsChkEUqMdPI37U7YjsnN
-=dW6r
+iEYEAREIAAYFAlG/qdMACgkQFuHa/bHpVdu9AQCghu6rCO++wCsD3mCwKTLjnZpi
+N9AAn3AHlkkJKbenVJtcyBeoyHlZpnLQ
+=tqO/
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/poppler-0.22.3.ebuild b/app-text/poppler/poppler-0.22.3.ebuild
deleted file mode 100644
index 3c71587fba96..000000000000
--- a/app-text/poppler/poppler-0.22.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.3.ebuild,v 1.2 2013/06/13 12:23:24 xmw Exp $
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-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 ~amd64-fbsd ~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/36"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
-
-# 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
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-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.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-src_configure() {
-	# this is needed for multilib, see bug 459394
-	local ft_libdir ft_includedir
-	ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
-	ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
-	export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
-	einfo "Detected FreeType at ${FREETYPE_DIR}"
-
-	mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_with tiff)
-	)
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	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/*
-	fi
-}
-
-pkg_postinst() {
-	ewarn "After upgrading app-text/poppler you may need to reinstall packages"
-	ewarn "linking to it. For EAPI=5 subslot-capable packages this may be done"
-	ewarn "automatically. Anyway, 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.22.4.ebuild b/app-text/poppler/poppler-0.22.5.ebuild
index a4cff6e10938..b99b86e39ce4 100644
--- a/app-text/poppler/poppler-0.22.4.ebuild
+++ b/app-text/poppler/poppler-0.22.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.4.ebuild,v 1.2 2013/06/13 12:23:24 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.5.ebuild,v 1.1 2013/06/18 00:28:41 reavertm Exp $
 
 EAPI=5