Fix build with newer scons wrt bug 544130

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BAB6B528DB029C

diff --git a/app-text/glosung/ChangeLog b/app-text/glosung/ChangeLog
index 0b0f956a0cc7d8b8caee6ab0b7fbb239b2e9ffca..19a2efa86a51936ea23446b4e8e4d180201b48fa 100644 (file)
--- a/app-text/glosung/ChangeLog
+++ b/app-text/glosung/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/glosung
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/ChangeLog,v 1.17 2013/01/31 20:26:36 creffett Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/ChangeLog,v 1.18 2015/04/19 01:23:29 creffett Exp $
+
+  19 Apr 2015; Chris Reffett <creffett@gentoo.org>
+  +files/glosung-3.6.2-scons-2.3.2-respectflags.patch, glosung-3.6.2-r1.ebuild:
+  Fix build with newer scons wrt bug 544130
 
   31 Jan 2013; Chris Reffett <creffett@gentoo.org> -glosung-2.1.3.ebuild,
   -glosung-3.2.2.ebuild, -glosung-3.4.2.ebuild, -glosung-3.5.2.ebuild:

diff --git a/app-text/glosung/Manifest b/app-text/glosung/Manifest
index 738f899a9d3b701231446d71d8153df839c82093..17a99678d8afe97a5f731c94973e6d4a7ea083a2 100644 (file)
--- a/app-text/glosung/Manifest
+++ b/app-text/glosung/Manifest
@@ -2,16 +2,29 @@
 Hash: SHA256
 
 AUX glosung-3.6.2-glib-includes.patch 329 SHA256 c9cc1607fadc3a5ae4f2cc4147ceb97805618912e505ae1e12c949a2739f069f SHA512 cceb87873bb1b617f0d550d0d1818e21705c9894015a6c8bbd6050365af580956fcf6f79289cc0ac619552ec170af3f42f5222c5733548f7eb5d3fd303733044 WHIRLPOOL ccf5a804c91299a2fc0cd3a7e4f3b765c630cfe151872b00426a3a16f0d52d85a0800ce81e691f2a4942b86a7045ec1620812e3e3f28fa7e3d8c654769581601
+AUX glosung-3.6.2-scons-2.3.2-respectflags.patch 1701 SHA256 a8560edd3780aa20d8478e22fcc711b26e02fa3077a468aac2362f0b4a3aa3af SHA512 6b2dfabc97cc87280a8078accd5d39bbae47b3d03db9efc85b820da135c6231683916cdae3a00dcd662d3c74332322997579370bf7b539f15ea033786d4fbb70 WHIRLPOOL 8cd9e23b3074b49aebe94ef198ea675da9550ffd1c62182497b22afa038fa4f0f0393056a27936d485c85c0d6e2e03dad5844e3471bbefebef31c15e8e811508
 AUX glosung-3.6.2-scons-respectflags.patch 1720 SHA256 2f30dd716dd64c5ee2a6766c0ea65a7d789210bdcada326c94a2477c60b88d36 SHA512 e2ab10f723fa30e9aec8f10fe629711228ee4d08076095fdf3879bc23da1f15fe991367272d55c5490f96255100a6024c96f639613f6a402b3112fb68ae29520 WHIRLPOOL c3438d1feaf72fa256f6a3ce71b529a5561f0f765afac40a9101c74ba0245b3cab2631d137ee3c6b021fccc47e93eefd5e6a865efdcd16fda0631529ac1b0797
 AUX glosung.desktop 374 SHA256 813df4d09c476b28b44af96e86b7e663fde1970e1ca1274f4f6d5a87c67d715f SHA512 3afccd76f801b61690eda4e7902aa3abe048a241dbbe31dc17670611d0463acbf5f54536d59f8b6da2d55423b62bdb0b16c30c241cca27b0774908e067d280a2 WHIRLPOOL 5160b172bd2fa81b615d117f17296a50f4f111ee17f86ecc31ec80601949381bfb5c7e1649c9d8c98fff84940887654ca586417c22b657b15ec51d14f35ef1db
 DIST glosung-3.6.2.tar.bz2 65089 SHA256 5b46cd776b51ea3ace6ef901512c4100e79ce5225f7d7cf910b69d930b7df4c9 SHA512 a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11 WHIRLPOOL 91bb6e08f149430edb41b901072b5fe4993590f7ef173b99f313d857539e1be40dd00797b8623312da8a2909be7577d39b5804523e3b79bce00eccf919ee5a8c
