fix bug 428572

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 48 insertions, 6 deletions

diff --git a/games-simulation/lincity-ng/ChangeLog b/games-simulation/lincity-ng/ChangeLog
index bea702071db4..e1f0c1f66c04 100644
--- a/games-simulation/lincity-ng/ChangeLog
+++ b/games-simulation/lincity-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/lincity-ng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/ChangeLog,v 1.22 2012/06/15 15:49:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/ChangeLog,v 1.23 2012/07/30 08:23:11 hasufell Exp $
+
+  30 Jul 2012; Julian Ospald <hasufell@gentoo.org> lincity-ng-2.0.ebuild,
+  +files/lincity-ng-2.0-build.patch:
+  fix bug 428572
 
   15 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> lincity-ng-2.0.ebuild:
   add multiprocessing for makeopts_jobs
diff --git a/games-simulation/lincity-ng/Manifest b/games-simulation/lincity-ng/Manifest
index 24c2691dda1e..42aedfc0d2c3 100644
--- a/games-simulation/lincity-ng/Manifest
+++ b/games-simulation/lincity-ng/Manifest
@@ -1,4 +1,19 @@
-DIST lincity-ng-2.0.tar.bz2 39475719 RMD160 0466d56687f18813f9c0454468c092d1f181123e SHA1 2961a3f60f7481b33858d7d5ef7cf9c788d01077 SHA256 a6b206a5dfc7a817669f4fc7cbc012bd4a7073c42f918ceb2f1f484cc0b06606
-EBUILD lincity-ng-2.0.ebuild 1142 RMD160 17ed817986dabfd4aefa23b36a4b30206cd7818c SHA1 431469d33cfa07963ba2b1476f042a841f61ff5f SHA256 4e914fa5afb3ffbe1b58757c2b278ec84edbb5a2de1eadbbe34e81c2fa13ebc4
-MISC ChangeLog 3024 RMD160 ffef5d57d649a639db9ab534279c24c4516f558f SHA1 94dd0a6fb2640f7e07c9483744602ce47ae63af4 SHA256 32bb8bf11a8926687b5801fd49d1519a80a4c47ffb70f0a59156b00640fe8dc0
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX lincity-ng-2.0-build.patch 413 SHA256 0181c7af8f0cf3fc162ebcad067877b97539280e039b457d9155e579013edad1 SHA512 11e9fe3e49414064d9ff131858cfea666ca31f51872183ee635baa17572139e3ef701deae0f5c676939a84fc244884b997af855b37613ab64c96040c904e4034 WHIRLPOOL fd3762a66fc99233b1b5b9ee7cdff6aacfec1290e8ca0f998bb370650778fe909a4572c06dc6ad1b34752b6bb0782259862e0e24293454f67a2148c4ae75089d
+DIST lincity-ng-2.0.tar.bz2 39475719 SHA256 a6b206a5dfc7a817669f4fc7cbc012bd4a7073c42f918ceb2f1f484cc0b06606 SHA512 d85cd398145d1591f8640458c076f2a0b55713c39ede28b67d99adc7b76d38f09b58cd2ec84d9acac11bbaa794f6d97f6200f54efcdd4286315e6b3133284c55 WHIRLPOOL d218d0475198c9852abf18caab55df57c2dc0026c74db3215c66c4915758c9f4e608906ccdeb8ff9b83eace67ad4cdcb3e5d5d7dd5d1a7aa4c18131e03646d91
+EBUILD lincity-ng-2.0.ebuild 1199 SHA256 5295744ff332e0c290ce0259d73cee7b371c5caa9c1440523d6ba96424cf192e SHA512 f2241cf251845499af8c3e06de7cd27e646fb93d04b1df894786f2da7c37d253d8292d85c5c92661f02cfc67cd8d1258ff92719d1bf306b95721a9dd82cd0e42 WHIRLPOOL 2f9a59663afbb7c042059b2f5b8b24c17e8b951eccbb13edab6cfdf2be408454a8ef0d3f6f6ed784d3650baaf5c5a38f8ff80a0c75622c3b80c7c691f9fec458
+MISC ChangeLog 3152 SHA256 efd23fcfbfb1d806d5aa30fedb8eeb640c334f62cc01930a5a0a45463c0c777a SHA512 4aeeebf4d347372393aee0a2600644c8abec6c27bbf35b7d89638421d58298f6c7dbf0e540d2610cadda516e40061be9b83500d4763abe0c3060aeb4dddd0012 WHIRLPOOL 1a21158385236b07bb7c350b516224066fbc1e800c6ba1657098750d639a1cb92b0c58020c7794956d741300d9cdf9d4ef9e8b32c15c2b5eb7aa11eec20fa839
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQFkNyAAoJEFpvPKfnPDWzSOgIAJF/yy5mQO82mWNz6xSShsYg
++kNu27wHA7mi9FoO7TZUw6zl+ImHpupJj8UjBT+FDLIXFHlhQalUxo6gB2h2kZwP
+phx00JjvHTyf5GfwkXVgVF72exNcpc8rxCl4otLODx1MDdiGGRy1HroTscmR7bLl
+ndCudw247l0WZp4a+HqMP98WL1jOPQEmO+em0cnzVRQaemvOc3XLSW3A1pmkgPW1
+51DheMeqWBFL3tlxo7ZUcXc7dlCTo7o2IcOMeXK72TT+MJrnOuqa1hPJzf5mvlZc
+yJM/eIe+4/8gYzjzUL9C3I8lRFTC0SIjy2Mwd8Q/qzx7Ppm5XXD7u26M+s3nhis=
+=w97x
+-----END PGP SIGNATURE-----
diff --git a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch b/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
new file mode 100644
index 000000000000..f7abfd420d9f
--- /dev/null
+++ b/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
@@ -0,0 +1,19 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Jul 30 07:06:54 UTC 2012
+Subject: build system
+
+arguments to AR would be overwritten if we export AR
+
+--- mk/jam/unix.jam
++++ mk/jam/unix.jam
+@@ -45,4 +45,10 @@
+     $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
+ }
+ 
++# jam Archive action seems to include the arguments which will break our AR export
++actions Archive
++{
++  $(AR) ru $(<) $(>)
++}
++
+ 
diff --git a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
index 5fa7defb66be..5e8c0d424f58 100644
--- a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
+++ b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/lincity-ng-2.0.ebuild,v 1.8 2012/06/15 15:49:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/lincity-ng/lincity-ng-2.0.ebuild,v 1.9 2012/07/30 08:23:11 hasufell Exp $
 
 EAPI=2
 inherit eutils multiprocessing games
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-util/ftjam"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
 src_compile() {
 	jam -q -dx -j $(makeopts_jobs) || die "jam failed"
 }