gentoo resync : 06.08.2019

4 files changed, 100 insertions, 12 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index e9aeb919ed2c..e02ec752264e 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 92183ba77703..9946c1db6a59 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -2,5 +2,6 @@ AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad9678818
 AUX pcsx2-1.4.0-xgetbv.patch 1361 BLAKE2B f6e28703f59dbf79c38812e9a61828f1c40b00982e86b7f3d8b507c54a331b38febbafc98012bc43a84b5ba077af56d73cfb9f1c036c0b619ace1129b91ad031 SHA512 03bc1059dbca73382c3d708e92eef270bbf7958736010d8ffcb92c81972e34e1603007b2aad41b70694791760f9323353815f3468392e39e3893c06327824022
 DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
 EBUILD pcsx2-1.4.0-r1.ebuild 2862 BLAKE2B 3d18870ff5ea8f0cfe42ac5d4c42b513e004a46b6540bc7bcf25c29b28cfaefb07ee3da983112f54442714c5a1551a89c8b8fcf9fe5b00c6729c4c75c63a6c84 SHA512 bea798521b7978df7a06a1130c38d8b57e68902e03915a2efde51cf541c9ab2da3f67ac3a1c90f86acdd7904c13bbb19369247c39ce436ac79674f67e15a89ad
-EBUILD pcsx2-9999.ebuild 2566 BLAKE2B a209364e3ac61ec3ae458b623be12a0c59b1b80d5572029f633ce039bc7e2955ae56b2d2e7401c75367a35f1362edb2308c4a5692fc71910cf211187e75328e4 SHA512 377835b46f97571801cb8e6477c8dce49ddf16b57e8ae71c6bd7f6a3b830e420c82ecbf8d4b67efd1878cd7d5ee9755eba346cf3b9ecaec11c2b85840050a4c0
+EBUILD pcsx2-1.4.0-r2.ebuild 2166 BLAKE2B 5d593177c67c44de721f699fd08192b3f56b0263bc58856c15a92db6b0535d5f6052b849216493539ae2c4c52cd5304d65d5afff7d6f0f3dc1769575af573014 SHA512 49bad15b3a7078b89adf2286b408867c85f7f71c9d1bde53b2a5bc5e2146c201e26baa81391e011c751971cee2926d08dc377fb0d951a1a06dd43fe88039bd24
+EBUILD pcsx2-9999.ebuild 2594 BLAKE2B 9fe5376db2d34d2c527120214331c7cfae9b72c03152194aca7bc52f65c125f26de130fb18b61f15a90e43d37337769f534b01ea5dc6bca8c2fbb89ac37ae7d2 SHA512 310cb64880e9104e4ef3efe395ca64b4f3dc7550e7953825855d2dfdb8d62ce2dc9d503ff7cf1326bead5b981cc6dc19bef72d3ef4a0870a8114119c1d84a3d4
 MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
new file mode 100644
index 000000000000..d31cad3370ad
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PV="${PV/_/-}"
+
+inherit cmake-utils multilib 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"
+
+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[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]
+"
+DEPEND="${RDEPEND}
+	dev-cpp/pngpp
+	dev-cpp/sparsehash
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-xgetbv.patch
+)
+
+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" setup-wxwidgets
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
+	cmake-utils_src_install
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index f79952eccb67..9e646daf5853 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets
 
@@ -25,20 +25,19 @@ RDEPEND="
 	media-libs/libsoundtouch[abi_x86_32(-)]
 	media-libs/portaudio[abi_x86_32(-)]
 	net-libs/libpcap[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
+	sys-libs/zlib[abi_x86_32(-)]
 	virtual/libudev[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]
+	x11-libs/wxGTK:3.0-gtk3[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
+	dev-cpp/sparsehash
 "
 
 pkg_setup() {
@@ -77,20 +76,21 @@ src_configure() {
 		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
 		-DDOC_DIR=/usr/share/doc/"${PF}"
 		-DEGL_API=FALSE
-		-DGTK3_API=FALSE
+		-DGTK3_API=TRUE
 		-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
+	WX_GTK_VER="3.0-gtk3" setup-wxwidgets
 	cmake-utils_src_configure
 }
 
 src_install() {
-	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
-
+	# Upstream issues:
+	#  https://github.com/PCSX2/pcsx2/issues/417
+	#  https://github.com/PCSX2/pcsx2/issues/3077
+	QA_EXECSTACK="usr/bin/PCSX2"
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
 	cmake-utils_src_install
 }