gentoo resync : 01.12.2017

3 files changed, 113 insertions, 3 deletions

diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index f3cf84c6e4cc..d3bc21c1fdfd 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,5 +1,7 @@
 DIST android-studio-ide-162.4069837-linux.zip 490782431 SHA256 1383cfd47441e5f820b6257a1bdd683e0e980bc76c7f2027ef84dc2e6ad2f17f SHA512 44f093ce4c97211913bb979fb28d5fe43163462ce6153c31c03576d872e11cbc11651f10397e14247ca41ea269a3cb0998e9e7d37fc63ac6782cc653037d925c WHIRLPOOL ed833816f48abba51d8142fda91175c07f019f40a3ed21ea026367870723016c17262c0eccb71d3d85a5f963ca0a84b0ee2111ae15f95ad92ac565f225d6c10a
-DIST android-studio-ide-171.4408382-linux.zip 771324214 SHA256 7991f95ea1b6c55645a3fc48f1534d4135501a07b9d92dd83672f936d9a9d7a2 SHA512 7637cc2bfd808cd641d8420e8f5a53660139f37beaf822b7b6a3bb49369d7f5a4e5ccfc805d914ff82eee3065d694a7c3d92b53ced88090ad15d57dae4e7e737 WHIRLPOOL b8b78d6838d960313d10bba98bf3deaf6e9e1defad0d6288c7108228210d8c3a6d9b92de38620f4c9ed43338d425605437d45f19e57c56eb369e10f046e9322d
+DIST android-studio-ide-171.4408382-linux.zip 771324214 BLAKE2B 4dbb194338a139d884d05acc60db65d2d85cb80cf28a44a50adf5dbb7390851d5d2640050f17a0048c926c7022794838f5ce6c259f5dd66b04dde47d7b237796 SHA512 7637cc2bfd808cd641d8420e8f5a53660139f37beaf822b7b6a3bb49369d7f5a4e5ccfc805d914ff82eee3065d694a7c3d92b53ced88090ad15d57dae4e7e737
+DIST android-studio-ide-171.4443003-linux.zip 773670325 BLAKE2B b8cff0b85cf20f9d181b4f5c29dc75385539ca2d8e2677211c6c42fcb115616c4208faa5df8cc8a8210c4e9e869d00ae42e7c9dd212756608ff9d4f47bdc8943 SHA512 ba91309c59e4f258222f5b5978bc9ea048476bab4d0662235c7900590f9d58716dc77e937464fab0e57752ee18353a13c163ee98615474f48d0b99e04dae1d34
 EBUILD android-studio-2.3.3.0.162.4069837.ebuild 2717 BLAKE2B f24a31196437f9fb953477e410e15fc66e9da92b27901329d14b94a19f23c1f9c10aa69773b8e2c583a1a9c19f95923e64b40dfb254081c01f3945ca701e7612 SHA512 2c6760fc2ed8879e65bf3ec17a5b7ca77e7f81850d2ec3a2fb9a7c97771361ccf401c58a30d9b0b686295e58eaa9d03573128ad709d7df97d2240da4efd1d3a5
-EBUILD android-studio-3.0.0.18.171.4408382.ebuild 3040 BLAKE2B a2407a4f495ecf80334f2346a5b3bd1f85e9d559655be1327843a9f1d42420996858132856778dae76b6eca75256e6d2aae48d28487a93fb035437ff5885337b SHA512 ffb0f2e69aca058afaa22caf2db59d0e6a59a94a815acd4c7326a6d0e0311be5a96c61059aff0267d04bf558a177ef1800809ca4983dc8b324e1f9b99c5f5322
+EBUILD android-studio-3.0.0.18.171.4408382.ebuild 3038 BLAKE2B 6d688375ee63521c546430bc262622714421f1cc981fece667b42eb3269dd319c80f5c892388d44609adfa5a10108ab7eb30cd1eabd4973e6b83e244d06eb544 SHA512 3ac33b4697c2012043e0c37d94d0ccabcd94b84cc5b83f755376f2a85286a43e3920f68b37aeb643f966d491e9ec27ed0f487e36a955f91c9c8a13d5d3af2b5e
+EBUILD android-studio-3.0.1.0.171.4443003.ebuild 3074 BLAKE2B 7d12080c52bed382f9c0d8d124fd18557b68c0b706b9e1fec6bf8bc64037e679cf0156acdbb9f7fa3510059eefa966294c22c37175989083a974f417b41c0e9a SHA512 567d68bd254c8a2e96e069d477315a851bd9088dc141dad4e0a47a1fc5f1486b5dabd682848149d01aadaf4ffe1ee9355bda9ee91de87020e845a2410607f120
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild b/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild
index fbc7007c5f62..446c76a3456d 100644
--- a/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild
+++ b/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild
@@ -28,7 +28,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.0.1.0.171.4443003.ebuild b/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild
new file mode 100644
index 000000000000..2791da5ee994
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.0.1.0.171.4443003.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 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"
+}