Version bump, remove old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x7EF137EC935B0EAF)

4 files changed, 18 insertions, 74 deletions

diff --git a/dev-util/android-studio/ChangeLog b/dev-util/android-studio/ChangeLog
index 4994d0dfaa8a..d15192be462a 100644
--- a/dev-util/android-studio/ChangeLog
+++ b/dev-util/android-studio/ChangeLog
@@ -1,6 +1,15 @@
 # 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.8 2014/11/21 10:53:28 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/ChangeLog,v 1.9 2014/12/05 08:19:34 perfinion Exp $
+
+*android-studio-1.0.0.135.1626825_rc4 (05 Dec 2014)
+
+  05 Dec 2014; Jason Zaman <perfinion@gentoo.org>
+  +android-studio-1.0.0.135.1626825_rc4.ebuild,
+  -android-studio-0.8.1.135.1248636.ebuild,
+  -android-studio-0.8.12.135.1503853.ebuild,
+  -android-studio-0.8.6.135.1339820.ebuild:
+  Version bump, remove old
 
   21 Nov 2014; Jason Zaman <perfinon@gentoo.org> metadata.xml:
   Change maintainer email
diff --git a/dev-util/android-studio/android-studio-0.8.12.135.1503853.ebuild b/dev-util/android-studio/android-studio-0.8.12.135.1503853.ebuild
deleted file mode 100644
index 7e9375744224..000000000000
--- a/dev-util/android-studio/android-studio-0.8.12.135.1503853.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.8.12.135.1503853.ebuild,v 1.1 2014/10/12 09:39:08 swift 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.7"
-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.8.6.135.1339820.ebuild b/dev-util/android-studio/android-studio-0.8.6.135.1339820.ebuild
deleted file mode 100644
index fd2e9cd662a8..000000000000
--- a/dev-util/android-studio/android-studio-0.8.6.135.1339820.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.8.6.135.1339820.ebuild,v 1.1 2014/09/03 19:29:08 swift 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.7"
-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.8.1.135.1248636.ebuild b/dev-util/android-studio/android-studio-1.0.0.135.1626825_rc4.ebuild
index d428bc873b0c..15feacf82d48 100644
--- a/dev-util/android-studio/android-studio-0.8.1.135.1248636.ebuild
+++ b/dev-util/android-studio/android-studio-1.0.0.135.1626825_rc4.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.8.1.135.1248636.ebuild,v 1.1 2014/07/05 08:40:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-1.0.0.135.1626825_rc4.ebuild,v 1.1 2014/12/05 08:19:34 perfinion Exp $
 
 EAPI=5
 inherit eutils versionator
@@ -9,17 +9,22 @@ 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)
+if [[ $(get_version_component_count) -gt 5 ]]; then
+	STUDIO_V="${STUDIO_V}-$(get_version_component_range 6-)"
+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=""
+IUSE="selinux"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/zip"
-RDEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )"
 S=${WORKDIR}/${PN}
 
 src_install() {