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 | |
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>
-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 | ||||
-rw-r--r-- | sci-chemistry/gromacs/ChangeLog | 4 | ||||
-rw-r--r-- | sci-chemistry/gromacs/Manifest | 12 | ||||
-rw-r--r-- | sci-physics/espresso/ChangeLog | 3 | ||||
-rw-r--r-- | sci-physics/espresso/Manifest | 12 | ||||
-rw-r--r-- | sys-cluster/nullmpi/ChangeLog | 3 | ||||
-rw-r--r-- | sys-cluster/nullmpi/Manifest | 14 | ||||
-rw-r--r-- | sys-cluster/nullmpi/nullmpi-9999.ebuild | 10 |
10 files changed, 33 insertions, 53 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" diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog index b4b2bc36c..dfa2b2863 100644 --- a/sci-chemistry/gromacs/ChangeLog +++ b/sci-chemistry/gromacs/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Jun 2011; Christoph Junghans <ottxor@gentoo.org> gromacs-4.5.9999.ebuild, + gromacs-9999.ebuild: + migrate to git-2 + 25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-4.5.9999.ebuild, gromacs-9999.ebuild, metadata.xml: migrate from 'git' to 'git-2' diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest index 725570508..83682c593 100644 --- a/sci-chemistry/gromacs/Manifest +++ b/sci-chemistry/gromacs/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - DIST gmxtest-4.0.4.tgz 14845017 RMD160 c7c583415438bdef4c9996da9064254e9460cf16 SHA1 998179aa2bfbc4f80514f10ed774762f85c854c3 SHA256 6a7f787f4bb7cbecb688115ff0854a5ffd2ef33487d7bce4b031e63848b6f361 DIST gromacs-manual-4.5.4.pdf 2463242 RMD160 309a1d9bc5f4821076d53f668c36f1c6bfc1714f SHA1 58c0261308212af29fa0c4f4a6d1b81da6d84766 SHA256 dc14504a7072b61e7aa576c48f04df03356824f3a9d9e744dfaf51529ab46252 EBUILD gromacs-4.5.9999.ebuild 7189 RMD160 12486dafb102a6488660cde00a8594059a85e341 SHA1 f1acf9501be52ff4c62da91978640c013ddbbca0 SHA256 48eea5a8bf86d247adc2f0b1c12da67c145ad9421d820499c377489b6f1e6898 EBUILD gromacs-9999.ebuild 7046 RMD160 e537569b65336b7848fab8143170a7eb45b2b15f SHA1 ef74076816e1a5b4f39cb03cd16646f6c78a3962 SHA256 a40fd3825a300ffe45f96ca829d8d6ae20a6ccda07ad2e9ac6fa0922b630b534 -MISC ChangeLog 8717 RMD160 eb2750db72aed8e42f5b89e08b726c996e99c12c SHA1 73bfa0b95e80a712747fa4c8cbd03aa2a38abb00 SHA256 18c4b09a08b262be97b3cd061a42aa9af6e703d798b401037e4ebb57a8657446 +MISC ChangeLog 8839 RMD160 b223aec401bb274dffa17d85f77b47abd4535390 SHA1 90f681867697cd6426baff74b36dee34d12cc1ea SHA256 d9426f0f18987f97c2532853bde16070adb8fbacf6b3a7f656a922c6e9ace49b MISC metadata.xml 564 RMD160 b7357b87a8c27d8540e14470312880b6597a71e9 SHA1 c99cb915680170596d0c45255fd8b0670e263c9a SHA256 772f8da05c1bb636017fb6a8f9beb217d998b30060a8da0fa3067d97a3ef6f7e ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEAREIAAYFAk4GA2AACgkQgAnW8HDreRb9ggCeKTS7A06jsMTfDeBMccmFnHQt -O9IAoJTe3FFJU7uSV3gKgWerpaJICbkB -=Mkmp ------END PGP SIGNATURE----- diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog index 28bcbb03b..e5ea3c74d 100644 --- a/sci-physics/espresso/ChangeLog +++ b/sci-physics/espresso/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Jun 2011; Christoph Junghans <ottxor@gentoo.org> espresso-9999.ebuild: + migrate to git-2 + 25 Jun 2011; Justin Lecher <jlec@gentoo.org> espresso-9999.ebuild, metadata.xml: Cleaned ebuild diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest index 5c60beefe..9f2366f3e 100644 --- a/sci-physics/espresso/Manifest +++ b/sci-physics/espresso/Manifest @@ -1,13 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - EBUILD espresso-9999.ebuild 2340 RMD160 11de82a761ac701e9c47969f551e951352158820 SHA1 eaf870e110c9a917785cddd600e23bb0d491e64d SHA256 ee9568ddc8a254384cca94d1ae881865197ecc8b0c0488fca12211702d090fa3 -MISC ChangeLog 1042 RMD160 e034cbd72a532f55913ac180a820cf2ec0131fb9 SHA1 219fed1b345b235e8f8599c0b7df8bcd51704bc6 SHA256 b0234c03fc49704222a31df8cf87e296ba2e4d96b962dd46cb92fbe6e27dc025 +MISC ChangeLog 1138 RMD160 beb3e9fe6541b914e72c4722ca8593086a3f3e12 SHA1 da5e5c27cf2bea5b58ce256d0828c6b4df61b4af SHA256 96faaa2a8013c080c46a0795f38b892364793ee85c51dcc6af8cf2d6d3aca201 MISC metadata.xml 291 RMD160 84daad3df42bb9c0c8df6209db215c4b1baf5ebf SHA1 e11cce7afa473f9e07767c735ddd77f103c6f350 SHA256 05ae7ea65ee894cccdd8feb7ee92963498fe13af6396bc0d99332fd5c0279791 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEAREIAAYFAk4GFHkACgkQgAnW8HDreRZSiwCdE8jG37EZ7x02eUxe97pAw7Vk -Qo0AoNAkxbaZuTN1dwJSHUt/kRU78reC -=+T7c ------END PGP SIGNATURE----- diff --git a/sys-cluster/nullmpi/ChangeLog b/sys-cluster/nullmpi/ChangeLog index f3e450227..f0f7252ce 100644 --- a/sys-cluster/nullmpi/ChangeLog +++ b/sys-cluster/nullmpi/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Jun 2011; Christoph Junghans <ottxor@gentoo.org> nullmpi-9999.ebuild: + migrate to git-2 + 25 Jun 2011; Justin Lecher <jlec@gentoo.org> nullmpi-0.7.ebuild, nullmpi-9999.ebuild, metadata.xml: migrate from 'git' to 'git-2' diff --git a/sys-cluster/nullmpi/Manifest b/sys-cluster/nullmpi/Manifest index c06d0807c..7e7de7f30 100644 --- a/sys-cluster/nullmpi/Manifest +++ b/sys-cluster/nullmpi/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX nullmpi-0.7-libtool.patch 1817 RMD160 5e5f928c71001c88f65306cc2db7bb98ad820038 SHA1 3bc54307cfac738862e8c8078e308831e601394a SHA256 dea202626599d20abf50c985a9b5b49620a145b32e5c90bf5e6562bd2f1be047 DIST nullmpi-0.7.tar.gz 148188 RMD160 feb30a64fdaf4555626e73ae3250d43e59abeffa SHA1 9a27e4b85d6675f763cc65ef70bdb6dff860ffb6 SHA256 88d6d09db717e22627fa7f225225f807d9315e611b903d2076ab0c83e74c8c96 EBUILD nullmpi-0.7.ebuild 675 RMD160 93cbe1d8def1a452c1e07f996a0acd2b43264e6f SHA1 9f54c6a1f14fe80fa62407c6b676a48767a4199f SHA256 06f99c5251ea44cbba63b716cf060724546eab5d24580f324d6f6de479421b4b -EBUILD nullmpi-9999.ebuild 675 RMD160 49f91700e6ec45b9344f4eae149af53f8cd2830b SHA1 a948ca62238ef20012284efadbe2808e96fc22f2 SHA256 4f60f4789c140ca77ec3538893eeed18d0c7441173c06f879dcfdd521323bca8 -MISC ChangeLog 672 RMD160 06fef21cac72561cf71f43b8591225a71a31ed68 SHA1 e9db53a60d37eff4c3649e9e7ee27b1c67913301 SHA256 0f1a70b83231133abaaaf312d13d098ee274a805c6a926e269eeae915e112e3d +EBUILD nullmpi-9999.ebuild 601 RMD160 39e44491f49ef068484f073394a28638ac2af329 SHA1 1b32a573845455c3374c0aebb01731123ed50e1d SHA256 f42b902c2dc643c52b82340aef0ec39399bd121da694e0e4406595481af23c03 +MISC ChangeLog 767 RMD160 99a1cc41977a08a6c41f9e91c492070684fdf86b SHA1 4d409fa101d1198345d5f2fb2810fe4d8e62a5de SHA256 dbcd6f94cee959ad384dd4b9de8875ba21a87420421fc90a868c23ccbbaee2b8 MISC metadata.xml 261 RMD160 803549c8dea5076513b626bd5f7bc30d98ae9aed SHA1 844661dd5d01619d641f6274718761c5ade3bbaf SHA256 efa4f30b31af6be6e8aafc0481c6144e5deebb4cded1d589ef8f644bc1043d16 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEAREIAAYFAk4GFN8ACgkQgAnW8HDreRbo4gCfcWikBZf6IeGpaO23374qW/cH -KnEAoMmDSOIDN+O8wkuNQS2HGpVuEoal -=aiAg ------END PGP SIGNATURE----- diff --git a/sys-cluster/nullmpi/nullmpi-9999.ebuild b/sys-cluster/nullmpi/nullmpi-9999.ebuild index c3e5965ba..1fb4fc4e3 100644 --- a/sys-cluster/nullmpi/nullmpi-9999.ebuild +++ b/sys-cluster/nullmpi/nullmpi-9999.ebuild @@ -6,6 +6,7 @@ EAPI=4 EGIT_REPO_URI="git://github.com/olenz/NullMPI.git" EGIT_BRANCH="master" +EGIT_BOOTSTRAP="eautoreconf" inherit autotools-utils git-2 @@ -26,11 +27,4 @@ RDEPEND=" DEPEND="${RDEPEND}" -DOCS=( AUTHORS ChangeLog README TODO ) - -S="${WORKDIR}/${EGIT_REPO_URI##*/}" - -src_prepare() { - autotools-utils_src_prepare - eautoreconf -} +DOCS=( AUTHORS NEWS README TODO ) |