diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-10-15 20:22:21 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-10-15 20:22:21 +0000 |
| commit | 96c60de42550afe7fd1ffc9a2956962a42821356 (patch) | |
| tree | a0c66e7a3bc0189df660f72123c9453aab68a8e2 /dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild | |
| parent | net-libs/farsight2 is going to be removed (diff) | |
| download | historical-96c60de42550afe7fd1ffc9a2956962a42821356.tar.gz historical-96c60de42550afe7fd1ffc9a2956962a42821356.tar.bz2 historical-96c60de42550afe7fd1ffc9a2956962a42821356.zip | |
Support multilib providers for deps. Bump to EAPI=5.
Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild')
| -rw-r--r-- | dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild | 29 |
1 files changed, 18 insertions, 11 deletions
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() { |