diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 18:59:32 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-21 18:59:32 +0100 |
| commit | 520a5b56dff7c24c9d42eafec142cb78b44f8e3e (patch) | |
| tree | f562f705600dbd2292e97c0b4145787c2a8d1f97 /dev-util/android-studio | |
| parent | 3811bc3072bf19e2be351d2c63f81532945c0f21 (diff) | |
gentoo resync : 21.07.2018
Diffstat (limited to 'dev-util/android-studio')
| -rw-r--r-- | dev-util/android-studio/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/android-studio/android-studio-3.1.3.0.173.4819257-r1.ebuild (renamed from dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild) | 6 | ||||
| -rw-r--r-- | dev-util/android-studio/files/0001-use-java-home-before-bundled.patch | 39 |
3 files changed, 46 insertions, 2 deletions
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.ebuild b/dev-util/android-studio/android-studio-3.1.3.0.173.4819257-r1.ebuild index 1ac8561ea03c..2659a27fd7b7 100644 --- 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-r1.ebuild @@ -62,11 +62,14 @@ RDEPEND=">=virtual/jdk-1.7 >=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 -R "${S}/jre" || die "Could not remove bundled jdk" + 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 @@ -98,6 +101,7 @@ src_install() { 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 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` + |