gentoo resync : 18.05.2019

3 files changed, 43 insertions, 24 deletions

diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 52a3584e237b..37c6d06a8c52 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,6 +1,6 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
-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
-EBUILD android-studio-3.2.1.0.181.5056338.ebuild 3240 BLAKE2B 7c2780bd4988f6ed98717846474992a3332599f16570f71837bfcf3a82c5659154cac12066a5a2362db6abd15468fb20816b35df0656aad24f55684b22b077af SHA512 8abdb86fba3d3135faff90623bfa68cd92c83374b2a01754657c17007aac46c408179c1ab4ffcb7c74dc123f0177bcdc251171856837044a76b4ca7eb51816eb
+DIST android-studio-ide-183.5452501-linux.tar.gz 1087166186 BLAKE2B 07c17dc854d24c7e96a91346887dfb96067acad330d485c996f13107bf2a92d6b85e791638c1f6d2f08ea9ea47eb0ee45568605b95f6cdefc2fbf4d350bfeb0e SHA512 c686c2dd89a19d9b2fabffff8ce5a7b5b96ff05bb8c9fbf3c1a7a7b78896653114a527b30d2a9795541f5c70dc80f59d7d3b0d2a56141fea48932bfbb51e8b5f
 EBUILD android-studio-3.3.0.20.182.5199772.ebuild 3240 BLAKE2B 7c2780bd4988f6ed98717846474992a3332599f16570f71837bfcf3a82c5659154cac12066a5a2362db6abd15468fb20816b35df0656aad24f55684b22b077af SHA512 8abdb86fba3d3135faff90623bfa68cd92c83374b2a01754657c17007aac46c408179c1ab4ffcb7c74dc123f0177bcdc251171856837044a76b4ca7eb51816eb
-MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
+EBUILD android-studio-3.4.0.18.183.5452501.ebuild 3826 BLAKE2B 798274d2f8c082f8edaa446593c2cc1fafac1c4a40c1d774720886a05738b141511a5fa8a599c290a9f4792355e748deee49a6a3ed72ba96034d8b88198d103e SHA512 a6d1ba053b6f4dc39202e63b2a21276f7695b49ddea2a346d22cef43f30d1abd5ac1bd055e0e3270d01179e78b02e4a5dbc2c1738a400497f16db0c26a27dc90
+MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-3.2.1.0.181.5056338.ebuild b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
index 008bd20b140e..655d30a45bdd 100644
--- a/dev-util/android-studio/android-studio-3.2.1.0.181.5056338.ebuild
+++ b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
@@ -1,18 +1,23 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils java-pkg-2 eapi7-ver
+EAPI=7
+inherit desktop eutils java-pkg-2
 
 RESTRICT="strip"
-QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
+QA_PREBUILT="
 	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/bin/libdbm64.so
 	opt/${PN}/bin/lldb/*
-	opt/${PN}/lib/libpty/linux/x86*/libpty.so
+	opt/${PN}/custom-jdk/*
+	opt/${PN}/lib/pty4j-native/linux/x86*/libpty.so
 	opt/${PN}/plugins/android/lib/libwebp_jni*.so
+	opt/${PN}/plugins/android/resources/installer/*/installer
 	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
 	opt/${PN}/plugins/android/resources/perfd/*/perfd
-	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
+	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf
+	opt/${PN}/plugins/android/resources/simpleperf/*/libsimpleperf_report.so
+"
 
 VER_CMP=( $(ver_rs 1- ' ') )
 if [[ ${#VER_CMP[@]} -eq 6 ]]; then
@@ -23,21 +28,21 @@ else
 	BUILD_V=$(ver_cut 4-5)
 fi
 
-DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+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.zip"
+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="selinux"
-KEYWORDS="amd64 x86"
+IUSE="custom-jdk selinux"
+KEYWORDS="~amd64 ~x86"
 
-DEPEND="app-arch/zip
+DEPEND="
 	dev-java/commons-logging:0
 	dev-java/log4j:0"
 
-#	dev-java/guava:18
-RDEPEND=">=virtual/jdk-1.7
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7
 	selinux? ( sec-policy/selinux-android )
 	>=app-arch/bzip2-1.0.6-r4
 	dev-java/commons-logging:0
@@ -62,6 +67,7 @@ RDEPEND=">=virtual/jdk-1.7
 	>=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" )
 
@@ -70,8 +76,12 @@ src_prepare() {
 	eapply_user
 
 	# This is really a bundled jdk not a jre
-	rm -rf "${S}/jre" || die "Could not remove bundled jdk"
-
+	# 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
@@ -90,7 +100,7 @@ src_prepare() {
 }
 
 src_compile() {
-	:
+	patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
 }
 
 src_install() {
@@ -99,14 +109,20 @@ src_install() {
 	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}
+	# 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}
-	chmod 755 "${ED%/}${dir}"/bin/*.py "${ED%/}${dir}"/bin/*.sh || die
+	if use custom-jdk; then
+		fperms -R 755 "${dir}"/jre/{bin,jre/bin}
+		fperms 755 ${dir}/jre/jre/lib/jexec
+	fi
 	chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die
 
 	newicon "bin/studio.png" "${PN}.png"
diff --git a/dev-util/android-studio/metadata.xml b/dev-util/android-studio/metadata.xml
index 35dce41ecd40..46a577ea1cfb 100644
--- a/dev-util/android-studio/metadata.xml
+++ b/dev-util/android-studio/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>perfinion@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="custom-jdk">Install and use Android Studio's custom JRE.</flag>
+	</use>
 </pkgmetadata>