Respect all compiler flags. Drop static lib and pkgconfig file. Multiple other fixes by Nikoli. Bug #452456

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 193 insertions, 17 deletions

diff --git a/media-gfx/mypaint/ChangeLog b/media-gfx/mypaint/ChangeLog
index 033933bf55da..36f248db92a0 100644
--- a/media-gfx/mypaint/ChangeLog
+++ b/media-gfx/mypaint/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/mypaint
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/ChangeLog,v 1.22 2013/04/26 17:54:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/ChangeLog,v 1.23 2013/10/11 21:07:13 hwoarang Exp $
+
+*mypaint-1.1.0-r1 (11 Oct 2013)
+
+  11 Oct 2013; Markos Chandras <hwoarang@gentoo.org>
+  +files/mypaint-1.1.0-build-env-vars.patch, +files/mypaint-1.1.0-desktop.patch,
+  +mypaint-1.1.0-r1.ebuild:
+  Respect all compiler flags. Drop static lib and pkgconfig file. Multiple other
+  fixes by Nikoli. Bug #452456
 
   26 Apr 2013; Markos Chandras <hwoarang@gentoo.org>
   +files/mypaint-1.1.0-json-c-0.11.patch, mypaint-1.1.0.ebuild:
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index 32ef2fbd9815..afc28c24882b 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -3,30 +3,33 @@ Hash: SHA256
 
 AUX mypaint-0.9.0-gentoo.patch 923 SHA256 1854bb028a28ed95b460ccae33a8f25afab2f0670a2adde5e4bdc5d0a49cce7c SHA512 bd4b92a54bc4c2d01490049619e496a6800106b0b11f0cab5aed29b293e6be7eed6b2d6d54ab9de611ce4f16e356af9793616cd1dcea42cf6d37c0dd83f06c68 WHIRLPOOL 3d8c4c970683b21836d33647d7368c2147141c8412536870fd3c02d2218270b7e59a93a7ba3e610d9799917d6878961fab2588f0074976b8bd37509ffae404ad
 AUX mypaint-0.9.1-gentoo.patch 923 SHA256 6fb6c5bd1278820c1a648dc406aa6574255060d16fb0656938fe9cc3d803b10c SHA512 feb2dd268d0e7d2929ad0ca65f4c56331cfee802e3969af55adb5098a4db36a1651e765228a09fd1f42732a4d51bf6f106a249af5dadfccfc20c31c0f667cc4b WHIRLPOOL f24bf394bb0614a3c0bc8ee78d5e9574a4f582e7dd87229d8622d4be678a5d6a5d5a0edcc8400acf5e81a04654a97865c51a1667aa95c0f14c179c5f1f6ecef6
