| 1 |
commit: 6c0dfdc73a5979e8765d2fb11ec1100ba00f8ee1 |
| 2 |
Author: Vicente Olivert Riera <vincent <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 5 17:45:10 2013 +0000 |
| 4 |
Commit: Vicente Olivert Riera <vincent <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 5 17:45:10 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/vincent.git;a=commit;h=6c0dfdc7 |
| 7 |
|
| 8 |
some fixes |
| 9 |
|
| 10 |
--- |
| 11 |
.../emul-linux-x86-libsoundtouch/Manifest | 2 +- |
| 12 |
.../emul-linux-x86-libsoundtouch-1.7.1.ebuild | 5 +++++ |
| 13 |
app-emulation/emul-linux-x86-wxGTK/Manifest | 2 +- |
| 14 |
.../emul-linux-x86-wxGTK-2.8.12.1.ebuild | 7 ++++++- |
| 15 |
games-emulation/pcsx2/Manifest | 2 +- |
| 16 |
games-emulation/pcsx2/pcsx2-1.0.0.ebuild | 13 ++++++------- |
| 17 |
6 files changed, 20 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-emulation/emul-linux-x86-libsoundtouch/Manifest b/app-emulation/emul-linux-x86-libsoundtouch/Manifest |
| 20 |
index f6e53bc..8f584bf 100644 |
| 21 |
--- a/app-emulation/emul-linux-x86-libsoundtouch/Manifest |
| 22 |
+++ b/app-emulation/emul-linux-x86-libsoundtouch/Manifest |
| 23 |
@@ -1,3 +1,3 @@ |
| 24 |
DIST emul-linux-x86-libsoundtouch-1.7.1.tar.xz 31644 SHA256 f5c1560ac71d1979a408b9025f2eca7e50b9477571b7103791cc6a51e339c580 SHA512 410ca522664fd5f140c6786200a6ce418363bfb6b17f68ffc297c0a7438e85ca72bdd0cb4373085103d8e99aff363a040e505c2bbe4afef8d0b4093dd2890e8c WHIRLPOOL d3b9914139666d62ea7ab10a8cb9f95e24508c8668f42cbfc3645f3f115f87978e7525fa85128afb025b7438d1f04099c85958ec5d24e292d2a5460ac7ab66bd |
| 25 |
-EBUILD emul-linux-x86-libsoundtouch-1.7.1.ebuild 445 SHA256 b54cb52619601d24a51deab7475f467c3c5932755bbf392556df1967b8f29869 SHA512 efed995aca39e0f9da47744b00e4e64f13696651b9093254ec3922102a8eca97575e59681295c365d9c59b7e2f1d62f104b7f48493143857236f50cef42265bc WHIRLPOOL e76eb5b477d15fe650dbb1d003a7056daea34c2273ce97e7ded312ffe750fc002154a71610d6bbd5e6f50b05d35cc6ce4ce5c659710ef52720c16885788d91ea |
| 26 |
+EBUILD emul-linux-x86-libsoundtouch-1.7.1.ebuild 532 SHA256 71f1ce907ffd288b23a7467eeab7c72200d010ee861e0e7e372d07ffa7aeb259 SHA512 1010c4bf7530f06cf59bd5d6013afcfc47168647525b8cf5848dd75f90ed34b1d82b708a3a7a90f59f90c50dbca19aee49fa38a673dc32e6090ca96288b05c05 WHIRLPOOL 3a466fe566627dfe2e54b98f4ef4c53c81b55779c5b2ff0a6c69c62520a9f7d82ceb5a284d243ef9a7593e962797ab974eb341353fa84a3906bc72701a04ebe8 |
| 27 |
MISC metadata.xml 493 SHA256 724e8962d34c0da31efee72d10596fde88ec86478e20389c75db108daf80fa16 SHA512 7d15a46d17fe3a7094e1382d90469e513992fb4eb9f14203ffb0ed996acf84359e5c99f45ba2f64a4473c670b2a560a2c22367e754f4cbc65272297823481270 WHIRLPOOL edcc91872f77cef19df62fc2dbd19489201833f50b2f28c6361effcd8d8daf9cd043b7021e795c36dff38f549e632b582458596ee8451ab2d31fee9fc3c83ee9 |
| 28 |
|
| 29 |
diff --git a/app-emulation/emul-linux-x86-libsoundtouch/emul-linux-x86-libsoundtouch-1.7.1.ebuild b/app-emulation/emul-linux-x86-libsoundtouch/emul-linux-x86-libsoundtouch-1.7.1.ebuild |
| 30 |
index 55fc223..13a2399 100644 |
| 31 |
--- a/app-emulation/emul-linux-x86-libsoundtouch/emul-linux-x86-libsoundtouch-1.7.1.ebuild |
| 32 |
+++ b/app-emulation/emul-linux-x86-libsoundtouch/emul-linux-x86-libsoundtouch-1.7.1.ebuild |
| 33 |
@@ -16,3 +16,8 @@ KEYWORDS="-* ~amd64" |
| 34 |
IUSE="development" |
| 35 |
|
| 36 |
RDEPEND="!media-libs/libsoundtouch[abi_x86_32]" |
| 37 |
+ |
| 38 |
+src_prepare() { |
| 39 |
+ ALLOWED="${S}/usr/lib32/|${S}/usr/bin" |
| 40 |
+ emul-linux-x86_src_prepare |
| 41 |
+} |
| 42 |
|
| 43 |
diff --git a/app-emulation/emul-linux-x86-wxGTK/Manifest b/app-emulation/emul-linux-x86-wxGTK/Manifest |
| 44 |
index a2303a4..93dfd9d 100644 |
| 45 |
--- a/app-emulation/emul-linux-x86-wxGTK/Manifest |
| 46 |
+++ b/app-emulation/emul-linux-x86-wxGTK/Manifest |
| 47 |
@@ -1,3 +1,3 @@ |
| 48 |
DIST emul-linux-x86-wxGTK-2.8.12.1.tar.xz 2960180 SHA256 530e0ae78ee27e162d7d4b4b83eff933cfb93623c0f5303ea98d9528150c41ce SHA512 7b4eb67a3410e30d422b98f32d20bf24c526f543d7bd6c1436eec77b2f44d8e8c914e70eed9c2060b7cbf16dad53ac6dc741b86e10d74fdd76419733b11caf05 WHIRLPOOL 61e1434266caacc6f1e4ece11c0103aab52a86f22bd2069ecb293a4ef73a8f9989e9b1584d6106c0b87699356dac73202da42208c5a81b13e32748b177915a15 |
| 49 |
-EBUILD emul-linux-x86-wxGTK-2.8.12.1.ebuild 658 SHA256 6a6ac884824e0592933fa68d0d49fe1fc255cd8095fadafc48ecfe2e4aa18620 SHA512 82a4d30d6aea5c0c87b7637137b69328f973ae0e27dd8d868efa696dca39261ca385eb208d7becb33c43d287cc6edcec3d86be0a6bdb99adff3c5b2626d48f13 WHIRLPOOL ecd290041c98f8c417c5ec55b1a29aa9847d634f6de9a298ac1a4f6e988eaaa9d5162289e8e671d72d7cc03d141728417c5a0a7729763b6f301162a36ebaf540 |
| 50 |
+EBUILD emul-linux-x86-wxGTK-2.8.12.1.ebuild 747 SHA256 eb1b9b7fd11fe1d60c9ad844418e275f13346f9a3e97684d4cab849b28dead4d SHA512 37d0ea334b799ef02f0de145bce0b71c9aa7f01dc55412a6bccf9ae99eae4ede4d984c3e8adb372b553f8683821e59a8e9f19154ede3c8e9ca4407612f570f20 WHIRLPOOL 93cae7463ee015cc7beefc68bb7e63bb0b09d2520a4c64eec2318cdd2f8cccc97b553f7f547db5db84993cb02bcbd1c2879e608a25e057c632f243cc9f703f28 |
| 51 |
MISC metadata.xml 493 SHA256 724e8962d34c0da31efee72d10596fde88ec86478e20389c75db108daf80fa16 SHA512 7d15a46d17fe3a7094e1382d90469e513992fb4eb9f14203ffb0ed996acf84359e5c99f45ba2f64a4473c670b2a560a2c22367e754f4cbc65272297823481270 WHIRLPOOL edcc91872f77cef19df62fc2dbd19489201833f50b2f28c6361effcd8d8daf9cd043b7021e795c36dff38f549e632b582458596ee8451ab2d31fee9fc3c83ee9 |
| 52 |
|
| 53 |
diff --git a/app-emulation/emul-linux-x86-wxGTK/emul-linux-x86-wxGTK-2.8.12.1.ebuild b/app-emulation/emul-linux-x86-wxGTK/emul-linux-x86-wxGTK-2.8.12.1.ebuild |
| 54 |
index 11673a1..6cb1c9a 100644 |
| 55 |
--- a/app-emulation/emul-linux-x86-wxGTK/emul-linux-x86-wxGTK-2.8.12.1.ebuild |
| 56 |
+++ b/app-emulation/emul-linux-x86-wxGTK/emul-linux-x86-wxGTK-2.8.12.1.ebuild |
| 57 |
@@ -11,7 +11,7 @@ HOMEPAGE="http://dev.gentoo.org/~vincent" |
| 58 |
SRC_URI="http://dev.gentoo.org/~vincent/${P}.tar.xz" |
| 59 |
|
| 60 |
LICENSE="wxWinLL-3 GPL-2" |
| 61 |
-SLOT="0" |
| 62 |
+SLOT="2.8" |
| 63 |
KEYWORDS="-* ~amd64" |
| 64 |
IUSE="development" |
| 65 |
|
| 66 |
@@ -22,3 +22,8 @@ RDEPEND="app-emulation/emul-linux-x86-baselibs |
| 67 |
app-emulation/emul-linux-x86-sdl |
| 68 |
app-emulation/emul-linux-x86-xlibs |
| 69 |
!x11-libs/wxGTK[abi_x86_32]" |
| 70 |
+ |
| 71 |
+src_prepare() { |
| 72 |
+ ALLOWED="${S}/usr/lib32/|${S}/usr/bin" |
| 73 |
+ emul-linux-x86_src_prepare |
| 74 |
+} |
| 75 |
|
| 76 |
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest |
| 77 |
index eca8ac8..d16c41c 100644 |
| 78 |
--- a/games-emulation/pcsx2/Manifest |
| 79 |
+++ b/games-emulation/pcsx2/Manifest |
| 80 |
@@ -1,3 +1,3 @@ |
| 81 |
DIST pcsx2-1.0.0-r5350-sources.7z 10673799 SHA256 3f6067c3ea23b2afa4d4c411f3121d86612c310b1c7a44413577cf5727e498bc SHA512 6f765596c1d46b6a409711d085c4b5f8163a86508af59ce12088dae11bb8891188b4651eff7d07eb8feb9e5fd0b8c1d0681ea9b69c333a4c2a9fa7777e962661 WHIRLPOOL 7738216c67d71a4e21b34c75013e0e0e4c63def1e51083ea462658f5b73fbd3f4e76053c49ad86a33aa08c55a1317dcc389f4a46955622b180cf97385e954eca |
| 82 |
-EBUILD pcsx2-1.0.0.ebuild 1999 SHA256 2893ef2e6b0b42d21a9744091a81b28cde229418170a284a36dbb80187bcbc78 SHA512 45a6d746139fdd57c293778507a74ebe7cf0055b071fb9ccc24a0ca5c1999df03c5fea3a871f7511f693cb5a4e688ea6f6233639b17c58e2683205a90f10726b WHIRLPOOL c20c6d77305bd1bde15bbf4341afe4b01f4d122c4c2bb1b3ad8a545e6e0aa6097e30d6f527b8049ebb01b0313acad7b99ecf2769a1a296831a37f7eb21ec00f9 |
| 83 |
+EBUILD pcsx2-1.0.0.ebuild 1994 SHA256 766b8f4c2d5e72c46d5cc968df868ba28026ef393612eed5501555bed9c4658f SHA512 1a8e5006b33a951b134044e883feb30dfc2dc95aa860612011da8ef13585b34144468b2d914435ac91925a706585ec0b9a64e969b3ec229d62c76a3fa0a338e9 WHIRLPOOL 024a85148e385ce63ad06eb5a2e73de7a60fcb04e95a33869f62f4226fd25ba7f3e02b3e552f2a580ec2daa286ab0641f562fdfcdeb8a5795889fcbf58b6d14a |
| 84 |
MISC metadata.xml 346 SHA256 ec3a634eed6c4f90c68925dc7127c2e706fc9f02013321918e72c0368f488bb9 SHA512 837626e9e6f66b309f65999684b459921c9e6294fbd47448046fcdec27d988a3bb941d2685d9fc0399bddc8ea78b6957aae56158941ed4425c507c3d22a20720 WHIRLPOOL 536fb2fca6cfe9d8a0e470f27d50efa043c4fa27586eff61d7fc3facf265623e4b03b8bde03ff1d04d302e292dfc77278deb6b418df7ee44dc37b3ef9bda8f39 |
| 85 |
|
| 86 |
diff --git a/games-emulation/pcsx2/pcsx2-1.0.0.ebuild b/games-emulation/pcsx2/pcsx2-1.0.0.ebuild |
| 87 |
index 2ab1240..4998431 100644 |
| 88 |
--- a/games-emulation/pcsx2/pcsx2-1.0.0.ebuild |
| 89 |
+++ b/games-emulation/pcsx2/pcsx2-1.0.0.ebuild |
| 90 |
@@ -1,14 +1,13 @@ |
| 91 |
-# Copyright 1999-2011 Gentoo Foundation |
| 92 |
+# Copyright 1999-2013 Gentoo Foundation |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
# $Header: $ |
| 95 |
|
| 96 |
EAPI=5 |
| 97 |
|
| 98 |
-WX_GTK_VER="2.8" |
| 99 |
-MY_P="${P}-r5350-sources" |
| 100 |
- |
| 101 |
inherit cmake-utils wxwidgets games |
| 102 |
|
| 103 |
+MY_P="${P}-r5350-sources" |
| 104 |
+ |
| 105 |
DESCRIPTION="A PlayStation 2 emulator" |
| 106 |
HOMEPAGE="http://www.pcsx2.net" |
| 107 |
SRC_URI="http://dev.gentoo.org/~vincent/${MY_P}.7z" |
| 108 |
@@ -35,7 +34,7 @@ DEPEND="app-arch/bzip2 |
| 109 |
x11-libs/libICE |
| 110 |
x11-libs/libX11 |
| 111 |
x11-libs/libXext |
| 112 |
- x11-libs/wxGTK[X] |
| 113 |
+ x11-libs/wxGTK:2.8[X] |
| 114 |
multilib? ( |
| 115 |
app-emulation/emul-linux-x86-baselibs |
| 116 |
app-emulation/emul-linux-x86-opengl |
| 117 |
@@ -44,7 +43,7 @@ DEPEND="app-arch/bzip2 |
| 118 |
app-emulation/emul-linux-x86-sdl |
| 119 |
app-emulation/emul-linux-x86-soundlibs |
| 120 |
app-emulation/emul-linux-x86-libsoundtouch |
| 121 |
- app-emulation/emul-linux-x86-wxGTK |
| 122 |
+ app-emulation/emul-linux-x86-wxGTK:2.8 |
| 123 |
)" |
| 124 |
RDEPEND="${DEPEND}" |
| 125 |
|
| 126 |
@@ -66,7 +65,7 @@ src_configure() { |
| 127 |
cg_config="" |
| 128 |
if use amd64 ; then |
| 129 |
mylibpath="/usr/lib32" |
| 130 |
- wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-32" |
| 131 |
+ wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-32" |
| 132 |
cg_config="-DCG_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCg.so |
| 133 |
-DCG_GL_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCgGL.so" |
| 134 |
else |
Archives