Clean up ebuild a bit.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/dev-util/android-tools/ChangeLog b/dev-util/android-tools/ChangeLog
index 7d2eec4be9c57075871bfc7d68f051e099250d84..4d276de7aecdc1c0e82e3dd777297da6f59239e7 100644 (file)
--- a/dev-util/android-tools/ChangeLog
+++ b/dev-util/android-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/android-tools
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-tools/ChangeLog,v 1.4 2014/12/06 05:16:25 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-tools/ChangeLog,v 1.5 2015/02/16 10:10:08 vapier Exp $
+
+  16 Feb 2015; Mike Frysinger <vapier@gentoo.org>
+  android-tools-0_p20130218.ebuild:
+  Clean up ebuild a bit.
 
   06 Dec 2014; Tim Harder <radhermit@gentoo.org>
   android-tools-0_p20130218.ebuild:

diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index ffd88c5f41376d4d0ebee54d9ab00f211ea5c6b5..23fa67fe50fca65c1774cc6392703a2e0d8318c1 100644 (file)
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -4,17 +4,23 @@ Hash: SHA256
 DIST android-tools-e89e09dd2b9b42184973e3ade291186a2737bced.patch 1115 SHA256 3bac2ec91d6d53cc7a2bd31f0670ff2e560b15d8722d3961e7b24b2f41cf5932 SHA512 2239e883269dc2cbd9f25dde9159cff8de8525b021ea9e2a243d4553e60c28398cb8e830117cc20e7cfe1b951f2841430e9bc950916d30b0f6c9e6dbd154f6b9 WHIRLPOOL 1bdbb65ebbf94e8c732f4893f090f895d24173928f6cc48b53160595449efc0457130ab67e6be132f77763110fd08e7aeba6701effa27de6fe3c0bdc0d82a8d1
 DIST android-tools_4.2.2+git20130218-3ubuntu36.debian.tar.gz 152459 SHA256 1bb63a418dc785277173ce971711a86f66d35d4ca7053cd1ff4afff8001cc7a6 SHA512 8e03fa08433f0cc358855d116926e50f0e6346c29ab3d1a865eb5b0e3be00091d861bd3ac2f3bc236a9028b35bf40988ab8130f566c3aca8c4ccbd7066a317f9 WHIRLPOOL 50c152c32a6d7f505a86faf24d2645053362073608990228eaa88f25e86c54b2a4dcab51f8d52941af493ac68628cf75c2abd320ec7c80a7aa89431277578e6c
 DIST android-tools_4.2.2+git20130218.orig.tar.xz 215868 SHA256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f SHA512 c5bfd3c8e514809db257ba5559c865742768b7520b38aa2f53185aff5c328e5cf7fb328a6ff6450eeddd5056985f232d492eba63a87978440e2147e26d62f458 WHIRLPOOL 0ad784e8524adf1d23958336b73f22fe504074b85c93f17e023a10e57f4e413d8b803c619a0dd7ff495ff8910681d3023932d7a87a008f3e44bacbe6c1fd70a4
