Version bump

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

3 files changed, 129 insertions, 16 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index c1e1758496db..63b5512bbcd9 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.383 2013/04/14 09:23:49 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.384 2013/05/13 20:03:17 dilfridge Exp $
+
+*poppler-0.22.4 (13 May 2013)
+
+  13 May 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +poppler-0.22.4.ebuild:
+  Version bump
 
 *poppler-0.22.3 (14 Apr 2013)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 4353c0e10332..3197721d9e60 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,26 +6,28 @@ AUX poppler-0.22.2-interp.patch 871 SHA256 4eeb1d831049df1d2a1971d4beb7d7e1a4bf3
 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
 EBUILD poppler-0.22.2-r2.ebuild 3153 SHA256 abd4fef5587e3725a96ef47486c22163f1c0f79ac688ae347c3a6eee610d29ba SHA512 35ba625f1f30218e82186568011f7879936d81de4ec95e3a48ca54e2571ac4623c0410ecec2a28fd2342cb212deceffe30568dfea8194440d8a72f61bfc2a3fa WHIRLPOOL 3742fc609570c09dcd7b0f9b87aa7c6d88015b588b7c20783cdc93851383e4ef66ccad21f3c87a914f35d071585bdce125fb8b2ac17166dc6c9f251e435034fb
 EBUILD poppler-0.22.3.ebuild 3048 SHA256 ab78d0ef5ae5524e6d51cb27eede749fb9e9d40766c29d09b446773e1db3988a SHA512 6d03aa33974e3608796f4ee9d057fe5fff87bf68415d6a6219da837dfaa5277f1134507c4f4ad57d050bd4b002a8906d1868da83c3b15a249f1755ebb68df7f1 WHIRLPOOL 638a58aeac6aa6feedc6a611121e80d0dc0de7e83570951db7ee591776e642fadc1f777090d69ca47a33decf7fc335e184720e48cfe0bb109fc17242c7547794
-MISC ChangeLog 53807 SHA256 106f6cbdced1785f4db89eaf77d544e9990b2fafd34dd614dd663bb16095c57e SHA512 2f11b08155b52896bfc92e5cf7927d21a6a50d14497b01775ba307026a1143c6ae890a725f6f3c9d920c8eb4d2f0e3558bec0ddcbcc23267337cf5063bded502 WHIRLPOOL 6d337639f4a5eeba73db99b362e77a3a496e5e375f4621450b71e1e6d353bb61b28d945107ea5b26e6026577cb3fd6ac1588bd6d3acbf1de6c001702e05539b9
+EBUILD poppler-0.22.4.ebuild 3048 SHA256 b7cfe6677f448a491ff0facef4a7e9bb845db04f032a8d199aee5df04c8eccad SHA512 64b8ee9ef34a9f5377cf022cbc2ead118a4bfb2b2a47c78eeae299a0374100426df152b2ba9e1dcdf13bbd191ea8f45b9c8cf1d87fbb4ae1bfe39c9f25da87f1 WHIRLPOOL 287d30db8705c96dbcf1d9a8db78d555f4ae3537822c2cc8494baa32f3d57abffe6e4fb70d289117045e4a7dfebf363f52fe4a751b3a9b37cb66cc497abca8ea
+MISC ChangeLog 53937 SHA256 f7c373e871e832c52459bf17ec9ef4c17c505d07a2e3271e634c201cad3a65b2 SHA512 281a1ce10308717e685a503483aeca23e50fbc8ced8ef4b3f675c6a22e7b916561a175eb1304ff94f5216010004582331f05e9e2bfa89d80e40d09e191504c03 WHIRLPOOL d2d5b30a6d8ccbfbc21bbfb3facaa0519889f689d84f09b272452cf8a148661755888a948ca569f56d8f205e1aae8c9ae5613434aa65fbdb74899ccaaa572302
 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRanXsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRkUdkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcKkAQAOalJIMRG96AzmgyMe3geLLE
-WDHtcRb/zibj/oTLAj2BRU8uGLXsHShGudmAvDvLGWEwFg+zHlP4vLEQi5Kmv+Yy
-TnyDwXE57f1G9Qr/f4g3T4HczkQcikMKzkKCzyk3rFwAEj8q1vZK+DULnYij4Zv6
-db6kConk3zIpouiGuR4P+4HIl40hhTKCbjVQ2f1qHL3vT82eA+25bFcnlibnCShK
-jULH4nDe5IZVf7fZXKORq8jC9GF6hF8xVOa3x4DPlidVkz1F/c3Uvgq3Dh4NHRfe
-rNckSpFnkWYlJ3LjAFN7mQFSgOuuM0Pt7fAx4sqdjFi4xpqh9V7swcqTyXOFdvxg
-Pi2j52KHHdjEIi551Lw1PZme7lEwqKQS82g3wLw9raqufIXASajOuiYiBdn6jlsb
-vCs0EYCF9JnDAInddvg60AqQX5NuA5YyP1U0s8HfyvNAcCN1lLoYW1qWcQR8OKTi
-ZWrK/2qS3hgit+F96Ule6Ab90z9rKqjPOtcJN7gunMxGfCidOktLUeu8H+ZwYga5
-xmUWpcSo5sHS+y1g/rIQcWcD5haUDygr9WuoRMucmvpfYCOFtfTtV+yBv30eeqzi
-IC3LPqsm7xWmq/gnC9bIJix6luqHi24kRX2YeWsTRQTCdJ44p3RsSp9Y35btQZaF
-2KYxKUPBSxX3XGRIRsc8
-=Tfwg
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcwxkQAIEt3bNHJruquvdjpUjmpRnA
+bjZ8OuS5cbp1ExFVlYou8joWAYMOmwQsZe9JLeMbBDTKUJC7TXDiO/OvWiZQm1tY
+CxYCY42N9vDIKcc3F2fkAVLeRvAWiw1tmli1YdpnKF4R5ix62AYP1xx+fFqV39sA
+eouam3LlCI/WmBDyMXwQbDDCgHdE7s0PMOsTr9SYIJKXO+fk5daBySXjLKMkjLGi
++lc/eUOmGvrrF4UXqza6UQIGAv3Cg0B/ya1sCkZ4bpry8KmgahuIcYvsRgjZ3tf2
+rd7+lUUlfbBhC8C22LIyimseIFZlllUQskclpoC8qvRXdg4LMyUEu83DQjLvEOc6
+7mvb0L63ISTPUibzCppMoOktDVyCkUHFUCJU9ARRXVcR3rqh9GqXsrgFLQJZYtkl
+aBxlr54BOFdql3M1ScyBCBFCdJdT/gcg+TeSGjv4bpS/KtWdi4Jvtd2nSyi/z1A1
+FtVQdylkriKjq0fxId3njnQ70o9SVicJ5WTgm6fI5cmeqPLrRpo+uiabCZYeMTYU
+z9u0uEl4u/aHY/EuxXX3HJeX/+YjTCXyz+qrkmzje+QpTuIPBigQyMQdCB9VTAVU
+IiI7qpOg/2C18K8J52AKmUkwxGsnCCI6AsCl/7yR6TXX+SZUCYkqLUQ9D0jIesRY
+5CMVjpcKKFKGmS92Ebzf
+=7WBT
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/poppler-0.22.4.ebuild b/app-text/poppler/poppler-0.22.4.ebuild
new file mode 100644
index 000000000000..09fefa2cb269
--- /dev/null
+++ b/app-text/poppler/poppler-0.22.4.ebuild
@@ -0,0 +1,105 @@
+# 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.1 2013/05/13 20:03:17 dilfridge 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/37"
+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 )
+	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."
+}