# HG changeset patch # User Da Risk # Date 1477519623 25200 # Node ID fd437be93d62c946327df5f74b645551d7695977 # Parent dcd3a578fac0f52a875cae4b75753d85bce1abca# Parent 4f4df43f2e9b52114e938d2d995b318dad5ff2c8 Merge genymotion-2.8.0 into master diff -r dcd3a578fac0 -r fd437be93d62 app-emulation/genymotion/Manifest --- a/app-emulation/genymotion/Manifest Tue Sep 20 11:26:02 2016 -0700 +++ b/app-emulation/genymotion/Manifest Wed Oct 26 15:07:03 2016 -0700 @@ -1,3 +1,2 @@ -DIST genymotion-2.6.0-linux_x64.bin 43085801 SHA256 ba1638c79127dc756216814df85b242ac6f4116a8d8768d118155a649c1e4422 SHA512 455b9e6cdb1752b0390638d7b2856ea83248d9a9e5018760a4b9d9103d01956b4f1dc0fe5769579893ffe832a659117c7f0bcfba88120b9822e613ddc4d9e42f WHIRLPOOL 8e9f9f6b45d28418ff1002c81a335387edfdf7af98b171580d1224367ca3ae5fe85e0bcf95a6245492d2b3cefe9bf7b86fb91f84e8380ce6211376b50f1bb650 -DIST genymotion-2.6.0-linux_x86.bin 43505335 SHA256 93ba1529d681708f4501964562de27e468ec64e2b57e0701326bb87c2d601a2b SHA512 637df7cd843044c1d3be1abc30a248d78649a57b65fb5386add937b0f4ee52e76a9e3f3184aa8d47969235f8a6861f315edb0cb45bdc83035f1f26ecb0491f8b WHIRLPOOL a18d302fd0ed520cb839caa11f99d7457395f2e5c612affd0a0fe448468a76fe779207fd1a53f354d9003575a991a3571af5ae60dbce419c79b0888460ed704f DIST genymotion-2.7.2-linux_x64.bin 46788769 SHA256 4171ffb234e8c0544fa5f16e430b37391d5973401f8591fde0cc386e7cfe2d48 SHA512 6894b6d406e0395cb278dcc10caf77b733dc9c2387898d22428685ee1952203cf7dab3138641f6891a1e8c0bac52499d311a937fddfee7c83103348de5783120 WHIRLPOOL 6e37a1746cbae9518de9ffb2e82b3b0bdc89281522f21be255e054f06b699b9b4f57a5e33b40523c09613de71a252a2b893b09a28d231a6db68a776932b9fb5a +DIST genymotion-2.8.0-linux_x64.bin 46920781 SHA256 9392dfbf1b324ae82c86d1c34c72abd1cdee9032ae12fd5214d8eb5a2f6d6e53 SHA512 3e45ffe6904032128e0bc251ac1657b06874f686d4281fad8418f37216ebcb19298eb3456bb96025d081a8af3322731858c1595836a3e9a9531e394f719277f6 WHIRLPOOL f5cb82be2bf7aefc840a39eef52131213a0151e2bddd2ca3b0cf9598aaa1315633ee0275e92459ed5aad786e3cfb437678681b5a4b93aa0cfe035cff2bf7c6fd diff -r dcd3a578fac0 -r fd437be93d62 app-emulation/genymotion/genymotion-2.6.0.ebuild --- a/app-emulation/genymotion/genymotion-2.6.0.ebuild Tue Sep 20 11:26:02 2016 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="An awesome Android emulator" -HOMEPAGE="http://www.genymotion.com" -SRC_URI="amd64? ( http://files2.genymotion.com/${PN}/${P}/${P}-linux_x64.bin ) - x86? ( http://files2.genymotion.com/${PN}/${P}/${P}-linux_x86.bin )" - -LICENSE="GENYMOTION" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="system-qt" - -inherit pax-utils - -DEPEND="" -RDEPEND="|| ( app-emulation/virtualbox - app-emulation/virtualbox-bin ) - dev-libs/openssl:0 - =dev-libs/protobuf-2.4.1 - media-video/libav - system-qt? ( - dev-qt/qtcore:5[icu] - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtscript:5 - dev-qt/qtsensors:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - )" - - # other dependencies - # libav - -QA_PRESTRIPPED=" - /opt/genymotion/device-upgrade - /opt/genymotion/genymotion - /opt/genymotion/genymotion-tool - /opt/genymotion/genyshell - /opt/genymotion/gmtool - /opt/genymotion/imageformats/libqsvg.so - /opt/genymotion/lib64EGL_translator.so - /opt/genymotion/lib64GLES_CM_translator.so - /opt/genymotion/lib64GLES_V2_translator.so - /opt/genymotion/lib64OpenglRender.so - /opt/genymotion/libavutil.so.51 - /opt/genymotion/libcrypto.so.1.0.0 - /opt/genymotion/libicudata.so.53 - /opt/genymotion/libicui18n.so.53 - /opt/genymotion/libicuuc.so.53 - /opt/genymotion/libminicrypt.so.1.0.0 - /opt/genymotion/libprotobuf.so.7 - /opt/genymotion/libQt5Concurrent.so.5 - /opt/genymotion/libQt5Core.so.5 - /opt/genymotion/libQt5DBus.so.5 - /opt/genymotion/libQt5Gui.so.5 - /opt/genymotion/libQt5Multimedia.so.5 - /opt/genymotion/libQt5MultimediaWidgets.so.5 - /opt/genymotion/libQt5Network.so.5 - /opt/genymotion/libQt5OpenGL.so.5 - /opt/genymotion/libQt5Positioning.so.5 - /opt/genymotion/libQt5PrintSupport.so.5 - /opt/genymotion/libQt5Qml.so.5 - /opt/genymotion/libQt5Quick.so.5 - /opt/genymotion/libQt5Script.so.5 - /opt/genymotion/libQt5Sensors.so.5 - /opt/genymotion/libQt5Sql.so.5 - /opt/genymotion/libQt5Svg.so.5 - /opt/genymotion/libQt5WebChannel.so.5 - /opt/genymotion/libQt5WebKit.so.5 - /opt/genymotion/libQt5WebKitWidgets.so.5 - /opt/genymotion/libQt5Widgets.so.5 - /opt/genymotion/libswscale.so.2 - /opt/genymotion/platforms/libqxcb.so - /opt/genymotion/player - /opt/genymotion/plugins/libvboxmanage.so.1.0.0 - /opt/genymotion/sqldrivers/libqsqlite.so - /opt/genymotion/tools/aapt - /opt/genymotion/tools/adb - /opt/genymotion/tools/glewinfo " - -src_unpack() { - mkdir "${S}" - skip=$(awk '/^__TARFILE_FOLLOWS__/ { print NR + 1; exit 0; }' "${DISTDIR}/${A}") - tail -n +$skip "${DISTDIR}/${A}" | tar -xj -C "${S}" -} - -src_install() { - dodir "/opt/genymotion" - if use system-qt ; then - rm libQt5*.so.5 || die - rm -r sqldrivers || die - # should be deleted and use the system one provided by qtsvg - # but it does not work - #rm -r imageformats || die - fi - - # use system ssl - rm libssl.so.1.0.0 libcrypto.so.1.0.0 || die - - cp -R "${S}"/* "${D}opt/genymotion" - pax-mark -m "${D}opt/genymotion/genymotion" - pax-mark -m "${D}opt/genymotion/gmtool" - - dodir "/opt/bin" - dosym "/opt/genymotion/genymotion" "/opt/bin/genymotion" - dosym "/opt/genymotion/genymotion-shell" "/opt/bin/genymotion-shell" - dosym "/opt/genymotion/gmtool" "/opt/bin/gmtool" -} diff -r dcd3a578fac0 -r fd437be93d62 app-emulation/genymotion/genymotion-2.8.0.ebuild --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app-emulation/genymotion/genymotion-2.8.0.ebuild Wed Oct 26 15:07:03 2016 -0700 @@ -0,0 +1,203 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="An awesome Android emulator" +HOMEPAGE="http://www.genymotion.com" +SRC_URI="https://dl.genymotion.com/releases/${P}/${P}-linux_x64.bin" + +LICENSE="GENYMOTION" +SLOT="0" +KEYWORDS="~amd64" +IUSE="unbundled-libs" + +inherit pax-utils + +DEPEND="" +# 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 +RDEPEND="|| ( app-emulation/virtualbox + app-emulation/virtualbox-bin ) + unbundled-libs? ( + dev-libs/openssl:0 + dev-qt/qtcore:5[icu] + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwebkit:5 + dev-qt/qtwebsockets:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtgraphicaleffects:5 + =dev-libs/protobuf-2.6* + )" + +# don't unbundle libav to avoid downgrade +# media-video/libav:0/9 + +QA_PRESTRIPPED=" + /opt/genymotion/device-upgrade + /opt/genymotion/genymotion + /opt/genymotion/genymotion-tool + /opt/genymotion/genymotionadbtunneld + /opt/genymotion/genyshell + /opt/genymotion/gmtool + /opt/genymotion/imageformats/libqsvg.so + /opt/genymotion/imageformats/libqgif.so + /opt/genymotion/imageformats/libqjpeg.so + /opt/genymotion/lib64EGL_translator.so + /opt/genymotion/lib64GLES_CM_translator.so + /opt/genymotion/lib64GLES_V2_translator.so + /opt/genymotion/lib64OpenglRender.so + /opt/genymotion/libavutil.so.51 + /opt/genymotion/libcrypto.so.1.0.0 + /opt/genymotion/libicudata.so.53 + /opt/genymotion/libicui18n.so.53 + /opt/genymotion/libicuuc.so.53 + /opt/genymotion/libminicrypt.so.1.0.0 + /opt/genymotion/libprotobuf.so.9 + /opt/genymotion/libQt5Concurrent.so.5 + /opt/genymotion/libQt5Core.so.5 + /opt/genymotion/libQt5DBus.so.5 + /opt/genymotion/libQt5Gui.so.5 + /opt/genymotion/libQt5Network.so.5 + /opt/genymotion/libQt5OpenGL.so.5 + /opt/genymotion/libQt5PrintSupport.so.5 + /opt/genymotion/libQt5Qml.so.5 + /opt/genymotion/libQt5Quick.so.5 + /opt/genymotion/libQt5Sql.so.5 + /opt/genymotion/libQt5Svg.so.5 + /opt/genymotion/libQt5WebKit.so.5 + /opt/genymotion/libQt5WebKitWidgets.so.5 + /opt/genymotion/libQt5Widgets.so.5 + /opt/genymotion/libswscale.so.2 + /opt/genymotion/platforms/libqxcb.so + /opt/genymotion/player + /opt/genymotion/plugins/libvboxmanage.so.1.0.0 + /opt/genymotion/sqldrivers/libqsqlite.so + /opt/genymotion/tools/aapt + /opt/genymotion/tools/adb + /opt/genymotion/tools/glewinfo " + +EMBEDDED_LIBS=" + libharfbuzz.so.0 + libXrender.so.1 + libXcomposite.so.1 + libxslt.so.1 + libxml2.so.2 + libsqlite3.so.0 + libfreetype.so.6 + libgraphite2.so.3 + libexpat.so.1 + libxcb-dri3.so.0 + libxcb-present.so.0 + libxcb-sync.so.1 + libxshmfence.so.1 + libglapi.so.0 + libXext.so.6 + libXdamage.so.1 + libXfixes.so.3 + libX11-xcb.so.1 + libxcb.so.1 + libxcb-glx.so.0 + libxcb-dri2.so.0 + libXxf86vm.so.1 + libdrm.so.2 + libicuuc.so.52 + libpng12.so.0 + libXau.so.6 + libXdmcp.so.6 + libicudata.so.52 + libQt5WebKitWidgets.so.5 + libQt5WebSockets.so.5 + libQt5Concurrent.so.5 + libQt5Svg.so.5 + libQt5Gui.so.5 + libQt5Core.so.5 + libQt5Network.so.5 + libQt5Widgets.so.5 + libQt5Sql.so.5 + libQt5WebKit.so.5 + libQt5X11Extras.so.5 + libQt5PrintSupport.so.5 + libQt5OpenGL.so.5 + libQt5Quick.so.5 + libQt5Qml.so.5 + libQt5DBus.so.5 + libjpeg.so.8 + libicui18n.so.52 + libgstreamer-1.0.so.0 + libgstapp-1.0.so.0 + libgstbase-1.0.so.0 + libgstpbutils-1.0.so.0 + libgstvideo-1.0.so.0 + libgstaudio-1.0.so.0 + libffi.so.6 + liborc-0.4.so.0 + libgsttag-1.0.so.0 + libdouble-conversion.so.1 + libXi.so.6 + libxcb-render-util.so.0 + libSM.so.6 + libICE.so.6 + libxcb-render.so.0 + libxcb-image.so.0 + libxcb-icccm.so.4 + libxcb-xfixes.so.0 + libxcb-shm.so.0 + libxcb-randr.so.0 + libxcb-shape.so.0 + libxcb-keysyms.so.1 + libxcb-xkb.so.1 + libxkbcommon-x11.so.0 + libxkbcommon.so.0 + libfontconfig.so.1 + libuuid.so.1 + libxcb-util.so.0 + libssl.so.1.0.0 + libcrypto.so.1.0.0 + libpcre.so.3 + libdbus-1.so.3 + libprotobuf.so.9 +" +# don't unbundle libav +# libavutil.so.51 +# libswscale.so.2 + +src_unpack() { + mkdir "${S}" + skip=$(awk '/^__TARFILE_FOLLOWS__/ { print NR + 1; exit 0; }' "${DISTDIR}/${A}") + tail -n +$skip "${DISTDIR}/${A}" | tar -xj -C "${S}" +} + +src_install() { + dodir "/opt/genymotion" + if use unbundled-libs ; then + rm -r sqldrivers || die + rm -r platforms || die + rm -r QtGraphicalEffects || die + rm -r QtQuick || die + rm -r QtQuick.2 || die + # should be deleted and use the system one provided by qtsvg + # but it does not work + # rm -r imageformats || die + # delete all other qt dependencies + rm $EMBEDDED_LIBS || die + rm qt.conf || die + fi + + cp -R "${S}"/* "${D}opt/genymotion" + pax-mark -m "${D}opt/genymotion/genymotion" + pax-mark -m "${D}opt/genymotion/gmtool" + + dodir "/opt/bin" + dosym "/opt/genymotion/genymotion" "/opt/bin/genymotion" + dosym "/opt/genymotion/genymotion-shell" "/opt/bin/genymotion-shell" + dosym "/opt/genymotion/gmtool" "/opt/bin/gmtool" +} diff -r dcd3a578fac0 -r fd437be93d62 app-emulation/genymotion/metadata.xml --- a/app-emulation/genymotion/metadata.xml Tue Sep 20 11:26:02 2016 -0700 +++ b/app-emulation/genymotion/metadata.xml Wed Oct 26 15:07:03 2016 -0700 @@ -8,7 +8,6 @@ Frederic Barthelery - Use the system-wide dev-qt packages instead of bundled. Use the system-wide libraries instead of bundled.