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

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 76 insertions, 13 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/Manifest b/dev-embedded/tavrasm/Manifest
index bed6dbb0aeef..261e7b932f6d 100644
--- a/dev-embedded/tavrasm/Manifest
+++ b/dev-embedded/tavrasm/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tavrasm-1.22-gentoo.patch 803 RMD160 5b83c01164a5d81c024a395ef0f1ce88b1d4ce4c SHA1 b91dbe0efe2fbcfb058824a2018fd9a05574aa41 SHA256 5e934397e3b41b6eb0b780f178bc57db528c61955b8f0703089e9b69293f563b
 DIST tavrasm-1.22.tar.gz 65685 RMD160 1e0f4553be660ebcfa44b2a9d81b3936997492e2 SHA1 9d19035b9fcc460a33a85338010541824633c417 SHA256 a2597fc6e18980edc0f33e8651b0f0df725ca2441eb39c5e2bbd1c82a1c009c7
+EBUILD tavrasm-1.22-r1.ebuild 874 RMD160 4d308be018e8a4c1c002263796817404ae57a658 SHA1 5bec2e3430be7f7883881206107dd88c212d6af2 SHA256 c7f42c1577c397a52966fb7cb745607a5ac2ae70ae8ed5568d76239c58142143
 EBUILD tavrasm-1.22.ebuild 735 RMD160 9c09208f32fbf91ae4af87442f59146377a4aafa SHA1 9a21ecfbf9104af553900f747e3607bfa0c7f288 SHA256 cd06883eee7b3f331c69e242c73703ceaf1e490ae1fe7775ac3aed04d98a2f3f
-MISC ChangeLog 475 RMD160 076114b130e0608effe0a3c626b3c160aa4ab839 SHA1 e7f867352bb6853a4038c77ef2a0de044603d5aa SHA256 1e0ff520dd9ae01a3ab5c9c58f951540518ef06500658408b71600a4963d6e91
+MISC ChangeLog 705 RMD160 7764494604c6adf4bc407b44431b1e889baae0af SHA1 a02136daef3d4568e558feaa519e795ea86ab562 SHA256 53733f728051848938ad2cce37b9b8e2ad78bd835d2f9b783c5cd41aa3857bac
 MISC metadata.xml 166 RMD160 3e9fb3b44ba8d9588c6b707be1adebc449a86c35 SHA1 16f4180775df6383c024b55f3db25ace7a18252a SHA256 b2dcf7711258209967bdcb64a889d1fb11ba9889d08501369a8cad102d5cefce
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqi5VMACgkQkKaRLQcq0GJgVQCfeo379wO/q5P7BKqNyWPPrSUu
-T1AAoKykwn12EDSOi2JUKd63WF0I3Lcy
-=JGhZ
------END PGP SIGNATURE-----
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
+}