+AUX mypaint-1.1.0-build-env-vars.patch 1812 SHA256 6259c8cfe61829880a6ed0f18e7d653271ec53df5132dc4d2eaa5628eb49aec6 SHA512 336a9c838ac9e51f929f9727008feab8251ab9defd106d7161fe5d5b5150460573c66873b88f202d616e4668d3bf272b8dc8305e367ef7c450620b6a48330fe9 WHIRLPOOL fe2eebfceb02e867590775569151e975fb9276e265cf5e7754d21401888cfccde69d29fe4599a87c4b9bf749a8090e92784104579727c143348ffd3137b46672
+AUX mypaint-1.1.0-desktop.patch 626 SHA256 0c2dad7f45e0d1b2763ef7933f2e774e5b8199a7f7732c6bfc78e59ae2e3a3ec SHA512 77f267ad6a12b6d18fa955b5b9f8ef3a3eb6fed832745eda4db539d75c49056bb7fd6474ee904e6ac7cab12ae286beb48617e4825b826ca77a439764873e8d75 WHIRLPOOL 89f5aead97dda499da0a4e6e26135941998205f97c9ab26b205221e43ffe6418e688692cbf063fded53900bf1853e5d5ad367eba77de61dff53ac00838590d40
 AUX mypaint-1.1.0-gentoo.patch 1250 SHA256 60bca9f9f12cd1f256f0cce165d203cd0f67712da7435b481c171d2b1fe17ae6 SHA512 0d8637a212661ae2ad7a610e121b09f6d568192b4ddcb36beea27afcf11bcdf9d2880044c0f93f0f904deb0cd4a052c4a6066d15db5eff600e07bab2f846440f WHIRLPOOL 047a840f04d9cc503d0b189f7bd6289046bb9f03807822f52158aa6b6bb86b1515b0b91ef41dfe8004ce36c97e36967af3018bdf4fe6fdae685a524f5a8c5d18
 AUX mypaint-1.1.0-json-c-0.11.patch 403 SHA256 e3cf5443175d3e8fe2e3e0d687c7d5e644ae7cb70f95d457356f610208c83d49 SHA512 554d0f0cc8c9cb4a48b1f9c57532247461e9705ad819c52f2e264ea238783fe60728af3e51e01667dc0c60883375727624811a48d1603436ad9970282a682605 WHIRLPOOL 05b67cb7c7b2c9dca6443ef5f61609cd0945d10e1bcb937cde9fb8e7b2d662bd32405b352741f3780cf02c117f6efc1a5740eb420a370a9db426447dd4062824
 DIST mypaint-1.0.0.tar.bz2 36748957 SHA256 ced440ec0307e29bfe4f612604fe27ec9bfaea3f4f9c8019ffaa50ef12dc7131 SHA512 91434f6d352d4f5dde3d919772a678a17f15a6d2914fb2377b40e4a0fea042e3c96b5618e1864eacdbfa52f449be03062da2ecb8ec08bae168e3a12904047bf2 WHIRLPOOL a4693b6436485126a033dacb014586e85c448863bbb14acb30aff739a96d8d2abdd2c920ad3e9a5be7790d18e13e4a8e15ebcde85fafcaafe9d2a901b53d5f52
 DIST mypaint-1.1.0.tar.bz2 37416388 SHA256 780d57e50dd90afd586873bc5120261930ea4c309d4d0958020916932122e838 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9 WHIRLPOOL bfd7356ad393dd85b91ccc010b5d0be23a6d82a33866edade0ef6eb739a1cbdb6823d7bffbdc943f96cdac9059abb7ac1edacf31d4ac2cd3871444594e23557a
 EBUILD mypaint-1.0.0-r1.ebuild 1751 SHA256 fb47ae52970e6efd88bd99e9c1d7d0f2f290a012874840a62df85529647270a5 SHA512 36a3efd6e4eea48cce9b474418134ec844d4854d9cc19798e6284d356b655d01f8eaadbb24296ca9b6b64c6241411ce19d6c00421a820f81103de1eb4a5a477e WHIRLPOOL c22818d99aa54bca811531dd20726aafc597acb4512c742bb0481ba7fca662fa9fe16d725f88ea3ed6c485f9b9a24aa125b7799da1ec1e0515cfe37b59ebc107
+EBUILD mypaint-1.1.0-r1.ebuild 2016 SHA256 843b1345926ce8061f873a4cdbfa1a88bcce675e96266e59a9db9d0d0d707977 SHA512 f448b5f6fa7f84873f9c625c6e7997ef6330a8186f499c3950124e450762338418cfcab40756fab28353fa74400c7f244f60acc69db8b29f51295b43fb3d9a40 WHIRLPOOL 39ac18687bb50091fc1742a1e0194cbd4a42c10fd0a2df4e79ae12c5c76aa290abe0a40bb91e27a85bb98e9ac866c61e05832addd0141235fb121b2b534fab83
 EBUILD mypaint-1.1.0.ebuild 1912 SHA256 de00678d99ef82a6402936255b1d9eed93107374d71ec5a7f0563604689e2f38 SHA512 a83a4e943b25daee3e727d480e4e241ca8aabe211bb472946ec47a474989373ca72e9297e7bfbac475277fb25ca9defa8f0f1a3f82a9b0b7ffb6102868556c52 WHIRLPOOL e60aa3cfff5a845297a090b4dc000fe8fd1f5dc1e0f1a272c60c80eb34c1628f74e2de0f2ba3bf95d2ae18f2ad9b42c9fa4669f47d4391cc097450ce17116ac2
