version bump

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

4 files changed, 175 insertions, 15 deletions

diff --git a/media-gfx/xpaint/ChangeLog b/media-gfx/xpaint/ChangeLog
index 9f88180ad0f0..c33a6bc1dc1c 100644
--- a/media-gfx/xpaint/ChangeLog
+++ b/media-gfx/xpaint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xpaint
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/ChangeLog,v 1.21 2014/03/04 03:10:04 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/ChangeLog,v 1.22 2014/04/22 13:09:39 hasufell Exp $
+
+*xpaint-2.9.10.2 (22 Apr 2014)
+
+  22 Apr 2014; Julian Ospald <hasufell@gentoo.org> +xpaint-2.9.10.2.ebuild,
+  +files/xpaint-2.9.10.2-QA2.patch:
+  version bump
 
 *xpaint-2.9.10 (04 Mar 2014)
 
diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest
index f8ae967ee4e1..7c8609bbd873 100644
--- a/media-gfx/xpaint/Manifest
+++ b/media-gfx/xpaint/Manifest
@@ -2,31 +2,36 @@
 Hash: SHA256
 
 AUX xpaint-2.9.10-version.patch 503 SHA256 56afc8dad77e0bdb8d3702b82368ef3b8e919ec9b4b7f64d657b8b0ec53dfbeb SHA512 b7ff74f8734d53400cec6cde6779099afb690c4e9aec4cc7d77950bb760d4be2d87a25bd5795663f412d12ddcf3130e9f3db4eb5bcf1802ea5d5ac906cd88d82 WHIRLPOOL c64e6955e759aa786bac869bdc81ba14d9d95e9a2106df279ea78b2e85e28cedc975def6ac7b69001aee2441ea3dcab6143e53e92d577a6f93478d8c24af6274
+AUX xpaint-2.9.10.2-QA2.patch 2235 SHA256 7bcb094de312522af55e6107a96cd9611da710d3b62dd681a7deef943dec1bc7 SHA512 5b8a34d8181f2b3b3b8459d4579b44e8a22807b25458401d3fe9243922ea1c7d565c25e938ff9506202ddd755e70ac103e70f9f258356ad0b240d8cbf2c53271 WHIRLPOOL 126983cf5b9ad0353fd931313526332473c7b50bec4b884554e63dcf846be708d11a41c94b94e37117c67c0d1bc1d1e5bbb45cd4271169e3ef8d448c9137a7ce
 AUX xpaint-2.9.9.4-QA1.patch 3336 SHA256 ede53a3bde4eeaf267234fa918ad2ace481add0988eeab4818ef6a15353de522 SHA512 2760bd60bc1e6335c48ce4576e9176c5893e70568f99d535b48878e6917591258ff5d206851c312b3af6b1bcda93076a60bcb3452176a49f588d4ffa1ed69a79 WHIRLPOOL 498fea0ef4149181f9bbd057d3c5e75b161f7704531e7ba1b96ee2d44560fd07a2ef259d8c5dfe153b9b3d2a0fb366ad0bbe1f155537fd9cfc61408728089dc2
 AUX xpaint-2.9.9.4-QA2.patch 1917 SHA256 8f24e1866add5c9e7376a2258f574be5c66611bfbcd8825230a454204a05c328 SHA512 90f4419f0b96f5178e9528bb1285ea3ef3a5aac8676ffc86f84c647d392f46441a99d122999bad21d1afec37c1f44708891919964a07930ff8146c12f3494f72 WHIRLPOOL 802601a94a9cba7245679cbf3407e4256ef0b72d23033dd3edf46afd789be5e4f19d1d298788de49a0261bb5032c0ff26bb18f0d5c35c6e3aed59d55e1446388
 AUX xpaint-2.9.9.4-autoreconf.patch 485 SHA256 9df6633075fb5c056718b92a3562522c7e122bdbe78119848fcb711271f16fc2 SHA512 aeebc6aadbc089ea0f532b947db028db0c10064c6b2883f508052ea2e2e99f41b51e6b72cf7782ed9c1afb61c709cce3e259a3be70d35cea863101b152a8f84a WHIRLPOOL c0bd2f8557edc14be1621b67f9a24fce687400786cdd0df8ab7a197cde4023146823c20dfa8e4ef20f13f019a51c4e5d37aefcfc8ce654a0edd58a3cd969b0cd
 AUX xpaint-2.9.9.4-parallel-make.patch 655 SHA256 1e416437a4c30d7bb6567baf6707a2dd32ad91e0ffc634cd4ac95a2a753568a1 SHA512 45161a7a76f05ebff009b8dda5c52baddcd936ee8c5984a3e0fa02d80a56947ba55df68c1241115dcce5a1f75d8993794b761ba0dbadb94b86b9c2ebfbe7c3d7 WHIRLPOOL 5ab4032ac7e81533dc2e51b235e8722f8ef491b0adccc40ea59c4c96d4157188d2f4b9c8c4202c2917e66e51ba33935f943a08bed05f4f39f7707907155102cf
 AUX xpaint-2.9.9.4-submake.patch 747 SHA256 483e844cc41a6899f114d317a2a283748ff509c1523d49bf790e32bfbb456a4b SHA512 72525c5cd892772210cba85b0f5ff193a6474657d6ffbead23c711de3346c87f8d306e252fdd8b98ae136f32311d88be6107bbe72932039bf17e4c0c64b70bae WHIRLPOOL 3324a1663897e968c5d962341ddc0c71ff8e67728ac5e18ed6e23bc772e64454ff33a1fb05aae491abad39f035bcdb2292f1a9ac38c34686b66a0b6f8b882578
