From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 38279139694 for ; Sat, 25 Mar 2017 12:54:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E095521C0F9; Sat, 25 Mar 2017 12:54:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B062521C0F9 for ; Sat, 25 Mar 2017 12:54:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 65B97341659 for ; Sat, 25 Mar 2017 12:54:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD83171B2 for ; Sat, 25 Mar 2017 12:53:59 +0000 (UTC) From: "Ettore Di Giacinto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ettore Di Giacinto" Message-ID: <1490446417.2afe6ded179c2ba59bda12bbe88051cac36e61c4.mudler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/genymotion-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild app-emulation/genymotion-bin/genymotion-bin-2.8.1.ebuild X-VCS-Directories: app-emulation/genymotion-bin/ X-VCS-Committer: mudler X-VCS-Committer-Name: Ettore Di Giacinto X-VCS-Revision: 2afe6ded179c2ba59bda12bbe88051cac36e61c4 X-VCS-Branch: master Date: Sat, 25 Mar 2017 12:53:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 48da715d-64a5-4b5c-bf26-a259de40ae6b X-Archives-Hash: 9f19416336be6be6c8020af0d492f308 commit: 2afe6ded179c2ba59bda12bbe88051cac36e61c4 Author: Marco Genasci gmail com> AuthorDate: Tue Mar 21 11:29:05 2017 +0000 Commit: Ettore Di Giacinto gentoo org> CommitDate: Sat Mar 25 12:53:37 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2afe6ded app-emulation/genymotion-bin: correct dependencies and access DISTDIR in pkg_* phases wrt bug #612900 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Signed-off-by: Ettore Di Giacinto gentoo.org> ...2.8.1.ebuild => genymotion-bin-2.8.1-r1.ebuild} | 32 ++++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.8.1.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild similarity index 80% rename from app-emulation/genymotion-bin/genymotion-bin-2.8.1.ebuild rename to app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild index 06c7e953407..45b76acfd35 100644 --- a/app-emulation/genymotion-bin/genymotion-bin-2.8.1.ebuild +++ b/app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild @@ -24,9 +24,13 @@ RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5 dev-libs/openssl dev-qt/qtgui:5[libinput,xcb] dev-qt/qtsql:5[sqlite] + dev-qt/qtwebkit:5 + dev-qt/qtsvg:5 + dev-qt/qtx11extras:5 + dev-qt/qtdeclarative:5 + dev-qt/qtconcurrent:5 dev-util/android-sdk-update-manager media-libs/jpeg:8 - dev-libs/protobuf:0/9 dev-libs/double-conversion sys-apps/util-linux media-libs/fontconfig:1.0 @@ -35,6 +39,7 @@ RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5 media-libs/gstreamer[orc] " RESTRICT="bindist fetch" +S="${WORKDIR}" pkg_nofetch() { einfo @@ -43,18 +48,18 @@ pkg_nofetch() { einfo } -pkg_setup() { - # removed function _install_desktop_file because happens outside of sandbox - sed -i -e "s/_install_desktop_file\ ||\ abort//" "${DISTDIR}"/${A} || die "sed failed" - chmod +x "${DISTDIR}"/${A} || die "chmod failed" -} - src_unpack() { - yes | "${DISTDIR}"/${A} -d "${S}" > /dev/null || die "unpack failed" + 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" } @@ -77,7 +82,7 @@ src_install() { doins "${MY_PN}"/{libcom,librendering}.so* # library that differ from system version - doins "${MY_PN}"/{libicudata,libicui18n,libicuuc,libswscale,libavutil}.so* + doins "${MY_PN}"/{libicudata,libicui18n,libicuuc,libswscale,libavutil,libprotobuf}.so* # android library doins "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender}.so* @@ -104,3 +109,12 @@ src_install() { 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" +}