-EBUILD android-tools-0_p20130218.ebuild 1930 SHA256 69b4f3ed7e6c488cab06d8274ce5b771580e62c971f4b71d974cded01aa2c54d SHA512 8a22ce201f6ba32c9c2c14d28b2fadbe964ed57ebcd3e590ce02f5ef14c70cbb3f7187825a036c0c25b1b428dc0b17df81e85b36ce34a7e24e766c417c96f834 WHIRLPOOL af1a57ae5ed111d4def4399e834261a9b4086ca83849b57d6afcaf135318b862ce94224093e5307c59265e5963c5619759ee059e9ce0a15bf6c0c7264d5b5daf
-MISC ChangeLog 835 SHA256 5e5ef95df467497b085e31884db8e07d5652dd4873b3aeb7ef99ed77b0e6e72c SHA512 b8dd743509dd41717bbcfe6aeae3d1d7275470220e10e670f34d8e3f3c0b7601a06dd617bebd90307da87fabf0ec7073ff75e9ae5f5a8b731331e7f57cb5ec55 WHIRLPOOL 9c72394d21bc062cad5d9b845aed5660f338bce91d6241ebc2f6eaff1649d31ba496ec3ead1a0c05d880ee49de24255e66fe171c289c6f4b5ef82933fa0ba177
+EBUILD android-tools-0_p20130218.ebuild 1827 SHA256 3871efec9080a8215628a1d8d02f6fbcf53a7fb44cd8a53ed0db238abbdf2855 SHA512 44fa54d1d6690835f3e661b6820a4a484b4decb0ac43800aee00ce91962d8b9d5c58f9835f0ff1bac2d8ef95546a67c80b02b86e1630727ecbf72514aa54d019 WHIRLPOOL f13b72319d03ad14a37ad14bdb06a18d1ce1b894b55dd86136f4030759f71ff7afe109001435c40097f0041a62754330a785fe936c37b85d6fe3e624574f0b72
+MISC ChangeLog 944 SHA256 b993bc590c51ffaa69ce9e22ff1bcb61b820e92e6d0c87f24d5e548656e925cd SHA512 47dc612aa1bf4e6528943c078770abf5c1e590b838a85509f77e9f6fdce774a7ff0e28e2e293926fed6da288b32f77dde46f84cdc5d15f2fa9f5904964cebe7c WHIRLPOOL 5ec8fe25654803bfa94d8b540135e3820937e210a71c1380c10c12f7bfaef946be56fecbdd54e463322cc17d4fe889898c9f6a4ec347a659b347eeae29fd8c1d
 MISC metadata.xml 512 SHA256 d0fcbd927d09452fda0f4c75e28a934abd758fa15aed7118e502ca71e6595891 SHA512 e7103dd1223e59e55b7f1b1decdc0cdfa87669b65a8e45737cf4e9d87c59f92bad5675b9567f9d06ef766d46e8edd3615d4bfe829f6f2309899c27c6be8ae040 WHIRLPOOL 97d7014c581cd0f3bf25f6f68c9d1317fa74c76156a11e76ad9a9323eb1897d09508e6d3d27513db63b1d4d056e006bd396fa312e99cb0e6ec0103e8e8af262a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUgpFUAAoJEEqz6FtPBkyjd5gH/1I/cDktdDOdf4nNr0HZnQeW
-HNXX2tuogIgYKBB+HA817Rm4BvGB12e0uAtQMk334rZsF3PsaXwrVD4K9u7GnUKU
-m7LywU/DmdirCrcTy/8hhjFtAeQkhKosJEnbMfArFzqGOFaKNuhzcO2kzUO/58+V
-pG55ZOS0IGdUslZMBa0kqEDGXPZ9DYKWuZwCjMWzRYINFPSqNNgWEhzNdcGuYEB0
-NLYjpXytfkLo7Z0IyIC9MXh8o2v08VrDHUISl8k3dChAl5mnK0RJ9uZSx5HtCKS9
-+M01UJ1CIGybJZIw0WFDp6xzw6YXLtVpPqUhCa7s1ZV9qtBDjdxZShg39c2vqYQ=
-=h6jh
+iQIcBAEBCAAGBQJU4cIBAAoJEPGu1DbS6WIAD08P/1QUVMxVHJ1fWurzoAdY2lTz
+pk7VTSE4Fwcr1D9NRxOMju4uARN0OLZ5biGoRZEWEUwVeLpSP1q570CKu1uzRdhy
+i7AQ59DmdZkOv8QiQvn8H/RDZDXt2USe6VAYcnB0Rn9+k2XYWffiOTa2y+QheHUI
+EYJSTqbUBt/KleR2RtpS9d7ebZ55N9edOKkWfkD4rgqv/1hZJsrNwSbzygZpdWhX
+85X0rM9xa5X0rz4HvF+fB+AhSZjtcYVk4VXfO5DQ75WR9KOOm7yFZa/0sQdTvK6a
+HQkGcCnPyeTlp3UT+neZzvvlcU+G0bNm6UBN1cpO/4JJLS+3s+jG9/keqjheHoWV
+r8cx+ievq/dl4ykIw/g6h0BqoW5vMl+K2IAXcYJTiFSIPmf0no29XdFAks4q58ed
+hZ2daqIa48Ibquc7WIfIURGFVZ1jzKy2dOo/f4iAqyXHokyC+RABlwgFRlNwzx9E
+pCz+YXgrOFbsrwNxvLsJE1/7m4RhUXJpLSEjN0L9Z7GZvzlgihy0zz+YQ23LqqtY
+ABm32BBIkTkb35TC9QkPIskU1K9adrmB5yCinSMozOx3SQ8X8nYheKkWJBIFpT5V
+4iIdjKenNXT2/q5lP9xE5UGjDLi3sHLfA7/OWlzhWAPjhLSFQA0l1eHgUZdBOf+n
+jTGxlqUzuna3Ut5G97LW
+=CZhH
 -----END PGP SIGNATURE-----

