[gentoo-commits] gentoo-x86 commit in dev-util/android-tools: android-tools-0_p20130123.ebuild android-tools-0_p20130218.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in dev-util/android-tools: android-tools-0_p20130123.ebuild android-tools-0_p20130218.ebuild ChangeLog

[Zac Medico (zmedico)]

zmedico     14/09/30 21:39:15

  Modified:             android-tools-0_p20130123.ebuild ChangeLog
  Added:                android-tools-0_p20130218.ebuild
  Log:
  Version bump to fix bug #500480.
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xFDE8EF85AE5719A3)

Revision  Changes    Path
1.2                  dev-util/android-tools/android-tools-0_p20130123.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-tools/android-tools-0_p20130123.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-tools/android-tools-0_p20130123.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-tools/android-tools-0_p20130123.ebuild?r1=1.1&r2=1.2

Index: android-tools-0_p20130123.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/android-tools/android-tools-0_p20130123.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- android-tools-0_p20130123.ebuild	26 Aug 2013 09:46:32 -0000	1.1
+++ android-tools-0_p20130123.ebuild	30 Sep 2014 21:39:15 -0000	1.2
@@ -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-tools/android-tools-0_p20130123.ebuild,v 1.1 2013/08/26 09:46:32 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-tools/android-tools-0_p20130123.ebuild,v 1.2 2014/09/30 21:39:15 zmedico Exp $
 
 EAPI=5
 inherit eutils rpm toolchain-funcs



1.2                  dev-util/android-tools/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-tools/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-tools/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-tools/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/android-tools/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	26 Aug 2013 09:46:32 -0000	1.1
+++ ChangeLog	30 Sep 2014 21:39:15 -0000	1.2
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/android-tools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/android-tools/ChangeLog,v 1.1 2013/08/26 09:46:32 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-tools/ChangeLog,v 1.2 2014/09/30 21:39:15 zmedico Exp $
+
+*android-tools-0_p20130218 (30 Sep 2014)
+
+  30 Sep 2014; Zac Medico <zmedico@gentoo.org>
+  +android-tools-0_p20130218.ebuild, android-tools-0_p20130123.ebuild:
+  Version bump to fix bug #500480.
 
 *android-tools-0_p20130123 (26 Aug 2013)
 



1.1                  dev-util/android-tools/android-tools-0_p20130218.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-tools/android-tools-0_p20130218.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-tools/android-tools-0_p20130218.ebuild?rev=1.1&content-type=text/plain

Index: android-tools-0_p20130218.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-tools/android-tools-0_p20130218.ebuild,v 1.1 2014/09/30 21:39:15 zmedico Exp $

EAPI=5
inherit eutils

KEYWORDS="~amd64 ~x86 ~arm-linux ~x86-linux"
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"
# The entire source code is Apache-2.0, except for fastboot which is BSD.
LICENSE="Apache-2.0 BSD"
SLOT="0"
IUSE=""

RDEPEND="sys-libs/zlib:=
	dev-libs/openssl:0="

DEPEND="${RDEPEND}"

S=${WORKDIR}/${PN}

src_prepare() {
	# Apply patch for bug #500480.
	pushd core || die
	epatch "${DISTDIR}"/${PN}-e89e09dd2b9b42184973e3ade291186a2737bced.patch
	popd
	epatch ../debian/patches/*.patch
	mv ../debian/makefiles/adb.mk core/adb/Makefile || die
	mv ../debian/makefiles/fastboot.mk core/fastboot/Makefile || die

	# Avoid libselinux dependency.
	sed -e 's: -lselinux::' -i core/fastboot/Makefile || die
	sed -e '/#include <selinux\/selinux.h>/d' \
		-e 's:#include <selinux/label.h>:struct selabel_handle;:' \
		-i extras/ext4_utils/make_ext4fs.h || die
	sed -e '62,63d;180,189d;231,234d;272,274d;564,579d' \
		-i extras/ext4_utils/make_ext4fs.c || die
}

src_compile() {
	pushd core/adb || die
	emake adb || die
	popd
	pushd core/fastboot || die
	emake fastboot || die
}

src_install() {
	exeinto /usr/bin
	doexe core/adb/adb
	doexe core/fastboot/fastboot
}