From 520a5b56dff7c24c9d42eafec142cb78b44f8e3e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Jul 2018 18:59:32 +0100 Subject: gentoo resync : 21.07.2018 --- dev-util/android-studio/Manifest | 3 +- .../android-studio-3.1.3.0.173.4819257-r1.ebuild | 112 +++++++++++++++++++++ .../android-studio-3.1.3.0.173.4819257.ebuild | 108 -------------------- .../files/0001-use-java-home-before-bundled.patch | 39 +++++++ 4 files changed, 153 insertions(+), 109 deletions(-) create mode 100644 dev-util/android-studio/android-studio-3.1.3.0.173.4819257-r1.ebuild delete mode 100644 dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild create mode 100644 dev-util/android-studio/files/0001-use-java-home-before-bundled.patch (limited to 'dev-util/android-studio') diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest index f67e08029d5c..25bca8f456dc 100644 --- a/dev-util/android-studio/Manifest +++ b/dev-util/android-studio/Manifest @@ -1,5 +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 EBUILD android-studio-3.1.2.0.173.4720617.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6 -EBUILD android-studio-3.1.3.0.173.4819257.ebuild 2946 BLAKE2B 8c832ef656ab9e82c5e48613724674fb48086b04faa1a856b1f1b8874ae775a874c74ebf695a9b27298cb4f6a1e60c354940be8ed57f85f037ce8d161175c331 SHA512 419443ce002b2bb60105681a5fb622265eb47e19dc6e9a9cf23488eaa33350abe95aee15707c5c989f938ae94d7b785fca32963f28b624ec21392f374970c65a +EBUILD android-studio-3.1.3.0.173.4819257-r1.ebuild 3102 BLAKE2B c6d14892b2113d35bf050b6a3d3d990bf2cd0a35606cb1b177ad784f0d10645809224690d01ff26159cd7d1067d91c3426f64313cb059062668559edc6031da2 SHA512 b9d8f3127ac2ec844916c36e79b9d61c9da77a454f54ac21485d6bcae0f9f408e5aaf4d418fbbdf2855b731860058e6586d293c2e42d44e69eb9faff8b07b966 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868 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.1.3.0.173.4819257-r1.ebuild new file mode 100644 index 000000000000..2659a27fd7b7 --- /dev/null +++ b/dev-util/android-studio/android-studio-3.1.3.0.173.4819257-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils java-pkg-2 eapi7-ver + +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" + +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="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} +PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" ) + +src_prepare() { + eapply "${PATCHES[@]}" + eapply_user + + # This is really a bundled jdk not a jre + rm -rf "${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.3.0.173.4819257.ebuild b/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild deleted file mode 100644 index 1ac8561ea03c..000000000000 --- a/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.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 eapi7-ver - -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" - -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="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 - - 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/files/0001-use-java-home-before-bundled.patch b/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch new file mode 100644 index 000000000000..6f97c7d3f925 --- /dev/null +++ b/dev-util/android-studio/files/0001-use-java-home-before-bundled.patch @@ -0,0 +1,39 @@ +Use JAVA_HOME before bundled jre + +Must keep bundled jre symlink around in case "Use Embedded JDK" is selected + +https://bugs.gentoo.org/613868 +https://bugs.gentoo.org/660404 + +--- android-studio/bin/studio.sh 2018-07-20 13:43:12.339049033 +0800 ++++ android-studio/bin/studio.sh 2018-07-20 13:43:38.494932028 +0800 +@@ -73,6 +73,14 @@ + fi + fi + ++if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then ++ JDK="$JDK_HOME" ++fi ++ ++if [ -z "$JDK" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then ++ JDK="$JAVA_HOME" ++fi ++ + if [ -z "$JDK" -a "$OS_TYPE" = "Linux" ] ; then + BUNDLED_JRE="$IDE_HOME/jre64" + if [ ! -d "$BUNDLED_JRE" ]; then +@@ -83,14 +91,6 @@ + fi + fi + +-if [ -z "$JDK" -a -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then +- JDK="$JDK_HOME" +-fi +- +-if [ -z "$JDK" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then +- JDK="$JAVA_HOME" +-fi +- + if [ -z "$JDK" ]; then + JDK_PATH=`which java` + -- cgit v1.2.3