stabilize, drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x7EF137EC935B0EAF

4 files changed, 24 insertions, 83 deletions

diff --git a/dev-util/android-studio/ChangeLog b/dev-util/android-studio/ChangeLog
index 7f7712e30d86..80832170efed 100644
--- a/dev-util/android-studio/ChangeLog
+++ b/dev-util/android-studio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/android-studio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/ChangeLog,v 1.21 2015/07/31 07:36:20 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/ChangeLog,v 1.22 2015/07/31 07:38:30 perfinion Exp $
+
+  31 Jul 2015; Jason Zaman <perfinion@gentoo.org>
+  -android-studio-1.2.1.1.141.1903250.ebuild,
+  android-studio-1.2.2.0.141.1980579.ebuild:
+  stabilize, drop old
 
 *android-studio-1.3.0.10.141.2117773 (31 Jul 2015)
 
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index cc99a8af15f6..4e5d9abe5771 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -2,31 +2,29 @@
 Hash: SHA256
 
 DIST android-studio-ide-141.1890965-linux.zip 259139652 SHA256 f6c083902156ab83435fa91ae0743d9a2ae64e8aca1396afd553a44071366906 SHA512 bed422287003072ea4d65c05724fce22d3e847d5d292d2fa53cf799e344c2638d721e1e0c1c2b1444e1a52931e96f83499c5f9c6fb64e79aacbbf03dd1c10b61 WHIRLPOOL 58b542bb7f0a4375a5281e500ed74542c17af10582f305dd56792b7efb666a1a316a2d8fded99801d219ceceba919e527272b87067531a0a910d34197740dde1
-DIST android-studio-ide-141.1903250-linux.zip 258634089 SHA256 f79756f27f6ddc14f90a52dbeed5231b4a6b382c72aba10e17ab1403b886c09e SHA512 a0baac0fd7406c16277f09662b798c2340725d0d11333aa1834c095e2041d74bb4e75096dfe146491dfbb330d3a17b5c00e70cc1a921fd230c18d7b3e0d6e9a3 WHIRLPOOL c4fd53b7a20039176fb2cdd47c2da0d73148108880ad0076528390802a4113993b9719e794943058ed5b8382036768d7a7bc47d9034a9554d95bec33335487af
 DIST android-studio-ide-141.1980579-linux.zip 258628239 SHA256 46a1b492360f873f7b99f53b535ce79503f4127a8ee5d06afbe0f53ec5f56a21 SHA512 54a83e6a54cd07ade1bfd3756bdff9c3431594412a01809ac3d2b1b5b2fb1719b8dd4f980516eeba5f7016c7757950c93a1d368ad1034d1300b9fe44577a1bcd WHIRLPOOL 567bcc5ae38015a586224e7c5870d7766f18b4241b46aa53eb7459a7f26d859d9855632cdcf54d3b35bca1b7c39b15cfc1141d11a4d017d9b3e199b72f088b56
 DIST android-studio-ide-141.2117773-linux.zip 351742127 SHA256 061be01b266fea24517dfee24ed98cec1eee2ef840f062a697c6bd07d2db5d27 SHA512 e21291c3e759e1b500eca487ef1e43c2dfd44e051cffd6fe2abbf9445c7577846d8e11aaaf0cb7423b70185bbcbdca8bf4ae2d084fedba7f28adc9063409520c WHIRLPOOL 22e00aae65870af2d9e0c77754f9b0fe9a35b9798c2e0e4535288cbb9803a40c405b2235b078f97e203356e8468fb6e49f270d00704abdc2027448984adf794a
 EBUILD android-studio-1.2.0.12.141.1890965.ebuild 2166 SHA256 6eb5fa72abfa1ad0c66c95027987482426bfeaec65bc2196f373409246afa5d2 SHA512 3f101025c9ea963a9894bdf05244485d9ffdc6e2d8f0d70e76660e23a0600ec8084cf19272caefd8ccfb62f11a994fbaa396a44f9990de3c265bf642b30cca5d WHIRLPOOL 491048550578f480f5f68fca5ec27ac34dd6a385fc058c03b8e1f154f812c08de78cd2700a3632498b614370857f101f0bb1c5c00c3f080e453ff9c7d591d4b2
