Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-util/android-sdk-update-manager
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-10-15 20:22:19 +0000
committerPacho Ramos <pacho@gentoo.org>2014-10-15 20:22:19 +0000
commit6797d2f79bbe716dee0b09f402bb8ceddacc2e6c (patch)
treed271e643785a17dc507bfc3010b142ed9a1e80d2 /dev-util/android-sdk-update-manager
parentnet-libs/farsight2 is going to be removed (diff)
downloadgentoo-2-6797d2f79bbe716dee0b09f402bb8ceddacc2e6c.tar.gz
gentoo-2-6797d2f79bbe716dee0b09f402bb8ceddacc2e6c.tar.bz2
gentoo-2-6797d2f79bbe716dee0b09f402bb8ceddacc2e6c.zip
Support multilib providers for deps. Bump to EAPI=5.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-util/android-sdk-update-manager')
-rw-r--r--dev-util/android-sdk-update-manager/ChangeLog16
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild29
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild29
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild27
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild29
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild27
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild27
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild27
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild27
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild29
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild28
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild27
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild29
-rw-r--r--dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild28
14 files changed, 237 insertions, 142 deletions
diff --git a/dev-util/android-sdk-update-manager/ChangeLog b/dev-util/android-sdk-update-manager/ChangeLog
index 1ea9f07945c2..f30ff31c37e9 100644
--- a/dev-util/android-sdk-update-manager/ChangeLog
+++ b/dev-util/android-sdk-update-manager/ChangeLog
@@ -1,6 +1,20 @@
# ChangeLog for dev-util/android-sdk-update-manager
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.62 2014/07/07 16:48:40 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.63 2014/10/15 20:22:19 pacho Exp $
+
+ 15 Oct 2014; Pacho Ramos <pacho@gentoo.org>
+ android-sdk-update-manager-21.1.ebuild, android-sdk-update-manager-21.ebuild,
+ android-sdk-update-manager-22.0.1-r1.ebuild,
+ android-sdk-update-manager-22.0.1.ebuild,
+ android-sdk-update-manager-22.0.4.ebuild,
+ android-sdk-update-manager-22.0.5-r1.ebuild,
+ android-sdk-update-manager-22.0.5.ebuild,
+ android-sdk-update-manager-22.2.1.ebuild,
+ android-sdk-update-manager-22.3.ebuild,
+ android-sdk-update-manager-22.6.1.ebuild,
+ android-sdk-update-manager-22.6.ebuild, android-sdk-update-manager-22.ebuild,
+ android-sdk-update-manager-23.ebuild:
+ Support multilib providers for deps. Bump to EAPI=5.
*android-sdk-update-manager-23 (07 Jul 2014)
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
index 1610e772ef6a..231f621f4948 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-21.1.ebuild,v 1.1 2013/03/03 21:41:23 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
-EAPI="3"
+EAPI=5
inherit eutils user
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
>=dev-java/swt-3.5[cairo]
- amd64? ( app-emulation/emul-linux-x86-gtklibs )
- x86? ( x11-libs/gtk+:2 )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -79,11 +86,11 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
index a2b3d7a25375..4a59ae42876f 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-21.ebuild,v 1.2 2013/01/20 00:14:14 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
-EAPI="3"
+EAPI=5
inherit eutils user
@@ -20,11 +20,19 @@ KEYWORDS="~amd64 ~x86"
DEPEND="app-arch/tar
app-arch/gzip"
-RDEPEND=">=virtual/jdk-1.5
+RDEPEND="
+ >=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
>=dev-java/swt-3.5[cairo]
- amd64? ( app-emulation/emul-linux-x86-gtklibs )
- x86? ( x11-libs/gtk+:2 )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,14 +59,14 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp}
fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die
@@ -79,12 +87,11 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
-
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
}
pkg_postinst() {
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
index a07274b8cb43..21ed6f3156f9 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-22.0.1-r1.ebuild,v 1.4 2013/06/13 14:57:47 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1-r1.ebuild,v 1.5 2014/10/15 20:22:19 pacho Exp $
EAPI="5"
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
- amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
- x86? ( x11-libs/gtk+:2= )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -79,11 +86,11 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
index ec64ef1f3e68..e48026629252 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-22.0.1.ebuild,v 1.1 2013/06/01 12:43:15 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
-EAPI="3"
+EAPI=5
inherit eutils user
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
>=dev-java/swt-3.5[cairo]
- amd64? ( app-emulation/emul-linux-x86-gtklibs )
- x86? ( x11-libs/gtk+:2 )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -79,11 +86,11 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
index cab596ece72e..2b4436f1d784 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-22.0.4.ebuild,v 1.1 2013/07/24 01:23:39 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.4.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
EAPI="5"
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
- amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
- x86? ( x11-libs/gtk+:2= )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -79,11 +86,11 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
index 7dc709e60435..b56b959cf7da 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-22.0.5-r1.ebuild,v 1.1 2013/09/16 13:13:59 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5-r1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
EAPI="5"
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
- amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
- x86? ( x11-libs/gtk+:2= )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -80,11 +87,11 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
index 550524d4780f..52b57ce74e6d 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-22.0.5.ebuild,v 1.1 2013/08/14 14:40:57 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.0.5.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
EAPI="5"
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
- amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
- x86? ( x11-libs/gtk+:2= )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -79,11 +86,11 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
index 6a427e8e0fa4..90a7a9c3f36c 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-22.2.1.ebuild,v 1.1 2013/09/25 20:00:00 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.2.1.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
EAPI="5"
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
- amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
- x86? ( x11-libs/gtk+:2= )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -80,11 +87,11 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
index 02a7f87b8d2e..d7bdc37660e6 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-22.3.ebuild,v 1.2 2013/11/20 23:49:06 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.3.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
EAPI="5"
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
- amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
- x86? ( x11-libs/gtk+:2= )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -80,14 +87,14 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
udev_dorules "${FILESDIR}"/80-android.rules || die
- domenu "${FILESDIR}"/android-sdk-update-manager.desktop || die
+ domenu "${FILESDIR}"/android-sdk-update-manager.desktop
}
pkg_postinst() {
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
index 54010c6ce4ef..5e2dd0ae9727 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.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-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild,v 1.2 2014/06/25 12:47:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
EAPI="5"
@@ -23,13 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
- amd64? (
- || (
- app-emulation/emul-linux-x86-gtklibs:=[-abi_x86_32(-)]
- x11-libs/gtk+:2=[abi_x86_32(-)]
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
)
)
- x86? ( x11-libs/gtk+:2= )"
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -56,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -85,14 +87,14 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
udev_dorules "${FILESDIR}"/80-android.rules || die
- domenu "${FILESDIR}"/android-sdk-update-manager.desktop || die
+ domenu "${FILESDIR}"/android-sdk-update-manager.desktop
}
pkg_postinst() {
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
index 10c232fa6d49..50143f538539 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.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-sdk-update-manager/android-sdk-update-manager-22.6.ebuild,v 1.1 2014/03/19 01:53:22 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
EAPI="5"
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
- amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
- x86? ( x11-libs/gtk+:2= )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -80,14 +87,14 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
udev_dorules "${FILESDIR}"/80-android.rules || die
- domenu "${FILESDIR}"/android-sdk-update-manager.desktop || die
+ domenu "${FILESDIR}"/android-sdk-update-manager.desktop
}
pkg_postinst() {
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
index 8f7fe8f067b8..f897c03d1b35 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-22.ebuild,v 1.2 2013/05/29 17:46:16 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.ebuild,v 1.3 2014/10/15 20:22:19 pacho Exp $
-EAPI="3"
+EAPI=5
inherit eutils user
@@ -23,8 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
>=dev-java/swt-3.5[cairo]
- amd64? ( app-emulation/emul-linux-x86-gtklibs )
- x86? ( x11-libs/gtk+:2 )"
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+ )
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -51,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -79,11 +86,11 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
}
diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
index 8e2d616fdb75..6951b1d04827 100644
--- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild
+++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.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-sdk-update-manager/android-sdk-update-manager-23.ebuild,v 1.1 2014/07/07 16:48:40 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-23.ebuild,v 1.2 2014/10/15 20:22:19 pacho Exp $
EAPI="5"
@@ -23,13 +23,15 @@ DEPEND="app-arch/tar
RDEPEND=">=virtual/jdk-1.5
>=dev-java/ant-core-1.6.5
|| ( dev-java/swt:3.7[cairo] dev-java/swt:3.6[cairo] )
- amd64? (
- || (
- app-emulation/emul-linux-x86-gtklibs:=[-abi_x86_32(-)]
- x11-libs/gtk+:2=[abi_x86_32(-)]
+ || (
+ (
+ >=x11-libs/gtk+-2.24.23-r2:2[abi_x86_32(-)]
+ )
+ amd64? (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
)
)
- x86? ( x11-libs/gtk+:2= )"
+"
ANDROID_SDK_DIR="/opt/${PN}"
QA_FLAGS_IGNORED_x86="
@@ -56,17 +58,17 @@ src_prepare(){
}
src_install(){
- dodoc tools/NOTICE.txt "SDK Readme.txt" || die
+ dodoc tools/NOTICE.txt "SDK Readme.txt"
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.
- dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp} || die "failed to dodir"
+ dodir "${ANDROID_SDK_DIR}"/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
- fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
- fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools} || die
+ fowners root:android "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
+ fperms 0775 "${ANDROID_SDK_DIR}"/{.,add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp,tools}
echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die
@@ -85,14 +87,14 @@ src_install(){
echo "ANDROID_SWT=\"${SWT_PATH}\"" >> "${T}/80${PN}" || die
echo "ANDROID_HOME=\"${EPREFIX}${ANDROID_SDK_DIR}\"" >> "${T}/80${PN}" || die
- doenvd "${T}/80${PN}" || die
+ doenvd "${T}/80${PN}"
echo "SEARCH_DIRS_MASK=\"${EPREFIX}${ANDROID_SDK_DIR}\"" > "${T}/80${PN}" || die
- insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}" || die
+ insinto "/etc/revdep-rebuild" && doins "${T}/80${PN}"
udev_dorules "${FILESDIR}"/80-android.rules || die
- domenu "${FILESDIR}"/android-sdk-update-manager.desktop || die
+ domenu "${FILESDIR}"/android-sdk-update-manager.desktop
}
pkg_postinst() {