From 391b5b359a346aff490103da7dddc85047f83830 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Oct 2021 20:54:53 +0100 Subject: gentoo resync : 01.10.2021 --- dev-util/android-studio/Manifest | 15 +-- .../android-studio-2020.3.1.24.ebuild | 87 ++++++++++++++ .../android-studio-4.0.1.0.193.6626763.ebuild | 129 --------------------- .../android-studio-4.1.0.19.201.6858069.ebuild | 129 --------------------- .../android-studio-4.1.1.0.201.6953283.ebuild | 129 --------------------- .../android-studio-4.1.2.0.201.7042882.ebuild | 129 --------------------- .../android-studio-4.1.3.0.201.7199119.ebuild | 129 --------------------- .../files/0001-use-java-home-before-bundled.patch | 39 ------- dev-util/android-studio/metadata.xml | 6 +- 9 files changed, 93 insertions(+), 699 deletions(-) create mode 100644 dev-util/android-studio/android-studio-2020.3.1.24.ebuild delete mode 100644 dev-util/android-studio/android-studio-4.0.1.0.193.6626763.ebuild delete mode 100644 dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild delete mode 100644 dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild delete mode 100644 dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild delete mode 100644 dev-util/android-studio/android-studio-4.1.3.0.201.7199119.ebuild delete mode 100644 dev-util/android-studio/files/0001-use-java-home-before-bundled.patch (limited to 'dev-util/android-studio') diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest index 362fc9b83a2c..996948986e7d 100644 --- a/dev-util/android-studio/Manifest +++ b/dev-util/android-studio/Manifest @@ -1,12 +1,3 @@ -AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832 -DIST android-studio-ide-193.6626763-linux.tar.gz 907569312 BLAKE2B 602170eea29e632dd5720ef364510a20056a4d98c61e77d5436a2f624a60e0cfa4e0533174613a74f359d8fdeb4e87489caeb5c34b292fcdc35843a76440a9a3 SHA512 7fba99efccdf3bbbfcbc94625aba3789b1bad0e830b2ac890bd681b9089e6789e87b2dbdc80c6ef3d8db2b2438678a8bb58aefb3c311f61f619042ab1ec9dfac -DIST android-studio-ide-201.6858069-linux.tar.gz 926181537 BLAKE2B ed815f5565ef97ca3f4e1c6cbae3548c70ba94a94a7ae522102044ada31468f241db68ef3d1a1ce6acef60a1bc2e6cd7eba1375a1cebbf01c73063a3d85eb9b2 SHA512 b473e9573e21c666042befa17fde8fc9cb0d6ffd41513d64b74779815079d8971c66afcd1dda5663b503324d14851c4f24a454e5da97e2473550323c09919825 -DIST android-studio-ide-201.6953283-linux.tar.gz 926213072 BLAKE2B bdcca29e75348230c37a141423faf27eae75f299ded1abb3aad12605cb5be144c222d15b998ff16203a035311a6a26d8ae4ee28f337098c78377c5df4e7fcf08 SHA512 554d53596280aa96349ed0b3808599cf315c4f1a439ff57cd2368c6a68b57afac620b86d742c2f2ff72d718a62e33f4353202b3bc3671c0fe934cd8d79f74c0c -DIST android-studio-ide-201.7042882-linux.tar.gz 925365363 BLAKE2B 337db94154a44ad95545b1f6ca48d9f95773663607ed2de415ae04ae80ed10670e9906b0bcac539d539455964a41c2af117557c4ec0af58b14fcbd175aa44197 SHA512 c7829df5296172613c8bc01d699c7581d27f7604e182143bc8ba4c8503771b4e290d16c4dd3498f1d5701eb8d54adc7a61b2a0967454d99f5ec2a10d697e5b56 -DIST android-studio-ide-201.7199119-linux.tar.gz 925388022 BLAKE2B 64f33e97a0428e332fe6bd9800d3710055a4f2657000cc0d799d6ee05b070fcfca80a8718ec0a5ae5affc05def401e68920d1dd6146c967ff011361dcc4d57c5 SHA512 5757280749f35f149cd776ad7c67e03853a531ca0fc633f2138c18052c09fb9abec6d330bc104f4ab6dd4970cf1dc23e797e14d2b0067ed75208227aadba4403 -EBUILD android-studio-4.0.1.0.193.6626763.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407 -EBUILD android-studio-4.1.0.19.201.6858069.ebuild 3658 BLAKE2B a4d9f2469abf8064e298949f81f91295aeea992dea500b1e721b68c0ac5ea0371446a088e7ae144704feaeb00ad78ee4b718f6a3eb21b83c2cbb6be1dc5db0a2 SHA512 333a6979fa5d1e863cde3a92172b129b7d16874bb4905228743fc35de421802d855ae2bcc85bfa3b7a1cfebefa508208051ab63d54096eed0f458382e91d9407 -EBUILD android-studio-4.1.1.0.201.6953283.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545 -EBUILD android-studio-4.1.2.0.201.7042882.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545 -EBUILD android-studio-4.1.3.0.201.7199119.ebuild 3658 BLAKE2B 854e2d4d191d541451993ff07948bdb0faa5a9599004f513df9c97e84a0d689009681a8882fd667e7153ca11c375186448eacf7ff38eff0d714fff758bf11abc SHA512 fdaa7cea293619b80b9e0deed2a77a6b33c7d29c51af2aff03bf25d350177964d871c8bbe22802ad9c7e49e4a4e2fd3abdd049b2a879e6b84e571f62e3ab0545 -MISC metadata.xml 314 BLAKE2B a0ebedab1e44cd55d61163dbbe73673c6901513ca00caebb168800b6937a1702053fb6ee147b62c1603ef4f304b0008f80e27e95ef318540552ebebc5506bbee SHA512 a572d6084d166d0961fabe828d3566336e3a6542b0d2bd3021cee1a92ef784a9920ee3ce40c0f6b47ff255c50c51448413f4d56f8796d2e80dec942ec1caf221 +DIST android-studio-2020.3.1.24-linux.tar.gz 980631631 BLAKE2B 11968ea566b8f03810752ecc1d50068420830fee04df16f579e88bc94e4bd25e7d2c731df608dd27a983e8d0a27b3622d4c73902bde0fc134915f2a3bbf3189b SHA512 a03305b3540a0473b93e0e30ae82a1b7cc77c9aefd6abf96b352092ce5c51012a6be0d55af1b406a62b9bcf3c4b83ec980d0ca1232d22031a97b0f455060f2b4 +EBUILD android-studio-2020.3.1.24.ebuild 2736 BLAKE2B de86ed17f3554749350b471582a8ee8479d589b25c0e43b73750236cc1d531ca1d5cd423078c7095f8b7da06318dc33fd9570f99d06330def6ca9ead225fa97f SHA512 fd11c80f2d9b0e62b2394985e221eb7a9c48c56e95192c8ff91a25992c7773662d560dd3304ca51c9ba7d850462d29665d6eb9b9d5727b18a021c4e72925cd76 +MISC metadata.xml 298 BLAKE2B 8f13e01e8c5a24c9af764e8882e2d5677ebf485cad143f35720ede0d491f2c09fd009ce48433cd33f863fb618d6413eac97e07a6d3526f5c8e679d9e51995908 SHA512 2c9d3c5d14e2499fac58df1d3cb2844172833f371fe4d557791efc0848b879191bca36aa772792cea6edd8f6e3be83452a188c0db043906a46c87af0dcacd4e2 diff --git a/dev-util/android-studio/android-studio-2020.3.1.24.ebuild b/dev-util/android-studio/android-studio-2020.3.1.24.ebuild new file mode 100644 index 000000000000..17e178391136 --- /dev/null +++ b/dev-util/android-studio/android-studio-2020.3.1.24.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop eutils + +RESTRICT="strip" + +QA_PREBUILT=" + opt/${PN}/bin/* + opt/${PN}/jre/bin/* + opt/${PN}/jre/lib/* + opt/${PN}/jre/lib/jli/* + opt/${PN}/jre/lib/server/* + opt/${PN}/lib/pty4j-native/linux/*/* + opt/${PN}/plugins/android-ndk/resources/lldb/android/*/* + opt/${PN}/plugins/android-ndk/resources/lldb/bin/* + opt/${PN}/plugins/android-ndk/resources/lldb/lib64/* + opt/${PN}/plugins/android-ndk/resources/lldb/lib/python3.8/lib-dynload/* + opt/${PN}/plugins/android/resources/installer/*/* + opt/${PN}/plugins/android/resources/layoutlib/data/linux/lib64/* + opt/${PN}/plugins/android/resources/perfetto/*/* + opt/${PN}/plugins/android/resources/simpleperf/*/* + opt/${PN}/plugins/android/resources/trace_processor_daemon/* + opt/${PN}/plugins/android/resources/transport/*/* + opt/${PN}/plugins/android/resources/transport/native/agent/*/* + opt/${PN}/plugins/android/resources/transport/*/* + opt/${PN}/plugins/c-plugin/bin/clang/linux/* + opt/${PN}/plugins/webp/lib/libwebp/linux/* +" + +DESCRIPTION="Android development environment based on IntelliJ IDEA" +HOMEPAGE="http://developer.android.com/sdk/installing/studio.html" +SRC_URI="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${PV}/${P}-linux.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="selinux" +KEYWORDS="~amd64 ~x86" + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-android ) + >=app-arch/bzip2-1.0.6-r4 + >=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[X(+)] + || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) + sys-libs/ncurses-compat: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 + virtual/libcrypt:= + !!> bin/studio64.vmoptions || die - echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die -} - -src_compile() { - patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH" -} - -src_install() { - local dir="/opt/${PN}" - - insinto "${dir}" - doins -r * - - # This is really a bundled jdk not a jre - # If custom-jdk is not set bundled jre is replaced with system vm/jdk - if use custom-jdk; then - dosym "custom-jdk" "${dir}/jre" - else - dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" - fi - - fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh} - fperms -R 755 "${dir}"/bin/lldb/{android,bin} - if use custom-jdk; then - fperms -R 755 "${dir}"/jre/{bin,jre/bin} - fperms 755 ${dir}/jre/jre/lib/jexec - fi - - 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-4.1.0.19.201.6858069.ebuild b/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild deleted file mode 100644 index e9812c3699a7..000000000000 --- a/dev-util/android-studio/android-studio-4.1.0.19.201.6858069.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop eutils java-pkg-2 - -RESTRICT="strip" -QA_PREBUILT=" - opt/${PN}/bin/fsnotifier* - opt/${PN}/bin/libdbm64.so - opt/${PN}/bin/lldb/* - opt/${PN}/custom-jdk/* - opt/${PN}/lib/pty4j-native/linux/*/libpty.so - opt/${PN}/plugins/android/lib/libwebp_jni*.so - opt/${PN}/plugins/android/resources/installer/* - opt/${PN}/plugins/android/resources/perfetto/* - opt/${PN}/plugins/android/resources/simpleperf/* - opt/${PN}/plugins/android/resources/transport/* -" - -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="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.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="custom-jdk selinux" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-java/commons-logging:0 - dev-java/log4j:0" - -RDEPEND="${DEPEND} - >=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[X(+)] - || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) - sys-libs/ncurses-compat: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" -BDEPEND="dev-util/patchelf" -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 - # If custom-jdk is not set bundled jre is replaced with system vm/jdk - if use custom-jdk; then - mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk" - else - rm -rf "${S}/jre" || die "Could not remove bundled jdk" - fi - # 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() { - patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH" -} - -src_install() { - local dir="/opt/${PN}" - - insinto "${dir}" - doins -r * - - # This is really a bundled jdk not a jre - # If custom-jdk is not set bundled jre is replaced with system vm/jdk - if use custom-jdk; then - dosym "custom-jdk" "${dir}/jre" - else - dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" - fi - - fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh} - fperms -R 755 "${dir}"/bin/lldb/{android,bin} - if use custom-jdk; then - fperms -R 755 "${dir}"/jre/{bin,jre/bin} - fperms 755 ${dir}/jre/jre/lib/jexec - fi - - 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-4.1.1.0.201.6953283.ebuild b/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild deleted file mode 100644 index c0c19c664875..000000000000 --- a/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop eutils java-pkg-2 - -RESTRICT="strip" -QA_PREBUILT=" - opt/${PN}/bin/fsnotifier* - opt/${PN}/bin/libdbm64.so - opt/${PN}/bin/lldb/* - opt/${PN}/custom-jdk/* - opt/${PN}/lib/pty4j-native/linux/*/libpty.so - opt/${PN}/plugins/android/lib/libwebp_jni*.so - opt/${PN}/plugins/android/resources/installer/* - opt/${PN}/plugins/android/resources/perfetto/* - opt/${PN}/plugins/android/resources/simpleperf/* - opt/${PN}/plugins/android/resources/transport/* -" - -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="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.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="custom-jdk selinux" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-java/commons-logging:0 - dev-java/log4j:0" - -RDEPEND="${DEPEND} - >=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[X(+)] - || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) - sys-libs/ncurses-compat: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" -BDEPEND="dev-util/patchelf" -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 - # If custom-jdk is not set bundled jre is replaced with system vm/jdk - if use custom-jdk; then - mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk" - else - rm -rf "${S}/jre" || die "Could not remove bundled jdk" - fi - # 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() { - patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH" -} - -src_install() { - local dir="/opt/${PN}" - - insinto "${dir}" - doins -r * - - # This is really a bundled jdk not a jre - # If custom-jdk is not set bundled jre is replaced with system vm/jdk - if use custom-jdk; then - dosym "custom-jdk" "${dir}/jre" - else - dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" - fi - - fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh} - fperms -R 755 "${dir}"/bin/lldb/{android,bin} - if use custom-jdk; then - fperms -R 755 "${dir}"/jre/{bin,jre/bin} - fperms 755 ${dir}/jre/jre/lib/jexec - fi - - 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-4.1.2.0.201.7042882.ebuild b/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild deleted file mode 100644 index c0c19c664875..000000000000 --- a/dev-util/android-studio/android-studio-4.1.2.0.201.7042882.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop eutils java-pkg-2 - -RESTRICT="strip" -QA_PREBUILT=" - opt/${PN}/bin/fsnotifier* - opt/${PN}/bin/libdbm64.so - opt/${PN}/bin/lldb/* - opt/${PN}/custom-jdk/* - opt/${PN}/lib/pty4j-native/linux/*/libpty.so - opt/${PN}/plugins/android/lib/libwebp_jni*.so - opt/${PN}/plugins/android/resources/installer/* - opt/${PN}/plugins/android/resources/perfetto/* - opt/${PN}/plugins/android/resources/simpleperf/* - opt/${PN}/plugins/android/resources/transport/* -" - -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="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.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="custom-jdk selinux" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-java/commons-logging:0 - dev-java/log4j:0" - -RDEPEND="${DEPEND} - >=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[X(+)] - || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) - sys-libs/ncurses-compat: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" -BDEPEND="dev-util/patchelf" -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 - # If custom-jdk is not set bundled jre is replaced with system vm/jdk - if use custom-jdk; then - mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk" - else - rm -rf "${S}/jre" || die "Could not remove bundled jdk" - fi - # 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() { - patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH" -} - -src_install() { - local dir="/opt/${PN}" - - insinto "${dir}" - doins -r * - - # This is really a bundled jdk not a jre - # If custom-jdk is not set bundled jre is replaced with system vm/jdk - if use custom-jdk; then - dosym "custom-jdk" "${dir}/jre" - else - dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" - fi - - fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh} - fperms -R 755 "${dir}"/bin/lldb/{android,bin} - if use custom-jdk; then - fperms -R 755 "${dir}"/jre/{bin,jre/bin} - fperms 755 ${dir}/jre/jre/lib/jexec - fi - - 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-4.1.3.0.201.7199119.ebuild b/dev-util/android-studio/android-studio-4.1.3.0.201.7199119.ebuild deleted file mode 100644 index c0c19c664875..000000000000 --- a/dev-util/android-studio/android-studio-4.1.3.0.201.7199119.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop eutils java-pkg-2 - -RESTRICT="strip" -QA_PREBUILT=" - opt/${PN}/bin/fsnotifier* - opt/${PN}/bin/libdbm64.so - opt/${PN}/bin/lldb/* - opt/${PN}/custom-jdk/* - opt/${PN}/lib/pty4j-native/linux/*/libpty.so - opt/${PN}/plugins/android/lib/libwebp_jni*.so - opt/${PN}/plugins/android/resources/installer/* - opt/${PN}/plugins/android/resources/perfetto/* - opt/${PN}/plugins/android/resources/simpleperf/* - opt/${PN}/plugins/android/resources/transport/* -" - -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="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.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="custom-jdk selinux" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-java/commons-logging:0 - dev-java/log4j:0" - -RDEPEND="${DEPEND} - >=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[X(+)] - || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) - sys-libs/ncurses-compat: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" -BDEPEND="dev-util/patchelf" -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 - # If custom-jdk is not set bundled jre is replaced with system vm/jdk - if use custom-jdk; then - mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk" - else - rm -rf "${S}/jre" || die "Could not remove bundled jdk" - fi - # 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() { - patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH" -} - -src_install() { - local dir="/opt/${PN}" - - insinto "${dir}" - doins -r * - - # This is really a bundled jdk not a jre - # If custom-jdk is not set bundled jre is replaced with system vm/jdk - if use custom-jdk; then - dosym "custom-jdk" "${dir}/jre" - else - dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre" - fi - - fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh} - fperms -R 755 "${dir}"/bin/lldb/{android,bin} - if use custom-jdk; then - fperms -R 755 "${dir}"/jre/{bin,jre/bin} - fperms 755 ${dir}/jre/jre/lib/jexec - fi - - 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/files/0001-use-java-home-before-bundled.patch b/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch deleted file mode 100644 index 6f97c7d3f925..000000000000 --- a/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch +++ /dev/null @@ -1,39 +0,0 @@ -Use JAVA_HOME before bundled jre - -Must keep bundled jre symlink around in case "Use Embedded JDK" is selected - -https://bugs.gentoo.org/613868 -https://bugs.gentoo.org/660404 - ---- android-studio/bin/studio.sh 2018-07-20 13:43:12.339049033 +0800 -+++ android-studio/bin/studio.sh 2018-07-20 13:43:38.494932028 +0800 -@@ -73,6 +73,14 @@ - fi - fi - -+if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then -+ JDK="$JDK_HOME" -+fi -+ -+if [ -z "$JDK" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then -+ JDK="$JAVA_HOME" -+fi -+ - if [ -z "$JDK" -a "$OS_TYPE" = "Linux" ] ; then - BUNDLED_JRE="$IDE_HOME/jre64" - if [ ! -d "$BUNDLED_JRE" ]; then -@@ -83,14 +91,6 @@ - fi - fi - --if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then -- JDK="$JDK_HOME" --fi -- --if [ -z "$JDK" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then -- JDK="$JAVA_HOME" --fi -- - if [ -z "$JDK" ]; then - JDK_PATH=`which java` - diff --git a/dev-util/android-studio/metadata.xml b/dev-util/android-studio/metadata.xml index 4c831eddc64c..c61e3dc74f4d 100644 --- a/dev-util/android-studio/metadata.xml +++ b/dev-util/android-studio/metadata.xml @@ -1,10 +1,10 @@ + + zx2c4@gentoo.org + perfinion@gentoo.org - - Install and use Android Studio's custom JRE. - -- cgit v1.2.3