diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-06-25 19:21:37 +0200 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-06-25 19:21:37 +0200 |
| commit | 572dfa781d2285ae54208b33fd1447c16ea27173 (patch) | |
| tree | bc4b00fd6bf383f3d640fdd111a8aae7d0553abd /app-doc/gromacs-manual | |
| parent | Cleaned ebuild (diff) | |
| parent | [sys-cluster/nullmpi] migrate to git-2 (diff) | |
| download | sci-572dfa781d2285ae54208b33fd1447c16ea27173.tar.gz sci-572dfa781d2285ae54208b33fd1447c16ea27173.tar.bz2 sci-572dfa781d2285ae54208b33fd1447c16ea27173.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci:
[sys-cluster/nullmpi] migrate to git-2
[sci-chemistry/gromacs] migrate to git-2
[sci-physics/espresso] migrate to git-2
[app-doc/gromacs-manual] migrate to git-2
Conflicts:
app-doc/gromacs-manual/ChangeLog
app-doc/gromacs-manual/Manifest
app-doc/gromacs-manual/gromacs-manual-9999.ebuild
sci-chemistry/gromacs/ChangeLog
sci-chemistry/gromacs/Manifest
sci-physics/espresso/ChangeLog
sci-physics/espresso/Manifest
sys-cluster/nullmpi/ChangeLog
sys-cluster/nullmpi/Manifest
sys-cluster/nullmpi/nullmpi-9999.ebuild
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'app-doc/gromacs-manual')
| -rw-r--r-- | app-doc/gromacs-manual/ChangeLog | 12 | ||||
| -rw-r--r-- | app-doc/gromacs-manual/Manifest | 10 | ||||
| -rw-r--r-- | app-doc/gromacs-manual/gromacs-manual-9999.ebuild | 6 |
3 files changed, 17 insertions, 11 deletions
diff --git a/app-doc/gromacs-manual/ChangeLog b/app-doc/gromacs-manual/ChangeLog index 35e0018b7..b9f148f17 100644 --- a/app-doc/gromacs-manual/ChangeLog +++ b/app-doc/gromacs-manual/ChangeLog @@ -2,9 +2,15 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ - 25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-manual-9999.ebuild, - metadata.xml: - migrate from 'git' to 'git-2' + 25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-manual-9999.ebuild: + Merged + + 25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-manual-9999.ebuild: + Merged + + 25 Jun 2011; Christoph Junghans <ottxor@gentoo.org> + gromacs-manual-9999.ebuild: + migrate to git-2 *gromacs-manual-9999 (26 Aug 2010) diff --git a/app-doc/gromacs-manual/Manifest b/app-doc/gromacs-manual/Manifest index 911c971c9..768d401b7 100644 --- a/app-doc/gromacs-manual/Manifest +++ b/app-doc/gromacs-manual/Manifest @@ -1,13 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD gromacs-manual-9999.ebuild 1169 RMD160 d73d8ac1d28c13f76d4645cf1d69d6f918d5d9f6 SHA1 eb4e58337c566af5eb4643cf0fb9935762ebe3b0 SHA256 d322e19726b0267640c4fed34943b72ca1390a531968dfb4cf3adec67c736e12 -MISC ChangeLog 403 RMD160 d7f24cdc4252e7c9730c8b4337b94698267b8e09 SHA1 b4ffae49d9fe807c8efb9defa2e061973b6dc356 SHA256 e8394fbd733378b71c4cda57c62daae2da83f280df59c8a4c40c68b01b2b5dd6 +EBUILD gromacs-manual-9999.ebuild 1169 RMD160 0b3754c292104c1de63026d3a3aa74499f412adb SHA1 6f43ff72060eed4ef41f60df49e754abb912d86d SHA256 6f4b4761334a43297e7afb11510be82f6c4de37338a6ebe648354053c573e59a +MISC ChangeLog 553 RMD160 9e7e760c4f49b2b1d4a68cd9278e7c43dd087948 SHA1 e8b60767a7483e3da163e003ee34a42cdd379e9f SHA256 23aa1d6f8f1179dd732b537645778b21214f8fbcd79fcd8964b42286062e6854 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk4F6H0ACgkQgAnW8HDreRZ2TQCeLYd92onWlP3v3l9M3QwNgOix -wqYAn1srQtFBp8AH5kpfm7qlCeEmsltV -=7cOm +iEYEAREIAAYFAk4GGJsACgkQgAnW8HDreRZkTwCfVhcxHDDiioFE1FlflkacpsNn +fvkAnRWvGIShj784zIcWRkicjZ2mwPmS +=3WPL -----END PGP SIGNATURE----- diff --git a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild index 49778e843..c9f988336 100644 --- a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild +++ b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild @@ -4,15 +4,15 @@ EAPI=4 +EGIT_REPO_URI="git://git.gromacs.org/manual" +EGIT_BRANCH="master" + inherit cmake-utils git-2 DESCRIPTION="Manual for gromacs" HOMEPAGE="http://www.gromacs.org/" SRC_URI="" -EGIT_REPO_URI="git://git.gromacs.org/manual" -EGIT_BRANCH="master" - LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |