commit: bb97179b6b56eab2a9bec679e3f79a1f10c57c6d
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 28 17:35:58 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sat Sep 29 10:20:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb97179b
dev-util/android-studio: drop old
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
dev-util/android-studio/Manifest | 2 -
.../android-studio-3.1.2.0.173.4720617.ebuild | 108 --------------------
.../android-studio-3.1.3.0.173.4819257-r1.ebuild | 112 ---------------------
3 files changed, 222 deletions(-)
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 19811783d8a..38833aa6b92 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,3 +1 @@
-DIST android-studio-ide-173.4720617-linux.zip 894052929 BLAKE2B
cc1ff03b24febf18e8ebd9a78ae0463e9552e20ee4c28e60e5e4f52379e66d6e5c6d91af1cd641b79c72590a081770a22882539612028915cd064834c8bc0ef3
SHA512
121d5eead42743127dfccf37b0b4bc4ceddc0df706bdddbc8c0ae2ec3711b4c8308d945b92ed5e8b3209d380e202dc08fbf8475ef6ad30016ca5cc9acb264d3e
-DIST android-studio-ide-173.4819257-linux.zip 894877040 BLAKE2B
159d57c0c0d6d6958d1a08e7ff4ff0314c0cb2b15c5126dd3d357e1dc696d32dfee78ae6b2d35a628cbf000bc014d61c20ad48acce12c10356b0db8183c27318
SHA512
c399897bc85ce1399ac8ce1df4749d7f1bff4501cb90b13efbd61a56173ab1f6f9b0c7c1f852dceb7a76bc631d83ca4efab9b39c4d3c76e3b4454f4803611251
DIST android-studio-ide-173.4907809-linux.zip 897596053 BLAKE2B
6142cfc21d41a23d93ff064be457a28879ce80830bec79a38f6862d0f5b9de7b552d7175d7bf3e3ddfc70b10e0f7313e7ebcb7a3cdf16511c070551a27193775
SHA512
3fc01ffef5dd88dce088cc67fde03c62dadce7a700aace17ebd414ad0b1125b8370b5f132349424ff65ffc721ff383e6793737a0021826f08e35c893e33535be
diff --git a/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
b/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
deleted file mode 100644
index cc5bd95dc8b..00000000000
--- a/dev-util/android-studio/android-studio-3.1.2.0.173.4720617.ebuild
+++ /dev/null
@@ -1,108 +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 versionator
-
-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"
-
-if [[ $(get_version_component_count) -eq 6 ]]; then
- STUDIO_V=$(get_version_component_range 1-4)
- BUILD_V=$(get_version_component_range 5-6)
-else
- STUDIO_V=$(get_version_component_range 1-3)
- BUILD_V=$(get_version_component_range 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}
-
-src_prepare() {
- eapply_user
- # This is really a bundled jdk not a jre
- rm -R "${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.1.3.0.173.4819257-r1.ebuild
b/dev-util/android-studio/android-studio-3.1.3.0.173.4819257-r1.ebuild
deleted file mode 100644
index d24d057d904..00000000000
--- a/dev-util/android-studio/android-studio-3.1.3.0.173.4819257-r1.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"
-}
