commit: 518a4681a064c7df3c14a6b850e3b8d596e9d3fc Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jun 10 19:30:03 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jun 10 20:18:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518a4681
sci-chemistry/molden: drop 5.5 Closes: https://bugs.gentoo.org/867223 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-chemistry/molden/Manifest | 1 - .../molden/files/molden-4.7-implicit-dec.patch | 12 ---- .../molden/files/molden-4.8-ldflags.patch | 26 ------- sci-chemistry/molden/files/molden-5.0-ambfor.patch | 16 ----- .../molden/files/molden-5.0-overflow.patch | 16 ----- sci-chemistry/molden/files/molden-5.5-gcc8.patch | 9 --- sci-chemistry/molden/molden-5.5.ebuild | 82 ---------------------- 7 files changed, 162 deletions(-) diff --git a/sci-chemistry/molden/Manifest b/sci-chemistry/molden/Manifest index 7a87ae783800..cc2d629165b6 100644 --- a/sci-chemistry/molden/Manifest +++ b/sci-chemistry/molden/Manifest @@ -1,2 +1 @@ -DIST molden5.5.tar.gz 4934764 BLAKE2B 6ce71f928ed9aacf8fe9830c4c36a675f81d63e97d08e96519ff74d172540ae0a9af25ca966d6c02cdcbbc43633a0ef80be9d31ef98a80d59a8e1a13374c2f51 SHA512 45269d2c7a52b3b2bf4fdb5f4ca3912637b3414ff9dfcd0d4f23815b3dcf7a53ffee717420d4fbf286b71c972539e756a440f5e37b7b7325ab312c25fc6c47b0 DIST molden6.9.tar.gz 8536291 BLAKE2B f50fd9c6303d215f3b1ea73136a8ecada07102a33cfc5831c412341731d00bd166f59bc260615d4a96c59d50a6a308087f02b637f8a8d36bf19f256ac407ba72 SHA512 dbb4a602f2957d0b1d5afb8748fb8ad012a41fb0dfa816b78e4d2748ea78ee39251846a549fce4b276641d4838a336ecd9cf02b92fcf9739adeb25bb550656ec diff --git a/sci-chemistry/molden/files/molden-4.7-implicit-dec.patch b/sci-chemistry/molden/files/molden-4.7-implicit-dec.patch deleted file mode 100644 index dd5aba4f17da..000000000000 --- a/sci-chemistry/molden/files/molden-4.7-implicit-dec.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/silly.c b/silly.c -index 57d07e8..102156a 100644 ---- a/silly.c -+++ b/silly.c -@@ -13,6 +13,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <math.h> -+#include <string.h> - - #ifndef WIN32 - #include <GL/gl.h> diff --git a/sci-chemistry/molden/files/molden-4.8-ldflags.patch b/sci-chemistry/molden/files/molden-4.8-ldflags.patch deleted file mode 100644 index 92fa6c665f3f..000000000000 --- a/sci-chemistry/molden/files/molden-4.8-ldflags.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/makefile b/makefile -index 81147a3..9e2353e 100644 ---- a/makefile -+++ b/makefile -@@ -224,10 +224,10 @@ all: molden gmolden ambfor/ambfor ambfor/ambmd surf/surf - - - 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) -+ $(LDR) $(LDFLAGS) -o gmolden $(OBJS) mpdum.o xwingl.o $(LIBSG) - - ambfor/ambfor: ambfor/*.f ambfor/*.c - $(MAKE) -C ambfor FC=${FC} FFLAGS="${FFLAGS}" LDR="${LDR}" CFLAGS="${CFLAGS}" -@@ -269,7 +269,7 @@ short_wrl: short_wrl.o - # 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-5.0-ambfor.patch b/sci-chemistry/molden/files/molden-5.0-ambfor.patch deleted file mode 100644 index 9656ff7a79be..000000000000 --- a/sci-chemistry/molden/files/molden-5.0-ambfor.patch +++ /dev/null @@ -1,16 +0,0 @@ - ambfor/makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/ambfor/makefile b/ambfor/makefile -index 8627a11..dbc23a1 100644 ---- a/ambfor/makefile -+++ b/ambfor/makefile -@@ -47,7 +47,7 @@ ambmd: md.o verlet.o qvdw.o allocmd.o $(OBJS) - $(LDR) -o ambmd md.o verlet.o qvdw.o allocmd.o $(OBJS) $(LIBS) - - ambfor.o: ambfor.f -- ${FC} -c -g -ffast-math -funroll-loops -o ambfor.o ambfor.f -+ ${FC} $(FFLAGS) -c -o ambfor.o ambfor.f - - allocmd.o: alloc.c - $(CC) $(CFLAGS) -DMD -c alloc.c -o allocmd.o diff --git a/sci-chemistry/molden/files/molden-5.0-overflow.patch b/sci-chemistry/molden/files/molden-5.0-overflow.patch deleted file mode 100644 index 4fc406266935..000000000000 --- a/sci-chemistry/molden/files/molden-5.0-overflow.patch +++ /dev/null @@ -1,16 +0,0 @@ - xwin.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/xwin.c b/xwin.c -index f395909..092edff 100644 ---- a/xwin.c -+++ b/xwin.c -@@ -27353,7 +27355,7 @@ char *errstr; - UpdateZME(); - RedrawScroll(&zscroll); - } -- strcpy(ZMEerr,errstr); -+ strncpy(ZMEerr,errstr,MAXZMEERR); - RedrawStatus(); - } - diff --git a/sci-chemistry/molden/files/molden-5.5-gcc8.patch b/sci-chemistry/molden/files/molden-5.5-gcc8.patch deleted file mode 100644 index b76cb6302679..000000000000 --- a/sci-chemistry/molden/files/molden-5.5-gcc8.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/rdchx.f 2016-01-25 17:56:49.000000000 +0600 -+++ b/rdchx.f 2018-08-24 16:51:14.000000000 +0700 -@@ -6004,5 +6004,5 @@ - implicit double precision (a-h,p-z),integer (i-n),logical (o) - parameter (mxcon=10) -- dimension iconn(mxcon+1,*),icnn(mxcon+1) -+ dimension iconn(mxcon+1,*),icnn(*) - - ibnds = 0 diff --git a/sci-chemistry/molden/molden-5.5.ebuild b/sci-chemistry/molden/molden-5.5.ebuild deleted file mode 100644 index 0c0cb0664768..000000000000 --- a/sci-chemistry/molden/molden-5.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit desktop fortran-2 flag-o-matic toolchain-funcs - -MY_P="${PN}${PV}" - -DESCRIPTION="Display molecular density from GAMESS-UK, GAMESS-US, GAUSSIAN and Mopac/Ampac" -HOMEPAGE="http://www.cmbi.ru.nl/molden/"; -SRC_URI="ftp://ftp.cmbi.ru.nl/pub/molgraph/${PN}/${MY_P}.tar.gz"; - -LICENSE="MOLDEN" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="opengl" - -RDEPEND=" - x11-libs/libXmu - virtual/glu - opengl? ( - media-libs/freeglut - virtual/opengl ) -" -DEPEND="${RDEPEND} - x11-misc/gccmakedep - app-editors/vim" - # vim provides ex, which the build system uses (surf/Makefile, at least) - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-5.0-ambfor.patch - "${FILESDIR}"/${PN}-5.0-overflow.patch - "${FILESDIR}"/${PN}-4.8-ldflags.patch - "${FILESDIR}"/${PN}-4.7-implicit-dec.patch - "${FILESDIR}"/${PN}-5.5-gcc8.patch -) - -src_prepare() { - default - sed \ - -e 's:makedepend:gccmakedep:g' \ - -i surf/Makefile || die - sed 's:shell g77:shell $(FC):g' -i makefile || die -} - -src_compile() { - local args=() - - # Use -mieee on alpha, according to the Makefile - use alpha && append-flags -mieee - - # GCC 10 workaround - # bug #724556 - append-fflags $(test-flags-FC -fallow-argument-mismatch) - - args=( - CC="$(tc-getCC) ${CFLAGS}" - FC="$(tc-getFC)" - LDR="$(tc-getFC)" - FFLAGS="${FFLAGS}" - ) - - einfo "Building Molden..." - emake -j1 "${args[@]}" - if use opengl ; then - einfo "Building Molden OpenGL helper..." - emake -j1 "${args[@]}" moldenogl - fi -} - -src_install() { - dobin ${PN} g${PN} $(usex opengl ${PN}ogl "") - doicon gmolden.png - make_desktop_entry gmolden MOLDEN gmolden.png - - dodoc HISTORY README REGISTER - cd doc || die - uncompress * && dodoc * -}
