[sci-chemistry/gromacs] patch appliyed upstream

(Portage version: 2.2_rc62/git/Linux x86_64)
 (Unsigned Manifest commit)

4 files changed, 6 insertions, 55 deletions

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index c97f3e210..00845f840 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   18 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org> gromacs-9999.ebuild,
+  -files/gromacs-9999-dirent.patch:
+  Dropped unneded patches. They all were applied to git master
+
+  18 Feb 2010; Alexey Shvetsov <alexxy@gentoo.org> gromacs-9999.ebuild,
   -files/gromacs-9999-as-needed.patch,
   -files/gromacs-9999-install-mdrun.patch:
   Dropped unneded patches. They all were applied to git master
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index b391f2adf..0fcd1e987 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,9 +1,8 @@
 AUX gromacs-4.0.9999-ccache.patch 678 RMD160 043d0e207e04a275fe00a3bd2b28f8dc0dfd4b7f SHA1 08bc5ac8bc0b28f68e1ede994d49616dd920af5d SHA256 ca477d54351c418f1d39dda29373a1426c9403ec0d2f21c28fc7568227d47632
 AUX gromacs-4.0.9999-configure-gfortran.patch 760 RMD160 1700579b0c2dfb8cbb743d795aa9f0f9f467c06b SHA1 e6924d3598b20195fcb6809e64f333def5b0f919 SHA256 1a59dfde8a3db8db729bd19691a5945e02be2725fa66ec0b125ab3b931518761
-AUX gromacs-9999-dirent.patch 1916 RMD160 781805e6e652f9a63fada5e3c92c0798b3077b07 SHA1 c3ff6d698c485aa985d49632a3475152123c8be4 SHA256 a63682ec1e0f3b8172b65fd65bab61258259010e85aef47940f15cce663e306a
 DIST gmxtest-4.0.4.tgz 14845017 RMD160 c7c583415438bdef4c9996da9064254e9460cf16 SHA1 998179aa2bfbc4f80514f10ed774762f85c854c3 SHA256 6a7f787f4bb7cbecb688115ff0854a5ffd2ef33487d7bce4b031e63848b6f361
 DIST manual-4.0.pdf 2135100 RMD160 b963642f8e1433f11328c3d0c4b1645c9de506da SHA1 8ae951ee15b2a7dc626331fce36511bc8766144c SHA256 646f810477eee2d710de6019c52056550413d0ba77baf9680195c835ddafe80a
 EBUILD gromacs-4.0.9999.ebuild 6857 RMD160 727af5d38f52f5db01f6185c7ca0a7c05191be21 SHA1 2d1988574567e9c19af1d5624e51055a6b39d199 SHA256 b2304948a62c4e42c048e7912b24354265901ce6d9e7ac260ee65fa5ed7f56f5
-EBUILD gromacs-9999.ebuild 6487 RMD160 a59462e60958521aab8fe43bf55da2a4e510c948 SHA1 e8eded8ef1b22cc7d1d5fc30cb439ae5906453a3 SHA256 7f39838c6d4a2820241c60e1fa6be2ad586ee839e2cb80e3d549bf5c6e2424ae
-MISC ChangeLog 3544 RMD160 28e6cfb1071566ae77b3837256b28696e0f84b0e SHA1 b0334b5859ae2e98fcd16520a90eed70853528cf SHA256 29294b3349f528da18a83efa316c8237879f4be455c9eb0b2a28ccd0dbeee850
+EBUILD gromacs-9999.ebuild 6447 RMD160 40392fd740056f9a533d2126ab374964d048f496 SHA1 b6bb1fa00d20b8e13455984e5e2ed661eff0f678 SHA256 07c745f4cb7563911a313b572af25eba4f613f3aeb733f8e80dd6b4df7f79a5e
+MISC ChangeLog 3716 RMD160 069baa7cb21c3bc94859e7d02d5ed3a73c37498e SHA1 f455d51fefc5a796bb43ce95518bda63a6e0a4e0 SHA256 68d8aa9ae6988786b8bd7abfb0a2c4b0be7a3e6c643930686296ff5cb65bec5b
 MISC metadata.xml 580 RMD160 06a95696ec536dd91eab06946d8787546f1e0582 SHA1 b6c5f5e50b518efa3014b69f97307d62734a288d SHA256 e976e31a9e16e9eea09d5ec147ce91d16b4e463453e71ebfb8092485589a6b49
diff --git a/sci-chemistry/gromacs/files/gromacs-9999-dirent.patch b/sci-chemistry/gromacs/files/gromacs-9999-dirent.patch
deleted file mode 100644
index 936cb0be7..000000000
--- a/sci-chemistry/gromacs/files/gromacs-9999-dirent.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e61c3be6a0bf0cdc4c21ac1b32d4fc546f2733c1 Mon Sep 17 00:00:00 2001
-From: Alexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
-Date: Thu, 18 Feb 2010 17:33:05 +0300
-Subject: [PATCH] Fix detection and usage of dirent.h
-
----
- configure.ac           |    5 +++++
- src/kernel/fflibutil.c |    4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 08e00c9..32eefe1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -651,6 +651,11 @@ Selections still work, but the default groups can differ from
- those obtained with regular expressions enabled.
- Consider installing the regular expression library from GNU libc.])])
- 
-+#######################################################################
-+# Check for dirent.h
-+#######################################################################
-+AC_CHECK_HEADERS([dirent.h],,AC_DEFINE([HAVE_DIRENT_H]))
-+
- #####
- # Checks for additional and/or optional functions or libraries.
- #AC_FUNC_MALLOC
-diff --git a/src/kernel/fflibutil.c b/src/kernel/fflibutil.c
-index ecab646..5b9e51a 100644
---- a/src/kernel/fflibutil.c
-+++ b/src/kernel/fflibutil.c
-@@ -147,7 +147,7 @@ static int low_fflib_search_file_end(const char *ffdir,
-                                      char ***filenames,
-                                      char ***filenames_short)
- {
--#ifndef HAVE_DIRENT
-+#ifndef HAVE_DIRENT_H
-     gmx_fatal(FARGS,"lib_search_file_end called while the 'dirent' functionality is not available on this system");
-     return 0;
- #else
-@@ -296,7 +296,7 @@ int fflib_search_file_end(const char *ffdir,const char *file_end,
- int fflib_search_file_in_dirend(const char *filename,const char *dirend,
-                                 char ***dirnames)
- {
--#ifndef HAVE_DIRENT
-+#ifndef HAVE_DIRENT_H
-     gmx_fatal(FARGS,"lib_search_file_in_dirend called while the 'dirent' functionality is not available on this system");
-     return 0;
- #else
--- 
-1.7.0
-
diff --git a/sci-chemistry/gromacs/gromacs-9999.ebuild b/sci-chemistry/gromacs/gromacs-9999.ebuild
index 3dd3e3217..38d1eaeec 100644
--- a/sci-chemistry/gromacs/gromacs-9999.ebuild
+++ b/sci-chemistry/gromacs/gromacs-9999.ebuild
@@ -44,7 +44,6 @@ src_prepare() {
 		die "Nothing to compile, enable single-precision and/or double-precision"
 
 	epatch "${FILESDIR}/${PN}-4.0.9999-ccache.patch"
-	epatch "${FILESDIR}/${P}-dirent.patch"
 
 	# Fix typos in a couple of files.
 	sed -e "s:+0f:-f:" -i share/tutor/gmxdemo/demo \