summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2012-07-29 21:18:01 +0000
committerJulian Ospald <hasufell@gentoo.org>2012-07-29 21:18:01 +0000
commitdd5bb384276450f05049199704a63eb9e9f97839 (patch)
tree479b9dc783c5d7a001fccf23660d283168f5cce1 /games-strategy
parentdrop toolchain-funcs not explicitly used (diff)
downloadhistorical-dd5bb384276450f05049199704a63eb9e9f97839.tar.gz
historical-dd5bb384276450f05049199704a63eb9e9f97839.tar.bz2
historical-dd5bb384276450f05049199704a63eb9e9f97839.zip
fix build with pkgconf wrt #428494
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/warzone2100/ChangeLog6
-rw-r--r--games-strategy/warzone2100/Manifest29
-rw-r--r--games-strategy/warzone2100/files/warzone2100-2.3.9-pkgconf.patch14
-rw-r--r--games-strategy/warzone2100/warzone2100-2.3.9.ebuild6
4 files changed, 45 insertions, 10 deletions
diff --git a/games-strategy/warzone2100/ChangeLog b/games-strategy/warzone2100/ChangeLog
index be0133807908..13c75503563c 100644
--- a/games-strategy/warzone2100/ChangeLog
+++ b/games-strategy/warzone2100/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/warzone2100
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.73 2012/06/20 20:55:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/ChangeLog,v 1.74 2012/07/29 21:18:01 hasufell Exp $
+
+ 29 Jul 2012; Julian Ospald <hasufell@gentoo.org> warzone2100-2.3.9.ebuild,
+ +files/warzone2100-2.3.9-pkgconf.patch:
+ fix build with pkgconf wrt #428494
20 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org>
warzone2100-2.3.9.ebuild:
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
index 266ff67532b3..f054492f68b6 100644
--- a/games-strategy/warzone2100/Manifest
+++ b/games-strategy/warzone2100/Manifest
@@ -1,7 +1,22 @@
-DIST warzone2100-2.3.8.tar.gz 56883675 RMD160 b94d81a225d26c4df3fef115629e7b415917166f SHA1 4138b7c8e9ebecd080ee16437066999ec815ee8b SHA256 d09af492f3dd44be5802a0454a7067448d003128c73a2b6e52e4ff2949109d13
-DIST warzone2100-2.3.9.tar.gz 62509972 RMD160 b6fb55ea1c86377018c03fa194f7547f5318e2df SHA1 919ba254291a9ce336ff915285a3e86cd644c81e SHA256 9e843bb752c9c4798b8e6ea0edfb625f9aa2f2ba8cbfe42e31ab1c6aa9267adb
-DIST warzone2100-videos-2.2.wz 571937134 RMD160 7350fa47b0dc0db631ad22763039e29bf420a847 SHA1 7ade8edd200afee3e4a675d1a5b739b32e574916 SHA256 142ae905be288cca33357a49f42b884c190e828fc0b1b1773ded5dff774f41a3
-EBUILD warzone2100-2.3.8.ebuild 1823 RMD160 b904017d1ab40aad3f79afdc7171244d68011ff6 SHA1 102d50e3ab99d39c0c3605db766ba0e3073f144b SHA256 0e50b8cdc73947143b76a292d800f4ff269e8a118e308cdfe448f673fe0b3533
-EBUILD warzone2100-2.3.9.ebuild 1914 RMD160 3476f36c3bb7224aeecb2b541c29a3062e1d2630 SHA1 54323b32ff6a79841b8aaccdb9dd19c6297590d8 SHA256 597f7822c046c2007969afea40117c582ce55600846fb985a53b4dca99284586
-MISC ChangeLog 10324 RMD160 bc03af18d7da55341208abaf7e593070d541dd57 SHA1 dd24a5f3d5a27e8980b8eb67d0efb224194d53da SHA256 97b45c3754369ae3676495b9330e114eb0007047c573a9af1117e29fbb71f3f5
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX warzone2100-2.3.9-pkgconf.patch 267 SHA256 7a4ccf217f5ce9e72853aebc1e8ba2ba312ed3f1932f6d1212bc87c63b514e0b SHA512 59374869920263c249e3e5f7a3088e4e233e51d263b44323bde5ffc539f458c4354a12c5fb1d6ceb4caf44f0ca5fef0a540797488d5a361225316ce974f05c80 WHIRLPOOL 26d000ba2e732ee8ef4a0c0e0902d87ee33c7b25a61b3cb1db3baa042c7dbc4482ce46791fe1e2e79ef138fb4f9866ab51a405f2e4ff2d879f31acb0ed1f5a9b
+DIST warzone2100-2.3.8.tar.gz 56883675 SHA256 d09af492f3dd44be5802a0454a7067448d003128c73a2b6e52e4ff2949109d13
+DIST warzone2100-2.3.9.tar.gz 62509972 SHA256 9e843bb752c9c4798b8e6ea0edfb625f9aa2f2ba8cbfe42e31ab1c6aa9267adb SHA512 3af34969e701e089886a228f7e2c33b61d763adcfebe6f8f0ac3cdb24ed133173dbf051c544e12e74f278b7193f4cbc79bb1df2d1a974f8d03575557695a8662 WHIRLPOOL 0953c323c86f0771a69c652326cb72356eb9efe45ad787eee0341d8d10a0c92bd6721691d73bdcd07f24e708b6b14ffb046f643393399ac425fe6a040ad4ee4b
+DIST warzone2100-videos-2.2.wz 571937134 SHA256 142ae905be288cca33357a49f42b884c190e828fc0b1b1773ded5dff774f41a3
+EBUILD warzone2100-2.3.8.ebuild 1823 SHA256 0e50b8cdc73947143b76a292d800f4ff269e8a118e308cdfe448f673fe0b3533 SHA512 d4d978fbf15166f43fd67871a21fedd1c867c2608784b4c4bced22a8849ff458cb9e5f34ec36ae9ef2fdf371aad117c2e5805666a103ea2d216ae9feebf1c1ee WHIRLPOOL cddfe0e0c79b12b3f7f6486742d449cc7c0a1d8977a7b8fdc5a810806760ee0a56950ebb4f47d17ef30d3c4dacc88439a02660ec31b88fc35c49e27999eee4ed
+EBUILD warzone2100-2.3.9.ebuild 1962 SHA256 fcfae15e2deafb9588881042d11803270b7461f1e70aebad49859c97d3dfe4c8 SHA512 23791dd09489347106d79e2fc46bd5924cc2a4fbb554b22b3c829b027a2853e462c03ab92bb9ffd021551e6c2cac6d515cdb343317afa08bf5fe47fdeaa0182b WHIRLPOOL bbfdadcc075fa17b5a8b2e72a0931577f3b1a7c09db1903a387bc740599f2d32c504333e1cfbfd3213fa15acaf026bcb4fbaeb390447988789385ab4980597ac
+MISC ChangeLog 10480 SHA256 61907ddfc18975405de0b8fdcbe5909bdd5e892df4edd0fb81bc70063ed2f46e SHA512 3ab815a47198636814ec6585b0f29d8f7146b6a1828f47d81590360c38fde667f226ba5195a9a23870ce80bb26d4655b739fa221fad1f71705d43252603b297e WHIRLPOOL c14cb65bb97180093b91d4cab524cf71638bf8e0fedbffd89dfbd8c702abfcaa61430c555641ef02b587b40a4c28284d77e2683e4782c2348ac8b321eb1b0a1b
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQFaePAAoJEFpvPKfnPDWzqPIH/21LbYhk2Y9+NYqXMy9ynwkg
+CPJxJvAqQikFjKw3AEJEUREpzIS6kAZFtLtkw4VIJM7WGJXHgEHB5neYiINcEtOT
+3Pcw3Y4mOb33+D1zLGOhr3DmXCLsTScCWjDB6MEt3c3AMZyvW+ybMW0omH3EnClj
+ta+q4UXIcUHQ4q2azXgNsZgGQNim1k0/MMW3h64BE2AZvT8ULB0nzTYds2GG6hSC
+zSqhRyo/7izHipX1hTJxIDt4bzbBbM3wmFfgzKynltuhKUb7GI2oVdsaVvxZnBYO
+j9sLsqAV9oghdxQcLDChIUeXl30w/G+4o5apGNBZSlmMwlVdH2ltmh4FuRkRIFc=
+=aL6Q
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/warzone2100/files/warzone2100-2.3.9-pkgconf.patch b/games-strategy/warzone2100/files/warzone2100-2.3.9-pkgconf.patch
new file mode 100644
index 000000000000..91d189575135
--- /dev/null
+++ b/games-strategy/warzone2100/files/warzone2100-2.3.9-pkgconf.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/show_bug.cgi?id=428494
+
+should be obsolete with >=dev-util/pkgconf-0.8.4
+
+--- configure.ac
++++ configure.ac
+@@ -76,7 +76,6 @@
+
+ # Check for pkg-config
+ PKG_PROG_PKG_CONFIG
+-AC_PROG_VERSION_CHECK([pkg-config], [0.9])
+
+
+ # Check for compiler
diff --git a/games-strategy/warzone2100/warzone2100-2.3.9.ebuild b/games-strategy/warzone2100/warzone2100-2.3.9.ebuild
index 1f271d8e7cbd..1812c09bebf5 100644
--- a/games-strategy/warzone2100/warzone2100-2.3.9.ebuild
+++ b/games-strategy/warzone2100/warzone2100-2.3.9.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.3.9.ebuild,v 1.6 2012/06/20 20:55:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warzone2100/warzone2100-2.3.9.ebuild,v 1.7 2012/07/29 21:18:01 hasufell Exp $
EAPI=2
-inherit autotools versionator games
+inherit autotools eutils versionator games
MY_PV=$(get_version_component_range -2)
VIDEOS_PV=2.2
@@ -46,6 +46,8 @@ src_prepare() {
-e 's/#top_builddir/top_builddir/' \
po/Makevars || die
+ epatch "${FILESDIR}"/${P}-pkgconf.patch
+
eautoreconf
}