+DIST xpaint-2.9.10.2.tar.bz2 1245813 SHA256 7f1554c8390bc68da2bcc0449407b8cc69616ce5d2170f97d1b30aee9fcbdcf6 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499 WHIRLPOOL 5ffe99ba979590c1ad675f7cbd57e4dba92aa7c24a9600784224c913069cad1fa88a676180d60fc2cc60c6f7185056385ccb59f2725c9799781335ed38d8934a
 DIST xpaint-2.9.10.tar.bz2 1320151 SHA256 f5302f7fb2cd803acedcec194b042c32a3699d4dba71d8d01d479a136e878d57 SHA512 78a41163cc8753d5fc30fbd2c3da3129eda9dfbc5fdd27aa5a110b571cc71594394d8e703d45f2aef2ac6b6fc60978dcb04f453a4f15eb85d09722ee32af5f26 WHIRLPOOL 78d408dac282450759d4bf0ea33002c0d2043201306afde19d736e13d1ad705d4b25e1bb5e357b2e575553688ed6af4ab9945166d4b530a24093e05fe7bfee0e
 DIST xpaint-2.9.9.4.tar.bz2 1287091 SHA256 bb521d7175a4c13c6dc296dcbb0a87cb7f39b14ad5014852c66f6efd070a4162 SHA512 fb0f314105917a042e4a92c1a688dc964fb9b7bd7ce936ae0d18323253efbb1887ad61b788028748790223a9576b9625b0bd46126b9cbc3423ac083252fd2d66 WHIRLPOOL 2809e79870269928fde32087fd886d1f6013bff58b4a6fbd41d8c83111206b4ebba52283f74a19a3a676af141fe1b4481d706e005b255a2fe2e4ebfb3394bfec
+EBUILD xpaint-2.9.10.2.ebuild 1720 SHA256 b088a9628708eafeb3c11c726b407e5676ec8c9b727c2fd354365ee9355a7068 SHA512 7a3f9c202cbd67f77cde8e06cac8cefd38db84c823101afa9d280dfd8c59bb17b4820f71ded579efd9986912109e02b42466f4f880380a0c4efff485f8de15fe WHIRLPOOL 336082f30777cf34a94d7579b893de04b7fa34f3a5b602393baf2edb73e3119b51f53433d25b7d45d258f29966410d7e5c7bdec65ffce5644257b09f4b0254cf
 EBUILD xpaint-2.9.10.ebuild 1718 SHA256 947a42bc285625d4e49a5a2769e82f113ae61a71f43cede6434aeadc63ad7d04 SHA512 e89daab7a10fdf9785eb3c550b56f785ab6ee7007fdf3f05d4994c9d768c3140e76966817db376b844f7aab718b16a99934cdaa8861413cf5fef90cfb1c601c0 WHIRLPOOL f647d3cfc3ff4685e9e8973df00aee7d6628f595c27e4b3f266d837614bd9f4b228b267ae760c5de05730a5fcd561ea308fe0222c1750559a849cf5c3b329c5c
 EBUILD xpaint-2.9.9.4.ebuild 1547 SHA256 1b64338187ac264c1b42dba4e2cea4c7c6afc23302dfd2e3fbffbd65d6c4621c SHA512 929e09295871e581667511e6d2e0ce97834ffe9753252dce98b7fa72d6f17b046ad1ddf6308c8eef8a1e9d845ef9e51fee1f517c412839527308db1adc62e075 WHIRLPOOL aea08733a649173f6d9d23b566573da720c45715382be1e2eedc6bf0bb96d3be6474c056667fd10fa8f4f6b72d3218e4358b3b36c6a0e7f081922814b5f2424d
