Masked version bump for testing. Likely still has automagic dep on Qt5.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

3 files changed, 118 insertions, 17 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index ff4d16f1f4b4..578318f7d1d5 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.387 2013/07/12 20:34:24 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.388 2013/08/10 03:01:33 dilfridge Exp $
+
+*poppler-0.24.0 (10 Aug 2013)
+
+  10 Aug 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +poppler-0.24.0.ebuild:
+  Masked version bump for testing. Likely still has automagic dep on Qt5.
 
   12 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   poppler-0.22.2-r2.ebuild, poppler-0.22.5.ebuild:
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 4db5011bab28..cd7ef5fc39c4 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,26 +6,26 @@ 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.5.tar.gz 2239107 SHA256 f742a390f1bf4a682452f59678e61add3a8f2b981024a2f6cabba7916976e818 SHA512 3da8433449ed2c74acaac385a877e214f08265c12172ec02b5f83904ebb11b7fdad4819a525f3ce140a0ed38b783112dedfc31f5e00d093d91471d1b9a0626ed WHIRLPOOL 421e1b4244d827e8122c3a7b91246708a0b0099045859a5aae2fe6ace0fee1b25ebe391f52697a38972f69167593109771c4ad1e23050465cfb9db0d1a6d62dc
+DIST poppler-0.24.0.tar.xz 1503420 SHA256 bdc517ea648a3f8ecbe0745a79fb6cbf9a7e2ef647d6156154449cf50c6d0c21 SHA512 c7c193733a172a7cbd33fef8cd58addb182a6b90f2c291b76d5145a886feb71bb7756a7fa01d7a9871722117ecf24ffe93825618b240d3cb9a7d1ecd046d1abb WHIRLPOOL 20f65fd8c2a46b322af5fc0b2c0ca76e4dfabd79b20fd75e874c57ab37071bc9b8d397f1f260b19f5645dcc19941de74b6aecd3c2120122651abcebfe4934bc9
 EBUILD poppler-0.22.2-r2.ebuild 2871 SHA256 7bb6e9ee11bf8623e43f8e47e253cb2268ec46c2daaf43ddb66aa0ba0f4affd4 SHA512 89aab71f5cd3a53c58abd8d1e22c30d8ac8103849bdc6aa3b35047e9507b6fcfd6414435ace73ca77d9247b8eeeef4cb53f3c75ab3890e928eac3b5c846c4249 WHIRLPOOL 6039aac57bc2bb6f3182be5b9a71c514ede209c933a2f540188c87211ac479f79c7ec5383d4d12487ac0eae8c2036521d091f8109d36878155efb5b3a7269043
 EBUILD poppler-0.22.5.ebuild 2760 SHA256 b187acc6dbe1b4a6f403bb5ab5d9bde1519f2996dce4127f71649df064c29f67 SHA512 89253d7006fdaa6607415575e39b93ff9ce25fce6b472e9046912ce627fa7055ed68b440e5282f5ebf67e10b03a4c1e92c8e7647e9ca467c534fbf6887389015 WHIRLPOOL b8825fde24d5ea9c314f1e56b35a4bf197cb993665db91b321747bd98dcb2520c1ea1138afd1327f259c51d1224a2651994a9f5320a22cf2fcc964b0d4c3c735
-MISC ChangeLog 54451 SHA256 631a926c0550e79de9f01844184d08af5a84152c9ae128abaf49c7aec80cd748 SHA512 e634a59cc328ecd5207b3f290d217b4eddcf859fea810354aee5e71580d563508aca96ec188ab824ea0f2665677385740df6fe83d52d133b70d51cfaeb04f8da WHIRLPOOL d28f84343440a2ae7412028272eff83f31ca7404ca29b516999ca687d4bbf35cdf6272777c6d789318ca5cc2403fa83a1e0872a2101ed316861d31e3f843bfb0
+EBUILD poppler-0.24.0.ebuild 2724 SHA256 5386823ca66ddfd1ecc7dc5471a2f21360f1486e2c5e1fbf54c9584b6e8e2d9a SHA512 0bd0577da323a8af0c6e5225b72958568968b986d769d85795657390acca361048c077f691a1b8b05bc8f4b27ffb6f8b467639923152e33f0fa1f74435409248 WHIRLPOOL fa2b754cfcdf5efaea52fbe7a59c76a3fb26219e77e29dd5cd43440dadb0ab4a63fc9e686a2e29987fc383d1761386d19cba6cb7f932e5c9667c42b9b1fb1dc7
+MISC ChangeLog 54640 SHA256 7fce4a4199327bc5e4baf36f00aa26c1bc6272118af1722aafc296bd90be9fc0 SHA512 2473764c14384addc26ef2b6700178d5fca849e624df016bb1554a88779675925c9526b63b665bdf28f3637cae52d02098d80be2aa6674c526ae3f183082379f WHIRLPOOL 7e346e9824a7f1cc9bdbd512fd3741fcb646d3a4b655f6fb18c11a0d4990a5b2e6f4d75e74da94f675617819ffc181799c7211e93d574e835a341d340cd11ba5
 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR4GjOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcGrYP/1HDJ6m0NYhzl0xnWUAcNt6y
