[gentoo-commits] proj/sci:master commit in: / - gentoo-commits

From:	Sebastien Fabbro <bicatali@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/sci:master commit in: /
Date:	Sat, 14 Jan 2012 05:30:43
Message-Id:	`c0ff3c6c91cbfed4417aac81e01e5dd814e1d83d.bicatali@gentoo`

1

commit:     c0ff3c6c91cbfed4417aac81e01e5dd814e1d83d

2

Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>

3

AuthorDate: Sat Jan 14 05:29:33 2012 +0000

4

Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>

5

CommitDate: Sat Jan 14 05:29:33 2012 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c0ff3c6c

7

8

Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci

9

10

Conflicts:

11

	sys-cluster/mpich2/Manifest

12

13

14

 sci-libs/atlas/Manifest                   |    3 +++

15

 sys-cluster/mpich2/Manifest               |   16 ++++++++++++++++

16

 sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild |    1 +

17

 3 files changed, 20 insertions(+), 0 deletions(-)

18

19

diff --cc sci-libs/atlas/Manifest

20

index cd7bb1d,cd7bb1d..9fff592

21

--- a/sci-libs/atlas/Manifest

22

+++ b/sci-libs/atlas/Manifest

23

@@@ -4,11 -4,11 +4,14 @@@ DIST atlas3.9.46.tar.bz2 5572227 RMD16

24

  DIST atlas3.9.47.tar.bz2 5733559 RMD160 036dbe08784bbda33ce1fa94b20a1999b22772cd SHA1 a3a4797669decea28308bd7d3e0adcac44267471 SHA256 ff4d303c7e3e965cf53f6691e110c1dbff76419c292f56b1ba89e6e5c4174fa0

25

  DIST atlas3.9.49.tar.bz2 5755631 RMD160 b718c3f343d220460427ba2008bd80d8efeb4a71 SHA1 ae2380986f5622f11fb88c4985e3633613a68fc5 SHA256 fbe55e35da9d8d46a01d13af5755145001edc321e5b240bc21b70c55e5c16289

26

  DIST atlas3.9.52.tar.bz2 5427461 RMD160 39d81972153482d2b7e85d3f6b8e07f8949a183d SHA1 3c9e78f9c6ac14d30965a9ce5dad6a38b8422170 SHA256 0376ad5fa51f974c612d51395db588fb8758582c229700b934d905e189d71d99

27

++DIST atlas3.9.62.tar.bz2 6319634 RMD160 8f09fd9f4d1da67e9d37b6ee03f7eb8903b78d98 SHA1 de68fbcd8ecfcf1c9fa78600443b5b26f67a113a SHA256 8767c7481a883db9286b915aa5a9d6fb7be736352742f610aae1ba6803b52c37

28

  DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4

29

++DIST lapack-3.4.0.tgz 6127787 RMD160 42599fbc1e9f943454d243097b043daa51668d4e SHA1 910109a931524f8dcc2734ce23fe927b00ca199f SHA256 a7139ef97004d0e3c4c30f1c52d508fd7ae84b5fbaf0dd8e792c167dc306c3e9

30

  EBUILD atlas-3.8.4.ebuild 7394 RMD160 4d60e4e8437f509e447988ee841da387d57f3b9e SHA1 bcf373b5fd94f2942e9eb1bd799ed782c21bc481 SHA256 48ce05edf409f60d8d1c9d404b021d0fc3d204194774ef097b838c6a7d0fa8ab

31

  EBUILD atlas-3.9.46.ebuild 7396 RMD160 dd985c2b4d8b4fcdd2b41acb851600900b2da74a SHA1 58ffa873126c0cae86761139df14f4ff85c42a45 SHA256 03bb28d219c0dd759c5b68549beee6f6e1800869d1afef8dbe3eace47dce4e61

32

  EBUILD atlas-3.9.47.ebuild 7396 RMD160 dd985c2b4d8b4fcdd2b41acb851600900b2da74a SHA1 58ffa873126c0cae86761139df14f4ff85c42a45 SHA256 03bb28d219c0dd759c5b68549beee6f6e1800869d1afef8dbe3eace47dce4e61

33

  EBUILD atlas-3.9.49.ebuild 7396 RMD160 dd985c2b4d8b4fcdd2b41acb851600900b2da74a SHA1 58ffa873126c0cae86761139df14f4ff85c42a45 SHA256 03bb28d219c0dd759c5b68549beee6f6e1800869d1afef8dbe3eace47dce4e61

