From d950fa39dbe16d164ed0cb8e3036fd5d0d896a4c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 31 Oct 2017 15:47:53 +0000 Subject: gentoo resync : 31.10.2017 --- dev-util/android-studio/Manifest | 6 +- .../android-studio-2.3.2.0.162.3934792.ebuild | 99 ------------------- .../android-studio-2.3.3.0.162.4069837.ebuild | 2 +- .../android-studio-3.0.0.18.171.4408382.ebuild | 108 +++++++++++++++++++++ 4 files changed, 112 insertions(+), 103 deletions(-) delete mode 100644 dev-util/android-studio/android-studio-2.3.2.0.162.3934792.ebuild create mode 100644 dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild (limited to 'dev-util/android-studio') diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest index 069cf8879958..2fc83e2fc326 100644 --- a/dev-util/android-studio/Manifest +++ b/dev-util/android-studio/Manifest @@ -1,7 +1,7 @@ -DIST android-studio-ide-162.3934792-linux.zip 459976690 SHA256 6e33a232466820a15c884af9faefab772b8267ede056aaedb63f291ceb5e95a7 SHA512 ff563d4c1adca5ae153bf23cde39cda4b462097706e92eb09e9850b07902388cdc569e479d7c8be7d27dca24f897797810534e54a113d043436c312637d62184 WHIRLPOOL 3d44bf16988c280d5ee6df1ee9a7c664a46a58107a73d001d493580f6ca365428a164a5ab9a6fb48fce730c0a19bc3b82a0f891c23131755c659842fe506aa3d DIST android-studio-ide-162.4069837-linux.zip 490782431 SHA256 1383cfd47441e5f820b6257a1bdd683e0e980bc76c7f2027ef84dc2e6ad2f17f SHA512 44f093ce4c97211913bb979fb28d5fe43163462ce6153c31c03576d872e11cbc11651f10397e14247ca41ea269a3cb0998e9e7d37fc63ac6782cc653037d925c WHIRLPOOL ed833816f48abba51d8142fda91175c07f019f40a3ed21ea026367870723016c17262c0eccb71d3d85a5f963ca0a84b0ee2111ae15f95ad92ac565f225d6c10a -EBUILD android-studio-2.3.2.0.162.3934792.ebuild 2717 SHA256 beec4c0b98acc040034fe7ee92f38c364103b3c1b3d17579b766c2b2e98253ad SHA512 2c6760fc2ed8879e65bf3ec17a5b7ca77e7f81850d2ec3a2fb9a7c97771361ccf401c58a30d9b0b686295e58eaa9d03573128ad709d7df97d2240da4efd1d3a5 WHIRLPOOL 03b228b4cddd2b30cd22c73d4f9019d09829623c1777537bec18ccc7c9717141147aa50dd9a0ac0e66fc884766424f29bec10cf5971ba69907feea5f4573635e -EBUILD android-studio-2.3.3.0.162.4069837.ebuild 2719 SHA256 4940f80141f8249a2183ae8141db9015aaa306e9183a0fd758f7bc13b355d4eb SHA512 d5891640cf450bba0c651f5a10df6354b35d42a2d77ea8b258555890c5f389e8cb9209e65e2410e0f9f6570fdc4452c72675473b1edf70edaea09be9c30a4a2a WHIRLPOOL 9b8b78f1b724acbce27b4c62a950c0b53368ea43b1bb3eda3b7700594aa5532bfde210cb967a798bd17fe44d664a051664c3ab2e38be9a43fe57318c39e2f245 +DIST android-studio-ide-171.4408382-linux.zip 771324214 SHA256 7991f95ea1b6c55645a3fc48f1534d4135501a07b9d92dd83672f936d9a9d7a2 SHA512 7637cc2bfd808cd641d8420e8f5a53660139f37beaf822b7b6a3bb49369d7f5a4e5ccfc805d914ff82eee3065d694a7c3d92b53ced88090ad15d57dae4e7e737 WHIRLPOOL b8b78d6838d960313d10bba98bf3deaf6e9e1defad0d6288c7108228210d8c3a6d9b92de38620f4c9ed43338d425605437d45f19e57c56eb369e10f046e9322d +EBUILD android-studio-2.3.3.0.162.4069837.ebuild 2717 SHA256 beec4c0b98acc040034fe7ee92f38c364103b3c1b3d17579b766c2b2e98253ad SHA512 2c6760fc2ed8879e65bf3ec17a5b7ca77e7f81850d2ec3a2fb9a7c97771361ccf401c58a30d9b0b686295e58eaa9d03573128ad709d7df97d2240da4efd1d3a5 WHIRLPOOL 03b228b4cddd2b30cd22c73d4f9019d09829623c1777537bec18ccc7c9717141147aa50dd9a0ac0e66fc884766424f29bec10cf5971ba69907feea5f4573635e +EBUILD android-studio-3.0.0.18.171.4408382.ebuild 3040 SHA256 5552fb8b6774e037bfe4ffc3c53a7b0cc1cffda986225a39033266973ff0e85e SHA512 ffb0f2e69aca058afaa22caf2db59d0e6a59a94a815acd4c7326a6d0e0311be5a96c61059aff0267d04bf558a177ef1800809ca4983dc8b324e1f9b99c5f5322 WHIRLPOOL 34cb3436f03dc73b928130cd75c0e6227429fbee2997c7add9bd13b9eaf681d74c764410c05cf73d3daa3c83739986921ccdab8d9abeed0a376427e66fa863c8 MISC ChangeLog 10211 SHA256 a8e1d7adff2dec32f7dba160601e9a7c9d492e771c7816f0e8cacefb62e0406d SHA512 58a5ccdcb5f8e3de65f01e33c5f316be59f2f2199fdf9683490c94c42005247e961603e4d23c91b948a552c899b268ea4932551a59dafd0325f090fe43a54f74 WHIRLPOOL c609dc7a79b943ee4ea393adb2a11e91f2adba23cb203fd6341a530af1a7d860f79c6444128fa85f1d65e5c084bc0306fb5396af849a77039035cf473f77ea99 MISC ChangeLog-2015 4579 SHA256 fcda269857b7243a4d6517b614aefc6de1847194d725c66bc9b5a7383f48f7f1 SHA512 2033de5e742271778dd540d7af3f1362eb46bfd413b26490781b892d08462ebe5221ae2d4439c7f5b1943767307d9973d3a6169a78425b78fbec730cb9c5457a WHIRLPOOL 82f4ed6caf282f8b2aa1caa51ad35647690dda7a9973948ec1a5ca87a94ba20f2518c8472710fe260f8ebb7402243389bfd54621e6bbd9a7182afeedc578421c MISC metadata.xml 220 SHA256 0f9b760bdf307e4eb7e930032df80e31c7dd8681f3f14fe37be63585790b2767 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868 WHIRLPOOL 5575d4398d983a8d060a8f759845b19c471606c6af96c43f786c906db4fb9de337e6a2c4d168e9792c71caa6970eb1e5ce0b6480675289853468777cd49d8ccc diff --git a/dev-util/android-studio/android-studio-2.3.2.0.162.3934792.ebuild b/dev-util/android-studio/android-studio-2.3.2.0.162.3934792.ebuild deleted file mode 100644 index 9edcf94e78b4..000000000000 --- a/dev-util/android-studio/android-studio-2.3.2.0.162.3934792.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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" - -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/ncurses-5.9-r3:0/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 -} - -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" -} diff --git a/dev-util/android-studio/android-studio-2.3.3.0.162.4069837.ebuild b/dev-util/android-studio/android-studio-2.3.3.0.162.4069837.ebuild index 40da7d6a297d..9edcf94e78b4 100644 --- a/dev-util/android-studio/android-studio-2.3.3.0.162.4069837.ebuild +++ b/dev-util/android-studio/android-studio-2.3.3.0.162.4069837.ebuild @@ -25,7 +25,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.0.18.171.4408382.ebuild b/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.ebuild new file mode 100644 index 000000000000..fbc7007c5f62 --- /dev/null +++ b/dev-util/android-studio/android-studio-3.0.0.18.171.4408382.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" +} -- cgit v1.2.3