diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-10-15 20:22:19 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-10-15 20:22:19 +0000 |
| commit | 6797d2f79bbe716dee0b09f402bb8ceddacc2e6c (patch) | |
| tree | d271e643785a17dc507bfc3010b142ed9a1e80d2 /dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild | |
| parent | net-libs/farsight2 is going to be removed (diff) | |
| download | gentoo-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/android-sdk-update-manager-21.1.ebuild')
| -rw-r--r-- | dev-util/android-sdk-update-manager/android-sdk-update-manager-21.1.ebuild | 29 |
1 files changed, 18 insertions, 11 deletions
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}" } |