1 |
commit: 9fe1eb6ce3cefecfaef0cda767eb23262abd792a |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 1 09:28:38 2014 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 1 09:28:38 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9fe1eb6c |
7 |
|
8 |
Merge remote-tracking branch 'github/master' |
9 |
|
10 |
* github/master: |
11 |
dev-util/nvidia-cuda-gdk: Remove RESTRICT, add QA_PREBUILT |
12 |
dev-util/nvidia-cuda-gdk: Fix symlink |
13 |
sci-misc/mendeleydesktop: adjust QA flags, add pkg_postrm |
14 |
sci-misc/mendeleydesktop: update Changelog and Manifest |
15 |
sci-misc/mendeleydekstop: add fdo-mime_*_database_update to pkg_postinst |
16 |
sci-misc/mendeleydesktop: make use of make_wrapper |
17 |
sci-misc/mendeleydesktop: fix missing die, EAPI and QA flags |
18 |
fixed a typo preventing AVX2 support (bug #530454) |
19 |
sci-misc/mendeleydesktop: add ebuild to overlay |
20 |
|
21 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
22 |
|
23 |
Conflicts: |
24 |
dev-util/nvidia-cuda-gdk/ChangeLog |
25 |
dev-util/nvidia-cuda-gdk/Manifest |
26 |
dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild |
27 |
|
28 |
|
29 |
dev-util/nvidia-cuda-gdk/ChangeLog | 4 + |
30 |
.../nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild | 8 +- |
31 |
licenses/Mendeley-EULA | 264 +++++++++++++++++++++ |
32 |
sci-chemistry/gromacs/ChangeLog | 4 + |
33 |
sci-chemistry/gromacs/gromacs-5.0.9999.ebuild | 2 +- |
34 |
sci-chemistry/gromacs/gromacs-9999.ebuild | 2 +- |
35 |
sci-misc/mendeleydesktop/ChangeLog | 16 ++ |
36 |
sci-misc/mendeleydesktop/Manifest | 5 + |
37 |
.../mendeleydesktop/mendeleydesktop-1.12.3.ebuild | 121 ++++++++++ |
38 |
sci-misc/mendeleydesktop/metadata.xml | 10 + |
39 |
10 files changed, 433 insertions(+), 3 deletions(-) |
40 |
|
41 |
diff --cc dev-util/nvidia-cuda-gdk/ChangeLog |
42 |
index 2526e36,6d816c8..169f0dc |
43 |
--- a/dev-util/nvidia-cuda-gdk/ChangeLog |
44 |
+++ b/dev-util/nvidia-cuda-gdk/ChangeLog |
45 |
@@@ -2,9 -2,10 +2,13 @@@ |
46 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
47 |
# $Header: $ |
48 |
|
49 |
+ 01 Dec 2014; Justin Lecher <jlec@g.o> nvidia-cuda-gdk-340.29.ebuild: |
50 |
+ Drop empty lines, clean variable names and quoting |
51 |
+ |
52 |
+ 30 Nov 2014; Marius Brehler <marbre@××××××××××××××.de> |
53 |
+ nvidia-cuda-gdk-340.29.ebuild: |
54 |
+ Fix symlink |
55 |
+ |
56 |
19 Nov 2014; Marius Brehler <marbre@××××××××××××××.de> |
57 |
nvidia-cuda-gdk-340.29.ebuild: |
58 |
Add ~x86 keyword |
59 |
diff --cc dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild |
60 |
index 99a4765,27a22a0..787e371 |
61 |
--- a/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild |
62 |
+++ b/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild |
63 |
@@@ -80,9 -76,8 +83,10 @@@ src_install() |
64 |
fi |
65 |
|
66 |
ebegin "Cleaning before installation..." |
67 |
- find -type f \( -name "*.o" -o -name "*.pdf" -o -name "*.txt" -o -name "*.3" \) -delete || die |
68 |
+ find -type f \ |
69 |
+ \( -name "*.o" -o -name "*.pdf" -o -name "*.txt" -o -name "*.3" \) -delete \ |
70 |
+ || die |
71 |
+ rm -f "${S}"/nvml/lib/libnvidia-ml.so |
72 |
eend |
73 |
|
74 |
if use healthmon; then |