[gentoo-commits] proj/qt:master commit in: app-text/poppler/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     d8a2fb3ae68a5a1786b6ebbb561c81ae1da95723
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 07:55:23 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 07:55:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d8a2fb3a

[app-text/poppler] Sync with portage.

Package-Manager: portage-2.1.13.5

---
 app-text/poppler/poppler-9999.ebuild | 50 +++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 285b77b..602e376 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.5.ebuild,v 1.2 2013/07/12 20:34:24 dilfridge Exp $
 
-EAPI=4
+EAPI=5
 
-inherit cmake-utils git-2
+inherit cmake-utils toolchain-funcs git-2
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"
@@ -12,9 +12,8 @@ EGIT_REPO_URI="git://git.freedesktop.org/git/poppler/poppler"
 
 LICENSE="GPL-2"
 KEYWORDS=""
-SLOT="0"
-IUSE="+abiword cairo cjk curl cxx debug doc exceptions +introspection jpeg
-jpeg2k +lcms png qt4 tiff +utils +xpdf-headers"
+SLOT="0/43"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
 
 # No test data provided
 RESTRICT="test"
@@ -23,23 +22,21 @@ COMMON_DEPEND="
 	>=media-libs/fontconfig-2.6.0
 	>=media-libs/freetype-2.3.9
 	sys-libs/zlib
-	abiword? ( dev-libs/libxml2:2 )
 	cairo? (
 		dev-libs/glib:2
 		>=x11-libs/cairo-1.10.0
-		>=x11-libs/gtk+-2.20.1:2[introspection?]
-		introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
 	)
 	curl? ( net-misc/curl )
 	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	lcms? ( =media-libs/lcms-1* )
-	png? ( >=media-libs/libpng-1.4 )
+	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 )
+	tiff? ( media-libs/tiff:0 )
 "
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
@@ -50,35 +47,42 @@ RDEPEND="${COMMON_DEPEND}
 	!dev-libs/poppler-qt3
 	!dev-libs/poppler-qt4
 	!app-text/poppler-utils
-	cjk? ( >=app-text/poppler-data-0.2.1 )
+	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_CPP_TESTS=OFF
-		-DWITH_Qt3=OFF
 		-DENABLE_SPLASH=ON
 		-DENABLE_ZLIB=ON
-		$(cmake-utils_use_enable abiword)
+		-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 lcms)
 		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
 		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with cairo GTK)
 		$(cmake-utils_use_with introspection GObjectIntrospection)
 		$(cmake-utils_use_with jpeg)
 		$(cmake-utils_use_with png)
 		$(cmake-utils_use_with qt4)
 		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use exceptions USE_EXCEPTIONS)
 	)
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
 
 	cmake-utils_src_configure
 }
@@ -92,9 +96,3 @@ src_install() {
 		doins -r "${S}"/glib/reference/html/*
 	fi
 }
-
-pkg_postinst() {
-	ewarn "After upgrading app-text/poppler you may need to reinstall packages"
-	ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
-	ewarn "to run revdep-rebuild"
-}