Version bump

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

3 files changed, 121 insertions, 10 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 062b796b71ee..114ba0969e00 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.389 2013/08/27 16:01:38 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.390 2013/08/27 21:24:37 dilfridge Exp $
+
+*poppler-0.24.1 (27 Aug 2013)
+
+  27 Aug 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +poppler-0.24.1.ebuild:
+  Version bump
 
   27 Aug 2013; Michael Palimaka <kensington@gentoo.org>
   poppler-0.22.2-r2.ebuild, poppler-0.22.5.ebuild, poppler-0.24.0.ebuild:
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 613f9aa21a2d..e5a4a571b506 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,19 +7,29 @@ AUX poppler-0.22.2-nojpeg.patch 1159 SHA256 be8eb19d4cda463e9aee48f3c8721e7e18fa
 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
+DIST poppler-0.24.1.tar.xz 1504620 SHA256 5cefc01aa0184bd92b0b3999922b62cf09599ebb3d95f553c2f3de02738effc6 SHA512 2b1a9c4898eb7a5efdebfc20be84fcc900795132465aca0d57b1fe6cb5d252c0451bee91ba1cd74f03938d17e606f0edee5cda890ca49d75eddcc1c4b1cf0ef2 WHIRLPOOL 507cf63a30c491df19d81ec0c36808dc106cc4553a507cbd5982fb14123abd36aa980b42b089978629022012f8950e0269a10676f97761d019e0bf0dc1245335
 EBUILD poppler-0.22.2-r2.ebuild 2874 SHA256 a029e4fef32b8ba00f23de025a8dc14d404b26439c7e4e27a873110236990542 SHA512 96daf85dc81809e780c793dff2cf71beca0a30144974fa1652a97b072b1fb28e26dcfcd0b2dfd8e2a5f84ef668494cc8e108494b24cca1c1d57a893bc249f4de WHIRLPOOL f4606480c9c1ccc52d82b7e9f61e38956bc21b448211b508d7acb13007ab6b75946b8729c13ed3c2fad38f0fc81ef72142dad2935320732f4620d51033adecf4
 EBUILD poppler-0.22.5.ebuild 2763 SHA256 36c95890ad716af5adf84652e24a973140653a5f909cebf4cc6263ebec16e399 SHA512 3cfd39e48062e75bb6a0bd236dfa5754d099331c188ed0e33074bdb7bd2905d407b754f315ed1cd87a5647c881b3287f37b7dcb2bca30672a48061af15ee0bb3 WHIRLPOOL bfb709f484f278d7cb77abe8a8be572f7549655fec06b08634e9e368c772f359812b99b58827cbc0e7b809435636e63c9480802255d358f7c2dd65109b7f32f7
 EBUILD poppler-0.24.0.ebuild 2727 SHA256 df60ad4ec5d88a11469b85ecb814835f58cc83907f06b2935e5f8a1f0ff9ca00 SHA512 35bacd8a72f9d4106536f854d64f4c4cb5e03600119d96ed76a18f838e8a22d71d4942e314d5f0342e33bd33940a2905d93598eeceeead2d26eaf692a28d0912 WHIRLPOOL b68b8182f5a33fda8c92b19a4edeccea2c48dc0752c3b4a70fc22f1d33ee496b1896387988c90faed5aadfb70af4cad29c6cad4d3e6f261e80bdacb58857fe22
