# HG changeset patch # User Da Risk # Date 1491240143 25200 # Node ID 37de2618fc689b30424b584cce4f78ea7fffe97c # Parent 27499e78f38c95bc0a8af09581ce137e65534cf4 Remove old android-studio that are already in main gentoo tree diff -r 27499e78f38c -r 37de2618fc68 dev-util/android-studio/Manifest --- a/dev-util/android-studio/Manifest Thu Mar 02 16:07:26 2017 -0800 +++ b/dev-util/android-studio/Manifest Mon Apr 03 10:22:23 2017 -0700 @@ -1,2 +0,0 @@ -DIST android-studio-ide-145.3360264-linux.zip 466765476 SHA256 95014a19786c076b31f0ea980eb42a163e9738356ec08a0878b7d67b6b7ec76e SHA512 446db0013b8d815ee89fa800fb5d610507fdc8b41fc3f09f2b94984ec2918e61cd9296920311f2f394c18521be53e4d7d5b44e6b6f60a617d44a451a61df4a7d WHIRLPOOL 814b227a3b22d6b69a70b7d11fd49c399dc8c45973221d07089ccf94ec07b7aa4c453ce54814d420205eeba203687083d152e81bf2f9a753af4ffb607f47b556 -DIST android-studio-ide-162.3764568-linux.zip 449372867 SHA256 214cee47ef7a628c712ae618f5aab6c2a56a72aa479a50937d4cad5a0abf8435 SHA512 36609ca69e7ebb62f14d9a8aa25eb2fe022acc99b0ffa4b1de7eb4c4554455bf3ea10c06d152e4fc14bc88e6f4990129aa5cbf605da883abf02a6a11c8be8293 WHIRLPOOL 8bdcc5b3f4f3f07d3e4e54d729eb46afdd018340e14676422b1e1f1276d73e891672dcfa2be225b8ec4f776b955751271a9c49133df658ff366e56149f9a6d04 diff -r 27499e78f38c -r 37de2618fc68 dev-util/android-studio/android-studio-2.2.2.0.145.3360264.ebuild --- a/dev-util/android-studio/android-studio-2.2.2.0.145.3360264.ebuild Thu Mar 02 16:07:26 2017 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils versionator - -RESTRICT="strip" -QA_PREBUILT="opt/${PN}/bin/libbreakgen.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" -RDEPEND=">=virtual/jdk-1.7 - selinux? ( sec-policy/selinux-android ) - >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)] - >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)] - >=dev-libs/libffi-3.0.13-r1[abi_x86_32(-)] - >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] - >=media-libs/freetype-2.5.5[abi_x86_32(-)] - >=media-libs/libpng-1.2.51[abi_x86_32(-)] - >=media-libs/mesa-10.2.8[abi_x86_32(-)] - >=sys-libs/ncurses-5.9-r3:5[abi_x86_32(-)] - >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] - >=x11-libs/libX11-1.6.2[abi_x86_32(-)] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32(-)] - >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32(-)] - >=x11-libs/libXext-1.3.2[abi_x86_32(-)] - >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)] - >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] - >=x11-libs/libdrm-2.4.46[abi_x86_32(-)] - >=x11-libs/libxcb-1.9.1[abi_x86_32(-)] - >=x11-libs/libxshmfence-1.1[abi_x86_32(-)]" -S=${WORKDIR}/${PN} - -src_install() { - local dir="/opt/${PN}" - - if use x86 ; then - rm "bin/fsnotifier-arm" "bin/fsnotifier64" || die - elif use amd64 ; then - rm "bin/fsnotifier-arm" "bin/fsnotifier" || die - fi - insinto "${dir}" - doins -r * - - fperms 755 "${dir}/bin/studio.sh" - - if use x86 ; then - fperms 755 "${dir}/bin/fsnotifier" - elif use amd64 ; then - fperms 755 "${dir}/bin/fsnotifier64" - fi - - newicon "bin/studio.png" "${PN}.png" - make_wrapper ${PN} ${dir}/bin/studio.sh - make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" -} diff -r 27499e78f38c -r 37de2618fc68 dev-util/android-studio/android-studio-2.3.0.8.162.3764568.ebuild --- a/dev-util/android-studio/android-studio-2.3.0.8.162.3764568.ebuild Thu Mar 02 16:07:26 2017 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,109 +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" - local JARS="commons-logging log4j" - local j - for j in ${JARS}; do - rm -v ${j/:*/}*.jar - java-pkg_jar-from ${j} - done -} - -src_compile() { - : -} - -src_install() { - local dir="/opt/${PN}" - - if use x86 ; then - rm "bin/fsnotifier64" || die - elif use amd64 ; then - rm "bin/fsnotifier" || die - fi - 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" - if use x86 ; then - fperms 755 "${dir}/bin/fsnotifier" - elif use amd64 ; then - fperms 755 "${dir}/bin/fsnotifier64" - fi - 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" -}