commit: 9fe1eb6ce3cefecfaef0cda767eb23262abd792a Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Dec 1 09:28:38 2014 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Dec 1 09:28:38 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9fe1eb6c
Merge remote-tracking branch 'github/master' * github/master: dev-util/nvidia-cuda-gdk: Remove RESTRICT, add QA_PREBUILT dev-util/nvidia-cuda-gdk: Fix symlink sci-misc/mendeleydesktop: adjust QA flags, add pkg_postrm sci-misc/mendeleydesktop: update Changelog and Manifest sci-misc/mendeleydekstop: add fdo-mime_*_database_update to pkg_postinst sci-misc/mendeleydesktop: make use of make_wrapper sci-misc/mendeleydesktop: fix missing die, EAPI and QA flags fixed a typo preventing AVX2 support (bug #530454) sci-misc/mendeleydesktop: add ebuild to overlay Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> Conflicts: dev-util/nvidia-cuda-gdk/ChangeLog dev-util/nvidia-cuda-gdk/Manifest dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild dev-util/nvidia-cuda-gdk/ChangeLog | 4 + .../nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild | 8 +- licenses/Mendeley-EULA | 264 +++++++++++++++++++++ sci-chemistry/gromacs/ChangeLog | 4 + sci-chemistry/gromacs/gromacs-5.0.9999.ebuild | 2 +- sci-chemistry/gromacs/gromacs-9999.ebuild | 2 +- sci-misc/mendeleydesktop/ChangeLog | 16 ++ sci-misc/mendeleydesktop/Manifest | 5 + .../mendeleydesktop/mendeleydesktop-1.12.3.ebuild | 121 ++++++++++ sci-misc/mendeleydesktop/metadata.xml | 10 + 10 files changed, 433 insertions(+), 3 deletions(-) diff --cc dev-util/nvidia-cuda-gdk/ChangeLog index 2526e36,6d816c8..169f0dc --- a/dev-util/nvidia-cuda-gdk/ChangeLog +++ b/dev-util/nvidia-cuda-gdk/ChangeLog @@@ -2,9 -2,10 +2,13 @@@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 Dec 2014; Justin Lecher <j...@gentoo.org> nvidia-cuda-gdk-340.29.ebuild: + Drop empty lines, clean variable names and quoting + + 30 Nov 2014; Marius Brehler <mar...@linux.sungazer.de> + nvidia-cuda-gdk-340.29.ebuild: + Fix symlink + 19 Nov 2014; Marius Brehler <mar...@linux.sungazer.de> nvidia-cuda-gdk-340.29.ebuild: Add ~x86 keyword diff --cc dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild index 99a4765,27a22a0..787e371 --- a/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild +++ b/dev-util/nvidia-cuda-gdk/nvidia-cuda-gdk-340.29.ebuild @@@ -80,9 -76,8 +83,10 @@@ src_install() fi ebegin "Cleaning before installation..." - find -type f \( -name "*.o" -o -name "*.pdf" -o -name "*.txt" -o -name "*.3" \) -delete || die + find -type f \ + \( -name "*.o" -o -name "*.pdf" -o -name "*.txt" -o -name "*.3" \) -delete \ + || die + rm -f "${S}"/nvml/lib/libnvidia-ml.so eend if use healthmon; then