gentoo auto-resync : 21:09:2022 - 23:26:49

3 files changed, 118 insertions, 89 deletions

diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 0924f194a829..2520221a83fe 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,5 +1,5 @@
-DIST android-studio-2020.3.1.24-linux.tar.gz 980631631 BLAKE2B 11968ea566b8f03810752ecc1d50068420830fee04df16f579e88bc94e4bd25e7d2c731df608dd27a983e8d0a27b3622d4c73902bde0fc134915f2a3bbf3189b SHA512 a03305b3540a0473b93e0e30ae82a1b7cc77c9aefd6abf96b352092ce5c51012a6be0d55af1b406a62b9bcf3c4b83ec980d0ca1232d22031a97b0f455060f2b4
 DIST android-studio-2021.2.1.14-linux.tar.gz 1010969463 BLAKE2B 24899d0b81303c5f7ad061afd80eac734444b313f40257d20dc99b99f11a867bb92fe7b77428e5431889fc2beabcea58a5875608087a5de96105675c42b2a8ba SHA512 9d9184828a8ca0007e613e53215b0af1abd2c79a482670fe7bbb708f2bcb144b8881ef2d1c89ca8e2528aedc1f3b7d4a40c0c6d3e20a16de520aaf075f6990a7
-EBUILD android-studio-2020.3.1.24.ebuild 2736 BLAKE2B de86ed17f3554749350b471582a8ee8479d589b25c0e43b73750236cc1d531ca1d5cd423078c7095f8b7da06318dc33fd9570f99d06330def6ca9ead225fa97f SHA512 fd11c80f2d9b0e62b2394985e221eb7a9c48c56e95192c8ff91a25992c7773662d560dd3304ca51c9ba7d850462d29665d6eb9b9d5727b18a021c4e72925cd76
+DIST android-studio-2021.3.1.16-linux.tar.gz 976205257 BLAKE2B 8854a346b751338bfadac61820a78f7ea9aa87828f9049a22d69221fc3ac2c4a9e6e738b84b2eb81023ceeb7866c35b74d38b0d9c2fca534df6e0947b6699b05 SHA512 4c033e1b5dd68fc73fe203ff19e134cf72d3a8faa9a9ba041bf478e529376f962c31d598b85e43a625fa56ef24f2ab6e13378125a7b710449daaf6d727ab51f5
 EBUILD android-studio-2021.2.1.14.ebuild 4004 BLAKE2B 556a288dbd72754205081405ab41a0461d66abb9c5dc96ecf5b41e093b395482057f7a5b24fa809dc5b5be123a91e33018166c9c872e6a17a85caefd271e1620 SHA512 f06725bface0c1deba713d160986a9abf785541e1fea2b93dca81333ac5b499796bb4288fd970bc6d90ad8bbe9736b03428cbaeaff97690e4cd14115db922b0e
+EBUILD android-studio-2021.3.1.16.ebuild 4035 BLAKE2B 9fb275ec17ae3836cd734cd0d03f20e6a24d95c8d7351fc209121f6bb8d5138fb39e410db314511b9658ab1e58872eb9b05ba9868a08552e7c48c010ec29c380 SHA512 caf555138a82bf2a17acead7be88607d8937d87014ac0284dcd9ff3d7c4f60646af618f712e845e4500de23ecbd16f7f32979ebd843554788c49a0d6160a4f54
 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