-EBUILD glosung-3.6.2-r1.ebuild 1220 SHA256 6be7de97dfc5587dac3fc58c4f5d7f9d00e86c68f217ef7fcad694f941daaea0 SHA512 0b1448436076ad17f2bcf6b0300da29a917d9ef98476d5399b72b8a86aa043d7f3e2617ac40b4cfea4dad62308728e36e45010c40f6df13f3863ef45e3c91a0f WHIRLPOOL c2a0ae02f6c869d25f3f7e301367b4c4aa59649d23e839256faca3b2a991e3c6afa7a44f2cd85541a2bb6e7e78aa6da0c33ca73b4f28ee59dbe3ba01cabc4fc0
-MISC ChangeLog 3095 SHA256 fa7b47122fdc8219b91e0146ecdcce4519ba998dd52fe998739adb8919960f85 SHA512 e39bb509d541713432398d365a8ed53f9f967756e7bf9106bfcf5ea561d082e1fdda57afc78ff51a54fac7cda1adf91e2f6fe6b741ac66ba989d6d0a11ca90c1 WHIRLPOOL 715a4f57f888cc9a72ec5a155dd8d6b8a5a67feb9b2dd2144c70b3bb1912f1844eb7390f82a20e37e276d9fbcf8c2ec662d9e74657af342d018f5579b72472fc
+EBUILD glosung-3.6.2-r1.ebuild 1349 SHA256 b5c05cbb4fec8aaf45cd2ace945bc7a4be60f4825b16cc761cdceade66cbfc39 SHA512 d8ae9bf657517bc47cd2b90ce08e82f44aca9a80a4d84d8a1c6d76eb63f462b77488624241cf00550cfebcb72945504ca2f0c01a165f5b4917f4f6d9db61f66a WHIRLPOOL ba8ef89ca5045a0ab96b4e372e7682897adacb3383eef5136c192accf561483ee683099d7ee6ddf8f3f1cc2deb32f13cfb92c7d3b44779ff10b65d0a9f6d83ac
+MISC ChangeLog 3271 SHA256 12bb032810b7c0ba3e0725044c7410428879522f9a5d966777ea2b81bf9b0dae SHA512 bcd443d3095ab91ba97d0182bee012b01c205725d0421a921de8c77649bfbe3ac1901f9555e297c7f3eac00b73f34fb44ed9c462a080146ac3351b2c06a0d832 WHIRLPOOL f6631928cd18fc8c786b2bd4170fc007dca41e4bbc06bae155ead2e5186474623c3961f939da5658b9a43fa68bd92e726b8fb32da3f96136922b0826441556fb
 MISC metadata.xml 225 SHA256 1dab477a800b766fe838154618bd7769afe79f427f3c05fa155ee1a411f5c006 SHA512 0efdc8e3f294969b59f05f95a050f2874334161bb2a1cceff59d3aaa32bd27f3516d39afde9e4dfe5537fa067a6cc6fce72dcdc888bdc21befa3dcd2f8d60927 WHIRLPOOL d2f3aac6fe5898a13b42170dc3a248abf6d3668e74afb556e0c78baaabf45c2722c1dcad440d683899e984b5e6c0f6ed813de1aab3c7920890e5b9829d0ba3eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlEK038ACgkQ23laikJhg1T0VwCeNrNlz4iXWRsX9yCT7bsDFycA
