Moving disco manpage to g_disco, fixing bug 210083.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64

6 files changed, 16 insertions, 104 deletions

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index d2acc91e00d7..29e33afffd9e 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/gromacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.24 2008/06/03 18:45:14 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/ChangeLog,v 1.25 2008/06/23 03:08:17 je_fro Exp $
+
+  23 Jun 2008; Jeff Gardner <je_fro@gentoo.org>
+  -files/gromacs-alpha-axp_asm.patch, -files/gromacs-ppc64-altivec.patch,
+  -gromacs-3.2.1-r1.ebuild, gromacs-3.3.1-r1.ebuild:
+  Moving disco manpage to g_disco, fixing bug 210083.
 
   03 Jun 2008; Jeff Gardner <je_fro@gentoo.org> gromacs-3.3.1-r1.ebuild:
   No altivec patching with this gromacs version. Thanks to Maik Nijhuis in
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 4cece126e3fc..26598d0c15bc 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,8 +1,4 @@
-AUX gromacs-alpha-axp_asm.patch 613 RMD160 56a617d34b9aa96f71cb84124271107d56557773 SHA1 96518a8fa20c0d597b5cb26b843f28f26d998942 SHA256 d6ae7d258e975a0c12a8b09bef11874eb0e25d4708f299b3e265c97ada69afee
-AUX gromacs-ppc64-altivec.patch 571 RMD160 e6bdccd29a29fb9ee85f0ca4a15f2ea229b6f52a SHA1 fe059c262d4fdbc9b918769dc88dd8a2ed177b6b SHA256 1e60a3a12cfd706af1860ca2ff36074291540f8ffa3616636eb612037f0611c3
-DIST gromacs-3.2.1.tar.gz 3302723 RMD160 778fb44b4b113eb5ba6e758884276165a8f003e9 SHA1 ddc86120c578e1147daf6e2f849da2096d75469b SHA256 de85710553202e17a3ac67049d2cf51117939d3d8944a34aa0909aa3771bef53
 DIST gromacs-3.3.1.tar.gz 7992897 RMD160 48e6f9098ac4f5b834f4beb050846c60aea18fff SHA1 8c67ee772cadf93067b3c8bcec65d7b3520df1dc SHA256 3df40151ff5364fab1c4d8692ec247d8245437e954882a803178cbe6b812d81f
