Handle multilib-aware freetype headers for bug #459404, and add version 0.9.2.

Package-Manager: portage-2.2.0_alpha163_p18/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

4 files changed, 151 insertions, 9 deletions

diff --git a/app-text/podofo/ChangeLog b/app-text/podofo/ChangeLog
index 929c1e9c5e1a..ec8b47b0f8ac 100644
--- a/app-text/podofo/ChangeLog
+++ b/app-text/podofo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/podofo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/podofo/ChangeLog,v 1.32 2012/10/28 02:45:53 zmedico Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/podofo/ChangeLog,v 1.33 2013/02/27 08:45:03 zmedico Exp $
+
+*podofo-0.9.2 (27 Feb 2013)
+
+  27 Feb 2013; Zac Medico <zmedico@gentoo.org> +podofo-0.9.2.ebuild,
+  podofo-0.9.1.ebuild:
+  Handle multilib-aware freetype headers for bug #459404, and add version 0.9.2.
 
   28 Oct 2012; Zac Medico <zmedico@gentoo.org> podofo-0.9.1.ebuild:
   Add missing unistd include in test/unit/TestUtils.cpp for bug #439784.
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index a956125c47cf..f85d28a48885 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST podofo-0.9.1.tar.gz 1080079 SHA256 7b969de0b6c584358f26fc5de23cff0378f46023e678fe058efbb64003ec9745 SHA512 4584aa770fd74eb246048d0350cfe55ffccb58528bf2e861fc6211a12cc8787e7118bb0023fc0977c5f8e483ce89c1c182a12e8b580983069c87e1a0d5b614e6 WHIRLPOOL ed09415f4ab15ec6fd47303b2a4b411426f43eef8fd14186f7ff00b2b78f985965da8421480b0888600ff407cb6d799df1d2bf65c36b858336633fd49a2932cf
-EBUILD podofo-0.9.1.ebuild 3090 SHA256 189119ed75421608e771dbb67bb1996e781aa8f9f666f52e760b184420461f60 SHA512 1c7b53140c3e2098584514422bb122a363955e0ca0690a59ebf5f8815455a8b85c6cbc705087132c8cab61d9a0297158455957b6219b3d17ec03a4315bdfefd7 WHIRLPOOL d1379b0c232bd87aaedd08488ccb3ae24ea2a143bedc6b913ddca7b531268688af24355f5fe299ce8760ff2a02b756e4f78c852635f11bbe85e5eb8290e13a82
-MISC ChangeLog 4441 SHA256 a5cd820a62ea59c8b0c68d081f350d10a1cd4d13897b73efe53c5d471f816f0f SHA512 bb439beb05d6eba0ee8b8fb39fd23056eb2e4358937f2b437afc29a01ba0dec728c5897929375e711da4877830e111a79f19b5b31240bd76035f3a55bbe7c5ba WHIRLPOOL 61f9801ff347db21dfbfcf38e02facedea5df0b0ab508dce5ac182a9dffb4d256a50aae5f7fb483c09585a36c8b6d0c4437b0564bc637a6b7676715bacf27d00
+DIST podofo-0.9.2.tar.gz 1092131 SHA256 465191618c57da9ae9230e7919e1985a242ddc7d1045cfdb6fb066140ed0a3f3 SHA512 e0bda743b192edfd42f381498edc56f30e6d89f45e7abd2b4351e15fd672a432d07f067ab8ed5cf378b0ecbab6d98abb32c22c1ce860c0021e31235fc5683a21 WHIRLPOOL f22c5ec0c3de1ef661198e8c94b2ac9faab88c6b12ebe27da14642c6eaed154f2e1fbf4f404807d7e33f895ffb64663eb7e403ec8a9e0f87b32e3470b7f5acfb
+EBUILD podofo-0.9.1.ebuild 3579 SHA256 fb98efd164430bb50aaa37adbca7fdd3857cecf67de3fe6ad3d2c157bfc1200c SHA512 beb694b30e5970c8cba09418a90affa1e5cbb739855a7eb033f33e5edab3352bdd20c67a9e659983a2c3920f88ab7fcccf45261430f32eced44e0fa4141d9842 WHIRLPOOL c1f3bcac764c8717a55201ebf68ef37b141296c1d95b27781da8e6f71818e37e10d8ae3aece305a7e7726756e449d9fa1871159bf9b5c9eee804c16bb2e566bc
+EBUILD podofo-0.9.2.ebuild 3583 SHA256 410316b0488631904903c1033f0cbeaec8c2592b6b731155b83e521d95fdd60b SHA512 d0e817d7dca8e3796cc8c365dcadb2d9929960665787f2f69bdf942ca3ff2302807b4a73d6f4194c7290bf67ba28e31c7eab078eaf66c32b8c6e954c76b31942 WHIRLPOOL 93b9f3ffde1e68a861c107a62f49550bd62a5d666ecab9fa2dc75da4ae6922c65c9df8c010537000bfcfad25f92e8e6ebd73abd2baebb423264b96a2c8712cad
+MISC ChangeLog 4644 SHA256 49da8895fd19a3dbe5db26af94a1b8fe2eff4eacccbc9d20931d66587665f878 SHA512 bc81d040690e1f8cca012c55f193852de57d13f62f34c2146401d2dc09f63bf946ee39107cec7faaa81b8365d059fdf6cc5089b2e9c04dae9ed43fa4815e007f WHIRLPOOL 36cf1091ab991e6184c7a3fc80a4925338f0390375ec8a4076138c300dd918bf3f81e850c33be7425b3e0c2aaedaf3dc8cd5d73f8b5d81a3710be462ec3acd13
 MISC metadata.xml 260 SHA256 8a81d33d3746a4c328ebc474793bdf7dbb0e8c80abf7950df90e8a9c2f85b2fe SHA512 1a84834d9c229b383c0db3a0e9ef91b4cd98db63e7a062a98f047cd89a2a45b392939bc28fcc26b5da0e86f21e8d19d904fcb06a1ddd5bedf8387f900291fff1 WHIRLPOOL 8611e4e75ee5ba8862c0dc96534b1a2bb09450de2966dc340f2f3cd030a48c28e9d2f727f36e81080b2cda3fdb11403fa058251cd73b022fbf97ae274378ba57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCMnGQACgkQ/ejvha5XGaPRqwCfeKUj6twNgoW1h0UHEL3kE8jQ
