Remove workaround on freetype, this is fixed in current stable dev-util/cmake-2.8.12.2, bug #459394.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

5 files changed, 27 insertions, 142 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 0ec2201e4b6c..d9260b3864bb 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.426 2014/06/22 18:57:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.427 2014/07/13 10:39:44 johu Exp $
+
+  13 Jul 2014; Johannes Huber <johu@gentoo.org> -poppler-0.26.1.ebuild,
+  poppler-0.26.2.ebuild, poppler-9999.ebuild:
+  Remove workaround on freetype, this is fixed in current stable dev-
+  util/cmake-2.8.12.2, bug #459394.
 
 *poppler-9999 (22 Jun 2014)
 *poppler-0.26.2 (22 Jun 2014)
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index fad08dfac4b4..bd046a68fdb2 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,30 +3,26 @@ 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.1.tar.xz 1592884 SHA256 c8c959c3f605a17ed21e2cfec2d9379be5e0c801db4edad5e7b2e44a6cef214c SHA512 5012bd4df931d86fd856a961819a7dd15162efa106518eeb8677edd9a21a62cfeff593a24e57181dfaacbd9e91e8bf782f2199d147c5a5398042ee055feab14d WHIRLPOOL 251481b53a180c1856b5860c6520a531547370454e78d0547afd8646c29a0de67bb2d25bf96ce27a0b976ac2539472f5ae7e53a03eb3a0f739f64a86697cb794
 DIST poppler-0.26.2.tar.xz 1592696 SHA256 1dd9963a82eba00b7a8c9f57a7d1d787be22f5e6cb0aead5dfe602775d0d9526 SHA512 1c8aa7a71b7f818a40fa3f886b54c627a600183a3d8b5b6e98439e1d3c7f5a1c7f0f6f8f5d685e9e19c539a2e11c5781de93f9032c88609e5b6eb32ee596ed9a WHIRLPOOL 85429392b904bd8ff7eb002f8858dfddd98fa53019934971e38117a46a1fbd9e7960e389f3e348ea484d1a9407abacc23be284f10481fc5882dda900fa50554e
 EBUILD poppler-0.24.5.ebuild 2700 SHA256 839735037cc6fe4b54843027742f7a97254c838132d9e2dbbf03c0c7447c9431 SHA512 f0e7d3a804ac6569577a120717ca2a3e4331cdcacd345db2c733df95e7e56a2d9d99e09872f1e3ec56236c27fa31e37865ec97e31b325090898f41c2d4648d2e WHIRLPOOL 5fdb4db49ff52a87d53210bd8c525b7270000ab7d72f7811532e34f556ef0f46f4224866ab0eb60e1a0497accbdab3d5ee58c20eb029ff0e255898511c188c2b
