media-gfx/xpaint: version bump to 2.9.10.3

3 files changed, 112 insertions, 0 deletions

diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index 452330505bd8..a3ac931c1e41 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -1 +1,2 @@
 DIST xpaint-2.9.10.2.tar.bz2 1245813 SHA256 7f1554c8390bc68da2bcc0449407b8cc69616ce5d2170f97d1b30aee9fcbdcf6 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499 WHIRLPOOL 5ffe99ba979590c1ad675f7cbd57e4dba92aa7c24a9600784224c913069cad1fa88a676180d60fc2cc60c6f7185056385ccb59f2725c9799781335ed38d8934a
+DIST xpaint-2.9.10.3.tar.bz2 1283725 SHA256 9de0cb99557ea8329391b5d45ad59be080972924258aeb1b3c0c748bab9586c7 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5 WHIRLPOOL 4d0ec766168fe329cba88506ff98f560f8fc4067245d1062ae9649db5bc3f380181e98eae0b443deb13f4f3de38c8239cc1d608499f61941cc18c18c70849d61
diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch
new file mode 100644
index 000000000000..a5a26214409e
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch
@@ -0,0 +1,25 @@
+From 69a76e5f4a72d83635cd413b7460df4776b2605f Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Sun, 16 Aug 2015 16:51:26 +0200
+Subject: [PATCH] Fix build with clang
+
+---
+ rw/readWriteTGA.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rw/readWriteTGA.c b/rw/readWriteTGA.c
+index 306a751..9046ee3 100644
+--- a/rw/readWriteTGA.c
++++ b/rw/readWriteTGA.c
+@@ -607,7 +607,7 @@ int WriteTGA(char *file_name, Image * image)
+ 	int tga_defdir = 1;
+         int transparency = -1;
+ 
+-        if (!image) return;
++        if (!image) return -1;
+         w = image->width;
+         h = image->height;
+         bpp = image->scale;
+-- 
+2.5.0
+
diff --git a/media-gfx/xpaint/xpaint-2.9.10.3.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild
new file mode 100644
index 000000000000..06434b75af9d
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-2.9.10.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Image editor with tiff, jpeg and png support"
+HOMEPAGE="http://sf-xpaint.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="jpeg2k pgf tiff"
+
+RDEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:0
+	x11-libs/libICE
+	x11-libs/libX11
+	>=x11-libs/libXaw3dXft-1.6.2c
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	sys-libs/zlib
+	virtual/jpeg:62
+	jpeg2k? ( media-libs/openjpeg:0 )
+	pgf? ( media-libs/libpgf )
+	tiff? (
+		media-libs/jbigkit:0
+		media-libs/tiff:0
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \
+		"${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch \
+		"${FILESDIR}"/${PN}-2.9.10.3-Fix-build-with-clang.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tiff) \
+		$(use_enable jpeg2k libopenjpeg)
+}
+
+src_compile() {
+	# clean up
+	emake clean
+	emake -C util clean
+
+	# parallel make still fails sometimes
+	emake substads
+	emake xpaint.1
+
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		-C util
+}
+
+src_install() {
+	default
+	emake \
+		WITH_PGF="$(usex pgf "yes" "no")" \
+		DESTDIR="${ED}" \
+		-C util install
+}
+
+pkg_postinst() {
+	elog "optional dependencies:"
+	elog "  app-text/gv (external viewer for PostScript output)"
+	elog "  media-gfx/imagemagick (external viewer for pixel graphics)"
+	elog "  net-print/cups (printing)"
+}