gentoo auto-resync : 01:02:2023 - 09:04:21

2 files changed, 50 insertions, 26 deletions

diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 6b7f0ee23afc..0e96aba12908 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,3 +1,3 @@
-DIST genymotion-3.2.1-linux_x64.bin 48264053 BLAKE2B 961b2480ed72ad29e1b71d98cedf98cb724e42032539445aa19e2783f2d714f389d983aa5d886e8f759a1a77585725daa1084ffac3d7083f72de78ccab46af77 SHA512 47589913c66dac42e107420574cdc1fd7ea6db8dacfa16c0173a72207f77d0bedf72e6c6643453b1b83e1e7d906ea52e79e3876d3d687bb689f251ce3bfa8385
-EBUILD genymotion-bin-3.2.1.ebuild 3218 BLAKE2B 21b7465d5aa0fad810c57922b9e91e0f72dccc216045b9e83335119345193aa616532d1367b3c7f19810dcac722b6700f876009428f75c36383575dd9411edc8 SHA512 d8020641f06594931127ce1ace3cd9805fba484ff8b788b2af7cfbcfc1290a39bd52be24a0a745c8ca995c3c78bac75520620923607f2c3526fadb92eff3d26d
+DIST genymotion-3.3.2-linux_x64.bin 66085990 BLAKE2B d2d11eaa00e387749e3257a90f3bbe30d586f1ec178d97e5f4537f331451b1161806fcf05d1c84b10b5116247023bd338ac4440e568d7e58d249055aed2f3597 SHA512 ae3bfd2c4eefceb04cd67256b291e3c7bee3c3d0e212add92086709e5fd60bee4789d2ea80732bacbcad880be472e507470afd635cb766903664ea0815ed0205
+EBUILD genymotion-bin-3.3.2.ebuild 3687 BLAKE2B 4df2fb86a01bf24d91981547a3bf6e02b04e6e75a8fbdec4c93f17c468405db874ba53aac3464c5e1f62dba06dc4055ce3d378ab8478e57ac418a4db1ca78015 SHA512 bc3ee073b66fb077a97be2fa10f1a8aaef48931c44c0338e941093d326f897fbde207eadfd984b00f7fc3f998049f7e219b46f6c551483f44c23ea2c7baef028
 MISC metadata.xml 402 BLAKE2B ab9053ca959660812f1e1bc536950c0278d23c2906ff0a82483241f16960d2ae6ecd3eff091666df8fef38fdb073a6e3d0a5c8a7c7926426fead769365df49a5 SHA512 785e5acc8811d310b7cd5dc52fe3de6a22d7a92fa81a12db8a16b1df75a83f47ffea4e2fe21a712dabc5c1fff8da4d6f2e49ae0597373fd6e106aa13e81323d3
diff --git a/app-emulation/genymotion-bin/genymotion-bin-3.2.1.ebuild b/app-emulation/genymotion-bin/genymotion-bin-3.3.2.ebuild
index 5cf358b040a3..0fc8ae17fa4d 100644
--- a/app-emulation/genymotion-bin/genymotion-bin-3.2.1.ebuild
+++ b/app-emulation/genymotion-bin/genymotion-bin-3.3.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1 desktop pax-utils
 
@@ -17,15 +17,37 @@ LICENSE="genymotion"
 SLOT="0"
 KEYWORDS="-* ~amd64"
 
-RDEPEND="app-emulation/virtualbox
+RDEPEND="app-arch/lz4
+	app-crypt/mit-krb5
+	app-emulation/virtualbox
 	|| (
-		dev-libs/openssl-compat:1.0.0
-		=dev-libs/openssl-1.0*:0
+		dev-libs/openssl-compat:1.1.0
+		=dev-libs/openssl-1.1*:0
 	)
-	>=dev-libs/hiredis-1.0.0
-	sys-apps/util-linux
+	dev-libs/glib:2
+	=dev-libs/hiredis-1.0*
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpulse
+	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0
+	sys-apps/dbus
+	sys-libs/zlib
 	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libxkbcommon
+	x11-libs/libXmu
+	x11-libs/xcb-util
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-renderutil
+	x11-libs/xcb-util-wm
 "