34

  EBUILD atlas-3.9.52.ebuild 7396 RMD160 dd985c2b4d8b4fcdd2b41acb851600900b2da74a SHA1 58ffa873126c0cae86761139df14f4ff85c42a45 SHA256 03bb28d219c0dd759c5b68549beee6f6e1800869d1afef8dbe3eace47dce4e61

35

++EBUILD atlas-3.9.62.ebuild 7429 RMD160 707bbc343daed27997c8f15ed25cecfefc86ae9c SHA1 409a34104ec391c7ffb64c8cf1e65cb62883a726 SHA256 9d91e143b20329e3607384a5d5f65be92da216dcc026ec4497f31256bed67926

36

  MISC ChangeLog 2360 RMD160 281bd2a873bbb8d22c2e0aa2abd120c1d3b86aa9 SHA1 f01d4e21cc612ee273622298cb07bc013f5d80f5 SHA256 8101a54ca40192962f869a09c8d7e0bce08d578cb4feccf710ba1852519a41d9

37

  MISC metadata.xml 617 RMD160 cbafba50b52b844c48932a2f848891b3bb98b5aa SHA1 c086b55d8493b984b461940c14409c9834e5ab5c SHA256 a07a38b4c94dea5acc2c9660f84e01c7e03244ecada1f3c77ada00025af48976

38

diff --cc sys-cluster/mpich2/Manifest

39

index 5f54022,389d573..ef417e0

40

--- a/sys-cluster/mpich2/Manifest

41

+++ b/sys-cluster/mpich2/Manifest

42

@@@ -14,6 -17,13 +17,19 @@@ AUX mpich2-hvector.patch 2011 RMD160 1a

43

  DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964

44

  DIST mpich2-1.4.1p1.tar.gz 19502854 RMD160 1d355cc07b8675af77b1c255fd10696844447298 SHA1 8dcc8888fb27232eb8f76c11cc890f1c3c483804 SHA256 a20f798ceaad6b0161ddecac98623b65d6a4033072f39ced13b9043916e3d1ee

45

  EBUILD mpich2-1.2.1_p1-r2.ebuild 5030 RMD160 b947f8a8fa374d4e49a407d212a61fdd20986e61 SHA1 264fa061d136685befd2637272510b2298f05ccb SHA256 48abd33f82ce7728c4fe2010c58fce7718e0e50ff0242f4d44d4781532a51a43

46

++<<<<<<< HEAD

47

 +EBUILD mpich2-1.4.1_p1.ebuild 4714 RMD160 a49b7faa577677ee339e61d289aa44018d5a4418 SHA1 36684e8346a54050e2150cadc03d051d414daca8 SHA256 e091de691c7c7fddb619cc6bc44c759866b2302998424fd6e9621fb7d7bb1848

48

 +MISC ChangeLog 5728 RMD160 c305f9e20d011642a1f21f24faf80aad982121d3 SHA1 b535528c38702ff0c4f7d4788afac2732b4ac95b SHA256 221798a06f715aa9c2503093cc46d794cdbc37f9256e9a304e7d1a9f6e538ac2

49

 +MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a

50

++=======

51

+ EBUILD mpich2-1.4.1_p1.ebuild 4779 RMD160 08f5cffd53be5fb3b34758421f408e4196c7a15d SHA1 510cf9c9a48bea54bb4573ac477aecd9ca4f8362 SHA256 c02772bf6fa2e1394691647c3f7d3297c6f451764d54fc994a15de99485531af

52

+ MISC ChangeLog 5601 RMD160 d8a414adb8883087a573543384ee25bb31695058 SHA1 cd7ed83163270871c38c17f315b1b0a45571a86e SHA256 85661b314d33580146a6d46118cc0b7dab1d364674c01a4c631ce801c82fc87e

53

+ MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a

54

+ -----BEGIN PGP SIGNATURE-----

55

+ Version: GnuPG v2.0.17 (GNU/Linux)

56

+

57

+ iEYEARECAAYFAk8NyWQACgkQ4MrvBE1wQ8l53gCeK19kDUNZSiJUfAi4Vdybx5iv

58

+ wx0An2hpRar8mlP5JwNbA6MFRREgrhKM

59

+ =3nzZ

60

+ -----END PGP SIGNATURE-----

61

++>>>>>>> a19ee9358dcfb3269bb741cb6e45e533e1ee5d3f