-EBUILD android-studio-1.2.1.1.141.1903250.ebuild 2173 SHA256 4fa920bc4d9f5c86960ac820cc434111361352ee1a2c1098a678cfd25c633684 SHA512 e35d82184aa170eb42fda176dba39a1dd2d5b0fd93c44c35fbdda3a335e2596d404c6bcb3c6e6118be419c656c9467f69095e17db60eef57f0ecf83e2bfb804a WHIRLPOOL b61d98900f38fa8a12074b14e6a1884d9d3dc26b37a6756fe4e56554412cd5e85d90f8d57133432a79e0f14dfd09e0d848e24fdd88e5c47a7ecc01cce1716f91
-EBUILD android-studio-1.2.2.0.141.1980579.ebuild 2173 SHA256 5802bd3c8e806a75a8e5a89bd06ba513e758f884c274aefe188f479ea889dd59 SHA512 d6ab5e8ba79e1cea804fbfc479b37cf686b1e28c9e10ff34fb9207b9cb23aee0c494f59589c180b6ec10d129aaeb0b425b7091dd87e116f711ff4b828b6f799d WHIRLPOOL 5ef48296ba7d45a905b353d5c2c81256d4e54bf0e2c30cee71203b8ee6ad88ed6d5cc1c4d2c05740554f907e8c1014542544910879dd898f679f9d5f7993f471
+EBUILD android-studio-1.2.2.0.141.1980579.ebuild 2171 SHA256 442c2d7af6f16b1fda1435cb7e1f00d7d663039184dec98826fe0037f29b60e2 SHA512 7a163719a23b6e318b0bda7387c3654d7a1055622555576035c3892faa1dd4688a6f2b6db8f34a4a73c56c5a999272fa482f5e63c96a673bbc279aadc0eecabe WHIRLPOOL a4a2ebf34875f30b0243e25145df72dcfcd476cc3b0b65278a0a88dfe5c14e0b2773fe8728263b8387d05c0e0b532bf075f5dffadfb8a65c138da56c07f38e82
 EBUILD android-studio-1.3.0.10.141.2117773.ebuild 2174 SHA256 0e37e36fed1d28bb9aef3627258ac40648434078f07367608f229cf5e4234cb8 SHA512 8838d3d7574f95c961b9e103150772edabdc22521c5b2d5e0a1851d5033bea711579f8f3b61ddfbc45508e888b76a7400e73a906d9500e8a42f0534aaf12182b WHIRLPOOL 2770a6dab1a1bae2731fb9c11147a7afc877aa4e6eee5c5ffd606f23d6f1567deb70985acb95cd75e4e1ebfb2373d98c8e9db9189e57de8b35799dbbaaebeae8
-MISC ChangeLog 4415 SHA256 1bf6759e083167ad281a573e9a759c94c5463e7a561a9da8f3d5c7cb3c4d18c1 SHA512 dd6a117edf5ccfc910bf725385d1a1a72b8fba14fe0f9f57d36296b86d9840986be258d5d4a75ce614de12e76f90b5d25288ac7ebe5c4ce236d91160cc2af449 WHIRLPOOL 6f82740ad18b64cce24842977e4f073ba2f1c56e5084020f913d55a965c12757a5d6d82aa31323d3c1a439b06a152706cfb93343bcbd318b5cc0d2116f59ac42
+MISC ChangeLog 4579 SHA256 fcda269857b7243a4d6517b614aefc6de1847194d725c66bc9b5a7383f48f7f1 SHA512 2033de5e742271778dd540d7af3f1362eb46bfd413b26490781b892d08462ebe5221ae2d4439c7f5b1943767307d9973d3a6169a78425b78fbec730cb9c5457a WHIRLPOOL 82f4ed6caf282f8b2aa1caa51ad35647690dda7a9973948ec1a5ca87a94ba20f2518c8472710fe260f8ebb7402243389bfd54621e6bbd9a7182afeedc578421c
 MISC metadata.xml 206 SHA256 47bf381c9ae4c1960c25221eb56a669422b55d677ab87d7ef9acc479af2b6c99 SHA512 f440c5f78fd09578272a46c4135b483eca70e6e1ee76fafaa9503fbdfcfbec6f5ee0cce60a00112927cadbfc3bbbc0d54bc4e3eb1851b4450ec3cd83be78fbe5 WHIRLPOOL b3f47b1a1e0fc0468017708da5c6f3d0c7e478f362a1549b5346464082f77e9a5f5270b411d840cf7e272380e872d7ed5c856ed28c5ba4e042f5c6e00b103e76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVuyV9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVuyX3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFMTYyREVBRDFDQ0REMTEzRjA0QjNENDky
-QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VjTsQAJSstOZLKc1PrJJ+CkARv6v1
-SqbYwhUwbPhzIeCKuyKmICjf6lDw0L8PcSCd52gQ8sCeGZ8VOM9z6VNHvuMMdybz
-yZ+f4AXzvypS0qoCdr9DwlMa03iLYy1Wf4tLME7atDNbvej9Irbn2ea3+8lqR6EU
-T4SegHMxQAsRjT8CnYpvbnDM1+qey7vM6Kr7I/RVXuK/CL3jDmtV9hEZhZmXAz8N
-CjTd3vupHHbQ8jcnrNHI0oRAcI3C/Miph0R6K6XUPg5IoPyoc/VaMcFPB9A2OBoA
-U1EqHt7BihF+LoE/sMj66RqDqJOPn0FyAdC+DVT9pcgUeP22N554g+WmzkqeNQHt
-DBjCourFmBgwptf5XluVguYx8BQP1fI9gu9EdE/jZv4Ed4dVo+F2ShaZvHbz3gY0
-eA/2uu0Kt04i/1Zp3H6TOWCFS8WKd3G5Ygpk5qSBnQAXuWe79em1e5UZtnfsjHne
-FtiQ+KQaTmUJUeutH7McS68qI1wfEQoL1jpnnSJvIYjkc7s1QbKnBAHTQx7PVuZh
-pxPEqV9Eemw/oVQhcmufqp+a5/EmAp+F98IoJSuWhrHKbSFpixYBM4NfCXZ+k8ua
-RGaMfnIjHhR70eQbu3xv9XiKP1zK8BzTW+BfLrlwF2M6LUe2V2v2IpJhenFWoglV
-TeLBPxsLWgF1fOFVZEck
-=BdSx
+QkJFRDlDQjFBNjhFRjU1AAoJECu+2csaaO9VgyUP/3a2jFUk2B8yoR+j3f0CpaC4
+zagYEXJ+0cvV320XGh8ohCcr/pEMLqDhIMWsTzmDgMCEd9ZpSMb8TMSVTTUM4tF3
+opsYnioGxJGEl6aQShth5osCOT47qf+qU2NRCYNn86bSdYY5L1aN6xRHcWcE2LeC
+qOYJJUO6unEz/W0lZF2I8PKMOJhxS//XIrXGnxinpi0w6Ege/7LoeMXNj325Rbl2
+JmjbWh277f28OwpKuHsFJnXyO07JoQqKOstjerCOEih8T0S4suA99yRTa6TRW+oh
+EVmiCAqT6enWhuXtsDGB6pc3Ey90eqdLKkhOzUv2KZOmNtfj4yExpPUrAy0YEZ/k
+I49PqsGA/ZhaNMbwdgxuxPyfeyAxORmkSIcfo2hWf980BDpN9SPcDYeW/BEI1zKh
+lZ0k0vS/Dm17uPqVCw4Ra0OQGR6W8GVcWzdRUCq7yAjGvKLNz8PA9v6P5wFyhU+w
+b6Csze965na0sHgfrHsY7eZSXT+BmZ5eoQw90WIaNAbYFsP9f7NKk5WSJlp277gk
+tcpyA8TyJXGCcAUiTl85myDmU+ziXaVuz2rQ728NnnebNC4+ULwDlgOFU4L3CLTa
+g1xpXBYjROVP0/TM8Ky15cozBuDcgBdL6giXuzrsLW++0jzYcL78aW6zEitF9yZw
+OotAyU9KGOgEGruzG7HN
+=l1VH
 -----END PGP SIGNATURE-----
diff --git a/dev-util/android-studio/android-studio-1.2.1.1.141.1903250.ebuild b/dev-util/android-studio/android-studio-1.2.1.1.141.1903250.ebuild
deleted file mode 100644
index 16af7b9df20f..000000000000
--- a/dev-util/android-studio/android-studio-1.2.1.1.141.1903250.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-1.2.1.1.141.1903250.ebuild,v 1.1 2015/06/01 15:30:53 perfinion Exp $
-
-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="http://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[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}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
-
-	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-1.2.2.0.141.1980579.ebuild b/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild
index d168589308d6..790714e28721 100644
--- a/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild
+++ b/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild,v 1.1 2015/06/17 10:38:42 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-1.2.2.0.141.1980579.ebuild,v 1.2 2015/07/31 07:38:30 perfinion Exp $
 
 EAPI=5
 inherit eutils versionator
@@ -22,7 +22,7 @@ SRC_URI="http://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"
 RDEPEND=">=virtual/jdk-1.7