Version bump.

Package-Manager: portage-2.2.16/cvs/Linux x86_64

3 files changed, 115 insertions, 2 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index d6624d90eb69..f98b2d9c018a 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.441 2015/01/06 19:54:02 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.442 2015/02/09 16:28:50 mrueg Exp $
+
+*poppler-0.31.0 (09 Feb 2015)
+
+  09 Feb 2015; Manuel Rüger <mrueg@gentoo.org> +poppler-0.31.0.ebuild:
+  Version bump.
 
 *poppler-0.30.0 (06 Jan 2015)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9c2976cdce58..b5b29d185892 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,11 +6,13 @@ DIST poppler-0.26.5.tar.xz 1595232 SHA256 de7de5fa337431e5d1f372e8577b3707322f1d
 DIST poppler-0.28.1.tar.xz 1600332 SHA256 2ccf6e234209aa5082ba99d3547e6798cd8758e7a921c72c00aedf0d5793fd06 SHA512 11fb99c34eb1b00af1c67e5607cd6dae9fcf98fb6b11d90e1074e7364b3cce7f8be06a7cfab99158a6b115841963b0c05381f668d117c871fe30b16627989222 WHIRLPOOL f9dbd055039cc54a08f6887157ad7b315d55bf02c68c2ae30dbbbea2baa1b6d09ad0da82befbc4272ff56586a7bacee2eb1003c1e75968f79f472b45a8a1a24c
 DIST poppler-0.29.0.tar.xz 1600980 SHA256 3c1e16dc8d5d846d085baf65844ed3e05cbde5d44f6682f9f1e2b120d66c62c4 SHA512 67849fb888e2bda71599f525634c9c334734296a98d1c381a68d0cc196a2d4bbc260c45ce5117dc0a3a662b869752418d1139d007280deef586983e4c3b80452 WHIRLPOOL f0ef40456680cb3160563bf1e38c1d50a838ec7bfc4c3bab43706b22f7bd247f0936206f7ab86437ba1e6b77db4e4cb4fe1d987506d08cc5eb891a87d650194c
 DIST poppler-0.30.0.tar.xz 1605292 SHA256 b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5 SHA512 a6632e68a60b1ce898fe8c64ced575a6e5133557d1df0ce2c41b5e49c8923b36bfeb32937831810af9a3c8346444113313206826dcc769481d766a1b686def10 WHIRLPOOL cfdd48ecf09017ed1e520e3d8acc009b36d89a06cf2591c20d8dd3f57788885fdf74372e72a9f0174a7fad59572a2f60c15aec5caba9e5bcd08e6e92f9e9aff4
+DIST poppler-0.31.0.tar.xz 1607300 SHA256 943290270dca390d8f14467d54b06a25d9d6f70dc5853b0a9b89c62f74570694 SHA512 188093ed14b33a007f1934bcc36594cedd2a4c320ec94564deded3c9a904f09650517e66c34103f3f0068a1b59e3838e9a2596ab37647ffa78aa20dd526af9f2 WHIRLPOOL cdeee49f8052f2268b13b04254549569b74f1c971632ebda6a8a1003238dacc063a0c5cc9eee37da146c473a0b8cffbdc745e25e42c2c1a1662e0e0496f329aa
 EBUILD poppler-0.24.5.ebuild 2700 SHA256 839735037cc6fe4b54843027742f7a97254c838132d9e2dbbf03c0c7447c9431 SHA512 f0e7d3a804ac6569577a120717ca2a3e4331cdcacd345db2c733df95e7e56a2d9d99e09872f1e3ec56236c27fa31e37865ec97e31b325090898f41c2d4648d2e WHIRLPOOL 5fdb4db49ff52a87d53210bd8c525b7270000ab7d72f7811532e34f556ef0f46f4224866ab0eb60e1a0497accbdab3d5ee58c20eb029ff0e255898511c188c2b
 EBUILD poppler-0.26.5.ebuild 2669 SHA256 e8523d7550acc0e018261eead1173245b683364972445151b421ebed1e170eb9 SHA512 694a7be564f1ccd37d6f401b65629949985f09d9ddde1bf3405a4cfec3f617fec929c80a30423458d1fbd373207a61673913619d827929f9f74ddc0610e36631 WHIRLPOOL f49bac29033c46ef99084021aaa09368cccf7b581a51bb882c7bda17a69197be9cd8a6f7e8cc8515239bfdf6b9cb30d848448fa9be101daf20b9a2b4fdb30a18
 EBUILD poppler-0.28.1.ebuild 2838 SHA256 e40bc3924bb38aaaa0ba1c79ec5e470f7b13ae1d0449a1e6cc8b3e1afe813fe7 SHA512 c0604f342ba2f9fb31c81a4987b0013ec486539a76469d19cb17caa53f0053d31be1461c3f5cb3fda57e2065ad692b68796246ac1e2aedf54f6dccba68bf4199 WHIRLPOOL 48cd246c4b7fe2f6059b438600f67a455a7b3059f8a11162e06969d9d6422a18ea39d7f90b5457c1f36d455f36515d6ab1cce4fa188f7070b4efb171cb05a768
 EBUILD poppler-0.29.0.ebuild 2854 SHA256 a93e252185bb9639c0e45d83763630386e90ff4e2456040fbf89f389396f9888 SHA512 e0c3614e369fff2621f575639789a00fb2a8da4f4c46b527bf3d678a53b1d51e0233421ac4e439ff7d09ac636d90db5db62e4feaf75a7dce62dd5564ef03ff2f WHIRLPOOL 835da8ba678529adb8a6a55b5f6b5c0690e2c1e691f16a55cec763278ba69e0bc01577813c9c5e87e2f374caec86e084f3b3e53bf012dcf6282aae8f3c8d1b0b
 EBUILD poppler-0.30.0.ebuild 2853 SHA256 4d4c060061ca7077449fdd374b3abeafc12de24cf9a7915d8c455c377b2437f2 SHA512 e5bd5fcaea1d0ddab90c2db885917a54dba95f5ed86351fcf6fb45fff2e68143dc80d7f745b0805597ce170aeff80bb60c90b4b9bcce064147a3df04cdf3fb25 WHIRLPOOL 9f8f9c78926e687cabf16ec0a8b118f822e967778e9116029853060e5200c8f13579c5ed4e86c82430975a70220cdfc4d5f83bbbb3fde4562ea591cf229d5a42
