summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-27 11:42:56 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-27 11:42:56 +0000
commit408041774fc89e9905304ad42239252b8a81ae53 (patch)
treedec47754ce580e2bfd971ef45976ee1a1bd8d5a3 /games-action
parentSupport multilib packages in dependencies. Update/fix dependencies. (diff)
downloadhistorical-408041774fc89e9905304ad42239252b8a81ae53.tar.gz
historical-408041774fc89e9905304ad42239252b8a81ae53.tar.bz2
historical-408041774fc89e9905304ad42239252b8a81ae53.zip
Support multilib packages in dependencies. Update/fix dependencies. Use ABI=x86 to obtain proper libGL path for config.
Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'games-action')
-rw-r--r--games-action/heretic2-demo/ChangeLog9
-rw-r--r--games-action/heretic2-demo/Manifest24
-rw-r--r--games-action/heretic2-demo/heretic2-demo-1.06a.ebuild24
3 files changed, 38 insertions, 19 deletions
diff --git a/games-action/heretic2-demo/ChangeLog b/games-action/heretic2-demo/ChangeLog
index fb5ecf4f8c40..03661de6f600 100644
--- a/games-action/heretic2-demo/ChangeLog
+++ b/games-action/heretic2-demo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/heretic2-demo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.10 2012/12/27 08:51:42 tupone Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/ChangeLog,v 1.11 2014/06/27 11:42:54 mgorny Exp $
+
+ 27 Jun 2014; Michał Górny <mgorny@gentoo.org> heretic2-demo-1.06a.ebuild:
+ Support multilib packages in dependencies. Update/fix dependencies. Use
+ ABI=x86 to obtain proper libGL path for config.
27 Dec 2012; Tupone Alfredo <tupone@gentoo.org> heretic2-demo-1.06a.ebuild:
Use QA_PREBUILT. Bug #431230 by Diego Elio Pettenò
@@ -41,4 +45,3 @@
+heretic2-demo-1.06a.ebuild:
Initial import. Ebuild by Paul Bredbury <brebs@sent.com>. Closing bug
#120358.
-
diff --git a/games-action/heretic2-demo/Manifest b/games-action/heretic2-demo/Manifest
index 277b821ca06e..7236edb44591 100644
--- a/games-action/heretic2-demo/Manifest
+++ b/games-action/heretic2-demo/Manifest
@@ -2,13 +2,25 @@
Hash: SHA256
DIST heretic2-demo.run 55065564 SHA256 623e1a277ff8eb47e48a6fa50f32eb1325eba1591cebdea002a32599464b881a SHA512 62aba7b4569b76bf9a01864652da7be8e268ad3cad4eb5b986b7e84adbd88e826799d021b141f9a7a1135520e440de4ce2e57c5be6ceaa85dc08295d5e3ad30e WHIRLPOOL fdde3e8caf5114e37e9db16801e99638a1fbe20b40c6bdf913d57d8e5f4774fa3d84bb44a365bb16ea6fefd1ad88e08c924bedd6ef58a50bc9612193cc4e8220
-EBUILD heretic2-demo-1.06a.ebuild 1603 SHA256 e6d7d8a0215158c8cf059a0526925cac6a7a49cf0b1c05d80a3b76d4fec065c0 SHA512 080e7b13f0166d3165db624d9cdf474b3f93d0cfeb9592432a09cc0a4b04078b18a76da0e596bb21f1326f883fd457d246b00b01bc02b59a8e4937325cf1a976 WHIRLPOOL f2636e89c36e7a82c2febeddadda337cd1e49d454cb16eb2eebaa3b701d9641875ad11061d9f4969218e6c7db84377adb0c6dd75e9d38b64d101e9d7d6ef49ba
-MISC ChangeLog 1633 SHA256 d7be417547a1f4a00d3553abdb03eccd78c6b4e0ea7ae4a3c7c8ac8e646b3a85 SHA512 4bd9c117e6027ff268105aa92980ab1a7bd2e7c5dc26d1782ce95ac4792b9c4cce5ad65adac3d4df1ebb770c102b1b06419df38533b38591435956d94bd2c86d WHIRLPOOL 2e5698c5ee9c6ff126bc35505f3a3f33b06798c04dd383b3c136cbd8251ec076f115a7e257104d8c5c4eabc6a460874290078dae7dfb8fd8c86d5b047f4d7206
+EBUILD heretic2-demo-1.06a.ebuild 1602 SHA256 29debe2f960eabc1639529844a164d4cae3f2d70db8a07fa46050b773f285b49 SHA512 0df45ec147f52dca748941f611a86d408b53ef9ac2c512c2fc15aa74a9078af39ad60faaa1c25fe692fb50c8dcc393c3709c6a4ce8c66823813d55f3f8e4cfc0 WHIRLPOOL b2311d0fac45ae53a013582f8a97d0aa85e811725f5d95d3fdbc05fb84a6519260ad67165df4a22b2172d44f4194377d89c482ba31177e1c4027e073cf477ade
+MISC ChangeLog 1835 SHA256 c64816621b04670b592eaebb35cd8cde47aba98420b583078c93eac6a729c8a0 SHA512 d79e1faf25a74a9760ca964b958f99bf231e5a7df8ad25b8bb743275f670f064cb6817c6027a934a5b8d7c46334c6485230aec94f515dbc549591a98dc278b72 WHIRLPOOL c0788ddd7cebb69be497f34d2bc06f4bc08cf04fc19ad9b7591c0fd24ec78646c9b5e004678d42eb04f3dba2f48f4017cdee75257df324b9b28fd1b54a8c62c1
MISC metadata.xml 619 SHA256 65f6bc137786d52f91ac807425743ea806e49ea4170f34226811bc13eaf3d084 SHA512 8edd9df5a046de51aa73d7fbb2b94baccd6651ce53de88b39018878a4676918478ea6074fc50c6ac24b33a82e6f1738d9aa9f7eb353b1a68fb5990036034777a WHIRLPOOL 374342c8625289adebf7f97a1ecec0ae514bd1e94aa8ca0e5a6b06c1010cb9fa0dcea381931b0d6b4c224499aa3d6e2765af5cacb03304073b363d99bc5bd57d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
-iEYEAREIAAYFAlDcDCoACgkQIY77eQFFFC24RQCfTOfD0q3DfkRbpnnFfQVK/bnu
-mYgAoLxv7P7V3vziIoq0otoWgmfQnfbJ
-=Kdxd
+iQJ8BAEBCABmBQJTrVi/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIcAQAOB8jg7w0vV9QNi3fECBDb5J
+HbEIVY6VUFYFfxml0QW3VaL5mNhLF02pVoTypjbjmMqpLOPaT/ks3TX3W4jsW7up
+ShnTj7yHAxpseRwjmqDAe8oE46SFbd9JuPenAS5LoR4MIVGRI7yjHavkOG4sEc+Z
+zobTe2uFqofRwAhd8mVFFlBwwGg2a+wB9kdu4EIVmu0de/njSYAc6lfrj5pYiWK2
+rPODZEg2qRP0Fj6USBTlAuEPFamVZaGf7HWfKYMB1ryXWUgnkh+hYJ4qEfFm4eP2
+J0NwRy9ica2QawMEuHbpq9na0NGvdX2sJ4GE6bnqmzYPw5DCdn2g/s9h2R8xFEcq
++OUKRC9jn1+IVQsJYGJ5rz7jx5S0CGzBGYEeo6TEJkptr7onX3hh4AzSPEppS1yj
+AYFHpy945g7Y/pUh9nkqgyB9eSIw6IlriBDr76u5ZZwcJ5JVWyJid71jjx4HoWKv
+3FeNTtrMbbXBes0K8/1yEwNvFSBp/772zg/20V1TY09JW8Ge/RorcWSSgqWO/dUZ
+jxmNHCDv2mKB48ynWYDbB89uidi9qEZqklUsKZRGzYRO54QXsk9MzY9JCmZijfrj
+kq0roxEcidJSL4T87DuIHxK829ENknQr/YYi0nVnwZgARGPCaP0QhBWdh4M+n0To
+1wWOElRLnh/I7RI/p8mN
+=rqYm
-----END PGP SIGNATURE-----
diff --git a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
index 61dcaa6bd1ca..ededbb20f643 100644
--- a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
+++ b/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 1.12 2012/12/27 08:51:42 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild,v 1.13 2014/06/27 11:42:54 mgorny Exp $
EAPI=4
inherit eutils unpacker multilib games
@@ -18,14 +18,16 @@ RESTRICT="strip"
QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/heretic2-demo/ref_glx.so"
DEPEND="games-util/loki_patch"
-RDEPEND="x86? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXau
- x11-libs/libXdmcp )
- amd64? (
- app-emulation/emul-linux-x86-xlibs
- app-emulation/emul-linux-x86-compat )"
+RDEPEND="
+ || (
+ (
+ x11-libs/libX11[abi_x86_32(-)]
+ x11-libs/libXext[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ )
+ )"
S=${WORKDIR}
@@ -34,6 +36,8 @@ Ddir=${D}/${dir}
QA_PREBUILT="${dir:1}/*"
src_install() {
+ ABI=x86
+
local demo="data/demos/heretic2_demo"
local exe="heretic2_demo.x86"