-MISC ChangeLog 3648 SHA256 5e78d97b10a975beb5bf56e6737efc4a97c27c04e30201f31325355e6c544663 SHA512 375e1ef2ece3adaa3f766f6980a733e4ba300fd53f466dbeafde9bdca99a8111b75831d901510c2f4ed7dae1b2ef09ee699676ae38a623be8b1badd08388ed93 WHIRLPOOL 60484c399001cbd9d1d3b667f7f8d38f40b1ee7535ec202169a17218d31213474ca0372efc7c3ebad716e599215ed98d610de3388ebb741dbe7ac65324e10508
+MISC ChangeLog 3956 SHA256 68eaca07f1e54e469f08e189495421c64690cdd3b3924f4f7f137ce48a86ec85 SHA512 7ec812e0aa8bc0664c19cb36bb8dcd60bce83f7de6e7e0be1d240b93629b5c95f18d744a8ad51b147eed17e476502f8a2ec9be4dce6077999ee4ead781301e74 WHIRLPOOL 0144dd3aeda8f5e0ec9bacb3747b1bf5861d4615691712e7b35ea6ebfce4ad4da73e2718b9625578917620142dd504917bf9cf8f867b51a704d9f97aa6ea1019
 MISC metadata.xml 278 SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160 SHA512 c47ad7b85f6516eec5bc86f26785d8731544436f25fce07093a7c51de184ddfeca02253022c54fb88c1b75645350d8d23de7fc1d8c62e8050e1288b4d6ebaba6 WHIRLPOOL 5fc748443c6e622808acfb4f906cc41bac88b04718771a678462d1079185b74de2840d3dfe1c0949ad96c5b8d2a278f7587af8b1381cddf72c92b9b3099b40c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRer9vXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSWGgsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88oxoP/Rwb5WEYG1VzvTSrf0fHTINT