+BDEPEND="x11-misc/xdg-utils"
 
 RESTRICT="bindist fetch"
 S="${WORKDIR}"
@@ -39,6 +61,7 @@ QA_PREBUILT="
 	opt/${MY_PN}/player
 	opt/${MY_PN}/${MY_PN}adbtunneld
 	opt/${MY_PN}/gmtool
+	opt/${MY_PN}/tools/*
 "
 
 pkg_nofetch() {
@@ -67,6 +90,12 @@ src_prepare() {
 
 	# removed windows line for bashcompletion
 	sed -i "/complete -F _gmtool gmtool.exe/d" "${MY_PN}/completion/bash/gmtool.bash" || die "sed failed"
+
+	# copy .desktop file in S directory
+	sed -i -e "s:Icon.*:Icon=/opt/${MY_PN}/icons/genymotion-logo.png:" \
+		-e "s:Exec.*:Exec=/opt/${MY_PN}/genymotion:" \
+		"${HOME}"/.local/share/applications/genymobile-genymotion.desktop || die "sed failed"
+	cp "${HOME}"/.local/share/applications/genymobile-genymotion.desktop "${S}" || die "copy .desktop file"
 }
 
 src_install() {
@@ -74,20 +103,27 @@ src_install() {
 	exeinto /opt/"${MY_PN}"
 
 	# Use qt bundled
-	doins -r "${MY_PN}"/{geoservices,Qt,QtGraphicalEffects,QtLocation,QtPositioning,QtQuick,QtQuick.2}
-	doins -r "${MY_PN}"/{icons,imageformats,platforms,plugins,sqldrivers,translations,xcbglintegrations}
+	doins -r "${MY_PN}"/{audio,geoservices,Qt,QtGraphicalEffects,QtLocation,QtPositioning,QtQuick,QtQuick.2}
+	doins -r "${MY_PN}"/{icons,imageformats,mediaservice,platforms,plugins,sqldrivers,translations,xcbglintegrations}
 	doins "${MY_PN}"/libQt*
 	doins "${MY_PN}"/qt.conf
 	doins "${MY_PN}"/libicu*
 
-	doexe "${MY_PN}"/{libcom,librendering,libswscale,libavutil}.so*
+	doexe "${MY_PN}"/{libcom,librendering,libshadertranslator,libswscale,libavutil}.so*
 	# android library
-	doexe "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender,libemugl_logger}.so*
+	doexe "${MY_PN}"/{libOpenglRender,libemugl_logger,libemugl_common}.so*
 
 	find "${ED}/opt/${MY_PN}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed"
 
 	doexe "${MY_PN}"/{genymotion,genyshell,player,gmtool}
 
+	# the android-sdk-update-manager have some bugs and lacks maintenance
+	# so installs bundled version
+	exeinto /opt/"${MY_PN}"/tools
+	doexe "${MY_PN}"/tools/{aapt,adb,glewinfo}
+	exeinto /opt/"${MY_PN}"/tools/lib64
+	doexe "${MY_PN}"/tools/lib64/libc++.so
+
 	pax-mark -m "${ED}/opt/${MY_PN}/genymotion"
 	pax-mark -m "${ED}/opt/${MY_PN}/gmtool"
 
@@ -100,17 +136,5 @@ src_install() {
 	insinto /usr/share/zsh/site-functions
 	doins "${MY_PN}/completion/zsh/_gmtool"
 
-	sed -i -e "s:Icon.*:Icon=/opt/${MY_PN}/icons/icon.png:" \
-		-e "s:Exec.*:Exec=/opt/${MY_PN}/genymotion:" \
-		"${HOME}"/.local/share/applications/genymobile-genymotion.desktop || die "sed failed"
-	domenu "${HOME}"/.local/share/applications/genymobile-genymotion.desktop
-}
-
-pkg_postinst() {
-	elog "Genymotion needs adb to work correctly: install with android-sdk-update-manager"
-	elog "'Android SDK Platform-tools' and 'Android SDK Tools'"
-	elog "Your user should also be in the android group to work correctly"
-	elog "Then in Genymotion set the android-sdk-update-manager directory: (Settings->ADB)"
-	elog
-	elog "      /opt/android-sdk-update-manager"
+	domenu genymobile-genymotion.desktop
 }