1 |
commit: 7845c582ba988abe5ac7bd9fe42155dda792585a |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 29 14:48:51 2011 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 29 14:48:51 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7845c582 |
7 |
|
8 |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci |
9 |
|
10 |
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci: |
11 |
Version bump. |
12 |
|
13 |
Conflicts: |
14 |
dev-cpp/eigen/ChangeLog |
15 |
dev-cpp/eigen/Manifest |
16 |
|
17 |
|
18 |
dev-cpp/eigen/ChangeLog | 10 ++++++ |
19 |
dev-cpp/eigen/Manifest | 30 +++++++++++++++++-- |
20 |
.../{eigen-3.0.1-r2.ebuild => eigen-3.0.2.ebuild} | 1 + |
21 |
3 files changed, 37 insertions(+), 4 deletions(-) |
22 |
|
23 |
diff --cc dev-cpp/eigen/ChangeLog |
24 |
index 3485cb2,1a25afe..87125c3 |
25 |
--- a/dev-cpp/eigen/ChangeLog |
26 |
+++ b/dev-cpp/eigen/ChangeLog |
27 |
@@@ -2,10 -2,11 +2,20 @@@ |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/eigen/ChangeLog,v 1.44 2011/03/25 16:01:28 jlec Exp $ |
30 |
|
31 |
++*eigen-3.0.2 (29 Aug 2011) |
32 |
++ |
33 |
++ 29 Aug 2011; Justin Lecher <jlec@g.o> +eigen-3.0.2.ebuild: |
34 |
++ Corrected doc installation, thanks James Cloos for the fix |
35 |
++ |
36 |
+ 29 Aug 2011; Justin Lecher <jlec@g.o> eigen-3.0.1-r2.ebuild, |
37 |
+ eigen-9999.ebuild, metadata.xml: |
38 |
+ Corrected doc installation, thanks James Cloos for the fix |
39 |
+ |
40 |
+ * eigen-3.0.2 (29 Aug 2011) |
41 |
+ |
42 |
+ 29 Aug 2011; Andrea Arteaga <andyspiros@×××××.com> eigen-3.0.2.ebuild |
43 |
+ Version bump. |
44 |
+ |
45 |
19 Aug 2011; Andrea Arteaga <andyspiros@×××××.com> eigen-9999.ebuild |
46 |
Removed ~x86 and ~amd64 keyworkds (mask). |
47 |
|
48 |
diff --cc dev-cpp/eigen/Manifest |
49 |
index b66a4ac,2572084..9f00bd8 |
50 |
--- a/dev-cpp/eigen/Manifest |
51 |
+++ b/dev-cpp/eigen/Manifest |
52 |
@@@ -1,15 -1,7 +1,37 @@@ |
53 |
+-----BEGIN PGP SIGNED MESSAGE----- |
54 |
+Hash: SHA512 |
55 |
+ |
56 |
++- -----BEGIN PGP SIGNED MESSAGE----- |
57 |
++Hash: SHA512 |
58 |
++ |
59 |
++- - -----BEGIN PGP SIGNED MESSAGE----- |
60 |
++Hash: SHA512 |
61 |
++ |
62 |
DIST eigen-3.0.1.tar.bz2 903484 RMD160 ac3343dddc208cada82d316b78b1b34d7031eafe SHA1 6fe629cd1eaef1a44430a068ff7202fc27209ee4 SHA256 d4d10aabe3fb92b2eadf71a0f15f0129864c6f80def31bdbd2a8d8ead132e5a6 |
63 |
+ DIST eigen-3.0.2.tar.bz2 955760 RMD160 7686dc72ac8ee96cb055d4bca8cd6da526d5780c SHA1 2bcc7a6b415f5c75b5e061a399c3f9ab9aadb708 SHA256 cd76169b426f89b667db24beaaaf2d982b48664d9615ad781bdf9e83f0be5e5f |
64 |
-EBUILD eigen-3.0.1-r2.ebuild 2034 RMD160 588c2a9b2028a2726cbaa5bd4e38703e2134d676 SHA1 bbf2cadbae809f103b48deae840014778c99c316 SHA256 1ab396b9bfb426aca8094ac1c192b1caf284e5147af1c810d7560495c374c923 |
65 |
-EBUILD eigen-3.0.2.ebuild 2102 RMD160 f7edaeb63f785a257ec0e7438f18656438012e7e SHA1 dfd7868d9ab03fb7ee0bf81f6d6a045a910dbf2e SHA256 65ceb6486a4ee4c078a406280ad37ebaf2754097861a6bc1b16dcc2d2c98a313 |
66 |
-EBUILD eigen-9999.ebuild 1961 RMD160 9ff6058e146b2609c1a66665f23e67cbd62580b2 SHA1 b0f02fed55bc0985c52522384c00708f2265c804 SHA256 a01f58d6df312580591caf43ac9f750165c9ebcbe34fd1f08d5b825f5e83458f |
67 |
-MISC ChangeLog 6835 RMD160 a55bcdd43635076b24bca99b9e0dfd32a573e7b7 SHA1 4bedce6dffb05c3a51833d17f31437798d56999a SHA256 411693400be744252cf92e3cafeea59bf64b77eff678a28e3853f3bdb51005cf |
68 |
-MISC metadata.xml 862 RMD160 c350c291df4c6b432a8c4d3094d9bd9f23fcbf15 SHA1 e05bd963b1e7eee9889ce01bed367dfaba71bedd SHA256 77d97c43534f73b933fa724698acae16705bf86ad32d9faf47bf020f5d8277fb |
69 |
+EBUILD eigen-3.0.1-r2.ebuild 2038 RMD160 ba6b7960f7e73cf8389a4efbcc932a622dcf84c9 SHA1 52082b7904a0a703e79d939c0568ee509dad2803 SHA256 446e2f58e41b8285c24774e83a58a941adfd786310ff7ead28c1a099d1d703b4 |
70 |
++EBUILD eigen-3.0.2.ebuild 2106 RMD160 6c1dbc11ebdf4863eec35197c9f43093a4c592a6 SHA1 2375bc3c4d7909baccd2328c3a5452209d1b68c2 SHA256 ea53c2ae7f23d78dc9cee892eff8f258f81c609da9851f7259faa90345f95bc9 |
71 |
+EBUILD eigen-9999.ebuild 1965 RMD160 09b9d492e0f8d51545f58c77c914a96aa9fe3f13 SHA1 1407975ba4b73388d740824817e0f9954f730dc7 SHA256 7383a573d2a00ad8ee49ddffde8da0676499241e2e35a61de96ca42fdc2c2642 |
72 |
- MISC ChangeLog 6884 RMD160 d0e697788824bc536b36e37511d061f3b25355b5 SHA1 b4a4b5e3de519ce3f210e3d6f2b4be227b9854b8 SHA256 1550fadb6e93415a0bab6282c6ee36b9c1d5e93c296c8a7deee4a12987070c5f |
73 |
++MISC ChangeLog 7160 RMD160 1b592a23619fc1c3582711a8cf74fa17db264b33 SHA1 94ff55a08c02413f2f569ea6315f031835d31c88 SHA256 0af3a8db785fd761aee523a54e91233d9e0b437f225cbad4c1fb2150ad24eb9f |
74 |
+MISC metadata.xml 867 RMD160 aa9dd92c298151ecc8c6f7bbb4d18f85be82bfac SHA1 06d4827b1fd0f87cf7aa23ca28b389a2c0dcc785 SHA256 6d74c99087833e44098a46949815591563c8df4a3812444472f1330d64155548 |
75 |
++- - -----BEGIN PGP SIGNATURE----- |
76 |
++Version: GnuPG v2.0.18 (GNU/Linux) |
77 |
++ |
78 |
++iEYEAREKAAYFAk5bpo0ACgkQgAnW8HDreRYeewCfYRTHSb/z4yZ5q5KbXedrA0t2 |
79 |
++jwgAn2ME0gnmkzMQyu7Kq8QIHFbIMafV |
80 |
++=RbMg |
81 |
++- - -----END PGP SIGNATURE----- |
82 |
++- -----BEGIN PGP SIGNATURE----- |
83 |
++Version: GnuPG v2.0.18 (GNU/Linux) |
84 |
++ |
85 |
++iEYEAREKAAYFAk5bprYACgkQgAnW8HDreRYF9gCgsVLd1KmwZvnQRV1L3qf99qfS |
86 |
++7zoAnj8tmfZywJcZvo4Egr7qjNmsd023 |
87 |
++=Zddv |
88 |
++- -----END PGP SIGNATURE----- |
89 |
+-----BEGIN PGP SIGNATURE----- |
90 |
+Version: GnuPG v2.0.18 (GNU/Linux) |
91 |
+ |
92 |
- iEYEAREKAAYFAk5bpfwACgkQgAnW8HDreRZD5wCgkhbqB2+raAeBY23+MMyBw8U6 |
93 |
- Ji4Ani4WHyVV6yka96G/+NiRPXNc0IR0 |
94 |
- =mjUi |
95 |
++iEYEAREKAAYFAk5bpsEACgkQgAnW8HDreRYUzQCgnjfBSL5ewtIe+aa5Y8Sk2+Hc |
96 |
++8f8AoKUdU0+PH7iDWW47Da2/jDIPnpya |
97 |
++=+N9e |
98 |
+-----END PGP SIGNATURE----- |