-4rUAnimMk18xbZzlDPgHRev6s2KpjvB4
-=/PdB
+iEYEAREIAAYFAlEtx5AACgkQ/ejvha5XGaMKhACg1Ns8rOJQxNSG1xx6WhYm6R1Q
+OlEAn0axqEwByqlVH/5kGcmvA1t1Vovu
+=m/BX
 -----END PGP SIGNATURE-----
diff --git a/app-text/podofo/podofo-0.9.1.ebuild b/app-text/podofo/podofo-0.9.1.ebuild
index d69e35f94706..3aa90b04649c 100644
--- a/app-text/podofo/podofo-0.9.1.ebuild
+++ b/app-text/podofo/podofo-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/podofo/podofo-0.9.1.ebuild,v 1.10 2012/10/28 02:45:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/podofo/podofo-0.9.1.ebuild,v 1.11 2013/02/27 08:45:03 zmedico Exp $
 
 EAPI=2
 inherit cmake-utils flag-o-matic multilib
@@ -23,17 +23,33 @@ RDEPEND="dev-lang/lua
 	media-libs/tiff:0
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	boost? ( dev-util/boost-build )
 	test? ( dev-util/cppunit )"
 
 DOCS="AUTHORS ChangeLog TODO"
 
 src_prepare() {
+	local x sed_args
 
 	sed -i \
 		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
 		CMakeLists.txt || die
 
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $(pkg-config --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
 	# Bug #439784: Add missing unistd include for close() and unlink().
 	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
 		test/unit/TestUtils.cpp || die
diff --git a/app-text/podofo/podofo-0.9.2.ebuild b/app-text/podofo/podofo-0.9.2.ebuild
new file mode 100644
index 000000000000..fa4eff9f0c16
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/podofo/podofo-0.9.2.ebuild,v 1.1 2013/02/27 08:45:03 zmedico Exp $
+
+EAPI=2
+inherit cmake-utils flag-o-matic multilib
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format."
+HOMEPAGE="http://sourceforge.net/projects/podofo/"
+SRC_URI="mirror://sourceforge/podofo/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+boost debug test"
+
+RDEPEND="dev-lang/lua
+	dev-libs/openssl
+	media-libs/fontconfig
+	media-libs/freetype:2
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	media-libs/tiff:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	boost? ( dev-util/boost-build )
+	test? ( dev-util/cppunit )"
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+	local x sed_args
+
+	sed -i \
+		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+		CMakeLists.txt || die
+
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $(pkg-config --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+	# Bug #439784: Add missing unistd include for close() and unlink().
+	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
+		test/unit/TestUtils.cpp || die
+
+	# TODO: fix these test cases
+	# ColorTest.cpp:62:Assertion
+	# Test name: ColorTest::testDefaultConstructor
+	# expected exception not thrown
+	# - Expected: PdfError
+	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# ColorTest.cpp:42:Assertion
+	# Test name: ColorTest::testHexNames
+	# assertion failed
+	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
+	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# Bug #352125: test failure, depending on installed fonts
+	# ##Failure Location unknown## : Error
+	# Test name: FontTest::testFonts
+	# uncaught exception of type PoDoFo::PdfError
+	# - ePdfError_UnsupportedFontFormat
+	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
+		-i test/unit/FontTest.h || die
+
+	# Bug #407015: fix to compile with Lua 5.2
+	if has_version '>=dev-lang/lua-5.2' ; then
+		sed -e 's: lua_open(: luaL_newstate(:' \
+			-e 's: luaL_getn(: lua_rawlen(:' -i \
+			tools/podofocolor/luaconverter.cpp \
+			tools/podofoimpose/planreader_lua.cpp || die
+	fi
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		$(cmake-utils_use_want boost)
+		$(cmake-utils_use_has test CPPUNIT)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}"/test/unit
+	./podofo-test --selftest || die "self test failed"
+}