1	commit: c0ff3c6c91cbfed4417aac81e01e5dd814e1d83d
2	Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
3	AuthorDate: Sat Jan 14 05:29:33 2012 +0000
4	Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5	CommitDate: Sat Jan 14 05:29:33 2012 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c0ff3c6c
7
8	Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci
9
10	Conflicts:
11	sys-cluster/mpich2/Manifest
12
13
14	sci-libs/atlas/Manifest \| 3 +++
15	sys-cluster/mpich2/Manifest \| 16 ++++++++++++++++
16	sys-cluster/mpich2/mpich2-1.4.1_p1.ebuild \| 1 +
17	3 files changed, 20 insertions(+), 0 deletions(-)
18
19	diff --cc sci-libs/atlas/Manifest
20	index cd7bb1d,cd7bb1d..9fff592
21	--- a/sci-libs/atlas/Manifest
22	+++ b/sci-libs/atlas/Manifest
23	@@@ -4,11 -4,11 +4,14 @@@ DIST atlas3.9.46.tar.bz2 5572227 RMD16
24	DIST atlas3.9.47.tar.bz2 5733559 RMD160 036dbe08784bbda33ce1fa94b20a1999b22772cd SHA1 a3a4797669decea28308bd7d3e0adcac44267471 SHA256 ff4d303c7e3e965cf53f6691e110c1dbff76419c292f56b1ba89e6e5c4174fa0
25	DIST atlas3.9.49.tar.bz2 5755631 RMD160 b718c3f343d220460427ba2008bd80d8efeb4a71 SHA1 ae2380986f5622f11fb88c4985e3633613a68fc5 SHA256 fbe55e35da9d8d46a01d13af5755145001edc321e5b240bc21b70c55e5c16289
26	DIST atlas3.9.52.tar.bz2 5427461 RMD160 39d81972153482d2b7e85d3f6b8e07f8949a183d SHA1 3c9e78f9c6ac14d30965a9ce5dad6a38b8422170 SHA256 0376ad5fa51f974c612d51395db588fb8758582c229700b934d905e189d71d99
27	++DIST atlas3.9.62.tar.bz2 6319634 RMD160 8f09fd9f4d1da67e9d37b6ee03f7eb8903b78d98 SHA1 de68fbcd8ecfcf1c9fa78600443b5b26f67a113a SHA256 8767c7481a883db9286b915aa5a9d6fb7be736352742f610aae1ba6803b52c37
28	DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4
29	++DIST lapack-3.4.0.tgz 6127787 RMD160 42599fbc1e9f943454d243097b043daa51668d4e SHA1 910109a931524f8dcc2734ce23fe927b00ca199f SHA256 a7139ef97004d0e3c4c30f1c52d508fd7ae84b5fbaf0dd8e792c167dc306c3e9
30	EBUILD atlas-3.8.4.ebuild 7394 RMD160 4d60e4e8437f509e447988ee841da387d57f3b9e SHA1 bcf373b5fd94f2942e9eb1bd799ed782c21bc481 SHA256 48ce05edf409f60d8d1c9d404b021d0fc3d204194774ef097b838c6a7d0fa8ab
31	EBUILD atlas-3.9.46.ebuild 7396 RMD160 dd985c2b4d8b4fcdd2b41acb851600900b2da74a SHA1 58ffa873126c0cae86761139df14f4ff85c42a45 SHA256 03bb28d219c0dd759c5b68549beee6f6e1800869d1afef8dbe3eace47dce4e61
32	EBUILD atlas-3.9.47.ebuild 7396 RMD160 dd985c2b4d8b4fcdd2b41acb851600900b2da74a SHA1 58ffa873126c0cae86761139df14f4ff85c42a45 SHA256 03bb28d219c0dd759c5b68549beee6f6e1800869d1afef8dbe3eace47dce4e61
33	EBUILD atlas-3.9.49.ebuild 7396 RMD160 dd985c2b4d8b4fcdd2b41acb851600900b2da74a SHA1 58ffa873126c0cae86761139df14f4ff85c42a45 SHA256 03bb28d219c0dd759c5b68549beee6f6e1800869d1afef8dbe3eace47dce4e61
34	EBUILD atlas-3.9.52.ebuild 7396 RMD160 dd985c2b4d8b4fcdd2b41acb851600900b2da74a SHA1 58ffa873126c0cae86761139df14f4ff85c42a45 SHA256 03bb28d219c0dd759c5b68549beee6f6e1800869d1afef8dbe3eace47dce4e61
35	++EBUILD atlas-3.9.62.ebuild 7429 RMD160 707bbc343daed27997c8f15ed25cecfefc86ae9c SHA1 409a34104ec391c7ffb64c8cf1e65cb62883a726 SHA256 9d91e143b20329e3607384a5d5f65be92da216dcc026ec4497f31256bed67926
36	MISC ChangeLog 2360 RMD160 281bd2a873bbb8d22c2e0aa2abd120c1d3b86aa9 SHA1 f01d4e21cc612ee273622298cb07bc013f5d80f5 SHA256 8101a54ca40192962f869a09c8d7e0bce08d578cb4feccf710ba1852519a41d9
37	MISC metadata.xml 617 RMD160 cbafba50b52b844c48932a2f848891b3bb98b5aa SHA1 c086b55d8493b984b461940c14409c9834e5ab5c SHA256 a07a38b4c94dea5acc2c9660f84e01c7e03244ecada1f3c77ada00025af48976
38	diff --cc sys-cluster/mpich2/Manifest
39	index 5f54022,389d573..ef417e0
40	--- a/sys-cluster/mpich2/Manifest
41	+++ b/sys-cluster/mpich2/Manifest
42	@@@ -14,6 -17,13 +17,19 @@@ AUX mpich2-hvector.patch 2011 RMD160 1a
43	DIST mpich2-1.2.1p1.tar.gz 18014859 RMD160 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa SHA1 26bd5620b45bc654aa3945755d11450be63d650c SHA256 a55d1682ee0b5ebbacc047f60620ed291e0a9b3ded3eaeb6a2c81a1598c4c964
44	DIST mpich2-1.4.1p1.tar.gz 19502854 RMD160 1d355cc07b8675af77b1c255fd10696844447298 SHA1 8dcc8888fb27232eb8f76c11cc890f1c3c483804 SHA256 a20f798ceaad6b0161ddecac98623b65d6a4033072f39ced13b9043916e3d1ee
45	EBUILD mpich2-1.2.1_p1-r2.ebuild 5030 RMD160 b947f8a8fa374d4e49a407d212a61fdd20986e61 SHA1 264fa061d136685befd2637272510b2298f05ccb SHA256 48abd33f82ce7728c4fe2010c58fce7718e0e50ff0242f4d44d4781532a51a43
46	++<<<<<<< HEAD
47	+EBUILD mpich2-1.4.1_p1.ebuild 4714 RMD160 a49b7faa577677ee339e61d289aa44018d5a4418 SHA1 36684e8346a54050e2150cadc03d051d414daca8 SHA256 e091de691c7c7fddb619cc6bc44c759866b2302998424fd6e9621fb7d7bb1848
48	+MISC ChangeLog 5728 RMD160 c305f9e20d011642a1f21f24faf80aad982121d3 SHA1 b535528c38702ff0c4f7d4788afac2732b4ac95b SHA256 221798a06f715aa9c2503093cc46d794cdbc37f9256e9a304e7d1a9f6e538ac2
49	+MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a
50	++=======
51	+ EBUILD mpich2-1.4.1_p1.ebuild 4779 RMD160 08f5cffd53be5fb3b34758421f408e4196c7a15d SHA1 510cf9c9a48bea54bb4573ac477aecd9ca4f8362 SHA256 c02772bf6fa2e1394691647c3f7d3297c6f451764d54fc994a15de99485531af
52	+ MISC ChangeLog 5601 RMD160 d8a414adb8883087a573543384ee25bb31695058 SHA1 cd7ed83163270871c38c17f315b1b0a45571a86e SHA256 85661b314d33580146a6d46118cc0b7dab1d364674c01a4c631ce801c82fc87e
53	+ MISC metadata.xml 534 RMD160 8d4fa7f5f4860a520e58b3866b2a2fdc04ab6d83 SHA1 60bc1b41a847e2f9fbf527b204fcafc054d04d33 SHA256 763dc9199c817bb987335dcdddcc65de5f419410aac2f027fc9a2208e91f5c0a
54	+ -----BEGIN PGP SIGNATURE-----
55	+ Version: GnuPG v2.0.17 (GNU/Linux)
56	+
57	+ iEYEARECAAYFAk8NyWQACgkQ4MrvBE1wQ8l53gCeK19kDUNZSiJUfAi4Vdybx5iv
58	+ wx0An2hpRar8mlP5JwNbA6MFRREgrhKM
59	+ =3nzZ
60	+ -----END PGP SIGNATURE-----
61	++>>>>>>> a19ee9358dcfb3269bb741cb6e45e533e1ee5d3f

Gentoo Archives: gentoo-commits