-EBUILD poppler-0.26.1.ebuild 2848 SHA256 54efa59cf53993cf270413bc8ccf7cb7f6b3c6c18e278d10987de295ce817ab8 SHA512 699251b47ccff120777ca8e3c17590ff320d92b757d34dadfe601f032f10cfe1625aff43b94194bfdd1053803d3519f8d697407f840d72c98a82d3806d4ccaa4 WHIRLPOOL 740ec9da5ef94e20ff4fbd76baa135ba83c42340bd37b3eb0972cfdb9d4a6f485175754fe6fa629d6810600eb7bce34c8074f04c17000bdbb136e098fbc17155
-EBUILD poppler-0.26.2.ebuild 2997 SHA256 53d6ce69fc78d43cb9830e102b2b911462f5f208c5172787aafe9ee2927168d6 SHA512 547f9b0e1fd83624712f0fa48e11889405dcf66bda6cb92405a010022ae8d32b54e2ed01c8823db5f429c65eea044df6734a36d0037da4368ba0a16a2b5178b3 WHIRLPOOL dda7df6fa18016c6f9ade1f172fbe98fd57eec4335091a72f4cfb6a358a20d151b0e58131cfa21cf20fc6272ac0be73adec0cd6f69095b91a8e371c2709f1964
-EBUILD poppler-9999.ebuild 3061 SHA256 270e0d2e5babdd0a95aa01640e808531fd02adb8988980e859c6fc664dab03ad SHA512 52efc84c5ce12e87d0d11dcf243af940ca824c5f9e6e442622935d04707014750fef4f89cf0fc41fa09309bc4c7ec1aeed8f0b0bc5f319d692924f6a99bf8878 WHIRLPOOL defcc627de93c5f07e7cc4516e72e47234f86d67c6a576ef75b8667e7f600353614f241cd9cdd52b6fb03d62c0f4f9118bec8b30ab42f111fb082cd73b20d2c8
-MISC ChangeLog 59229 SHA256 3982c700d70fc6014a148180f42c700e0feb9b00591a5842efb88de29f7b9096 SHA512 4c3a0795d16d097bc11c04e28719265312526367f5e4d15bfe147f5432de0f4161b5f2a589235303063505fcb5da43ed772e0b6d8c32f554edbf716f09f96d3a WHIRLPOOL 86b27ef6eea71965e00687948d47ff443b233e54121bdd444731eba01da8fdb0ee97cc1db6e383d536e611c7a3a761d7675cc970051180e1d5af882df4e4d98d
+EBUILD poppler-0.26.2.ebuild 2675 SHA256 feaf850a4fe79c0e2206803ce92f16ba638a3ca1dd667d283528c8d89c812d71 SHA512 1073ebf1cc25a74cfa76e7b6b3261be3653fdd648e5bd34fff0fb917357751ee1e51e73a9798a6d090c0a5b19c36a384bb9deb2df5ea279a3e8660236139d7b8 WHIRLPOOL efcd3b1943d5a0851d80b844d00f944759403736de1a202becf2b70f2f5194b836fcb8e162b22763ed4452f009e94639cde7b5e34a6e0cd05809ea2fc95656de
+EBUILD poppler-9999.ebuild 2739 SHA256 03678545160fb5fd4183b5b7f36433faf85819d92796c3573992f30137273ab3 SHA512 00a560fb290fce399d4be0df9afef2d59b6dbdbb4fb13156760cfa205b5bf9a67ec93ee3f373d9bc5dbc4fdd7af8c455d9ca551bbd40cd9227472b499f2ce5ff WHIRLPOOL 341c5b2bd74c18793b011efbc4a708681c9f12013ae2f75aff35bdcff1dd13e7caac7d3c2b56bfc9f36af1303f8071d6b1421db94a31e60ebcb050518955b5dc
+MISC ChangeLog 59449 SHA256 891350e2f316daddcfb45dc803e7f2b36d85202c23d6a8c98515105b790543cb SHA512 686a8276739be62b9aa30576412e1423ceba37ec1332666349adba52833a20ca7607df6deb052818e2285b66bbe1783a8f529abeb464cd3a7ed2290344cb5bb3 WHIRLPOOL 0af7f7eea9708f10dbe988cb771b47fba30170aa4e7b41de7b258cfb9d2c57de65828e35856acf928cb5d6fcdeb4d694032daae41c62c60297ba12dff4007d2d
 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTpyc1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcPfkP/0U5nzVYeS23z1iMgQ5zSvqx
