Keyword ~amd64 wrt #187145, Fix LD, CC, LDFLAGS, CFLAGS, pre-stripped files, and clean up.

Package-Manager: portage-2.1.4_rc2

3 files changed, 30 insertions, 41 deletions

diff --git a/dev-embedded/avra/ChangeLog b/dev-embedded/avra/ChangeLog
index 6417cf859b5d..6d3772f9f2b0 100644
--- a/dev-embedded/avra/ChangeLog
+++ b/dev-embedded/avra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/avra
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avra/ChangeLog,v 1.3 2007/02/09 01:10:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avra/ChangeLog,v 1.4 2007/11/23 21:39:57 drac Exp $
+
+  23 Nov 2007; Samuli Suominen <drac@gentoo.org> avra-1.0.1.ebuild:
+  Keyword ~amd64 wrt #187145, Fix LD, CC, LDFLAGS, CFLAGS, pre-stripped files,
+  and clean up.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-embedded/avra/Manifest b/dev-embedded/avra/Manifest
index b4139c0fef0d..d2956f18ad22 100644
--- a/dev-embedded/avra/Manifest
+++ b/dev-embedded/avra/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST avra-1.0.1-src.tar.gz 90993 RMD160 b975b2ae65a8024283fb746d8a0d6b78cc761cda SHA1 a898f81891c6c47db9dc7bfc5e11a6f2ae39b919 SHA256 b79776cc1e413bac902ed08208df02cded1c4ec0b6bc7250468ba6ee41e77468
-EBUILD avra-1.0.1.ebuild 684 RMD160 1edfcd7f87042c068e8ce7dfcd903f12afe92e3e SHA1 852064cc74147898fae693e1ab222636fe4a3f6c SHA256 94960ca134098c5fd0b77e01b7967d860885c047dfd4b3dff8b6bf0b975515a9
-MD5 e210cf49b88d73d7ec13f4c9ab8f20ea avra-1.0.1.ebuild 684
-RMD160 1edfcd7f87042c068e8ce7dfcd903f12afe92e3e avra-1.0.1.ebuild 684
-SHA256 94960ca134098c5fd0b77e01b7967d860885c047dfd4b3dff8b6bf0b975515a9 avra-1.0.1.ebuild 684
-MISC ChangeLog 560 RMD160 00392b69778559578b280af9b37aa35c5037dd9b SHA1 16f57b0a237d728fbadaa3062c013d7579acfab7 SHA256 36e3a31f80784852ebc311c93ba5c86024cb7f9efc9fcc1127d6fdec73b7654e
-MD5 98d020e4f730dbd29553dc03240240bd ChangeLog 560
-RMD160 00392b69778559578b280af9b37aa35c5037dd9b ChangeLog 560
-SHA256 36e3a31f80784852ebc311c93ba5c86024cb7f9efc9fcc1127d6fdec73b7654e ChangeLog 560
+EBUILD avra-1.0.1.ebuild 765 RMD160 a5a6ef36a5cc518b59a92fa2d95b094287b766c5 SHA1 b1078fd34444012e1d6174acdd0492c62849bf0d SHA256 0b70e20755c83c2164d73e6c976bc122e1526499bab8c042680db64ad04d2b9e
+MD5 bc9c4afb750b3476d0c3be9eb5278c8d avra-1.0.1.ebuild 765
+RMD160 a5a6ef36a5cc518b59a92fa2d95b094287b766c5 avra-1.0.1.ebuild 765
+SHA256 0b70e20755c83c2164d73e6c976bc122e1526499bab8c042680db64ad04d2b9e avra-1.0.1.ebuild 765
+MISC ChangeLog 719 RMD160 63664bbfe808daf89de13f79348a767b6f8596e1 SHA1 7739b3ad4ad3b7c933482bbc5254f876fd58e8ff SHA256 6d31ca94f87e7e48d046cd944eb77fd9c0f243d9a45a95e790f68c1ab91063a5
+MD5 7b8be0b0fbfabeb0de0c4a8fd51afa8b ChangeLog 719
+RMD160 63664bbfe808daf89de13f79348a767b6f8596e1 ChangeLog 719
+SHA256 6d31ca94f87e7e48d046cd944eb77fd9c0f243d9a45a95e790f68c1ab91063a5 ChangeLog 719
 MISC metadata.xml 338 RMD160 689f65f1da0961256d05ef053fd80ff543feb8a9 SHA1 346067ce6d7e1b5646e383d5c70feeef79187518 SHA256 9b0b933b518140a1818e0b09562b34fdc25da1984751e200066736aebb16bff5
 MD5 d8c3b459c087536e93352755baebbf70 metadata.xml 338
 RMD160 689f65f1da0961256d05ef053fd80ff543feb8a9 metadata.xml 338
@@ -17,10 +14,3 @@ SHA256 9b0b933b518140a1818e0b09562b34fdc25da1984751e200066736aebb16bff5 metadata
 MD5 db14dfcc95c6eaa8386c1c290c910959 files/digest-avra-1.0.1 241
 RMD160 20446c0fa048a7e2d2c00a70a354799e217f3335 files/digest-avra-1.0.1 241
 SHA256 abb1f040d5e157c974859307b765d98635f014442ece217ebd9178b08a8e6c5d files/digest-avra-1.0.1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFy8oJAiZjviIA2XgRAnkmAKDmt9ReEW9zOz6crYQ+g45BVaAHcwCgow/u
-u8bV1RgL42y+N+GBgxqDYsI=
-=ouBS
------END PGP SIGNATURE-----
diff --git a/dev-embedded/avra/avra-1.0.1.ebuild b/dev-embedded/avra/avra-1.0.1.ebuild
index 485db979d383..ef5407e1cf14 100644
--- a/dev-embedded/avra/avra-1.0.1.ebuild
+++ b/dev-embedded/avra/avra-1.0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avra/avra-1.0.1.ebuild,v 1.2 2006/01/21 14:54:31 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avra/avra-1.0.1.ebuild,v 1.3 2007/11/23 21:39:57 drac Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Atmel AVR Assembler"
 HOMEPAGE="http://avra.sourceforge.net/"
@@ -8,34 +10,27 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="doc"
+KEYWORDS="~amd64 ppc x86"
+IUSE="examples"
 
-DEPEND=""
 RDEPEND=""
+DEPEND=""
 
-src_unpack() {
-	mkdir ${S}
-	cd ${S}
-	unpack ${A}
-}
+S="${WORKDIR}"
 
 src_compile() {
-	cd ${S}/SOURCE
-	make all
+	cd SOURCE
+	emake all CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
+		LD="$(tc-getCC)" LDFLAGS="${LDFLAGS}" \
+		|| die "emake failed."
 }
 
 src_install() {
-	cd ${S}/SOURCE
-	into /usr
-	dobin avra
-
-	cd ${S}
-	into /usr
-	dodoc COPYING ChangeLog README
+	dobin SOURCE/avra
+	dodoc ChangeLog README
 
-	if use doc ; then
-		docinto TEST
-		dodoc TEST/*
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins TEST/*
 	fi
 }