Version bump.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64

3 files changed, 112 insertions, 22 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 8596df928880..3fe874591187 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.430 2014/09/12 19:24:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.431 2014/10/05 23:50:56 mrueg Exp $
+
+*poppler-0.26.5 (05 Oct 2014)
+
+  05 Oct 2014; Manuel Rüger <mrueg@gentoo.org> +poppler-0.26.5.ebuild:
+  Version bump.
 
   12 Sep 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   -poppler-0.26.2.ebuild, -poppler-0.26.3.ebuild:
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 7545802ee59e..8b8e3ce5bed0 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,28 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX poppler-0.26.0-qt5-dependencies.patch 1112 SHA256 f32f81e4fa0b39799acc5f4c3b36ffdf9d1674b8da902e14b1ff7e5ea01eec56 SHA512 94353b0c94b9385496074888e04e11e2349a9e1c60131c661bfb4c7df3df3c5c2494761b94b2bd47f8fe69c17aab4ea3c3d0812df6491554085001148d70477b WHIRLPOOL ef6e1b94a0d5f1085723ae3c80684772b4a30ae0628fe69548bb61468df14c17ae16e4a562f4edbd0dd41f28453657e3b17213ee97ba3907e396745b0738fa55
 DIST poppler-0.24.5.tar.xz 1512476 SHA256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84 SHA512 dfb40f7d864614f4ad7e8729334931c4b40c48c0dc3d7a8c33b14134cf13c61f8a562cc790a08bee4a43c2c29e587a9d26330437858d465e18ceafd69521250c WHIRLPOOL 066924beb46e58c2906a3b278e617438bd966e2b7bd884e110949f0d149d2cca0bf6326f2fa8c99e3a2c0f2d3cb3f145c8eeee4f060d17e3dded501ef8ec7f33
 DIST poppler-0.26.4.tar.xz 1595096 SHA256 7ede502a5ad6651d2ca56f3846ddee1ae66d0b1ab9bd302fb8b39a366d195c65 SHA512 20fe38af0b27d9d71f1d97f0ddfd929c8c8ad7569bf3beb76b4e4767540042da83b8a038c5a1e863199c571837dc9e798dfdbcaf42c78749ea1c993731d213ec WHIRLPOOL 8c1a27132656a4b82b23f79662b0aeb5c93c604f0d810f614b14e672da679dd71f2d165154035e1c2d28383c37620b6bbe5d952017290137ee978da07a9560b3
+DIST poppler-0.26.5.tar.xz 1595232 SHA256 de7de5fa337431e5d1f372e8577b3707322f1dbc1dc28a70f2927476f134d1ee SHA512 c374865809ed0c0ba43b4218f1e2185d1692a74a16aef722b2c6388bed7fbd8eef6e809f10fa061b90e8e35f28be2a5858d7dd6bf9d1c0c6e3c23ed8026688cc WHIRLPOOL 1e11d34d3a5f9a41f81609c65a3bbeb0e81b789d4d8b08ec9781e389284cf333ac959b6e510a490c98e28eb280fae2cf4362198456113a0a324efe2ce58226ff
 EBUILD poppler-0.24.5.ebuild 2700 SHA256 839735037cc6fe4b54843027742f7a97254c838132d9e2dbbf03c0c7447c9431 SHA512 f0e7d3a804ac6569577a120717ca2a3e4331cdcacd345db2c733df95e7e56a2d9d99e09872f1e3ec56236c27fa31e37865ec97e31b325090898f41c2d4648d2e WHIRLPOOL 5fdb4db49ff52a87d53210bd8c525b7270000ab7d72f7811532e34f556ef0f46f4224866ab0eb60e1a0497accbdab3d5ee58c20eb029ff0e255898511c188c2b
 EBUILD poppler-0.26.4.ebuild 2676 SHA256 3a02872a91e7e562e82b8071ffe0ef7e7fb0f29d3f3c6fb81801696784ee11b0 SHA512 66468986dfe73dd04ede86c94ab1bae9c93c5cba561e5d8aedfd97becc3f9d85fa1bed1d72c2c537c453a4b46d1ca32703871ebc0c5314a8ddafad942a346b7c WHIRLPOOL dd1dcffeec93041918451f6b508424efd0e9fb5422462945e0c0301a834e9cd83b1d0203fdb2f114a2580e8edcb979252cc84a5df9319e478e560740a440ad70