-MISC ChangeLog 1018 SHA256 ddb3e5c244e247a00c371129fff4b6eeb27811651b48dac41a480efe328f9e52 SHA512 9d592cf73df4aded52a0c380d2edeff7955e23cdf3737d72a676013f5c2903dc3202895f738f34fb721828493434de832e268384536ea4011c17711fecc9dee0 WHIRLPOOL ffd996852bc4b48117dffe43e266144c3fee98f0f5cc6fa33d29a158aaa3440cec4a488e432faa46071c6c16ef9e837179354e21c545077de7c0859a9ae8d11d
+MISC ChangeLog 1178 SHA256 896d4ee7db4bd59b8cb00e8e4186bf2ae5fa11ba6ccb066b6e19ca8acd4b5c5f SHA512 9c6fbd02e327d91749438378ff55151c53aaa2caa837bf856bb28edc42d2a54cc1a1211afb4fa1a3184724aa31b4f062ad626290cd7615d2bf935229cecbd1ca WHIRLPOOL 2e01074518c8b1e852ac793d6a6bf502073b5d5088d9d4b80a07a6620ad613220bf846d06c2741eb1c3ab617fc6916703ea4885cdc058ec12dc64685e36fc848
 MISC metadata.xml 1271 SHA256 f65c522395643dc16d378aaecec922f7e1d69b0bc8877b24bcd644b76d838c6c SHA512 e825462df512a6d7ddbe51ca9cd250339935e031faf16d9a6f47e9c1feaebd26c9201fd6994b2501098ec4ba0825c0aa6c5e4622a3e161cb91774520f70d6277 WHIRLPOOL f2a583cbe3d9b59b2681996c1526d1a9b3b8313819521bcc09bef2962b0cbc1e65e3cb641ce07344264457f3d164ed82958b7acfbed736d060fb3cf315df91db
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTFUQPAAoJECIM0cW97tAgCwIQAMstwAyNnv18vxAqjtLoK+pX
-drBx+Q5rtgYTJr/YmADk8lInbLGixnt4SApJlZxpOLIzk2K4BK259H8kZf46ivnl
-jIUOrnLbyfrCoOvXncCDBHGB9gCFeAwiLvs2K/IufGuUh2rDsjQF5cnaJ9wSVpdV
-2ViVvw11T2v6DF5luw49motiPc/oTNAoQKMxYBURITlqdVKKs7HsIWlWWQ0BhfoI
-KBlonCjJ21g2jxKF+n4TdXxFYQGXvUHUeWeAJUh48VpiLXfCccRCys+9WoaZ1+mw
-+q/6rEN/L8OIeORPiQNEFSJDlzL2EKC0dvtoAWJsucwY3l7C7V6wZhLONUOQ6GuB
-Q2Ccy2Nfrk9+cCr/VsnUCz7MGaNpv5+EAQ6gC3I9J1ci6uzVVoU/SSSqRQWjs2l5
-zLuCdMuAQC86eff75iGmKGLLU0UNePeem/Yc45MhzJDzjwpo046ffQQ64P/hxYXn
-shG8z2VQcmyQECuji0ky5/5IcN/XEbwMtqIHnTl/gapzUF2ImdMYkP9KZT/w2ox2
-BmTSjgzJrMfKUUA2kAXrv9qfacIzohEnsiyTou3bEDadXn+muON6keVMxxnbPxXd
-jfMTy5d+r+RYrFTkpQri20lfWH9zorCory+jj6w6Btn3rr8mtoqVHhTiQZQhJjn9
-hcq7HA6m6Eu+GVzmgwv0
-=mdpw
+iQJ8BAEBCABmBQJTVmoWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgylkP/0ZQ7g6XC9Mid48S7ppdgouF
+/gUCZtRJvgrtnA5yWegLVtA+nQEo2mKZ2EIv9u6F6vKPnSQLyHKalBhBOVRItaPH
+CJ74KDzRFlO4UAaJFZy625hnPL7yJcddA1ww6iEt8t8LWPNBXuWktYUoQpRW5je8
+c/9u98a3j73nhH/Yro0wCWE6Lz81OaNe9B/CXR8woZRdS55W3YaK88zyhYAo+l1T
+pdf1wbEREmfQA74h0dIzM5Oy3/W9u7NnA12/+j8lb2WaFaaPmOYv88dUzQMqgt8f
+2mQ7NVkGOkfR/P5POU+lfZCJsTf700rmbu99gg6nBhEzVr4leNzVM+nu5D7ERNww
+CveiYBCfejBQZRPkg4AnLlqE7S2Idx4F45A7DB1GWDHuZ0Wk2XBFIHoOtvsnkI8O
+4PvCTIDMdLgy9xFmT/g3NMKa2vyxQIxIrncbVsQ+ytvTAucpgl+MUUPPg7gKCDoz
+kfC+DDFFeJ4U1R0Psp8Y2xUEqMMRr4vugj6LSNseax5vDmKCdV4vEENEBiFnavWH
+mC4gGp7Sz1Odi03zLaO5Oq5s/zO76x6fETB4EdEKMITP+JUzGbQqybZMkwx2rG9n
+MQ0stqDdqS29A+T3+eZpAi3CSoKr57wBJB8d2Dc/dcHx0jbP2Nup9QR7aRtSO0fe
+l+9hNZKJJ+VqBH56v9nB
+=cE+J
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch
new file mode 100644
index 000000000000..9179585974c2
--- /dev/null
+++ b/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch
@@ -0,0 +1,67 @@
+From 08bdf5f5d0c64384b2be16bd8ac68244675388d5 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Sun, 6 Oct 2013 21:13:51 +0200
+Subject: [PATCH] respect CFLAGS
+
+---
+ Makefile.am     | 2 +-
+ configure.ac    | 2 +-
+ rw/Makefile.am  | 2 +-
+ rw/configure.ac | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4cf1753..414597f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -26,7 +26,7 @@ EXTERN_VIEWER = display
+ ##  -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+ ##  -DFUNCPROTO=15 -DNARROWPROTO
+ 
+-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC
++ARCH_DEFINES = -fno-strict-aliasing -fPIC
+ 
+ ## 
+ ## Specific xpaint options
+diff --git a/configure.ac b/configure.ac
+index e058529..3979075 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T
+ AC_TYPE_UINT32_T
+ AC_TYPE_UINT64_T
+ 
+-CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
++CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
+ LIBS="$LIBS -lm"
+ echo "VERSION = $VERSION" > .version
+ 
+diff --git a/rw/Makefile.am b/rw/Makefile.am
+index d91d5d5..2f50253 100644
+--- a/rw/Makefile.am
++++ b/rw/Makefile.am
+@@ -10,7 +10,7 @@ SHAREDIR = $(prefix)/share/xpaint
+ ##  -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+ ##  -DFUNCPROTO=15 -DNARROWPROTO
+ 
+-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC
++ARCH_DEFINES = -fno-strict-aliasing -fPIC
+ 
+ ## 
+ ## Specific xpaint options
+diff --git a/rw/configure.ac b/rw/configure.ac
+index fb4f3d4..d9c7601 100644
+--- a/rw/configure.ac
++++ b/rw/configure.ac
+@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T
+ AC_TYPE_UINT32_T
+ AC_TYPE_UINT64_T
+ 
+-CFLAGS="-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
++CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft"
+ LIBS="$LIBS -lm"
+ 
+ dnl check X11
+-- 
+1.8.3.2
+
diff --git a/media-gfx/xpaint/xpaint-2.9.10.2.ebuild b/media-gfx/xpaint/xpaint-2.9.10.2.ebuild
new file mode 100644
index 000000000000..71c89fdbec79
--- /dev/null
+++ b/media-gfx/xpaint/xpaint-2.9.10.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xpaint/xpaint-2.9.10.2.ebuild,v 1.1 2014/04/22 13:09:39 hasufell Exp $
+
+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
+	jpeg2k? ( media-libs/openjpeg:0 )
+	pgf? ( media-libs/libpgf )
+	tiff? ( 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.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)"
+}