-jj0An0GySQ6gOBOBgN8xccPfcnnnyg0C
-=QspK
+iQJ8BAEBCABmBQJVMwOTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2M0VCRUYxOEZGRkExNTY5MDA5NEMzQzBD
+QTFBNTc1NUI2OUU3RUNCAAoJEMoaV1W2nn7L1iEQALGG8tEa3Blm879GwMO9GLtp
+9SPvhHlmP8mXG9ahLbT/0L/jF237XO5hm758LkIUs6bxB7uPBLCuUR5qasQENa8Q
+VOgACDntypnaER4BXY69Ta8xTYeCgO3Iyzbqo2Tv+qzW5+ngiQHTZQip60I3tRst
+EejHHlVmQgq2ZRMEec8YUHgERekRXC2jfN31Nu368xCV4aDVGcJSIfFSuUUau3IG
+yGysZl3Y2IMMg9R+o4ucZPcdZMfD/4PCOyrMe9+QQnGq1x1nWq3y3glxR1KM2cPy
+XbA3MVkJLZw5nyDJxZEN1/aN36wd4cC1F2Eky/fD3jLTuBPf80ncrEN4mhYjiB8P
+z+OFv7lC5Q4zam3Y1+pDOcvpFJP794DDWKqxSrKwf//4PGarwQoYCsvfz6lgsMsk
+K99kN+GuRI1L6NvOTPQHZ1N/hk8tVQiQZpw9Py6oA7QN6X97vti9q4HPIJXwjobi
+lspsXzHcMiuAPGiQxmMQn0INbU8jKz5frIxcNprcBCCm8jegBxUvfJEDbyw/tB+2
+uAHyR00ZV2fzPmr4HjiKI3vZ2Uus7bLI8a0oo9Gnr2SatWrZE87JeapnZQyGfP6v
+OqkVOi7U/9MUGESaAYmYMcXKRQXqUNdiQFJ/zYwuv9FUFH+ElnrBNVIalasEuo/f
+9x4yhdw3Nbq5wKq35SF2
+=xGdd
 -----END PGP SIGNATURE-----

diff --git a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
new file mode 100644 (file)
index 0000000..0f4ac73
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
@@ -0,0 +1,63 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -17,6 +17,7 @@
+ 
+ 
+ import os
++import SCons.Util
+ 
+ version = '3.6.2'
+ 
+@@ -32,14 +33,22 @@
+                               (this option is only for packaging)''')
+ 
+ env = Environment (
+-  LINK      = 'gcc',
+-  CC        = 'gcc',
+   CPPPATH   = '',
+   LINKFLAGS = '',
+   CCFLAGS   = '',
+   ENV       = os.environ,
+   TARFLAGS  = '-c -j')
+ 
++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('LDFLAGS'):
++      env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ 
+ if env['PLATFORM'] == 'win32':
+       prefix      = ARGUMENTS.get ('PREFIX', '')
+@@ -58,7 +68,7 @@
+ BuildDir ('build', 'src')
+ 
+ cpppath = ['#', '#build']
+-ccflags   = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
++ccflags   = ['-std=c99',
+ #             '-DLIBXML_STATIC',
+               '-DVERSION=\\"' + version + '\\"',
+               '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+@@ -74,7 +74,7 @@
+               '-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+               '-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
+ 
+-linkflags = ['-Wl,--export-dynamic', '-L.']
++linkflags = []
+ #  -L/usr/lib'
+ #             `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
+
+@@ -83,9 +83,6 @@
+     ccflags.append   ('-pg', '-fprofile-arcs')
+     linkflags.append ('-pg', '-fprofile-arcs')
+ 
+-if env['PLATFORM'] != 'win32':
+-        linkflags.append ('-Wl,--as-needed')
+-
+ #if not (ARGUMENTS.get ('dev')):
+ if (ARGUMENTS.get ('dev')):
+     ccflags   += [

diff --git a/app-text/glosung/glosung-3.6.2-r1.ebuild b/app-text/glosung/glosung-3.6.2-r1.ebuild
index b891a54a0fa6047fadee706587b8aad79e31237c..99a8896a767a3530dafad4d7b48eb47d0646e59d 100644 (file)
--- a/app-text/glosung/glosung-3.6.2-r1.ebuild
+++ b/app-text/glosung/glosung-3.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.6.2-r1.ebuild,v 1.3 2013/01/30 19:02:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/glosung/glosung-3.6.2-r1.ebuild,v 1.4 2015/04/19 01:23:29 creffett Exp $
 
 EAPI=5
 
@@ -32,7 +32,11 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
        epatch "${FILESDIR}/${PN}-3.6.2-glib-includes.patch"
-       epatch "${FILESDIR}/${PN}-3.6.2-scons-respectflags.patch"
+       if has_version '>=dev-util/scons-2.3.2'; then
+               epatch "${FILESDIR}/${PN}-3.6.2-scons-2.3.2-respectflags.patch"
+       else
+               epatch "${FILESDIR}/${PN}-3.6.2-scons-respectflags.patch"
+       fi
 }
 
 src_compile() {