gentoo resync : 08.06.2019

3 files changed, 135 insertions, 2 deletions

diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 37c6d06a8c52..223fcca6ef2e 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,6 +1,8 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
 DIST android-studio-ide-182.5199772-linux.zip 1059268546 BLAKE2B b5485c444eea49e10b155a763d40a08c09a05e34c151cf21b79bfbb9b039f0bb112fc806b3b8cf4fe7e17127fe89c8651fac7ff83163ff1cf78c24b330273490 SHA512 76647fc50fbe06f93b733962b51dc8fb57d59c1e30364b82bf7a03a7700a0f7835eab240db6bd93ae71f4147408cbe8641b41965c97d40494c2e5fe0fecfba4d
 DIST android-studio-ide-183.5452501-linux.tar.gz 1087166186 BLAKE2B 07c17dc854d24c7e96a91346887dfb96067acad330d485c996f13107bf2a92d6b85e791638c1f6d2f08ea9ea47eb0ee45568605b95f6cdefc2fbf4d350bfeb0e SHA512 c686c2dd89a19d9b2fabffff8ce5a7b5b96ff05bb8c9fbf3c1a7a7b78896653114a527b30d2a9795541f5c70dc80f59d7d3b0d2a56141fea48932bfbb51e8b5f
+DIST android-studio-ide-183.5522156-linux.tar.gz 1087847976 BLAKE2B 6bff44f3d4dd5de1ce65ebc444c5b30d717b92ee34ccdfc268706f1ea07cc6c431ca6a42d361f89fdbe852f347b63afbfb9667acfd80980b869d244e5b957249 SHA512 2d9f10fc53c0d8036e413897c5003b07be106c5108a494d347b8c035b0e8155e13fcd487627b2b4910e918f41b1972b96cd078d09e3469eef2e18ce04a416b05
 EBUILD android-studio-3.3.0.20.182.5199772.ebuild 3240 BLAKE2B 7c2780bd4988f6ed98717846474992a3332599f16570f71837bfcf3a82c5659154cac12066a5a2362db6abd15468fb20816b35df0656aad24f55684b22b077af SHA512 8abdb86fba3d3135faff90623bfa68cd92c83374b2a01754657c17007aac46c408179c1ab4ffcb7c74dc123f0177bcdc251171856837044a76b4ca7eb51816eb
-EBUILD android-studio-3.4.0.18.183.5452501.ebuild 3826 BLAKE2B 798274d2f8c082f8edaa446593c2cc1fafac1c4a40c1d774720886a05738b141511a5fa8a599c290a9f4792355e748deee49a6a3ed72ba96034d8b88198d103e SHA512 a6d1ba053b6f4dc39202e63b2a21276f7695b49ddea2a346d22cef43f30d1abd5ac1bd055e0e3270d01179e78b02e4a5dbc2c1738a400497f16db0c26a27dc90
+EBUILD android-studio-3.4.0.18.183.5452501.ebuild 3824 BLAKE2B e55d7fcacf1cf84302d53ce243df58f8ca8c9826df1a49b3378a4d77d8716d9a794c6121b05d46595667c8570f2a31dae5ba9e33d9d123911b1c9ac782e45f91 SHA512 0751583b69d3aa79c19ede7f74ab8fd5a9120b1704d99397a745f43373d272cb062ec1669aa117b41c7348def2e3c18f86c053f19619a6ff42a0c494da5ac39c
+EBUILD android-studio-3.4.1.0.183.5522156.ebuild 3826 BLAKE2B 798274d2f8c082f8edaa446593c2cc1fafac1c4a40c1d774720886a05738b141511a5fa8a599c290a9f4792355e748deee49a6a3ed72ba96034d8b88198d103e SHA512 a6d1ba053b6f4dc39202e63b2a21276f7695b49ddea2a346d22cef43f30d1abd5ac1bd055e0e3270d01179e78b02e4a5dbc2c1738a400497f16db0c26a27dc90
 MISC metadata.xml 313 BLAKE2B 623366c889e8b0d9c33a56fd3ca96156208db355e1549bbf8040a6839a953a82459b3c87e5a0f16f1d67ede403ee5a9e1747c445e855434f25d0f03fe5a6c43a SHA512 1c3e18bd57e48e7f65791f8904bcdde910f1d97d83e781c7c3815df6127aaac9063614e0a11cf7762059f762c4696e2b89ca446ffb9e631a2c85ff2b350e972a
diff --git a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
index 655d30a45bdd..8a6b5cc35200 100644
--- a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
+++ b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
@@ -35,7 +35,7 @@ SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="custom-jdk selinux"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-java/commons-logging:0
diff --git a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
new file mode 100644
index 000000000000..655d30a45bdd
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 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/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/*/libsimpleperf_report.so
+"
+
+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
+	|| ( 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"
+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
+	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"
+}