sci-biology/rnaview: Respect CFLAGS, #429536; Bump to EAPI=4

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

3 files changed, 93 insertions, 36 deletions

diff --git a/sci-biology/rnaview/ChangeLog b/sci-biology/rnaview/ChangeLog
index cf3cc33e592a..5241f8d0cd39 100644
--- a/sci-biology/rnaview/ChangeLog
+++ b/sci-biology/rnaview/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/rnaview
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/rnaview/ChangeLog,v 1.12 2010/09/06 12:24:45 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/rnaview/ChangeLog,v 1.13 2012/08/03 15:04:03 jlec Exp $
+
+*rnaview-20040713-r3 (03 Aug 2012)
+
+  03 Aug 2012; Justin Lecher <jlec@gentoo.org> +rnaview-20040713-r3.ebuild,
+  files/rnaview-20040713-makefile.patch:
+  Respect CFLAGS, #429536; Bump to EAPI=4
 
 *rnaview-20040713-r2 (06 Sep 2010)
 
diff --git a/sci-biology/rnaview/files/rnaview-20040713-makefile.patch b/sci-biology/rnaview/files/rnaview-20040713-makefile.patch
index 5d9ecd99cf25..1af72f581fbf 100644
--- a/sci-biology/rnaview/files/rnaview-20040713-makefile.patch
+++ b/sci-biology/rnaview/files/rnaview-20040713-makefile.patch
@@ -1,39 +1,18 @@
-Fix install paths, respect LDFLAGS, CFLAGS
+ Makefile          |   20 +++++++++++++++++---
+ rnaml2ps/Makefile |   19 ++++++++++++-------
+ 2 files changed, 29 insertions(+), 10 deletions(-)
 
-http://bugs.gentoo.org/show_bug.cgi?id=336196
-
---- rnaml2ps/Makefile
-+++ rnaml2ps/Makefile
-@@ -5,16 +5,21 @@
- RNADRAW = rnaml2ps
- OBJS_RNADRAW = rnaml2ps.o nrutil.o 
+diff --git a/Makefile b/Makefile
+index 452e6c4..00d35f0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,4 +1,4 @@
+-CC        = cc
++CC        ?= cc
  
-+all: $(RNADRAW)
-+
- $(RNADRAW):   $(OBJS_RNADRAW)
--	$(CC) -o $(RNADRAW) $(OBJS_RNADRAW) -lm
-+	$(CC) $(LDFLAGS) -o $(RNADRAW) $(OBJS_RNADRAW) -lm
  
- nrutil.o : nrutil.c 
--	cc -c  nrutil.c
-+	$(CC) $(CFLAGS) -c  nrutil.c
  
- rnaml2ps.o :  rnaml2ps.c
--	cc -c  rnaml2ps.c
-+	$(CC) $(CFLAGS) -c  rnaml2ps.c
- 
- 
--.PHONY : clean
-+.PHONY : clean all install
- clean:
--	rm *.o
-+	rm -f *.o
-+
-+install:
-+	install -D -m 0755 $(RNADRAW) $(DESTDIR)/usr/bin/$(RNADRAW)
---- Makefile
-+++ Makefile
-@@ -56,9 +56,14 @@
+@@ -56,12 +56,17 @@ OBJ_FILE = $(OBJ)/rnaview.o \
             $(OBJ)/multiple.o \
             $(OBJ)/statistics.o
  
@@ -48,8 +27,12 @@ http://bugs.gentoo.org/show_bug.cgi?id=336196
 +CFLAGS  +=  $(LINCLUDES)
  
  $(RNAVIEW) : $(HFILES) $(OBJ_FILE) 
- 	$(CC) $(CFLAGS) -o $@ $(OBJ_FILE) $(LDFLAGS) -lm $(MALLOCLIB)
-@@ -111,6 +116,15 @@
+-	$(CC) $(CFLAGS) -o $@ $(OBJ_FILE) $(LDFLAGS) -lm $(MALLOCLIB)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ_FILE) -lm $(MALLOCLIB)
+ 
+ 
+ 
+@@ -111,6 +116,15 @@ $(OBJ)/statistics.o :  $(SRC)/statistics.c
  clean:
  	@rm -f $(OBJ)/*.o
  	@rm -f $(ALLTARGETS)
@@ -65,3 +48,40 @@ http://bugs.gentoo.org/show_bug.cgi?id=336196
  
  export:
  	mkdir -p $(EXPORT_DIR)
+diff --git a/rnaml2ps/Makefile b/rnaml2ps/Makefile
+index d207655..2278ccc 100644
+--- a/rnaml2ps/Makefile
++++ b/rnaml2ps/Makefile
+@@ -1,20 +1,25 @@
+-CFLAGS        = -O
+-CC            = cc
++CFLAGS        ?= -O
++CC            ?= cc
+ 
+ # ++++++++++++++++++++++++++++ Program RNADRAW
+ RNADRAW = rnaml2ps
+ OBJS_RNADRAW = rnaml2ps.o nrutil.o 
+ 
++all: $(RNADRAW)
++
+ $(RNADRAW):   $(OBJS_RNADRAW)
+-	$(CC) -o $(RNADRAW) $(OBJS_RNADRAW) -lm
++	$(CC) $(LDFLAGS) -o $(RNADRAW) $(OBJS_RNADRAW) -lm
+ 
+ nrutil.o : nrutil.c 
+-	cc -c  nrutil.c
++	$(CC) $(CFLAGS) -c  nrutil.c
+ 
+ rnaml2ps.o :  rnaml2ps.c
+-	cc -c  rnaml2ps.c
++	$(CC) $(CFLAGS) -c  rnaml2ps.c
+ 
+ 
+-.PHONY : clean
++.PHONY : clean all install
+ clean:
+-	rm *.o
++	rm -f *.o
++
++install:
++	install -D -m 0755 $(RNADRAW) $(DESTDIR)/usr/bin/$(RNADRAW)
diff --git a/sci-biology/rnaview/rnaview-20040713-r3.ebuild b/sci-biology/rnaview/rnaview-20040713-r3.ebuild
new file mode 100644
index 000000000000..7aa14415141d
--- /dev/null
+++ b/sci-biology/rnaview/rnaview-20040713-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/rnaview/rnaview-20040713-r3.ebuild,v 1.1 2012/08/03 15:04:03 jlec Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Generates 2D displays of RNA/DNA secondary structures with tertiary interactions"
+HOMEPAGE="http://ndbserver.rutgers.edu/services/download/index.html"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-implicit.patch
+	cat <<- EOF > 22rnaview
+		RNAVIEW="${EPREFIX}/usr/share/${PN}"
+	EOF
+	tc-export CC
+}
+
+src_install() {
+	default
+	doenvd 22rnaview
+}