[gentoo-commits] gentoo-x86 commit in dev-util/android-sdk-update-manager: android-sdk-update-manager-22.6.1.ebuild ChangeLog

2014-06-25 Thread Michal Gorny (mgorny)
mgorny  14/06/25 12:47:50

  Modified: android-sdk-update-manager-22.6.1.ebuild ChangeLog
  Log:
  Support multilib dependencies aside to emul-linux-x86.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
EFB4464E!)

Revision  ChangesPath
1.2  
dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild?rev=1.2view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild?rev=1.2content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild?r1=1.1r2=1.2

Index: android-sdk-update-manager-22.6.1.ebuild
===
RCS file: 
/var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- android-sdk-update-manager-22.6.1.ebuild19 Mar 2014 17:25:31 -  
1.1
+++ android-sdk-update-manager-22.6.1.ebuild25 Jun 2014 12:47:50 -  
1.2
@@ -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.1 2014/03/19 17:25:31 rich0 Exp $
+# $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 $
 
 EAPI=5
 
@@ -23,7 +23,12 @@
 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:= )
+   amd64? (
+   || (
+   app-emulation/emul-linux-x86-gtklibs:=[-abi_x86_32(-)]
+   x11-libs/gtk+:2=[abi_x86_32(-)]
+   )
+   )
x86? ( x11-libs/gtk+:2= )
 
 ANDROID_SDK_DIR=/opt/${PN}



1.61 dev-util/android-sdk-update-manager/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog?rev=1.61view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog?rev=1.61content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog?r1=1.60r2=1.61

Index: ChangeLog
===
RCS file: 
/var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog   19 Mar 2014 17:25:31 -  1.60
+++ ChangeLog   25 Jun 2014 12:47:50 -  1.61
@@ -1,6 +1,10 @@
 # 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.60 
2014/03/19 17:25:31 rich0 Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.61 
2014/06/25 12:47:50 mgorny Exp $
+
+  25 Jun 2014; Michał Górny mgo...@gentoo.org
+  android-sdk-update-manager-22.6.1.ebuild:
+  Support multilib dependencies aside to emul-linux-x86.
 
 *android-sdk-update-manager-22.6.1 (19 Mar 2014)
 






[gentoo-commits] gentoo-x86 commit in dev-util/android-sdk-update-manager: android-sdk-update-manager-22.6.1.ebuild ChangeLog

2014-03-19 Thread Richard Freeman (rich0)
rich0   14/03/19 17:25:31

  Modified: ChangeLog
  Added:android-sdk-update-manager-22.6.1.ebuild
  Log:
  bump
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 
0x08C170DE55EC123A)

Revision  ChangesPath
1.60 dev-util/android-sdk-update-manager/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog?rev=1.60view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog?rev=1.60content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog?r1=1.59r2=1.60

Index: ChangeLog
===
RCS file: 
/var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog   19 Mar 2014 01:53:22 -  1.59
+++ ChangeLog   19 Mar 2014 17:25:31 -  1.60
@@ -1,6 +1,12 @@
 # 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.59 
2014/03/19 01:53:22 rich0 Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/ChangeLog,v 1.60 
2014/03/19 17:25:31 rich0 Exp $
+
+*android-sdk-update-manager-22.6.1 (19 Mar 2014)
+
+  19 Mar 2014; Richard Freeman ri...@gentoo.org
+  +android-sdk-update-manager-22.6.1.ebuild:
+  bump
 
 *android-sdk-update-manager-22.6 (19 Mar 2014)
 



1.1  
dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild?rev=1.1view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/android-sdk-update-manager-22.6.1.ebuild?rev=1.1content-type=text/plain

Index: android-sdk-update-manager-22.6.1.ebuild
===
# 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.1 2014/03/19 17:25:31 rich0 Exp $

EAPI=5

inherit eutils user udev

MY_P=android-sdk_r${PV}-linux

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.7[cairo] dev-java/swt:3.6[cairo] )
amd64? ( app-emulation/emul-linux-x86-gtklibs:= )
x86? ( x11-libs/gtk+:2= )

ANDROID_SDK_DIR=/opt/${PN}
QA_FLAGS_IGNORED_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_FLAGS_IGNORED_amd64=${QA_FLAGS_IGNORED_x86}

QA_PREBUILT=${ANDROID_SDK_DIR/\/}/tools/*

S=${WORKDIR}/android-sdk-linux

pkg_setup() {
enewgroup android
}

src_prepare(){
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.
dodir 
${ANDROID_SDK_DIR}/{add-ons,build-tools,docs,extras,platforms,platform-tools,samples,sources,system-images,temp}
 || die failed to dodir

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

echo 
PATH=\${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\
  ${T}/80${PN} || die

SWT_PATH=
SWT_VERSIONS=3.7 3.6
for version in $SWT_VERSIONS; do
# redirecting stderr to /dev/null
# not sure if this is best, but avoids misleading error messages
SWT_PATH=`dirname \`java-config -p swt-\$version 2/dev/null\` 
2/dev/null`
if [ $SWT_PATH ]; then
einfo SWT_PATH=$SWT_PATH selecting version $version of 
SWT.
break
fi
done

echo ANDROID_SWT=\${SWT_PATH}\