-EBUILD gromacs-3.2.1-r1.ebuild 1972 RMD160 1295aab9e62ea7bbecc861197c10750be72c9d95 SHA1 af03cfe77b60bffc741e22a741c8f6e1ffb91470 SHA256 97ce18a986ed699d7cb1413041f6274a6e9dab0207f2fdea670b114717acc5ab
-EBUILD gromacs-3.3.1-r1.ebuild 5643 RMD160 46053984dd8b131fc55f090d333328de9128cf99 SHA1 2c5f2f10916a849567d60a9a707f7afdbe037ebc SHA256 9dcb75433abe378c92bdda4106c66590f66c351c5ffd5255e9e0f55204744359
-MISC ChangeLog 6280 RMD160 29c965c3e288a769fc309b93c9c924f8db3465a8 SHA1 77567cfadcc2daf83ad7f4a8ba2f1e7fd60c0dfa SHA256 cc78708897b09edb60c3fef67af47c61803d5d3738c920b2268830e9e34f43ed
+EBUILD gromacs-3.3.1-r1.ebuild 5842 RMD160 aa04d4ac3f5368066a06958f802551507d1b6aa9 SHA1 009b2d46fa70915d73a9743d33c8aaa6d68608dc SHA256 e9dfd98665d44bcab28a6d767bb0691ad1392db196e5f17ed4f218710a1a0c53
+MISC ChangeLog 6510 RMD160 cef4a6dbc2e9bc797d1d36ea28f1c38863984b1a SHA1 abdcd0edd084b862b4a9143cacebefa728d4b4e2 SHA256 a7a29f833743b138c0aebf9e6e8a19c360360aa2ca795d1c11c3ffc1b3788be9
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/gromacs/files/gromacs-alpha-axp_asm.patch b/sci-chemistry/gromacs/files/gromacs-alpha-axp_asm.patch
deleted file mode 100644
index 071b11f4b3bf..000000000000
--- a/sci-chemistry/gromacs/files/gromacs-alpha-axp_asm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur gromacs-3.2.1/src/gmxlib/Makefile.in gromacs-3.2.1-new/src/gmxlib/Makefile.in
---- gromacs-3.2.1/src/gmxlib/Makefile.in	2004-03-01 20:49:02.000000000 +0100
-+++ gromacs-3.2.1-new/src/gmxlib/Makefile.in	2006-05-30 17:40:33.000000000 +0200
-@@ -301,6 +301,7 @@
- LTF77COMPILE = $(LIBTOOL) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS)
- F77LD = $(F77)
- CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-+LTASCOMPILE = $(LIBTOOL) --mode=compile $(AS) $(AM_ASFLAGS) $(ASFLAGS)
- LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
- 	$(CCASFLAGS)
- DIST_SOURCES = $(libgmx@LIBSUFFIX@_la_SOURCES) \
diff --git a/sci-chemistry/gromacs/files/gromacs-ppc64-altivec.patch b/sci-chemistry/gromacs/files/gromacs-ppc64-altivec.patch
deleted file mode 100644
index d170bbd70ad3..000000000000
--- a/sci-chemistry/gromacs/files/gromacs-ppc64-altivec.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur gromacs-3.2.1/include/ppc_altivec.h gromacs-3.2.1-new/include/ppc_altivec.h
---- gromacs-3.2.1/include/ppc_altivec.h	2003-11-18 02:41:58.000000000 -0600
-+++ gromacs-3.2.1-new/include/ppc_altivec.h	2005-08-04 13:42:05.000000000 -0500
-@@ -33,6 +33,14 @@
- #ifndef _ppc_altivec_h
- #define _ppc_altivec_h
- 
-+#if !defined(__APPLE_ALTIVEC__) 
-+#include <altivec.h>
-+#ifdef bool
-+#undef bool
-+#define bool int
-+#endif
-+#endif
-+
- static char *SRCID_ppc_altivec_h = "$Id: ppc_altivec.h,v 1.7 2003/11/18 08:41:58 lindahl Exp $";
- #ifdef HAVE_CONFIG_H
- #include <config.h>
diff --git a/sci-chemistry/gromacs/gromacs-3.2.1-r1.ebuild b/sci-chemistry/gromacs/gromacs-3.2.1-r1.ebuild
deleted file mode 100644
index 0d7ee123e392..000000000000
--- a/sci-chemistry/gromacs/gromacs-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-3.2.1-r1.ebuild,v 1.5 2008/06/03 18:45:14 je_fro Exp $
-
-inherit eutils
-
-IUSE="altivec mpi xml"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gromacs.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-
-#mpi is a local USE flag now
-#May become official when situation with mpich is cleared (now the only mpi implementation awailable is lam-mpi)
-DEPEND="=sci-libs/fftw-2.1*
-	mpi? ( >=sys-cluster/lam-mpi-6.5.6 )
-	>=sys-devel/binutils-2.10.91.0.2
-	app-shells/tcsh
-	xml? ( dev-libs/libxml2 )"
-
-src_unpack() {
-	unpack ${A}
-	if use ppc64 && use altivec ; then
-		epatch "${FILESDIR}"/${PN}-ppc64-altivec.patch
-	fi
-}
-
-src_compile() {
-#!!!Please note!!!
-#for troublesome work gromacs should be compiled with the same mpi setting as fftw.
-#Unfortunately portage cannot trace optional dependencies of dependencies at present.
-#Until this (planned) feature is completed, please try to do corresponding check yourself.
-
-	# static should work but something's broken.
-	# gcc spec file may be screwed up.
-	# Static linking should try -lgcc instead of -lgcc_s.
-	# For more info:
-	# http://lists.debian.org/debian-gcc/2002/debian-gcc-200201/msg00150.html
-	econf \
-		--enable-fortran \
-		--datadir=/usr/share/${P} \
-		--bindir=/usr/bin \
-		--libdir=/usr/lib \
-		$(use_with xml) \
-		$(use_enable mpi) \
-		$(use_enable altivec ppc-altivec) \
-		$(use_enable alpha axp-asm) || die "configure failed"
-
-	#	`use_enable static all-static` \
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-
-	# Install documentation.
-	dodoc AUTHORS INSTALL README
-
-	#move html docs under /usr/share/doc
-	#and leave examples and templates under /usr/gromacs...
-	mv "${D}"/usr/share/${P}/html "${D}"/usr/share/doc/${PF}
-}
diff --git a/sci-chemistry/gromacs/gromacs-3.3.1-r1.ebuild b/sci-chemistry/gromacs/gromacs-3.3.1-r1.ebuild
index 89dbb8c16a55..67a83f399117 100644
--- a/sci-chemistry/gromacs/gromacs-3.3.1-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-3.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-3.3.1-r1.ebuild,v 1.10 2008/06/03 18:45:14 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gromacs/gromacs-3.3.1-r1.ebuild,v 1.11 2008/06/23 03:08:17 je_fro Exp $
 
 inherit eutils fortran multilib
 
@@ -51,6 +51,13 @@ src_unpack() {
 	-i src/tools/Makefile.am \
 	|| die "sed tools/Makefile.am failed"
 
+# Rename disco manpage to fix bug #210083
+	sed "s:disco.1:g_disco.1:" \
+	-i "${S}"/man/man1/Makefile.am \
+	|| die "sed failed to rename disco"
+
+	mv "${S}"/man/man1/disco.1 "${S}"/man/man1/g_disco.1
+
 	cd "${WORKDIR}" && mv ${P} ${P}-single ;
 
 	use double-precision && cp -prP ${P}-single ${P}-double ;