-fH5Ma2X/75fxQ6VhQgDr2lD/L7ty3wMfR0k4ZIhfoGUTzDbooY7RWmkCMgn8Gjwx
-f9X4DXZVZP8JqV1tWDsPPXUKluHE87L/jtKqErFmJfmSg3GHNswMIzZyoPHB9caO
-SXTVX7iJxBf5QHFC1AhOTNO7pR00MkQZ+cS73GKOHL/y0/31ui8rf2+SNCeMZvfL
-tkl93SHSP4nq13QCV+1Et38P77/1Xvg2HSdg8pkVDcZiQ1D3+Z6EIi2A0eVP87DT
-mXCaknISgjssCQtLcKwzTNWxFYECBt/fPX4mYY9XDjSsJ5tHl4xgFkdICFF1q8KO
-ZpDbsHdVJYgC1TAtVDZp0EIB9mCGlGyv+FMunWezcoDvz4GWG3a47dGE2jhgrtNR
-O+Xkoo5NC3c4rqkrkfuB+I6FW9le/XtMIHtjqxS1Vg9rVIvMJgbbto3UydBc2f7Y
-PSe/GB+iEWpsXMYU6KPLfs1JqutTaOShtWCyNQtodktOQ9Ho0+8Fc8okUy6M2bwV
-HlYu7EqyfG04qYPtWunYlTw5uVUTB6vNqQUpVrj3O+jEdIsKGjkdDXSsDlLqpcOE
-6AdwxHgVtoev+7pUM6gRJCaJehmsv6F0kQdHwNNFIGstImfRN86v3YHrl4MtlzAy
-tE69M5jexM2sy6qV5P/X
-=3U3a
+iQIcBAEBCAAGBQJTwmH0AAoJEGVpnaTzz9K9uRwP/1VhPrj2gfy5M0xCKm1HWCFp
+uB6IKsmOCTjG7nyu0NIzODl2fibpdu9bXW71r0kEF14XU18J6uXhApwQeMoe5dSs
+MWdEgHVkmz55eQsLJLSiB66pnSIlrc5MgEjAK0NdbccLu+ueLY2T3yX0zA4EDFO8
+AnLi4fVhpy+HU6faJ/W1XqiRC71expNQXUUx+TOZNGwZHYcvKXzKQsR5fBKmmgLv
+8XxTO9H9rwDCdgmiaD5m/M9U3+ZAvq8dzO9lHFIpeSblKywsjsw2/MhrrqcVNoz2
+3ki8b7Iz5Ivo+Dnm2kMHw9hNhsrgrcrc2AgVSUFyGq2ZLmqJGeUCDLAFTApieHSB
+O1yWp4tgaXnQDsjCI2ML95a0wPMvpOzNup/1824pH7UWIKF49SYkVPkKIJfLAbh4
+mZmgoYgB+x2B2X4N25bXo6eXuaSSx3rnlLlq+yqBnj6qb+N5Iwi1hwKwmJRvTEvN
+aYLU7amIZVEF9j0AU1ewvXlKT9IlPXtdWfHKdGgVygRH9hRFfZKAaKrDji/RM8OM
+CH3qKH2wPIMm7bhNXTtShUGsnjKwSGw9myueAlw+UaIgLu77PhDP8P6409P8yXxj
+7yaex9G+YjX3NhCCLcmYkJ4iiqTYOTqIm48UUlOir0MxRZWqljrYLTaOiyY4c83D
+I20wuk6RsQVN8pRQy2Eg
+=IZ8+
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/poppler-0.26.1.ebuild b/app-text/poppler/poppler-0.26.1.ebuild
deleted file mode 100644
index becb8eeaf85c..000000000000
--- a/app-text/poppler/poppler-0.26.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.1.ebuild,v 1.1 2014/05/23 22:49:52 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/46"
-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() {
-	# 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)
-		$(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
-}
diff --git a/app-text/poppler/poppler-0.26.2.ebuild b/app-text/poppler/poppler-0.26.2.ebuild
index f2e6056bf8f0..681080b41f13 100644
--- a/app-text/poppler/poppler-0.26.2.ebuild
+++ b/app-text/poppler/poppler-0.26.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2014/06/22 18:57:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.26.2.ebuild,v 1.2 2014/07/13 10:39:44 johu Exp $
 
 EAPI=5
 
@@ -63,14 +63,7 @@ DOCS=(AUTHORS NEWS README README-XPDF TODO)
 PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
 
 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=(
+	local mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF
 		-DBUILD_QT4_TESTS=OFF
 		-DBUILD_QT5_TESTS=OFF
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 4fb7d83fcb47..3e0770aafde7 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.1 2014/06/22 18:57:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.2 2014/07/13 10:39:44 johu Exp $
 
 EAPI=5
 
@@ -63,14 +63,7 @@ DOCS=(AUTHORS NEWS README README-XPDF TODO)
 PATCHES=( "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" )
 
 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=(
+	local mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF
 		-DBUILD_QT4_TESTS=OFF
 		-DBUILD_QT5_TESTS=OFF