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 96FBD138334 for ; Fri, 1 Feb 2019 12:17:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EEEEE0ACA; Fri, 1 Feb 2019 12:17:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE3BBE0ACA for ; Fri, 1 Feb 2019 12:17:53 +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 9681B33BDF5 for ; Fri, 1 Feb 2019 12:17:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E88352F for ; Fri, 1 Feb 2019 12:17:49 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1549023272.3746d1d102ad8d2b014ff6e9aa1f110b9c743c07.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/android-studio/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/android-studio/Manifest dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild dev-util/android-studio/android-studio-3.2.0.26.181.5014246.ebuild X-VCS-Directories: dev-util/android-studio/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 3746d1d102ad8d2b014ff6e9aa1f110b9c743c07 X-VCS-Branch: master Date: Fri, 1 Feb 2019 12:17:49 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7abbc3a9-1a24-4063-9733-683a27fd29ce X-Archives-Hash: fef3ecd338ba19c72042f22a81ebc29a commit: 3746d1d102ad8d2b014ff6e9aa1f110b9c743c07 Author: Jason Zaman gentoo org> AuthorDate: Fri Feb 1 12:14:32 2019 +0000 Commit: Jason Zaman gentoo org> CommitDate: Fri Feb 1 12:14:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3746d1d1 dev-util/android-studio: drop old Signed-off-by: Jason Zaman gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-util/android-studio/Manifest | 2 - .../android-studio-3.1.4.0.173.4907809.ebuild | 112 -------------------- .../android-studio-3.2.0.26.181.5014246.ebuild | 115 --------------------- 3 files changed, 229 deletions(-) diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest index a38e9afc385..383dfb8c3b1 100644 --- a/dev-util/android-studio/Manifest +++ b/dev-util/android-studio/Manifest @@ -1,4 +1,2 @@ -DIST android-studio-ide-173.4907809-linux.zip 897596053 BLAKE2B 6142cfc21d41a23d93ff064be457a28879ce80830bec79a38f6862d0f5b9de7b552d7175d7bf3e3ddfc70b10e0f7313e7ebcb7a3cdf16511c070551a27193775 SHA512 3fc01ffef5dd88dce088cc67fde03c62dadce7a700aace17ebd414ad0b1125b8370b5f132349424ff65ffc721ff383e6793737a0021826f08e35c893e33535be -DIST android-studio-ide-181.5014246-linux.zip 1054392038 BLAKE2B 455ce3455710d0709746dc9c18caf61fd347f6c157873de54821601846be6e086646d6261d2c9bdd6986d8f2874e7a90c37b0db820326d2eb17afe438954e240 SHA512 37c622cab6d21e8a0e6d38e0f8c29e22910647df3e6d93ee86c71a39f171b1b51952a13eae2660e209c2eb7a093a9f7d2177562ea287353a30507b22c2617bd0 DIST android-studio-ide-181.5056338-linux.zip 1055510234 BLAKE2B d22e4455ccbe7c6f12eacbcc2b707d840945586d9824bfbd2b6f093ef986d54eb042ba0ecc5bdca17c74a20b43e73821eaeefdfb28d4e129bebbb885c7b17483 SHA512 d1e225ed97f4737bdc9cddfc40e85ed5cfea7b4f911a088d2a1cc09558f010affe0a0661fb6f6911d47902b49bbde81868eb56363b90bbec70dd87b679850156 DIST android-studio-ide-182.5199772-linux.zip 1059268546 BLAKE2B b5485c444eea49e10b155a763d40a08c09a05e34c151cf21b79bfbb9b039f0bb112fc806b3b8cf4fe7e17127fe89c8651fac7ff83163ff1cf78c24b330273490 SHA512 76647fc50fbe06f93b733962b51dc8fb57d59c1e30364b82bf7a03a7700a0f7835eab240db6bd93ae71f4147408cbe8641b41965c97d40494c2e5fe0fecfba4d diff --git a/dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild b/dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild deleted file mode 100644 index d24d057d904..00000000000 --- a/dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils java-pkg-2 eapi7-ver - -RESTRICT="strip" -QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so - opt/${PN}/bin/fsnotifier* - opt/${PN}/lib/libpty/linux/x86*/libpty.so - opt/${PN}/plugins/android/lib/libwebp_jni*.so - opt/${PN}/plugins/android/resources/perfa/*/libperfa.so - opt/${PN}/plugins/android/resources/perfd/*/perfd - opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf" - -VER_CMP=( $(ver_rs 1- ' ') ) -if [[ ${#VER_CMP[@]} -eq 6 ]]; then - STUDIO_V=$(ver_cut 1-4) - BUILD_V=$(ver_cut 5-6) -else - STUDIO_V=$(ver_cut 1-3) - BUILD_V=$(ver_cut 4-5) -fi - -DESCRIPTION="A new Android development environment based on IntelliJ IDEA" -HOMEPAGE="http://developer.android.com/sdk/installing/studio.html" -SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="selinux" -KEYWORDS="amd64 x86" - -DEPEND="app-arch/zip - dev-java/commons-logging:0 - dev-java/log4j:0" - -# dev-java/guava:18 -RDEPEND=">=virtual/jdk-1.7 - selinux? ( sec-policy/selinux-android ) - >=app-arch/bzip2-1.0.6-r4 - dev-java/commons-logging:0 - dev-java/log4j:0 - >=dev-libs/expat-2.1.0-r3 - >=dev-libs/libffi-3.0.13-r1 - >=media-libs/fontconfig-2.10.92 - >=media-libs/freetype-2.5.5 - >=media-libs/libpng-1.2.51 - >=media-libs/mesa-10.2.8 - || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) - >=sys-libs/ncurses-5.9-r3:5/5[tinfo] - >=sys-libs/zlib-1.2.8-r1 - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXau-1.0.7-r1 - >=x11-libs/libXdamage-1.1.4-r1 - >=x11-libs/libXdmcp-1.1.1-r1 - >=x11-libs/libXext-1.3.2 - >=x11-libs/libXfixes-5.0.1 - >=x11-libs/libXrender-0.9.8 - >=x11-libs/libXxf86vm-1.1.3 - >=x11-libs/libdrm-2.4.46 - >=x11-libs/libxcb-1.9.1 - >=x11-libs/libxshmfence-1.1" -S=${WORKDIR}/${PN} -PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" ) - -src_prepare() { - eapply "${PATCHES[@]}" - eapply_user - - # This is really a bundled jdk not a jre - rm -rf "${S}/jre" || die "Could not remove bundled jdk" - - # Replace bundled jars with system - # has problems with newer jdom:0 not updated to jdom:2 - cd "${S}/lib" || die - local JARS="commons-logging log4j" - local j - for j in ${JARS}; do - rm -v ${j/:*/}*.jar || die - java-pkg_jar-from ${j} - done - - cd "${S}" || die - - # bug 629404 - echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die - echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die -} - -src_compile() { - : -} - -src_install() { - local dir="/opt/${PN}" - - insinto "${dir}" - # Replaced bundled jre with system vm/jdk - # This is really a bundled jdk not a jre - doins -r * - - rm -rf "${D}${dir}/jre" || die - dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" - - fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64} - chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die - - newicon "bin/studio.png" "${PN}.png" - make_wrapper ${PN} ${dir}/bin/studio.sh - make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio" -} diff --git a/dev-util/android-studio/android-studio-3.2.0.26.181.5014246.ebuild b/dev-util/android-studio/android-studio-3.2.0.26.181.5014246.ebuild deleted file mode 100644 index ec9300dae61..00000000000 --- a/dev-util/android-studio/android-studio-3.2.0.26.181.5014246.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils java-pkg-2 eapi7-ver - -RESTRICT="strip" -QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so - opt/${PN}/bin/fsnotifier* - opt/${PN}/bin/lldb/* - opt/${PN}/lib/libpty/linux/x86*/libpty.so - opt/${PN}/plugins/android/lib/libwebp_jni*.so - opt/${PN}/plugins/android/resources/perfa/*/libperfa.so - opt/${PN}/plugins/android/resources/perfd/*/perfd - opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf" - -VER_CMP=( $(ver_rs 1- ' ') ) -if [[ ${#VER_CMP[@]} -eq 6 ]]; then - STUDIO_V=$(ver_cut 1-4) - BUILD_V=$(ver_cut 5-6) -else - STUDIO_V=$(ver_cut 1-3) - BUILD_V=$(ver_cut 4-5) -fi - -DESCRIPTION="A new Android development environment based on IntelliJ IDEA" -HOMEPAGE="http://developer.android.com/sdk/installing/studio.html" -SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="selinux" -KEYWORDS="~amd64 ~x86" - -DEPEND="app-arch/zip - dev-java/commons-logging:0 - dev-java/log4j:0" - -# dev-java/guava:18 -RDEPEND=">=virtual/jdk-1.7 - selinux? ( sec-policy/selinux-android ) - >=app-arch/bzip2-1.0.6-r4 - dev-java/commons-logging:0 - dev-java/log4j:0 - >=dev-libs/expat-2.1.0-r3 - >=dev-libs/libffi-3.0.13-r1 - >=media-libs/fontconfig-2.10.92 - >=media-libs/freetype-2.5.5 - >=media-libs/libpng-1.2.51 - >=media-libs/mesa-10.2.8 - || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) - >=sys-libs/ncurses-5.9-r3:5/5[tinfo] - >=sys-libs/zlib-1.2.8-r1 - >=x11-libs/libX11-1.6.2 - >=x11-libs/libXau-1.0.7-r1 - >=x11-libs/libXdamage-1.1.4-r1 - >=x11-libs/libXdmcp-1.1.1-r1 - >=x11-libs/libXext-1.3.2 - >=x11-libs/libXfixes-5.0.1 - >=x11-libs/libXrender-0.9.8 - >=x11-libs/libXxf86vm-1.1.3 - >=x11-libs/libdrm-2.4.46 - >=x11-libs/libxcb-1.9.1 - >=x11-libs/libxshmfence-1.1" -S=${WORKDIR}/${PN} -PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" ) - -src_prepare() { - eapply "${PATCHES[@]}" - eapply_user - - # This is really a bundled jdk not a jre - rm -rf "${S}/jre" || die "Could not remove bundled jdk" - - # Replace bundled jars with system - # has problems with newer jdom:0 not updated to jdom:2 - cd "${S}/lib" || die - local JARS="commons-logging log4j" - local j - for j in ${JARS}; do - rm -v ${j/:*/}*.jar || die - java-pkg_jar-from ${j} - done - - cd "${S}" || die - - # bug 629404 - echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die - echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die -} - -src_compile() { - : -} - -src_install() { - local dir="/opt/${PN}" - - insinto "${dir}" - doins -r * - - # Replaced bundled jre with system vm/jdk - # This is really a bundled jdk not a jre - rm -rf "${ED%/}${dir}/jre" || die - dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" - - fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64} - fperms 755 "${dir}"/bin/*.py "${dir}"/bin/*.sh - chmod -R 755 "${ED%/}${dir}"/bin/lldb/{android,bin} || die - chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die - - newicon "bin/studio.png" "${PN}.png" - make_wrapper ${PN} ${dir}/bin/studio.sh - make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio" -}