-MISC ChangeLog 54802 SHA256 b276f82a272e82d5c282acabd1d62438046280778f7076e911ced9b23f9ea864 SHA512 d1f937b950408ce9448471fcf01b0ab0cfe919001521e4301b20f1b8b80115ec4a03ff95dbd5ddc574d3a65cc6284516056a148f468c9095cd090cf786c790a6 WHIRLPOOL 0b3e8b497d6bf47b67493c62f7cdae406a1b433248db93d96151b7925799caf5d89db83b0ca16b10086781b6fc06823c5641cf47d09fe5fdc97705d52842fd21
+EBUILD poppler-0.24.1.ebuild 2726 SHA256 3a3ef0635be711673964032e661f8eaf80b2a70d33aabe4977a47080d185237c SHA512 bc255edd77b204e93bb377906a91123d533c99b5065301f268fc2bc88595785ba863609e3b5ff5f95290efbf79b554387f3de365d3977496e91714b4dfdca7b7 WHIRLPOOL 23455a4cd7dab1f3fed71047f28a6a12486e3009cd5d4897e8fc5e231846b2243cda27db53dcf1b61dca50009396ac1172a00e6611b0c8ff1236cc8bee6b9db9
+MISC ChangeLog 54931 SHA256 e9396b1969721d772da63cdb50907d80d6a609b4c7432ec77ffc4ff23a0329a7 SHA512 866a3bee1892d1df9306220cd4e835d39477b90b6aa3797d608e0c662a4551d01956729244f7b27a7fa0690b73c40bfbb0053106daf8457821eb9cae2fe4523f WHIRLPOOL f4447aafe5d4c3240fd1c21d973f73d28c6efeafc2e629d48e801580c34c00080193d7b1404147e285563d7b20e96f1192d16c20df3aa17bbc7ef58400f3e416
 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSHMzSAAoJEMbwO6tnXQ0s7iMH/iihzDPytX7xTGVOYNwGP2ID
-6ZVWF+2Xwtjs/8xGOP/UrpxyRDCk9fm4JVXAeB0AoBUeVIBdB2vp9nn+Bcs8qR3w
-Bm1EBr3AIVrUDUsuUbvor472tw2NE98Lo9BA4BvbAGhcOG2TiwHqpmq+CUCkIjdi
-9L3A5xlt0xlzfdn+ed4HmOtPDQxma28wzuhEL9ZFwT+VUTdNxnU0sS2G8RDc7l5P
-h/izvFCaXFzZtDTmFlPeXRcFrStYbW+xUUHz0I/qIOmpVdKG1eMGv4//7xxhYbLt
-d+i4f85ygczHN1ZCdpZ9KOswefqb00ANzdhWkoMZmx31A8FIoW/BgaKwdQ/fpMQ=
-=J9t9
+iQJ8BAEBCABmBQJSHRmxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcd8wQAL5oiFMvVmz01p3Y5IdSry14
+2cM+wKwH5nmUT7ES0uziTnnDpL6Nkc2vAEPJ2ZGsyxT1o+v0o6gQHvo9jPHSOUHj
+JODdVUHbYPRlWI9h8Md8ZP8XGmxCXgDc2aHe+E9U/D4/oL15u3VcVedYx4cKf3Gx
+X2px7f7sjh8VIX5MKIJj/Ulo0vfLMX+j+BHR4O9BZeX8+Ari08Q9ogpOs/dylpST
+PSNAuCMsH9cmd12+tmPiqXI6iBC+vCp/RUHHqQm6I5zQsVdmYvwh/vLR5tr0cpe9
+pSolNK5JsP+dV8dLujtndr29VVzHZTU0/2IUwtJWeC1AnTCmUktmL6oAB1mXxKHI
+XIexBXITGxtIfX/ipqW4cYG5cWvx+cJXnnvk6kwsWSwacHeKIVQrInwjjeU2DsXE
+xq/PBB9bXdqVeiOn4xBZ1riecbBQrPXYgBQlbaOPGWpuFI6wRQDfkKEnixuSpwrx
+nmrKw8qsg/9Y1oTSFI3CkyjRoQjL3c5q6tW0F/I3vpD9cRUNv9bPRvWDV7CY/nqu
+69Tc6tMgnRL9lnjVKg0gYpJLEqqSxWsoq5F1EgzbaAABk8Ke2HDC/P+Y4ZcupUS4
+1DcnpZhvo5VnV1vfbqRjm/ykrLVI09uuLncZX+2LTfpEfGAvHZgE4WXnmwCarRLg
+WQH0FwuAStFajJGWfEVg
+=3nuG
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/poppler-0.24.1.ebuild b/app-text/poppler/poppler-0.24.1.ebuild
new file mode 100644
index 000000000000..aa19942b79e8
--- /dev/null
+++ b/app-text/poppler/poppler-0.24.1.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.1.ebuild,v 1.1 2013/08/27 21:24:37 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:0 )
+	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
+}