diff --git a/dev-util/android-tools/android-tools-0_p20130218.ebuild b/dev-util/android-tools/android-tools-0_p20130218.ebuild
index 2efcdb300654bd396fdef7a4790c7343cc6da1eb..78d191b39a101ede978f1b0839c6ad9a1c24b329 100644 (file)
--- a/dev-util/android-tools/android-tools-0_p20130218.ebuild
+++ b/dev-util/android-tools/android-tools-0_p20130218.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-tools/android-tools-0_p20130218.ebuild,v 1.2 2014/12/06 05:16:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-tools/android-tools-0_p20130218.ebuild,v 1.3 2015/02/16 10:10:08 vapier Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
 
-KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
+MY_VERSION="${PV##*_p}"
+GIT_SHA1="e89e09dd2b9b42184973e3ade291186a2737bced"
+
 DESCRIPTION="Android platform tools (adb and fastboot)"
 HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-MY_VERSION="${PV##*_p}"
 SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git${MY_VERSION}.orig.tar.xz
-https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git${MY_VERSION}-3ubuntu36.debian.tar.gz
-https://github.com/android/platform_system_core/commit/e89e09dd2b9b42184973e3ade291186a2737bced.patch -> ${PN}-e89e09dd2b9b42184973e3ade291186a2737bced.patch"
+       https://launchpad.net/ubuntu/+archive/primary/+files/android-tools_4.2.2+git${MY_VERSION}-3ubuntu36.debian.tar.gz
+       https://github.com/android/platform_system_core/commit/${GIT_SHA1}.patch -> ${PN}-${GIT_SHA1}.patch"
+
 # The entire source code is Apache-2.0, except for fastboot which is BSD.
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/zlib:=
@@ -25,10 +28,9 @@ DEPEND="${RDEPEND}"
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-       # Apply patch for bug #500480.
-       pushd core || die
-       epatch "${DISTDIR}"/${PN}-e89e09dd2b9b42184973e3ade291186a2737bced.patch
-       popd
+       pushd core >/dev/null || die
+       epatch "${DISTDIR}"/${PN}-${GIT_SHA1}.patch #500480
+       popd >/dev/null
        epatch ../debian/patches/*.patch
        mv ../debian/makefiles/adb.mk core/adb/Makefile || die
        mv ../debian/makefiles/fastboot.mk core/fastboot/Makefile || die
@@ -45,15 +47,10 @@ src_prepare() {
 }
 
 src_compile() {
-       pushd core/adb || die
-       emake adb || die
-       popd
-       pushd core/fastboot || die
-       emake fastboot || die
+       emake -C core/adb adb
+       emake -C core/fastboot fastboot
 }
 
 src_install() {
-       exeinto /usr/bin
-       doexe core/adb/adb
-       doexe core/fastboot/fastboot
+       dobin core/adb/adb core/fastboot/fastboot
 }