+EBUILD poppler-0.31.0.ebuild 2853 SHA256 03301aef829e3b0fca17980d9166be9c917c4a15b18c0923b00601ea431cf0d9 SHA512 11f214cbfa10a02d0f9c58fbb2ff95763800c5c0a53197af39c7a2ef85ce61ab4a91c5f3fda7b2f626f5dc28e0e32ecd3ac0abbef43a567887f0ff50d82dbe19 WHIRLPOOL 9b1bba0bc80527d419fba56d67686f60bc4a5855496ca1e11d7cb153d76a681698d83025e9005020ee41d170df3cdb05e85d1a426b99227f4600222e502eba53
 EBUILD poppler-9999.ebuild 2871 SHA256 ddc1abf5394eaf85b577ba2d0765385f931fb953b58ab2bed3bb8d8fa08ef497 SHA512 313da9063539193f0a65d1619442fccfa29670be42284c5aa3e50b3c54638aeade1e1467906f37d5e938ca4e387a3abfca70a7d2d20de4863f647c0e57d7cd62 WHIRLPOOL ed3b61d71b00fc86118476bcd22be3217d983585d39c864fe60d077326fd52e4dfd7a6570bcc407e2d2bd4f3ec7dbfeccfa9997f48f8aeffc1085d2a264c3372
-MISC ChangeLog 61293 SHA256 07f3ba5820036d611ac09496dad6c48488cde7a6aaef66806065836b5ac03d86 SHA512 c9686a3ed502caf7a2f9abb029c238d2fecbdf11476ed3d7830fcb13a999ff882e4de87f3c20a7f43a419b91e9e6fcc7674dd28e3a58c04764a72e5b7c150cae WHIRLPOOL 91137f3c625989c15d7ebe3be2221648e63aac5ca92ad8313a2d41ffda39403dc32b623e006820a592e1b2c2f6e96b204e89d282657b0f2290accfcc30a46023
+MISC ChangeLog 61413 SHA256 7a841e481350b6c28c2bda4ebfd14b94d21a927d8307dd50ea296348ee7c0405 SHA512 6d6ef07e729b62cabfb8a96512052625f00048a62911acee60e44a5821de63b69f3825889158ea62bf5c939863438d024a9925325fbc3584057c94088d69d899 WHIRLPOOL ab7ef2986c8c2e00ebd50e949333262bdaf973962b77ea3e4192631ff4a6d73c569cf0102d0e3c291cc99bd871af8feddfe6cd222dd71f933bd2a94cb52243c4
 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
diff --git a/app-text/poppler/poppler-0.31.0.ebuild b/app-text/poppler/poppler-0.31.0.ebuild
new file mode 100644
index 000000000000..5c505d9be3a0
--- /dev/null
+++ b/app-text/poppler/poppler-0.31.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.31.0.ebuild,v 1.1 2015/02/09 16:28:50 mrueg Exp $
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	KEYWORDS=""
+	SLOT="0/9999"
+else
+	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
+	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/50"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 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
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	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)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" )
+
+src_configure() {
+	local 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)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(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
+}