From 87f2279f5cd5deb911d443dfc766d9358e7187ee Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 15 Jul 2012 18:39:52 +0000 Subject: sci-chemistry/molden: Drop old (Portage version: 2.2.0_alpha118/cvs/Linux x86_64) --- sci-chemistry/molden/ChangeLog | 6 +- .../molden/files/molden-4.7-glibc-2.11.patch | 116 --------------------- .../molden/files/molden-4.7-ldflags.patch | 13 --- sci-chemistry/molden/molden-4.7.ebuild | 56 ---------- 4 files changed, 5 insertions(+), 186 deletions(-) delete mode 100644 sci-chemistry/molden/files/molden-4.7-glibc-2.11.patch delete mode 100644 sci-chemistry/molden/files/molden-4.7-ldflags.patch delete mode 100644 sci-chemistry/molden/molden-4.7.ebuild (limited to 'sci-chemistry') diff --git a/sci-chemistry/molden/ChangeLog b/sci-chemistry/molden/ChangeLog index 3cc47045a238..26c958779511 100644 --- a/sci-chemistry/molden/ChangeLog +++ b/sci-chemistry/molden/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-chemistry/molden # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/ChangeLog,v 1.43 2012/07/15 17:09:25 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/ChangeLog,v 1.44 2012/07/15 18:39:51 jlec Exp $ + + 15 Jul 2012; Justin Lecher -molden-4.7.ebuild, + -files/molden-4.7-glibc-2.11.patch, -files/molden-4.7-ldflags.patch: + Drop old 15 Jul 2012; Raúl Porcel molden-4.7.ebuild, molden-4.8-r2.ebuild, molden-5.0.ebuild: diff --git a/sci-chemistry/molden/files/molden-4.7-glibc-2.11.patch b/sci-chemistry/molden/files/molden-4.7-glibc-2.11.patch deleted file mode 100644 index 70125518c330..000000000000 --- a/sci-chemistry/molden/files/molden-4.7-glibc-2.11.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff --git a/xwin.c b/xwin.c -index d38f87c..d328ee6 100644 ---- a/xwin.c -+++ b/xwin.c -@@ -3776,7 +3776,7 @@ static int imoptm = 0; - static int ibopth = 0; - static int iboptl = 0; - static int iboptm = 0; --static int linkat = 0; -+static int lnkat = 0; - - static QBOXSTRU IANZboxes[MAXAT]; - static QBOXSTRU IZboxes[MAXAT][4]; -@@ -19234,7 +19234,7 @@ int i; - if (ioniom == 1) { - int ism, isl; - -- linkat = 0; -+ lnkat = 0; - - /* Counting the number of Link atoms between H and lower - levels*/ -@@ -19247,10 +19247,10 @@ int i; - if (ionij != 0) continue; - nconn = xyzp->iconn[j*(MXCON+1)]; - for (k=1;k<=nconn;k++) { -- if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 > 0) linkat++; -+ if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 > 0) lnkat++; - } - } -- linkat += 20000; -+ lnkat += 20000; - jobcom->itotc = jobcom->icopth; - jobcom->imult = jobcom->ispopth; - if (CheckChargeMult()) { -@@ -19271,7 +19271,7 @@ int i; - - } else if (ioniom == 2) { - -- linkat = 0; -+ lnkat = 0; - - /* Counting the number of Link atoms between H and - lower levels*/ -@@ -19281,10 +19281,10 @@ int i; - if(ionij != 0) continue; - nconn = xyzp->iconn[j*(MXCON+1)]; - for (k=1;k<=nconn;k++) { -- if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 > 0) linkat++; -+ if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 > 0) lnkat++; - } - } -- linkat += 20000; -+ lnkat += 20000; - jobcom->itotc = jobcom->icopth; - jobcom->imult = jobcom->ispopth; - if (CheckChargeMult()) { -@@ -19296,7 +19296,7 @@ int i; - break; - */ - } -- linkat = 0; -+ lnkat = 0; - - /* Counting the number of Link atoms between H+M and - lower levels*/ -@@ -19306,10 +19306,10 @@ int i; - if (ionij == 2) continue; - nconn = xyzp->iconn[j*(MXCON+1)]; - for (k=1;k<=nconn;k++) { -- if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 == 2) linkat++; -+ if (xyzp->ityp[xyzp->iconn[j*(MXCON+1)+k]-1]/10000 == 2) lnkat++; - } - } -- linkat += 20000; -+ lnkat += 20000; - jobcom->itotc = jobcom->icoptm; - jobcom->imult = jobcom->ispoptm; - if (CheckChargeMult()) { -@@ -19324,7 +19324,7 @@ int i; - icopt = jobcom->icoptl+3; - ispopt = jobcom->ispoptl-1; - } -- linkat = 0; -+ lnkat = 0; - jobcom->itotc = icopt - 3; - jobcom->imult = ispopt + 1; - jobcom->ito = itopt[jmode] + 1; -@@ -19576,10 +19576,10 @@ int CheckChargeMult() - ionil = 0; - - if (ioniom) { -- ionil = 3 - (linkat / 10000); -- linkat -= (linkat / 10000) * 10000; -+ ionil = 3 - (lnkat / 10000); -+ lnkat -= (lnkat / 10000) * 10000; - } else { -- linkat = 0; -+ lnkat = 0; - } - - if (*zmptrp->ihaszm) { -@@ -19602,10 +19602,10 @@ int CheckChargeMult() - } - } - /* -- fprintf(stderr,"ionil %d ne %d itotc %d linkat %d mult %d\n", -- ionil,ne,jobcom->itotc,linkat,jobcom->imult); -+ fprintf(stderr,"ionil %d ne %d itotc %d lnkat %d mult %d\n", -+ ionil,ne,jobcom->itotc,lnkat,jobcom->imult); - */ -- ne = ne - jobcom->itotc + linkat; -+ ne = ne - jobcom->itotc + lnkat; - if (ne % 2 == jobcom->imult % 2) return(1); - return(0); - } diff --git a/sci-chemistry/molden/files/molden-4.7-ldflags.patch b/sci-chemistry/molden/files/molden-4.7-ldflags.patch deleted file mode 100644 index 2dc3f94c1b72..000000000000 --- a/sci-chemistry/molden/files/molden-4.7-ldflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/makefile b/makefile -index 410ca25..30dd5e1 100644 ---- a/makefile -+++ b/makefile -@@ -265,7 +265,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/molden-4.7.ebuild b/sci-chemistry/molden/molden-4.7.ebuild deleted file mode 100644 index 18df801f9413..000000000000 --- a/sci-chemistry/molden/molden-4.7.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molden/molden-4.7.ebuild,v 1.10 2012/07/15 17:09:25 armin76 Exp $ - -inherit eutils fortran-2 toolchain-funcs flag-o-matic - -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.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="opengl" - -RDEPEND=" - virtual/fortran - opengl? ( media-libs/freeglut - virtual/opengl ) - x11-libs/libXmu" -DEPEND="${RDEPEND} - app-editors/vim" - # vim provides ex, which the build system uses (surf/Makefile, at least) - -S="${WORKDIR}/${MY_P}" - -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="$(tc-getFC)" LDR="$(tc-getFC)" 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 || die "failed to install molden executable." - if use opengl ; then - dobin moldenogl || die "failed to install moldenogl." - fi - - dodoc HISTORY README REGISTER || die "failed to install docs." - cd doc - uncompress * && dodoc * || die "failed to install docs." -} -- cgit v1.2.3-65-gdbad