gentoo resync : 28.04.2019

3 files changed, 125 insertions, 115 deletions

diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 0a956faa2b07..bf38b3c38ad9 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,3 +1,3 @@
-DIST genymotion-2.12.2-linux_x64.bin 45850812 BLAKE2B 74c3dfa73818f1d7318235d13acbff79d5dd27fd8d7c8cd246046406aaf8f2b9cdb9e9cb7c44bd294b0a047c2bd1e6a419bd4191dd3e332d82494f358cc9d73c SHA512 31b1c9de1a264f285938fcc62612a6aa74393e88f6075664f3e168c5226e74ab25e72061904716f6b2d33ed77221b8c4605c247090c7e2fd149ea8be96f9b5dc
-EBUILD genymotion-bin-2.12.2.ebuild 3426 BLAKE2B a0dd9c1be92d3d6f88172dc0c32c44175af09b4728f06484286fab1456fdd306f1fefa9fadc7f4e2a9c08a911c5abac56c7e590887fe00233e69210c6415eb4f SHA512 a5457a9151f83c6e09a764e2ba0419fc14b634a7502805c8534dd5763ab876846dcb4318efe35ef340b21b3db9618294e8e6dff9904bb75ad219722797e126cb
+DIST genymotion-3.0.2-linux_x64.bin 38744066 BLAKE2B 4c98cdc8d5a5cd98192260893b39dd838bba5903d590268d53223c1ebe712296cf25aa638c16de39ea4f83a5fd8717edbab7c043ff6a12e6455862ecd25ca7cc SHA512 5075d9a9c6c5e84ff90e05e4fa70db98cf89ad25e8765566176b94559f60cc170e383a02f50c752fb63859b757645390d977081d2f79ce0fab8607ebf3e08e01
+EBUILD genymotion-bin-3.0.2.ebuild 3570 BLAKE2B 0943e4837194aba53b44b4f7e4c6db986855953a48d3201c548b0f60e475ac612f568bf318f20051205954074d81171b7ccb420180979b8bdc205696804bb4ac SHA512 4e84ac81c6aa701bf7870eb678bdd92d271b3940c6ce270aa7985ac61d40f51a2a6131a62c87d51b93f234cbf23bf022611f6492fccbf2a22465b6927520ccef
 MISC metadata.xml 483 BLAKE2B 1ed85dae79388f3c548163e5fafd2838e1adf9bfc9a9c793ce7f9e7e323f8e3c9e7e2f3190b3ec54a0c598d048c61b6ad67c8eefb3845cd446ea67b01e0df8a8 SHA512 e88ad9fd8c20d5be5569c64544c3f4dd72eb3243d46333c30aaa1b939eb6ce35855aa3e771008b2fff990de5b2e5bf79ca378714e3cf7dc375144b7cd8f5649c
diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.12.2.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.12.2.ebuild
deleted file mode 100644
index b7acb03d4784..000000000000
--- a/app-emulation/genymotion-bin/genymotion-bin-2.12.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1 pax-utils
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Complete set of tools that provide a virtual environment for Android"
-HOMEPAGE="https://genymotion.com"
-SRC_URI="${MY_P}-linux_x64.bin"
-DOWNLOAD_URL="https://www.genymotion.com/download/"
-
-LICENSE="genymotion"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 )
-	app-arch/snappy
-	virtual/opengl
-	dev-libs/openssl
-	dev-libs/hiredis
-	media-gfx/graphite2
-	sys-apps/util-linux
-	media-libs/gst-plugins-base:0.10
-"
-# note if you compile protobuf with >=gcc-5.1 you need to disable the new c++11 abi
-# -D_GLIBCXX_USE_CXX11_ABI=0  to your CXXFLAGS for protobuf
-#	=dev-libs/protobuf-2.6*
-
-RESTRICT="bindist fetch"
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo
-	einfo "Please visit ${DOWNLOAD_URL} and download ${A}"
-	einfo "which must be placed in DISTDIR directory."
-	einfo
-}
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die "cp failed"
-}
-
-src_prepare() {
-	default
-
-	# removed function _install_desktop_file because happens outside of sandbox
-	sed -i -e "s/_install_desktop_file\ ||\ abort//" ${A} || die "sed failed"
-	chmod +x ${A} || die "chmod failed"
-	yes | ./${A} -d "${S}" > /dev/null || die "unpack failed"
-
-	# removed windows line for bashcompletion
-	sed -i -e "s/complete\ -F\ _gmtool\ gmtool.exe//" "${S}/${MY_PN}/completion/bash/gmtool.bash" || die "sed failed"
-}
-
-QA_PREBUILT="
-	opt/${MY_PN}/*.so*
-	opt/${MY_PN}/imageformats/*.so
-	opt/${MY_PN}/plugins/*.so*
-	opt/${MY_PN}/device-upgrade
-	opt/${MY_PN}/${MY_PN}
-	opt/${MY_PN}/genyshell
-	opt/${MY_PN}/player
-	opt/${MY_PN}/${MY_PN}adbtunneld
-	opt/${MY_PN}/gmtool
-"
-
-src_install() {
-	insinto /opt/"${MY_PN}"
-	doins -r "${MY_PN}"/{plugins,translations,icons}
-
-	doins -r "${MY_PN}"/{QtGraphicalEffects,QtQuick,QtQuick.2,platforms,sqldrivers,imageformats}
-	doins "${MY_PN}"/libQt*
-	doins "${MY_PN}"/qt.conf
-	doins "${MY_PN}"/libicu*
-
-	doins "${MY_PN}"/{libcom,librendering}.so*
-	# android library
-	doins "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender}.so*
-
-	insopts -m0755
-	doins "${MY_PN}"/{device-upgrade,genymotion,genyshell,player,genymotionadbtunneld,gmtool}
-
-	pax-mark -m "${ED%/}/opt/${MY_PN}/${MY_PN}"
-	pax-mark -m "${ED%/}/opt/${MY_PN}/gmtool"
-
-	dosym "${ED%/}"/opt/"${MY_PN}"/genyshell /opt/bin/genyshell
-	dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}" /opt/bin/"${MY_PN}"
-	dosym "${ED%/}"/opt/"${MY_PN}"/gmtool /opt/bin/gmtool
-
-	newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
-
-	if has_version "app-shells/zsh" ; then
-		insinto /usr/share/zsh/site-functions
-		doins "${MY_PN}/completion/zsh/_gmtool"
-	fi
-
-	make_desktop_entry "/opt/${MY_PN}/${MY_PN}" "Genymotion ${PV}" "/opt/${MY_PN}/icons/icon.png" "Development;Emulator;"
-	mv "${ED%/}"/usr/share/applications/*.desktop "${ED%/}"/usr/share/applications/"${MY_PN}".desktop || die "mv failed"
-}
-
-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"
-}
diff --git a/app-emulation/genymotion-bin/genymotion-bin-3.0.2.ebuild b/app-emulation/genymotion-bin/genymotion-bin-3.0.2.ebuild
new file mode 100644
index 000000000000..70737af7536c
--- /dev/null
+++ b/app-emulation/genymotion-bin/genymotion-bin-3.0.2.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 desktop pax-utils
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+BIN_ARCHIVE="${MY_P}-linux_x64.bin"
+
+DESCRIPTION="Complete set of tools that provide a virtual environment for Android"
+HOMEPAGE="https://genymotion.com"
+SRC_URI="${BIN_ARCHIVE}"
+
+LICENSE="genymotion"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+DEPEND=""
+RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 )
+	virtual/opengl
+	|| (
+		dev-libs/openssl:1.0.0
+		=dev-libs/openssl-1.0*:0
+	)
+	dev-libs/hiredis:0/0.14
+	sys-apps/util-linux
+"
+BDEPEND=">=dev-util/patchelf-0.9_p20180129"
+
+RESTRICT="bindist fetch"
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/${MY_PN}/*.so*
+	opt/${MY_PN}/imageformats/*.so
+	opt/${MY_PN}/plugins/*.so*
+	opt/${MY_PN}/${MY_PN}
+	opt/${MY_PN}/genyshell
+	opt/${MY_PN}/player
+	opt/${MY_PN}/${MY_PN}adbtunneld
+	opt/${MY_PN}/gmtool
+"
+
+pkg_nofetch() {
+	einfo
+	einfo "Please visit"
+	einfo
+	einfo "  https://www.genymotion.com/download/"
+	einfo
+	einfo "and download "
+	einfo
+	einfo "  ${BIN_ARCHIVE}"
+	einfo
+	einfo "which must be placed in DISTDIR directory."
+	einfo
+}
+
+src_unpack() {
+	cp "${DISTDIR}/${BIN_ARCHIVE}" "${WORKDIR}" || die "cp failed"
+}
+
+src_prepare() {
+	default
+
+	chmod +x ${BIN_ARCHIVE} || die "chmod failed"
+	yes | ./${BIN_ARCHIVE} > /dev/null || die "unpack failed"
+
+	# removed windows line for bashcompletion
+	sed -i "/complete -F _gmtool gmtool.exe/d" "${MY_PN}/completion/bash/gmtool.bash" || die "sed failed"
+
+	# patch to support newer hiredis version (0.14)
+	for i in genymotion genyshell gmtool player libcom.so.1.0.0 librendering.so.1.0.0 ; do
+		patchelf --replace-needed libhiredis.so.0.13 libhiredis.so.0.14 "${MY_PN}/${i}" || die "Unable to patch ${i} for hiredis"
+	done
+}
+
+src_install() {
+	insinto /opt/"${MY_PN}"
+	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 "${MY_PN}"/libQt*
+	doins "${MY_PN}"/qt.conf
+	doins "${MY_PN}"/libicu*
+
+	doexe "${MY_PN}"/{libcom,librendering}.so*
+	# android library
+	doexe "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender}.so*
+
+	find "${ED}/opt/${MY_PN}" -name "*.so*" -type f -exec chmod +x {} \; || die "Change .so permission failed"
+
+	doexe "${MY_PN}"/{genymotion,genyshell,player,genymotionadbtunneld,gmtool}
+
+	pax-mark -m "${ED}/opt/${MY_PN}/genymotion"
+	pax-mark -m "${ED}/opt/${MY_PN}/gmtool"
+
+	dosym ../"${MY_PN}"/genyshell /opt/bin/genyshell
+	dosym ../"${MY_PN}"/genymotion /opt/bin/genymotion
+	dosym ../"${MY_PN}"/gmtool /opt/bin/gmtool
+
+	newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
+
+	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"
+}