Adhere to CC, CFLAGS, LDFLAGS. Prevent implicit RDEPEND (bug #221319). Make dobin fail.

(Portage version: 2.2_rc67/cvs/Linux i686)

3 files changed, 73 insertions, 2 deletions

diff --git a/dev-embedded/tavrasm/ChangeLog b/dev-embedded/tavrasm/ChangeLog
index 27bc24ef464e..cb643dd7d56a 100644
--- a/dev-embedded/tavrasm/ChangeLog
+++ b/dev-embedded/tavrasm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/tavrasm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/tavrasm/ChangeLog,v 1.2 2009/09/05 22:24:37 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/tavrasm/ChangeLog,v 1.3 2010/05/07 01:35:12 jer Exp $
+
+*tavrasm-1.22-r1 (07 May 2010)
+
+  07 May 2010; Jeroen Roovers <jer@gentoo.org> +tavrasm-1.22-r1.ebuild,
+  +files/tavrasm-1.22-gentoo.patch:
+  Adhere to CC, CFLAGS, LDFLAGS. Prevent implicit RDEPEND (bug #221319).
+  Make dobin fail.
 
   05 Sep 2009; Markus Meier <maekke@gentoo.org> tavrasm-1.22.ebuild:
   add ~amd64, bug #276484
diff --git a/dev-embedded/tavrasm/files/tavrasm-1.22-gentoo.patch b/dev-embedded/tavrasm/files/tavrasm-1.22-gentoo.patch
new file mode 100644
index 000000000000..f752c715d32d
--- /dev/null
+++ b/dev-embedded/tavrasm/files/tavrasm-1.22-gentoo.patch
@@ -0,0 +1,25 @@
+* Do not set CC
+* Adhere to CFLAGS and LDFLAGS, do not set optimisation flags
+
+
+--- a/src/makefile	2004-12-12 00:51:29.000000000 +0100
++++ b/src/makefile	2010-05-07 03:26:38.000000000 +0200
+@@ -24,8 +24,7 @@
+ 
+ ### Compiler options #########################################################
+ 
+-CC		= gcc
+-CFLAGS          = -O2 -Wall -DAVRLANG=LANGUAGE_$(LANGUAGE)
++CFLAGS          += -Wall -DAVRLANG=LANGUAGE_$(LANGUAGE)
+ CPPFLAGS	=
+ CCFLAGS         = $(CFLAGS) $(CPPFLAGS)
+ LINK            = -lm -lstdc++
+@@ -39,7 +38,7 @@
+ ### Executable ##############################################################
+ 
+ $(EXENAME):	$(OBJS)
+-		$(CC) $(CCFLAGS) $(OBJS) $(LINK) -o $@
++		$(CC) $(CCFLAGS) $(LDFLAGS) $(OBJS) $(LINK) -o $@
+ 
+ ### Parser file #############################################################
+ 
diff --git a/dev-embedded/tavrasm/tavrasm-1.22-r1.ebuild b/dev-embedded/tavrasm/tavrasm-1.22-r1.ebuild
new file mode 100644
index 000000000000..3f2aac08c85a
--- /dev/null
+++ b/dev-embedded/tavrasm/tavrasm-1.22-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/tavrasm/tavrasm-1.22-r1.ebuild,v 1.1 2010/05/07 01:35:12 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs versionator
+
+DESCRIPTION="Compiles code written for Atmels AVR DOS assembler"
+HOMEPAGE="http://www.tavrasm.org/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex"
+RDEPEND=""
+
+S="${WORKDIR}/${PN}.$(delete_all_version_separators ${PV})"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	tc-export CC
+	cd src
+
+	# The Makefile of tavrasm is stupid, hence the -j1
+	emake -j1 || die "Compilation failed"
+}
+
+src_install() {
+	dobin src/tavrasm || die "dobin failed"
+	doman tavrasm.1
+	dodoc README
+}