-uHxHFe3sbbg5+75T4GBBuJf5mOiUVVU/s9YyLP983LIHJBCfGHLJom0A/PZGem/+
-m2Q0Ne019vQdR6h2c6l9OkmiVPLNuQcq2/iuXn0UpC9zInkIqKsJLk7hrIV7fIAd
-3e0k/uwVpoIlG692zqJXMcbyFi7ovES9aiRqvm3MpdRfnnW3nRE29kMcXeVIB27E
-93/3gtMi97ppFLHDpNHxkkXK49/9TsjtOyxb1oN3FrCuO4J05/aodgvjqjLjkzUj
-Xik9AM+IyNm0AXtBSbb0BQJ6kgMvLn0kRfYdrUr7q77Z834Ee4GaKFBe6+0KYxWL
-oSJMK+Zk5H37sSo9q7DwEibaeIYkO2XtbwiJmAY8xx6NGUOLnKUgdQ6ZnjY5sv4R
-1JN2aRu3EN22yPDKSqRNXBXqBG65yBTnn+pcfFO0w8h9lOtjJQAO8XnSy14UYd8N
-Nd2iiUKblGmImh5kcKzbvZ9ratFu89GHCS8xX9bEO/h9YBHi9evNvSiDucRl4MoU
-DB1z7MWptn6FMWNvDzrazXsNOwZZZPf4FueQzmYLrpXGVkbzWsACyp7ZHRvzc00d
-PNeBJkvLmfebdQ1OxULERpHl3/gsYqjEbrw3XdmD+3MaAlFzxtkjimrpciLmEeNn
-yd6YwAWJAmsIHyGH/alX
-=Iy3t
+iQIcBAEBCAAGBQJSBa0kAAoJEJS/30SErRQvJ/oP/0VUk+YgXIhYsD7xlF/betvh
+AkDfUmXXTg6drF5XZ28y4tqlKkdtcqhwgL27ErwpawIGQA0pqYlj+Nah4SkpPzt6
+zUaIDAP5tPg5SRBnH3Kw8FdOgWUQ9zefyPh1AD8KrtD7JJueuHv33Q38OqNx9itv
+IczR1LGIuF5d9sII1siYIdHamV52NqMB1QYsMkvQFkIml26sIzY2aB3MtVfl68gy
+23lVVQWwyTozXvkw4OqvOth4B2kAKjDa9glBa2jIgrWFohw9/iY6/4YGlHKNKNUo
+Uyw3/ipIAcUwe2ygNzP17Oz/YCTq3ZWJFp98v2ypkdHSOTxOyeYRR5yZrnO7nGE0
+f1P5sJdIQPnzJYesgTyMXCz+x+FC00ixUrWQhgBDGJ/FHEtgfYW7AW0paISkFglw
+WLaxo9MrehhsmYX+jxNhMy4IHmitAoUZqShO2N7JIjctSJnmJvEY/pJQ1whr0PQM
+AX0kn5TkeI1JbqAjyOEVo/bQyROIS5dtSzZ5iP1VKXl0sZQEU7Gkh79a5d7rj2SS
+JN3KDxlbgcSitygQFELDBw4z000ZjjXMCu4UdWeqbYZPXAFDkxiVwR/tSBz7c4Vj
+ecFoYx99HoGmSCea2jGPl3SQpuUTbrs4KfDJfQg8yHmiBci3IbZqChGssF4qnw2s
+qqvpH3YbhK3GBal7Ddte
+=JpiZ
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/poppler-0.24.0.ebuild b/app-text/poppler/poppler-0.24.0.ebuild
new file mode 100644
index 000000000000..2e9a2cd71af0
--- /dev/null
+++ b/app-text/poppler/poppler-0.24.0.ebuild
@@ -0,0 +1,95 @@
+# 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.24.0.ebuild,v 1.1 2013/08/10 03:01:33 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.xz"
+
+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/43"
+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}
+	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_QT5_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)
+		-DWITH_QT5=OFF				# this probably does not work yet
+		$(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
+}