Bump version (bug #5213400). Drop older editions. Thanks to Jason Zaman (perfinion)

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)

4 files changed, 13 insertions, 73 deletions

diff --git a/dev-util/android-studio/ChangeLog b/dev-util/android-studio/ChangeLog
index 64aaee3c5d02..a8f456899021 100644
--- a/dev-util/android-studio/ChangeLog
+++ b/dev-util/android-studio/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/android-studio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/ChangeLog,v 1.4 2014/07/05 08:40:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/ChangeLog,v 1.5 2014/09/03 19:29:08 swift Exp $
+
+*android-studio-0.8.6.135.1339820 (03 Sep 2014)
+
+  03 Sep 2014; Sven Vermeulen <swift@gentoo.org>
+  +android-studio-0.8.6.135.1339820.ebuild,
+  -android-studio-0.5.8.135.1155795.ebuild,
+  -android-studio-0.5.9.135.1195882.ebuild,
+  -android-studio-0.6.1.135.1224218.ebuild:
+  Bump version (bug #5213400). Drop older editions. Thanks to Jason Zaman
+  (perfinion)
 
 *android-studio-0.8.1.135.1248636 (05 Jul 2014)
 
diff --git a/dev-util/android-studio/android-studio-0.5.8.135.1155795.ebuild b/dev-util/android-studio/android-studio-0.5.8.135.1155795.ebuild
deleted file mode 100644
index 2b31f1a51062..000000000000
--- a/dev-util/android-studio/android-studio-0.5.8.135.1155795.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-0.5.8.135.1155795.ebuild,v 1.1 2014/05/11 21:14:32 jauhien Exp $
-
-EAPI=5
-inherit eutils versionator
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-STUDIO_V=$(get_version_component_range 1-3)
-BUILD_V=$(get_version_component_range 4-5)
-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=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.6"
-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/idea.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-0.5.9.135.1195882.ebuild b/dev-util/android-studio/android-studio-0.5.9.135.1195882.ebuild
deleted file mode 100644
index b793ac73ccac..000000000000
--- a/dev-util/android-studio/android-studio-0.5.9.135.1195882.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-0.5.9.135.1195882.ebuild,v 1.1 2014/06/01 21:21:27 tomwij Exp $
-
-EAPI=5
-inherit eutils versionator
-
-RESTRICT="strip"
-QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
-STUDIO_V=$(get_version_component_range 1-3)
-BUILD_V=$(get_version_component_range 4-5)
-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=""
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.6"
-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/idea.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-0.6.1.135.1224218.ebuild b/dev-util/android-studio/android-studio-0.8.6.135.1339820.ebuild
index 94bbf7638bf8..fd2e9cd662a8 100644
--- a/dev-util/android-studio/android-studio-0.6.1.135.1224218.ebuild
+++ b/dev-util/android-studio/android-studio-0.8.6.135.1339820.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-0.6.1.135.1224218.ebuild,v 1.1 2014/06/23 18:54:41 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-0.8.6.135.1339820.ebuild,v 1.1 2014/09/03 19:29:08 swift Exp $
 
 EAPI=5
 inherit eutils versionator
@@ -19,7 +19,7 @@ IUSE=""
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jdk-1.7"
 S=${WORKDIR}/${PN}
 
 src_install() {