Version bump (fixes #285220, #270941). Removed old ebuild.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

9 files changed, 67 insertions, 143 deletions

diff --git a/sci-chemistry/molden/ChangeLog b/sci-chemistry/molden/ChangeLog
index 3950f02c4561..9611cf06b4e4 100644
--- a/sci-chemistry/molden/ChangeLog
+++ b/sci-chemistry/molden/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-chemistry/molden
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/ChangeLog,v 1.31 2010/01/18 19:17:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/ChangeLog,v 1.32 2010/02/26 05:33:34 markusle Exp $
+
+*molden-4.8 (26 Feb 2010)
+
+  26 Feb 2010; Markus Dittrich <markusle@gentoo.org>
+  -files/molden-3.9-fixMakefile.patch, -molden-4.4.ebuild,
+  -files/molden-4.4-gfortran-gentoo.patch, -molden-4.6.ebuild,
+  -files/molden-4.6-gfortran.patch, +molden-4.8.ebuild,
+  +files/molden-4.8-ambfor.patch, +files/molden-4.8-ldflags.patch,
+  +files/molden-4.8-overflow.patch:
+  Version bump (fixes #285220, #270941). Removed old ebuild.
 
   18 Jan 2010; Raúl Porcel <armin76@gentoo.org> molden-4.7.ebuild:
   alpha/ia64/x86 stable
diff --git a/sci-chemistry/molden/files/molden-3.9-fixMakefile.patch b/sci-chemistry/molden/files/molden-3.9-fixMakefile.patch
deleted file mode 100644
index cb7fd3856f7e..000000000000
--- a/sci-chemistry/molden/files/molden-3.9-fixMakefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -urN molden3.9-orig/makefile molden3.9/makefile
---- molden3.9-orig/makefile	2003-11-10 00:28:48.744433167 -0500
-+++ molden3.9/makefile	2003-11-10 00:29:18.327453549 -0500
-@@ -16,9 +16,9 @@
- LIBS =  -lX11 -lm
- 
- # Silicon Graphics
--CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
--FFLAGS =   
--LDR = f77 
-+#CFLAGS = -c -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-+#FFLAGS =   
-+#LDR = f77 
- 
- # Ultrix, Dec Alpha, Linux ( and best start for Unix other than below )
- #
-@@ -40,11 +40,11 @@
- #
- # On 64-bit Alpha-Linux add -mieee to the FFLAGS
- #
--#CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
--#FC = g77
--#FFLAGS =
--#LIBS =  -L/usr/X11R6/lib -lX11 -lm
--#LDR = g77   
-+CFLAGS = -c -I/usr/X11R6/include -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0
-+FC = g77
-+FFLAGS =
-+LIBS =  -L/usr/X11R6/lib -lX11 -lm
-+LDR = g77   
- #
- 
- #
-@@ -160,11 +160,11 @@
- # For The OpenGL Graphics library molden helper 'moldenogl'
- # (make moldenogl)
- #
--LIBSG = -lglut -lGLU -lGL -lXmu -lX11 -lm
-+#LIBSG = -lglut -lGLU -lGL -lXmu -lX11 -lm
- #
- # on linux :
- #
--#LIBSG = -L/usr/X11R6/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
-+LIBSG = -L/usr/X11R6/lib -lglut -lGLU -lGL -lXmu -lX11 -lm
- #
- # on linux with older Mesa installations try:
- #
diff --git a/sci-chemistry/molden/files/molden-4.4-gfortran-gentoo.patch b/sci-chemistry/molden/files/molden-4.4-gfortran-gentoo.patch
deleted file mode 100644
index c5df6d545931..000000000000
--- a/sci-chemistry/molden/files/molden-4.4-gfortran-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur molden4.4-old/molden.f molden4.4/molden.f
---- molden4.4-old/molden.f	2006-07-10 07:46:06.000000000 -0400
-+++ molden4.4/molden.f	2006-10-02 21:05:15.000000000 -0400
-@@ -255,7 +255,7 @@
-       common /vrmlhl/ spcdfil
-       common /pmflvl/ ipmfm,ipmfh,pmflev(mxpmfl),levcol(mxpmfl)
-       common /comsrf/ vo(3), rt(3),v1t(3),v2t(3),v3t(3)
--      external iargc
-+c      external iargc
-       dimension fcnt(mxcntr)
-       character title*80, keywrd*160, keyhlp*80, keyori*160
-       character tmpstr*80,movfil*80,vrmlfil*80,povfil*80,oglfil*80
diff --git a/sci-chemistry/molden/files/molden-4.6-gfortran.patch b/sci-chemistry/molden/files/molden-4.6-gfortran.patch
deleted file mode 100644
index 458d5657e316..000000000000
--- a/sci-chemistry/molden/files/molden-4.6-gfortran.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur molden4.6/molden.f molden4.6-new/molden.f
---- molden4.6/molden.f	2007-06-11 10:04:58.000000000 -0400
-+++ molden4.6-new/molden.f	2007-06-22 20:57:13.000000000 -0400
-@@ -267,9 +267,9 @@
-       common /vrmlhl/ spcdfil
-       common /pmflvl/ ipmfm,ipmfh,pmflev(mxpmfl),levcol(mxpmfl)
-       common /comsrf/ vo(3), rt(3),v1t(3),v2t(3),v3t(3),wo(3)
--      external iargc
-+c     external iargc
- c GCC 4.0 or higher: 
--c      external gfortran_iargc
-+      external gfortran_iargc
-       dimension fcnt(mxcntr)
-       character title*80, keywrd*160, keyhlp*80, keyori*160
-       character tmpstr*80,movfil*80,povfil*80,oglfil*80
diff --git a/sci-chemistry/molden/files/molden-4.8-ambfor.patch b/sci-chemistry/molden/files/molden-4.8-ambfor.patch
new file mode 100644
index 000000000000..1ececa7f57e9
--- /dev/null
+++ b/sci-chemistry/molden/files/molden-4.8-ambfor.patch
@@ -0,0 +1,12 @@
+diff -Naur molden4.8/ambfor/makefile molden4.8.new/ambfor/makefile
+--- molden4.8/ambfor/makefile	2009-12-19 06:14:32.000000000 -0500
++++ molden4.8.new/ambfor/makefile	2010-02-25 22:33:41.000000000 -0500
+@@ -32,7 +32,7 @@
+ 	$(LDR) -o ambmd md.o verlet.o allocmd.o $(OBJS) $(LIBS)
+ 
+ ambfor.o:	ambfor.f
+-	${FC} -c -g -ffast-math -funroll-loops -m32 -o ambfor.o ambfor.f
++	${FC} $(FFLAGS) -c ambfor.f -o ambfor.o 
+ 
+ allocmd.o:	alloc.c
+ 	$(CC) $(CFLAGS) -DMD -c alloc.c -o allocmd.o
diff --git a/sci-chemistry/molden/files/molden-4.8-ldflags.patch b/sci-chemistry/molden/files/molden-4.8-ldflags.patch
new file mode 100644
index 000000000000..3759f1406f00
--- /dev/null
+++ b/sci-chemistry/molden/files/molden-4.8-ldflags.patch
@@ -0,0 +1,21 @@
+diff -Naur molden4.8.old/makefile molden4.8/makefile
+--- molden4.8.old/makefile	2009-09-21 12:01:33.000000000 -0400
++++ molden4.8/makefile	2010-02-26 00:11:28.000000000 -0500
+@@ -224,7 +224,7 @@
+ 
+ 
+ molden:	$(OBJS) mpdum.o xwin.o 
+-	$(LDR) -o molden $(OBJS) mpdum.o xwin.o $(LIBS)
++	$(LDR) $(LDFLAGS) -o molden $(OBJS) mpdum.o xwin.o $(LIBS)
+ 
+ gmolden:	$(OBJS) mpdum.o xwingl.o 
+ 	$(LDR) -o gmolden $(OBJS) mpdum.o xwingl.o $(LIBSG)
+@@ -269,7 +269,7 @@
+ # Moldens OpenGL helper program
+ 
+ moldenogl:	oglmol.o silly.o
+-	$(CC) -o moldenogl oglmol.o silly.o $(LIBSOGL)
++	$(CC) $(LDFLAGS) -o moldenogl oglmol.o silly.o $(LIBSOGL)
+ 
+ # conversion of CADPAC output to molden format
+ 
diff --git a/sci-chemistry/molden/files/molden-4.8-overflow.patch b/sci-chemistry/molden/files/molden-4.8-overflow.patch
new file mode 100644
index 000000000000..811664d4923b
--- /dev/null
+++ b/sci-chemistry/molden/files/molden-4.8-overflow.patch
@@ -0,0 +1,12 @@
+diff -Naur molden4.8/xwin.c molden4.8.new//xwin.c
+--- molden4.8/xwin.c	2010-02-01 08:04:08.000000000 -0500
++++ molden4.8.new//xwin.c	2010-02-26 00:03:36.000000000 -0500
+@@ -27353,7 +27353,7 @@
+ 	UpdateZME();
+ 	RedrawScroll(&zscroll);
+     }
+-    strcpy(ZMEerr,errstr);
++    strncpy(ZMEerr,errstr,MAXZMEERR);
+     RedrawStatus();
+ }
+ 
diff --git a/sci-chemistry/molden/molden-4.4.ebuild b/sci-chemistry/molden/molden-4.4.ebuild
deleted file mode 100644
index 42b177a554b6..000000000000
--- a/sci-chemistry/molden/molden-4.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/molden-4.4.ebuild,v 1.6 2009/09/23 19:55:12 patrick Exp $
-
-inherit eutils toolchain-funcs flag-o-matic fortran
-
-MY_P="${PN}${PV}"
-DESCRIPTION="Display molecular density from GAMESS-UK, GAMESS-US, GAUSSIAN and Mopac/Ampac."
-HOMEPAGE="http://www.cmbi.kun.nl/~schaft/molden/molden.html"
-SRC_URI="ftp://ftp.cmbi.kun.nl/pub/molgraph/${PN}/${MY_P}.tar.Z"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 x86"
-IUSE="opengl"
-
-RDEPEND="opengl? ( virtual/glut
-	virtual/opengl )
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-FORTRAN="g77 gfortran"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gfortran-gentoo.patch
-}
-
-src_compile() {
-	# Use -mieee on alpha, according to the Makefile
-	use alpha && append-flags -mieee
-
-	# Honor CC, CFLAGS, FC, and FFLAGS from environment;
-	# unfortunately a bash bug prevents us from doing typeset and
-	# assignment on the same line.
-	typeset -a args
-	args=( CC="$(tc-getCC) ${CFLAGS}" \
-		FC="${FORTRANC}" LDR="${FORTRANC}" FFLAGS="${FFLAGS}" )
-
-	einfo "Building Molden..."
-	emake -j1 "${args[@]}" || die "molden emake failed"
-	if use opengl ; then
-		einfo "Building Molden OpenGL helper..."
-		emake -j1 "${args[@]}" moldenogl || die "moldenogl emake failed"
-	fi
-}
-
-src_install() {
-	dobin molden
-	use opengl && dobin moldenogl
-	dodoc HISTORY README REGISTER
-	cd doc
-	uncompress *
-	dodoc *
-}
diff --git a/sci-chemistry/molden/molden-4.6.ebuild b/sci-chemistry/molden/molden-4.8.ebuild
index d33a8be38906..21527549b10c 100644
--- a/sci-chemistry/molden/molden-4.6.ebuild
+++ b/sci-chemistry/molden/molden-4.8.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/molden-4.6.ebuild,v 1.4 2009/09/23 19:55:12 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/molden-4.8.ebuild,v 1.1 2010/02/26 05:33:34 markusle Exp $
+
+EAPI="2"
 
 inherit eutils toolchain-funcs flag-o-matic fortran
 
@@ -17,19 +19,18 @@ IUSE="opengl"
 RDEPEND="opengl? ( virtual/glut
 	virtual/opengl )
 	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	app-editors/vim"
+	# vim provides ex, which the build system uses (surf/Makefile, at least)
 
 S="${WORKDIR}/${MY_P}"
 
 FORTRAN="g77 gfortran"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if [[ "${FORTRANC}" = "gfortran" ]]; then
-		epatch "${FILESDIR}"/${P}-gfortran.patch
-	fi
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ambfor.patch
+	epatch "${FILESDIR}"/${P}-overflow.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_compile() {