From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- games-emulation/pcsx2/Manifest | 5 - games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch | 26 ----- games-emulation/pcsx2/metadata.xml | 16 --- games-emulation/pcsx2/pcsx2-1.4.0.ebuild | 107 --------------------- games-emulation/pcsx2/pcsx2-9999.ebuild | 102 -------------------- 5 files changed, 256 deletions(-) delete mode 100644 games-emulation/pcsx2/Manifest delete mode 100644 games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch delete mode 100644 games-emulation/pcsx2/metadata.xml delete mode 100644 games-emulation/pcsx2/pcsx2-1.4.0.ebuild delete mode 100644 games-emulation/pcsx2/pcsx2-9999.ebuild (limited to 'games-emulation/pcsx2') diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest deleted file mode 100644 index ed229fa815d8..000000000000 --- a/games-emulation/pcsx2/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad96788184cbc19e1d983a37524d63618ce45009fba555f31f75c8a325156ae0cbfff74531c469add6c867ffc73f47e8 SHA512 c95b5abd255f4d0a1d9efa8b45126fea2c57ed2110358687a14d44c5ccc8f670f33a5e9b56bd9e3ea4806ad2429a84b70d796bec9c909262379bba5914e7d51d -DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb -EBUILD pcsx2-1.4.0.ebuild 2863 BLAKE2B 8f3db9fbbf1062dc9f0c8e795c6030bb1e2408e37f26e0d4fc08d3a68f53fea3cce300d3097ab2ae870bc5038023618f9ff9345d8bc4af6b56259c35ddc322cf SHA512 4d1e1c48d64b8c2e538adf546ac8f9767224d3fdf4d326b72546602e464b6ceced4b0defcd140e6934b5df69ac29a38179ebe12476b6278c60916aafaab7da0a -EBUILD pcsx2-9999.ebuild 2748 BLAKE2B 7269d9dfe2be80399909b3399ca0a2918e6711cea0a95400e338b6ea1bb2ca688a91d67ec222969487ca17298540496caa33a65a3779d459ac244644b62a98fa SHA512 9f05e4bab5761623335212e94d73a1f12135309c78d846d7d8b13090d3ee365e98fb4dcc305463e82e635485b1e9a75e240e6e7d63fad2224366984bfd7d0f01 -MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3 diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch deleted file mode 100644 index cfc941f28244..000000000000 --- a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 71991f24ef75b7da678d8de8d593bf82677d2708 Mon Sep 17 00:00:00 2001 -From: Yuri Konotopov -Date: Mon, 9 Jan 2017 18:37:44 +0400 -Subject: [PATCH] x86emitter: gcc 5 compilation fix - ---- - common/src/x86emitter/cpudetect.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp -index 717ca89..cf94d7f 100644 ---- a/common/src/x86emitter/cpudetect.cpp -+++ b/common/src/x86emitter/cpudetect.cpp -@@ -16,6 +16,9 @@ - #include "PrecompiledHeader.h" - #include "cpudetect_internal.h" - #include "internal.h" -+#if defined(__GNUC__) -+#include "x86intrin.h" -+#endif - - using namespace x86Emitter; - --- -2.10.2 - diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml deleted file mode 100644 index 16221929ad22..000000000000 --- a/games-emulation/pcsx2/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - ykonotopov@gnome.org - Yuri Konotopov - - - proxy-maint@gentoo.org - Proxy Maintainers - - - https://github.com/PCSX2/pcsx2/issues - PCSX2/pcsx2 - - diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild deleted file mode 100644 index cfd1606f91af..000000000000 --- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW" -MY_PV="${PV/_/-}" - -inherit cmake-utils l10n multilib toolchain-funcs wxwidgets - -DESCRIPTION="A PlayStation 2 emulator" -HOMEPAGE="https://www.pcsx2.net" -SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="" - -RDEPEND=" - app-arch/bzip2[abi_x86_32(-)] - app-arch/xz-utils[abi_x86_32(-)] - dev-libs/libaio[abi_x86_32(-)] - media-libs/alsa-lib[abi_x86_32(-)] - media-libs/libpng:=[abi_x86_32(-)] - media-libs/libsdl[abi_x86_32(-),joystick,sound] - media-libs/libsoundtouch[abi_x86_32(-)] - media-libs/portaudio[abi_x86_32(-)] - >=sys-libs/zlib-1.2.4[abi_x86_32(-)] - virtual/jpeg:62[abi_x86_32(-)] - virtual/opengl[abi_x86_32(-)] - x11-libs/gtk+:2[abi_x86_32(-)] - x11-libs/libICE[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/wxGTK:3.0[abi_x86_32(-),X] -" -# Ensure no incompatible headers from eselect-opengl are installed, bug #510730 -DEPEND="${RDEPEND} - >=app-eselect/eselect-opengl-1.3.1 - dev-cpp/pngpp - >=dev-cpp/sparsehash-1.5 -" - -S="${WORKDIR}/${PN}-${MY_PV}" - -PATCHES=( "${FILESDIR}"/${P}-gcc5.patch ) - -clean_locale() { - rm -R "${S}"/locales/"${1}" || die -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then - if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then - die "${PN} does not compile with gcc less than 4.8" - fi - fi -} - -src_prepare() { - cmake-utils_src_prepare - l10n_for_each_disabled_locale_do clean_locale -} - -src_configure() { - multilib_toolchain_setup x86 - - # pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel - # if it something other than "Devel|Debug|Release" - local CMAKE_BUILD_TYPE="Release" - - if use amd64; then - # Passing correct CMAKE_TOOLCHAIN_FILE for amd64 - # https://github.com/PCSX2/pcsx2/pull/422 - local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake) - fi - - local mycmakeargs=( - -DARCH_FLAG= - -DDISABLE_BUILD_DATE=TRUE - -DDISABLE_PCSX2_WRAPPER=TRUE - -DEXTRA_PLUGINS=FALSE - -DOPTIMIZATION_FLAG= - -DPACKAGE_MODE=TRUE - -DXDG_STD=TRUE - - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}" - -DDOC_DIR=/usr/share/doc/"${PF}" - -DEGL_API=FALSE - -DGTK3_API=FALSE - -DPLUGIN_DIR="/usr/$(get_libdir)/${PN}" - # wxGTK must be built against same sdl version - -DSDL2_API=FALSE - -DWX28_API=FALSE - ) - - WX_GTK_VER="3.0" need-wxwidgets unicode - cmake-utils_src_configure -} - -src_install() { - # Upstream issue: https://github.com/PCSX2/pcsx2/issues/417 - QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*" - - cmake-utils_src_install -} diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild deleted file mode 100644 index 1ab14376a933..000000000000 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW" - -inherit cmake-utils git-r3 l10n multilib toolchain-funcs wxwidgets - -DESCRIPTION="A PlayStation 2 emulator" -HOMEPAGE="https://www.pcsx2.net" -EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" -IUSE="" - -RDEPEND=" - app-arch/bzip2[abi_x86_32(-)] - app-arch/xz-utils[abi_x86_32(-)] - dev-libs/libaio[abi_x86_32(-)] - media-libs/alsa-lib[abi_x86_32(-)] - media-libs/libpng:=[abi_x86_32(-)] - media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] - media-libs/libsoundtouch[abi_x86_32(-)] - media-libs/portaudio[abi_x86_32(-)] - >=sys-libs/zlib-1.2.4[abi_x86_32(-)] - virtual/jpeg:62[abi_x86_32(-)] - virtual/opengl[abi_x86_32(-)] - x11-libs/gtk+:2[abi_x86_32(-)] - x11-libs/libICE[abi_x86_32(-)] - x11-libs/libX11[abi_x86_32(-)] - x11-libs/libXext[abi_x86_32(-)] - x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X] -" -# Ensure no incompatible headers from eselect-opengl are installed, bug #510730 -DEPEND="${RDEPEND} - >=app-eselect/eselect-opengl-1.3.1 - dev-cpp/pngpp - >=dev-cpp/sparsehash-1.5 -" - -clean_locale() { - rm -R "${S}"/locales/"${1}" || die -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then - if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then - die "${PN} does not compile with gcc less than 4.8" - fi - fi -} - -src_prepare() { - cmake-utils_src_prepare - l10n_for_each_disabled_locale_do clean_locale -} - -src_configure() { - multilib_toolchain_setup x86 - - # pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel - # if it something other than "Devel|Debug|Release" - local CMAKE_BUILD_TYPE="Release" - - if use amd64; then - # Passing correct CMAKE_TOOLCHAIN_FILE for amd64 - # https://github.com/PCSX2/pcsx2/pull/422 - local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake) - fi - - local mycmakeargs=( - -DARCH_FLAG= - -DDISABLE_BUILD_DATE=TRUE - -DDISABLE_PCSX2_WRAPPER=TRUE - -DEXTRA_PLUGINS=FALSE - -DOPTIMIZATION_FLAG= - -DPACKAGE_MODE=TRUE - -DXDG_STD=TRUE - - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}" - -DDOC_DIR=/usr/share/doc/"${PF}" - -DEGL_API=FALSE - -DGTK3_API=FALSE - -DPLUGIN_DIR="/usr/$(get_libdir)/${PN}" - # wxGTK must be built against same sdl version - -DSDL2_API=TRUE - -DWX28_API=FALSE - ) - - WX_GTK_VER="3.0" need-wxwidgets unicode - cmake-utils_src_configure -} - -src_install() { - # Upstream issue: https://github.com/PCSX2/pcsx2/issues/417 - QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*" - - cmake-utils_src_install -} -- cgit v1.2.3