From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7F94C1381FA for ; Thu, 1 May 2014 20:03:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A638CE09A2; Thu, 1 May 2014 20:03:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2261EE09A2 for ; Thu, 1 May 2014 20:03:14 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCF0234001A for ; Thu, 1 May 2014 20:03:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 530441818D for ; Thu, 1 May 2014 20:03:08 +0000 (UTC) From: "Vicente Olivert Riera" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vicente Olivert Riera" Message-ID: <1398974566.f25bacc2cd257961c94b3e1fc87328a5fa6698a1.vincent@gentoo> Subject: [gentoo-commits] dev/vincent:master commit in: games-emulation/pcsx2/ X-VCS-Repository: dev/vincent X-VCS-Files: games-emulation/pcsx2/Manifest games-emulation/pcsx2/pcsx2-1.3.0_p5919.ebuild games-emulation/pcsx2/pcsx2-9999.ebuild X-VCS-Directories: games-emulation/pcsx2/ X-VCS-Committer: vincent X-VCS-Committer-Name: Vicente Olivert Riera X-VCS-Revision: f25bacc2cd257961c94b3e1fc87328a5fa6698a1 X-VCS-Branch: master Date: Thu, 1 May 2014 20:03:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9dfe37a3-3501-4649-af2b-a8d320232bdb X-Archives-Hash: d6303e4547051bd44f4d113f13ac10fc commit: f25bacc2cd257961c94b3e1fc87328a5fa6698a1 Author: Vicente Olivert Riera gentoo org> AuthorDate: Thu May 1 20:02:46 2014 +0000 Commit: Vicente Olivert Riera gentoo org> CommitDate: Thu May 1 20:02:46 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/vincent.git;a=commit;h=f25bacc2 Remove old version. Fix live ebuild. Signed-off-by: Vicente Olivert Riera gentoo.org> --- games-emulation/pcsx2/Manifest | 14 +--- games-emulation/pcsx2/pcsx2-1.3.0_p5919.ebuild | 91 -------------------------- games-emulation/pcsx2/pcsx2-9999.ebuild | 2 + 3 files changed, 3 insertions(+), 104 deletions(-) diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest index a51a606..b9f5cf4 100644 --- a/games-emulation/pcsx2/Manifest +++ b/games-emulation/pcsx2/Manifest @@ -1,15 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -DIST pcsx2-1.3.0_p5919.tar.xz 3123164 SHA256 b12568c19f17b221c98ad7030661af2ab13b0c522ec45a089988ac8056c6d313 SHA512 97f823f0eeb3b5adf1f28598f45a51158345d0ead5dfbd323f056d910e1c79a528e5d2694b8c0f4a6d269024c60b0de0f3eb5cfec325ea704742324a767ce20c WHIRLPOOL e4746365ad16aed7370e7f6529e8862c5dec4bf175b50e49a3761e59f25da4d1f4a30d305f30a42beafa01d99309a2d1e49001f28a7721a38c7cfd81b8629c97 -EBUILD pcsx2-1.3.0_p5919.ebuild 1975 SHA256 3ffb6f464a21436b9847e4208f4ec61018a5d2771b09743d6c108b5d28573c85 SHA512 3148b8d4a886e8f7816ffe4a8e9295b629d7df8f57a808d2c33c9ee970abfce0d5b7906d0fa5d1a3cea943e547b5fbc73c579a36409fcd6589b720f20f0d24d5 WHIRLPOOL 221c7cdf7465da77cd1d1517734b0760116558c3a6c506c473c46c97a2fe4f0f7967a80e18cbc0cd0d3d325e3ba01ec513c42303a95ce6276012415aaa77f66e -EBUILD pcsx2-9999.ebuild 2019 SHA256 673f71f7b794520c42f44519e39da2e72e5d5c7ccd3d7e6bbecbed813bda8011 SHA512 62b9ba484236404f1ef40899b285db75fcd807e99182fbfce32a433b55daecf84c0c0a75d23af3aabb845a2f2164943c488f96c0e2952ce44904400868bcd95a WHIRLPOOL ac1aeb2704bb7c62f573382b7a38d78ce56b287fd69ede1cc06c0175fc30bb10b190949baff7bf8c3ddfb2b25e32f1be0ee7cf2623561757ad1180afce21e6d4 +EBUILD pcsx2-9999.ebuild 2067 SHA256 7b3773850d280fc6bdc22b5bfe1beffc43753bb2ceba82c9f4dc41d1e0bd87a8 SHA512 930bf0641153be613543132406c03ad601dea2727cae3ab606b1d3637de826e4fa6473ececf7148d45fb363ab8c3e1bea39972f5c74fa3efb12b00b3dcd1d065 WHIRLPOOL 9342ebed692f4ee82d79bc200c07a6cebd316f1e65d4d64c163036ae7d45fc5788c8da9150a0086be4f77b552ca4e3d9c820cabc4aca226c554a7ea3af2b2139 MISC ChangeLog 1448 SHA256 f5799473d43a98e59762e7c5136ed78898225db01e60d4c7ef0642f2eec2289c SHA512 7d8fb4ef4afc8c961c3238d2734159826cb4f6792a69d2049b0d11d6628a2cadd0c5f7d17efeb0bccc6d08365a5dc9bf0fcc5f2e56ba0168745b15cbba7a1ffb WHIRLPOOL 930278a972b515c5565a61f8951cd97838e88b98d2576020f0f359e9f2a4e0bc34264c789d1ab28bcc88d805deb9ad1ea45444a374f1c139160e8c43ea88d39e MISC metadata.xml 346 SHA256 ec3a634eed6c4f90c68925dc7127c2e706fc9f02013321918e72c0368f488bb9 SHA512 837626e9e6f66b309f65999684b459921c9e6294fbd47448046fcdec27d988a3bb941d2685d9fc0399bddc8ea78b6957aae56158941ed4425c507c3d22a20720 WHIRLPOOL 536fb2fca6cfe9d8a0e470f27d50efa043c4fa27586eff61d7fc3facf265623e4b03b8bde03ff1d04d302e292dfc77278deb6b418df7ee44dc37b3ef9bda8f39 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iEYEAREIAAYFAlNf8JgACgkQWunnsum7y6gD4ACfYH89edXZVUEmudO/RAmKZjiG -OzwAnRIoZFoO0Y2kvxLSEukWt/jrBvn1 -=+Pq4 ------END PGP SIGNATURE----- diff --git a/games-emulation/pcsx2/pcsx2-1.3.0_p5919.ebuild b/games-emulation/pcsx2/pcsx2-1.3.0_p5919.ebuild deleted file mode 100644 index 2dffb49..0000000 --- a/games-emulation/pcsx2/pcsx2-1.3.0_p5919.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit cmake-utils wxwidgets games - -DESCRIPTION="A PlayStation 2 emulator" -HOMEPAGE="http://www.pcsx2.net" -SRC_URI="http://dev.gentoo.org/~vincent/distfiles/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="-* ~x86 ~amd64" - -DEPEND="dev-cpp/sparsehash - media-libs/alsa-lib - media-libs/glew - media-libs/libsdl - media-libs/libsoundtouch - media-libs/portaudio - sys-libs/zlib - virtual/jpeg - virtual/opengl - x11-libs/gtk+:2 - x11-libs/libICE - x11-libs/libX11 - x11-libs/libXext - x11-libs/wxGTK:2.8[X] - x86? ( - dev-libs/libaio - media-gfx/nvidia-cg-toolkit - ) - amd64? ( - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-opengl - app-emulation/emul-linux-x86-xlibs - app-emulation/emul-linux-x86-gtklibs - app-emulation/emul-linux-x86-sdl - app-emulation/emul-linux-x86-soundlibs - app-emulation/emul-linux-x86-libsoundtouch - app-emulation/emul-linux-x86-wxGTK:2.8 - >=dev-libs/libaio-0.3.109-r4[multilib] - >=media-gfx/nvidia-cg-toolkit-3.1[multilib] - )" -RDEPEND="${DEPEND}" - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - use amd64 && local ABI="x86" - - local wxgtk_config="" - local cg_config="" - local mylibpath="" - - if use amd64 ; then - mylibpath="/usr/$(get_libdir)" - wxgtk_config="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.8-32" - cg_config="-DCG_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCg.so - -DCG_GL_LIBRARY=/opt/nvidia-cg-toolkit/lib32/libCgGL.so" - else - mylibpath="/usr/$(get_libdir)" - fi - - mycmakeargs="-DPACKAGE_MODE=1 - -DCMAKE_VERBOSE_MAKEFILE=TRUE - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_LIBRARY_PATH=${mylibpath} - -DBUILD_REPLAY_LOADERS=FALSE - ${wxgtk_config} - ${cg_config}" - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - dogamesbin "${D}usr/bin/${PN}" - rm "${D}usr/bin/${PN}" || die "rm failed" - - prepgamesdirs -} diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index 3927d1f..7c43851 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -53,6 +53,8 @@ src_unpack() { } src_prepare() { + # Don't build GSdx plugin + rm -Rf plugins/GSdx cmake-utils_src_prepare }