gentoo resync : 30.09.2018

4 files changed, 11 insertions, 118 deletions

diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index c2c3112c5aa5..9a7bb104d545 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,8 +1,6 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
-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
-EBUILD android-studio-3.1.2.0.173.4720617.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6
-EBUILD android-studio-3.1.3.0.173.4819257-r1.ebuild 3102 BLAKE2B c6d14892b2113d35bf050b6a3d3d990bf2cd0a35606cb1b177ad784f0d10645809224690d01ff26159cd7d1067d91c3426f64313cb059062668559edc6031da2 SHA512 b9d8f3127ac2ec844916c36e79b9d61c9da77a454f54ac21485d6bcae0f9f408e5aaf4d418fbbdf2855b731860058e6586d293c2e42d44e69eb9faff8b07b966
-EBUILD android-studio-3.1.4.0.173.4907809.ebuild 3102 BLAKE2B c6d14892b2113d35bf050b6a3d3d990bf2cd0a35606cb1b177ad784f0d10645809224690d01ff26159cd7d1067d91c3426f64313cb059062668559edc6031da2 SHA512 b9d8f3127ac2ec844916c36e79b9d61c9da77a454f54ac21485d6bcae0f9f408e5aaf4d418fbbdf2855b731860058e6586d293c2e42d44e69eb9faff8b07b966
+DIST android-studio-ide-181.5014246-linux.zip 1054392038 BLAKE2B 455ce3455710d0709746dc9c18caf61fd347f6c157873de54821601846be6e086646d6261d2c9bdd6986d8f2874e7a90c37b0db820326d2eb17afe438954e240 SHA512 37c622cab6d21e8a0e6d38e0f8c29e22910647df3e6d93ee86c71a39f171b1b51952a13eae2660e209c2eb7a093a9f7d2177562ea287353a30507b22c2617bd0
+EBUILD android-studio-3.1.4.0.173.4907809.ebuild 3100 BLAKE2B 82439e0e353c0409ec545dbe8cb4f8acef6d38184744b3e9d78250c5c6c2588a4d2cc097b277595ae506becf206a30d6aa506188e64a72c338d542258496ee75 SHA512 ff5570c0ea735078f9ebd22069f3d93c65d935e6e35d15c62231652f1f8b6260a27be7f71229a55635fb23debc3a1f3c6789af445050566d35a47c9ba56515e8
+EBUILD android-studio-3.2.0.26.181.5014246.ebuild 3238 BLAKE2B e055000aba0fcbbdd8663c75d452fa1241df2011abfe0fd1cd0012f83069b7eee7d4dc959f4d8d04869128f95489fd8c5791d60aea8e998e9af5a64bfaaa752e SHA512 c26b76a8658f9dc52004aeed53a23d0999742f4477107f922e611c8b95aa7efeda441b1b5640f4225966f0417efbaa49791a44db79d1a7c1a7e0899762023bc1
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
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 cc5bd95dc8b5..000000000000
--- 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.4.0.173.4907809.ebuild b/dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild
index 2659a27fd7b7..d24d057d9043 100644
--- a/dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild
+++ b/dev-util/android-studio/android-studio-3.1.4.0.173.4907809.ebuild
@@ -29,7 +29,7 @@ SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/zip
 	dev-java/commons-logging:0
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.2.0.26.181.5014246.ebuild
index 2659a27fd7b7..ec9300dae613 100644
--- a/dev-util/android-studio/android-studio-3.1.3.0.173.4819257-r1.ebuild
+++ b/dev-util/android-studio/android-studio-3.2.0.26.181.5014246.ebuild
@@ -7,6 +7,7 @@ inherit eutils java-pkg-2 eapi7-ver
 RESTRICT="strip"
 QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
 	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/bin/lldb/*
 	opt/${PN}/lib/libpty/linux/x86*/libpty.so
 	opt/${PN}/plugins/android/lib/libwebp_jni*.so
 	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
@@ -96,15 +97,17 @@ 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
+	# 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}
-	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
+	fperms 755 "${dir}"/bin/*.py "${dir}"/bin/*.sh
+	chmod -R 755 "${ED%/}${dir}"/bin/lldb/{android,bin} || die
+	chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die
 
 	newicon "bin/studio.png" "${PN}.png"
 	make_wrapper ${PN} ${dir}/bin/studio.sh