-t2GOUU17YM/toD3/Nb0vuUYf0tWKClEn5jWgS9rnErV48jNA9SK0XCN0tAATpm3a
-j6UZ0xHTeAGDB3OZio5g7fAuh8RbYvZM67d6Ag4ZN2ZfXxVy3LI4wM9Qg6ZsYc9N
-7wfvv1+S2jHYcGMjlo20xYPt1rw8ALkAp3yK7phQXFXAyplFAucOQSU/1b3IxInK
-7HKkEuDwjILolczdH6+r22WYkD28bM7d26WJwFsVWYKGdJXCW1FCKm4EjLcMd5rJ
-yF+b7Q8mh2wkxR3pN0NRDPpyZBj8O2TMkC9gxqBcvFg7lusotmbFIlHsZfspD+1F
-+kuH8Hn6unZGPlzOna70bOTHk4CAsuk1H23nWw+qHtLQu158CrXhHf3oYor2lH2F
-avncs/z8NQ1Cy8nDFBFz/cIFs2PbrrnDm1TBBKmhmajnRmZx/ydQACkhe7WdKL16
-MFSzRrSFLEm7/dF2OCYp+wax48ZDSF4lpdmJkVEI9VmC5EEQ/tLVDbiX4Jbv8qZL
-FPmBcMnJJ3pTq0GuJPsQJPfqbwu3kTfIsoys4/1i/RQzRXioD+q0EzszbHX2BOp7
-YRhHH2WW4Omhg0UzNvsn5yBEcKZaajfwHeQE0RjdNEIWNEkyuXy7GOypqszmn1xK
-PBqgKN8AvpYh8Byc0H0r
-=fib/
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88rc8P/2pqyrMUGVl91O3bWnySwm39
+keT/MgpDqD9Oi9uCCdv4krEQ40hdXdBnEx+iNj3Ibpsc5ZxoZcrpqaaG9BlgA85U
+qDIVM1R18M+zoMYiZalBL5Ip30PWIiLH/Div8xux0LIfSn1LbAZPlWhfQtt1inAW
+5O6t10BqPT0DJ3lC13X7V2SxVDtb5cfK45SPveFvRLNqK7WxP5nvlmd2zvUsbTdb
+zpXvCQbYcqNcnpPUCovMsYyZMaW99IZZTwzkklwFLjG6xfOdtFZ4lSHTQb9Tdnl0
+0dbhmpMTsAdAwDnh4E3DT9vunligzHA+oeT58tYUhUiSr/JcFM9RrIsOauNgarfY
+jqL1TIO+gYuCWmAzLgUZt7J6ELEEQ2RPMfrERTRLHizMBxrIje3UNgJwK8sgwGmK
+CDRkKi8wiMfAPeeGZ4qnFvCs727ZzyaeeQUvTH09O0OCxnlPOKtKVXdfpGYR4jN0
+7SERZN0WkJHRW4JPvYGI6P4sE/maEcU8LoAhGkA94KWU8OLRoOdMhllZSFsp2f9U
+7MNU0BTJ45nkgxxbbzAbMGWlBs0ur8JClPHJ2VYKUjictpg28+rW2Hr5fKaKOBrI
+e9KjyqQ88Xw98N5yqIDvq2z0oWyLnaLj4lw5qKePi4BeTt1y+av4oAhQUg0RplAm
+Q7Jw5zeEe9IqFgChEhYR
+=Ch+W
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch b/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch
new file mode 100644
index 000000000000..7d7ac3e36359
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch
@@ -0,0 +1,53 @@
+From 516d184b5db8ebdd8b184ef871050c3ab3f03fdf Mon Sep 17 00:00:00 2001
+From: Andrew Chadwick <andrewc-git@piffle.org>
+Date: Sun, 21 Apr 2013 22:51:05 +0100
+Subject: [PATCH] SConstruct: support standard build environ vars
+
+Support the standard build environment vars CC, CXX, CFLAGS, CXXFLAGS,
+CPPFLAGS, and LDFLAGS everywhere.
+
+Partially addresses https://gna.org/bugs/?20754
+---
+ SConstruct |   19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 0b55da1..ef39b9e 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1,6 +1,7 @@
+ import os, sys
+ from os.path import join, basename
+ from SCons.Script.SConscript import SConsEnvironment
++import SCons.Util
+ 
+ EnsureSConsVersion(1, 0)
+ 
+@@ -45,6 +46,24 @@ print('using %r (use scons python_config=xxx to change)' % env['python_config'])
+ if sys.platform == "win32":
+     # remove this mingw if trying VisualStudio
+     env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts)
++
++# Respect some standard build environment stuff
++if os.environ.has_key('CC'):
++   env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++   env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++   env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++   env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('CPPFLAGS'):
++   env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
++   env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++   env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++if "$CCFLAGS" in env['CXXCOM']:
++   env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","")
++
+ opts.Update(env)
+ 
+ env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
+-- 
+1.7.10.4
+
diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch b/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch
new file mode 100644
index 000000000000..b992131bf29e
--- /dev/null
+++ b/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch
@@ -0,0 +1,24 @@
+From: Andrew Chadwick <andrewc-git@piffle.org>
+Date: Tue, 8 Jan 2013 13:53:01 +0000
+Subject: desktop: remove deprecated Encoding key
+
+The Encoding key is deprecated as of 1.0 of the Desktop Entry Specification
+(8 Jan 2012)
+
+http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html
+---
+ desktop/mypaint.desktop |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/desktop/mypaint.desktop b/desktop/mypaint.desktop
+index 9850b54..24383db 100644
+--- a/desktop/mypaint.desktop
++++ b/desktop/mypaint.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=MyPaint
+ TryExec=mypaint
+ Exec=mypaint %f
+-- 
diff --git a/media-gfx/mypaint/mypaint-1.1.0-r1.ebuild b/media-gfx/mypaint/mypaint-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..dcdcc4812233
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.1.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mypaint/mypaint-1.1.0-r1.ebuild,v 1.1 2013/10/11 21:07:13 hwoarang Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2:2.5"
+
+inherit eutils fdo-mime gnome2-utils multilib scons-utils toolchain-funcs python
+
+DESCRIPTION="fast and easy graphics application for digital painters"
+HOMEPAGE="http://mypaint.intilinux.com/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
+for x in ${LANGS}; do
+	IUSE+="linguas_${x} "
+done
+
+RDEPEND="
+	dev-python/pygtk:2
+	dev-python/numpy
+	>=dev-python/pycairo-1.4
+	dev-libs/protobuf[python]
+	>=dev-libs/json-c-0.11:=
+	media-libs/lcms:2
+	media-libs/libpng:0=
+"
+DEPEND="${RDEPEND}
+	dev-lang/swig
+	virtual/pkgconfig"
+
+pkg_setup(){
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# multilib support
+	sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
+		SConstruct SConscript || die
+	# respect CXXFLAGS,CXX,LDFLAGS
+	epatch "${FILESDIR}"/${P}-build-env-vars.patch
+	# fix mypaint.desktop
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	# pkgconfig patch for json-c-0.11. 467322
+	epatch "${FILESDIR}"/${P}-json-c-0.11.patch
+}
+
+src_compile() {
+	#workaround scons bug with locales. Bug #352700
+	export LANG="en_US.UTF-8"
+	tc-export CC CXX
+	escons
+}
+
+src_install () {
+	escons prefix="${D}/usr" install
+	newicon pixmaps/${PN}_logo.png ${PN}.png
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			rm -rf "${ED}"/usr/share/locale/${x} || die
+		fi
+	done
+
+	# not used and broken
+	rm -rf "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	python_mod_optimize /usr/share/${PN}
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	python_mod_cleanup /usr/share/${PN}
+}