+EBUILD poppler-0.26.5.ebuild 2676 SHA256 615bce3e58dc6a86cedbc482ac0e52a860846f37f7577757df950d647446ff17 SHA512 4613fc7e96a776900ca8c6cbfe2766a1eb4a7c477a47bcba2d6fd5307196111b91cbbb6ecad735edaeef169a095db53435568522d01c61ff5cb6f14fd2a08dda WHIRLPOOL 3f396beb088d620b7fab1a2e0a73633d4c610f80deea2a9b458b64ebea99a44670ad667c4dbe89dd83b1d77ae36a72b388799a2c9502575013b33db45d2a8bce
 EBUILD poppler-9999.ebuild 2739 SHA256 03678545160fb5fd4183b5b7f36433faf85819d92796c3573992f30137273ab3 SHA512 00a560fb290fce399d4be0df9afef2d59b6dbdbb4fb13156760cfa205b5bf9a67ec93ee3f373d9bc5dbc4fdd7af8c455d9ca551bbd40cd9227472b499f2ce5ff WHIRLPOOL 341c5b2bd74c18793b011efbc4a708681c9f12013ae2f75aff35bdcff1dd13e7caac7d3c2b56bfc9f36af1303f8071d6b1421db94a31e60ebcb050518955b5dc
-MISC ChangeLog 59815 SHA256 a5ab76d822bb8e3dd2f7e497c4914de9b3c969fb644afaef681da1476d87a011 SHA512 070fa89d8a7e6ba86b6368f26a8d66b3fb5eefeca331b925776fecc5f0d074d3f7b584f7ed0eb3f47c136f52164b21ae2ebc7816939537b44c616098098140c0 WHIRLPOOL 4254596d976206abbe106d899ecb0a6dd1fc1d4cc17531486e46c063714169ce4aa8d3a304014ff5a0260367ee30df4a3dcfbce59dab3a96aedfcbb0c4df9160
+MISC ChangeLog 59931 SHA256 c9847cb374e29308550dfe935e27bb25b3c0899433523a01c9097981e601f4f2 SHA512 5e785dc014402b7cd9746593d30b8f42d3915d092114d27ae73604a45f2d50038d8c0c91124f220b662b4a0ed51f0663a0eeb4c60a843ec108ddbaf664e64174 WHIRLPOOL 869b11f535c50d46c71f1c977734f0e9b13e80efb9546e2c2ccaa629c6bc423fb6012d8142a03ce4e76d66bf798a961bb806b7671996d755b79d50c046c59e3b
 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUE0hcAAoJEJS/30SErRQvToQP/3+q/oq6P0P4r7Ar0YCIcOzE
-Irmm00tG8XWu0kENiNziEVZtE4+m7MdxpPZ6IsbdtSrUsmlkqkhyacHE4MphMzpa
-F3UsK1bSykv4Oqm20JnHw2BfORqMn6YLobquqfw8RxHuyZCDP+jd7XS0Gq4+v0J4
-yXFLc3bhz/GK7KycaG5terB5+khjJIJq4MUdi4ue+xPxXFi8npEdZbvz1A2mwuzG
-HDZNdqOroCLly54dmK91NrRUdf0N3lYuCkti47mITWsYcM7jAZaE88Ue9Srok/qN
-XaTSHqFB9JbS1r5sK7C4ZED9f6ywQ8cSGQjFh4X2g1M7alUOhC1mhOAZ2lNQ6QqA
-j7ev4jC7/CRqLCDhHsfY+1/31SQRpaIAbG03yUnbLFKB7mMyjWNu862YpkyitE55
-qCzIqDjcPEhWxd22NbmMmRdN6YFilPOmbuADOwbt9W8zIIB81tgK9GUNYNceYkFs
-J/T5lGdvAFVIiq7P2YpnRYOZfiXKbaftqjIsTBF43I6PyU1D93rtqBm7bmIknzH3
-B5EWK6am13uUVYHZjnkuYeA4S1zUnUYK8zy+f5R570xiIH6D/36e/CPNDY3JZg1m
-cMvwskCJoJbfF0blt8CQowTu6/W8ZytilNvSoNJrXLgMMp/xYz+iC1nDUtf8NTPa
-tx7V6ohZfSSaXN779ku8
-=Jn6F
------END PGP SIGNATURE-----
diff --git a/app-text/poppler/poppler-0.26.5.ebuild b/app-text/poppler/poppler-0.26.5.ebuild
new file mode 100644
index 000000000000..b0a70bdaf0d7
--- /dev/null
+++ b/app-text/poppler/poppler-0.26.5.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.5.ebuild,v 1.1 2014/10/05 23:50:56 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/46"
+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" )
+
+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
+}