deleted file mode 100644
index 17e178391136..000000000000
--- a/dev-util/android-studio/android-studio-2020.3.1.24.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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:=
-	!!<dev-util/android-studio-2020.3.1.24
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb
-	fperms -R 755 "${dir}"/plugins/{android-ndk/resources/lldb,c-plugin/bin}
-	fperms -R 755 "${dir}"/jre/bin
-	fperms 755 ${dir}/jre/lib/jexec
-	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-2021.3.1.16.ebuild b/dev-util/android-studio/android-studio-2021.3.1.16.ebuild
new file mode 100644
index 000000000000..6ac0460a99b0
--- /dev/null
+++ b/dev-util/android-studio/android-studio-2021.3.1.16.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper
+
+RESTRICT="bindist mirror 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/resources/installer/*/*
+	opt/${PN}/plugins/android/resources/native/*
+	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-ndk/resources/lldb/android/*/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/bin/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib/python3.9/lib-dynload/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib64/*
+	opt/${PN}/plugins/design-tools/resources/layoutlib/data/linux/lib64/*
+	opt/${PN}/plugins/c-clangd/bin/clang/linux/*
+	opt/${PN}/plugins/webp/lib/libwebp/linux/*
+"
+
+DESCRIPTION="Android development environment based on IntelliJ IDEA"
+HOMEPAGE="https://developer.android.com/studio"
+SRC_URI="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${PV}/${P}-linux.tar.gz"
+#SRC_URI="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${PV}/${PN}-${PV}-linux.tar.gz"
+
+LICENSE="Apache-2.0 android BSD BSD-2 CDDL-1.1 CPL-0.5
+	EPL-1.0 GPL-2 GPL-2+ JDOM IJG LGPL-2.1 MIT
+	MPL-1.1 MPL-2.0 NPL-1.1 OFL ZLIB"
+
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.8-r3
+	>=dev-libs/expat-2.4.8
+	>=dev-libs/libffi-3.4.2-r2
+	>=media-libs/fontconfig-2.14.0-r1
+	>=media-libs/freetype-2.12.1-r1
+	>=media-libs/libpng-1.6.37-r2
+	>=media-libs/mesa-22.1.3[X(+)]
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	sys-libs/ncurses-compat:5[tinfo]
+	>=sys-libs/zlib-1.2.12-r3
+	>=x11-libs/libX11-1.8.1
+	>=x11-libs/libXau-1.0.9-r1
+	>=x11-libs/libXdamage-1.1.5
+	>=x11-libs/libXdmcp-1.1.3-r1
+	>=x11-libs/libXext-1.3.4
+	>=x11-libs/libXfixes-6.0.0
+	>=x11-libs/libXrender-0.9.10-r2
+	>=x11-libs/libXxf86vm-1.1.4-r2
+	>=x11-libs/libdrm-2.4.112
+	>=x11-libs/libxcb-1.15-r1
+	>=x11-libs/libxshmfence-1.3-r2
+	virtual/libcrypt:=
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+	insinto "${dir}"
+	doins -r *
+
+	fperms 755 "${dir}"/bin/{fsnotifier,format.sh,game-tools.sh,inspect.sh,ltedit.sh,profiler.sh,studio.sh,printenv.py,restart.py}
+	fperms -R 755 "${dir}"/bin/{helpers,lldb}
+	fperms -R 755 "${dir}"/jre/bin
+	fperms 755 "${dir}"/jre/lib/{jexec,jspawnhelper}
+	fperms -R 755 "${dir}"/plugins/Kotlin/kotlinc/bin
+	fperms -R 755 "${dir}"/plugins/android/resources/installer
+	fperms -R 755 "${dir}"/plugins/android/resources/perfetto
+	fperms -R 755 "${dir}"/plugins/android/resources/simpleperf
+	fperms -R 755 "${dir}"/plugins/android/resources/trace_processor_daemon
+	fperms -R 755 "${dir}"/plugins/android/resources/transport/{arm64-v8a,armeabi-v7a,x86,x86_64}
+	fperms -R 755 "${dir}"/plugins/android-ndk/resources/lldb/{android,bin,lib,shared}
+	fperms 755 "${dir}"/plugins/c-clangd/bin/clang/linux/{clang-tidy,clangd}
+	fperms -R 755 "${dir}"/plugins/terminal/{,fish}
+	fperms 755 "${dir}"/plugins/textmate/lib/bundles/git/src/{askpass-empty.sh,askpass.sh}
+
+	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"
+}
+
+pkg_postrm() {
+	elog "Android studio data files were not removed."
+	elog "If there will be no other programs using them anymore"
+	elog "(especially another flavor of Android Studio)"
+	elog " remove manually following folders:"
+	elog ""
+	elog "		~/.android/"
+	elog "		~/.config/Google/AndroidStudio*/"
+	elog "		~/Android/"
+	elog ""
+	elog "Also, if there are no other programs using Gradle, remove:"
+	elog ""
+	elog "		~/.gradle/"
+}