Remove most older versions.

(Portage version: 2.1.9.25/cvs/Linux x86_64)

6 files changed, 9 insertions, 295 deletions

diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index 2239fd984795..10e6dd9e61ab 100644
--- a/dev-util/android-sdk-update-manager/ChangeLog
+++ b/dev-util/android-sdk-update-manager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/android-sdk-update-manager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.19 2011/02/23 15:45:20 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.20 2011/02/23 15:51:31 rich0 Exp $
+
+  23 Feb 2011; Richard Freeman <rich0@gentoo.org>
+  -android-sdk-update-manager-6-r2.ebuild,
+  -files/android-sdk-update-manager-6-swt.patch,
+  -android-sdk-update-manager-8.ebuild,
+  -android-sdk-update-manager-8-r1.ebuild,
+  -files/android-sdk-update-manager-8-swt.patch:
+  Remove most older versions.
 
 *android-sdk-update-manager-10 (23 Feb 2011)
 
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-6-r2.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-6-r2.ebuild
deleted file mode 100644
index 1d36ebc0878d..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-6-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-6-r2.ebuild,v 1.3 2010/10/15 17:46:23 fauli Exp $
-
-EAPI="2"
-
-inherit eutils
-
-MY_P="android-sdk_r0${PV}-linux_86"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
-SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	=dev-java/swt-3.5*
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )
-	x86? ( x11-libs/gtk+:2 )"
-
-ANDROID_SDK_DIR="${ROOT}/opt/${PN}"
-QA_DT_HASH_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_DT_HASH_amd64="${QA_DT_HASH_x86}"
-
-S="${WORKDIR}/android-sdk-linux_86"
-
-pkg_setup() {
-	enewgroup android || die
-}
-
-src_prepare(){
-	epatch "${FILESDIR}/${PN}-6-swt.patch"
-
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	insinto "${ANDROID_SDK_DIR}/tools"
-	doins -r tools/lib || die "failed to doins tools/lib"
-	rm -rf tools/lib || die
-
-	exeinto "${ANDROID_SDK_DIR}/tools"
-	doexe tools/* || die "failed to doexe tools/"
-
-	# Maybe this is needed for the tools directory too.
-	#keepdir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to keepdir"
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to dodir"
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-
-	echo "PATH=\"${ANDROID_SDK_DIR}/tools\"" > "${T}/80${PN}" || die
-	doenvd "${T}/80${PN}" || die
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See http://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-8-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-8-r1.ebuild
deleted file mode 100644
index e8946411831f..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-8-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-8-r1.ebuild,v 1.1 2010/12/31 13:32:24 rich0 Exp $
-
-EAPI="3"
-
-inherit eutils
-
-MY_P="android-sdk_r0${PV}-linux_86"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
-SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	=dev-java/swt-3.5*
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )
-	x86? ( x11-libs/gtk+:2 )"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_DT_HASH_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_DT_HASH_amd64="${QA_DT_HASH_x86}"
-
-S="${WORKDIR}/android-sdk-linux_86"
-
-pkg_setup() {
-	enewgroup android || die
-}
-
-src_prepare(){
-#	epatch "${FILESDIR}/${PN}-8-swt.patch"
-
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	#keepdir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to keepdir"
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to dodir"
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-
-	SWT_PATH="`dirname \`java-config -p swt-3.5\``"
-
-	echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
-
-	doenvd "${T}/80${PN}" || die
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See http://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
-}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-8.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-8.ebuild
deleted file mode 100644
index 2cc82ddc16ab..000000000000
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-8.ebuild,v 1.1 2010/12/09 18:17:14 rich0 Exp $
-
-EAPI="3"
-
-inherit eutils
-
-MY_P="android-sdk_r0${PV}-linux_86"
-
-DESCRIPTION="Open Handset Alliance's Android SDK"
-HOMEPAGE="http://developer.android.com"
-SRC_URI="http://dl.google.com/android/${MY_P}.tgz"
-IUSE=""
-RESTRICT="mirror"
-
-LICENSE="android"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/tar
-		app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.6.5
-	=dev-java/swt-3.5*
-	amd64? ( app-emulation/emul-linux-x86-gtklibs )
-	x86? ( x11-libs/gtk+:2 )"
-
-ANDROID_SDK_DIR="/opt/${PN}"
-QA_DT_HASH_x86="
-	${ANDROID_SDK_DIR/\/}/tools/emulator
-	${ANDROID_SDK_DIR/\/}/tools/adb
-	${ANDROID_SDK_DIR/\/}/tools/mksdcard
-	${ANDROID_SDK_DIR/\/}/tools/sqlite3
-	${ANDROID_SDK_DIR/\/}/tools/hprof-conv
-	${ANDROID_SDK_DIR/\/}/tools/zipalign
-	${ANDROID_SDK_DIR/\/}/tools/dmtracedump
-"
-QA_DT_HASH_amd64="${QA_DT_HASH_x86}"
-
-S="${WORKDIR}/android-sdk-linux_86"
-
-pkg_setup() {
-	enewgroup android || die
-}
-
-src_prepare(){
-	epatch "${FILESDIR}/${PN}-8-swt.patch"
-
-	rm -rf tools/lib/x86*
-}
-
-src_install(){
-	dodoc tools/NOTICE.txt "SDK Readme.txt" || die
-	rm -f tools/NOTICE.txt "SDK Readme.txt"
-
-	dodir "${ANDROID_SDK_DIR}/tools"
-	cp -pPR tools/* "${ED}${ANDROID_SDK_DIR}/tools" || die "failed to install tools"
-
-	# Maybe this is needed for the tools directory too.
-	#keepdir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to keepdir"
-	dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to dodir"
-
-	fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-	fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp} || die
-
-	echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
-	doenvd "${T}/80${PN}" || die
-}
-
-pkg_postinst() {
-	elog "The Android SDK now uses its own manager for the development	environment."
-	elog "You must be in the android group to manage the development environment."
-	elog "Just run 'gpasswd -a <USER> android', then have <USER> re-login."
-	elog "See http://developer.android.com/sdk/adding-components.html for more"
-	elog "information."
-	elog "If you have problems downloading the SDK, see http://code.google.com/p/android/issues/detail?id=4406"
-}
diff --git a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch
deleted file mode 100644
index 7a01219cf0a6..000000000000
--- a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- android-sdk-linux_86/tools/android.old      2010-08-16 19:56:17.522813374 -0400
-+++ android-sdk-linux_86/tools/android  2010-08-16 19:56:57.876813929 -0400
-@@ -93,13 +93,7 @@
- if [ -n "$ANDROID_SWT" ]; then
-     swtpath="$ANDROID_SWT"
- else
--    vmarch=`"${java_cmd}" -jar "${frameworkdir}/archquery.jar"`
--    if [ -n "$ANDROID_BUILD_TOP" ]; then
--        osname=`uname -s | tr A-Z a-z`
--        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"
--    else
--        swtpath="${frameworkdir}/${vmarch}"
--    fi
-+    swtpath=`dirname \`java-config -p swt-3.5\``
- fi
-
- # Combine the swtpath and the framework dir path.
---- android-sdk-linux_86/tools/ddms.old         2010-08-21 18:25:12.000000000 +0200
-+++ android-sdk-linux_86/tools/ddms             2010-08-26 14:44:36.000000000 +0200
-@@ -85,13 +85,7 @@
- if [ -n "$ANDROID_SWT" ]; then
-     swtpath="$ANDROID_SWT"
- else
--    vmarch=`${javaCmd} -jar "${frameworkdir}"/archquery.jar`
--    if [ -n "$ANDROID_BUILD_TOP" ]; then
--        osname=`uname -s | tr A-Z a-z`
--        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"
--    else
--        swtpath="${frameworkdir}/${vmarch}"
--    fi
-+    swtpath=`dirname \`java-config -p swt-3.5\``
- fi
- 
- # Combine the swtpath and the framework dir path.
diff --git a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-8-swt.patch b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-8-swt.patch
deleted file mode 100644
index 5bd8db2e4110..000000000000
--- a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-8-swt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- android-sdk-linux_86/tools/android.old      2010-08-16 19:56:17.522813374 -0400
-+++ android-sdk-linux_86/tools/android  2010-08-16 19:56:57.876813929 -0400
-@@ -93,13 +93,7 @@
- if [ -n "$ANDROID_SWT" ]; then
-     swtpath="$ANDROID_SWT"
- else
--    vmarch=`"${java_cmd}" -jar "${frameworkdir}/archquery.jar"`
--    if [ -n "$ANDROID_BUILD_TOP" ]; then
--        osname=`uname -s | tr A-Z a-z`
--        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"
--    else
--        swtpath="${frameworkdir}/${vmarch}"
--    fi
-+    swtpath=`dirname \`java-config -p swt-3.5\``
- fi
-
- # Combine the swtpath and the framework dir path.