commit: adb78a0f2f4e1fe4316fa9158e0000c76d5dd36f Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> AuthorDate: Sat Sep 12 07:27:43 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sat Sep 12 07:27:43 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=adb78a0f
sci-libs/clfft: Patch merged upstream Package-Manager: portage-2.2.20.1 sci-libs/clfft/ChangeLog | 5 ++++ sci-libs/clfft/clfft-9999.ebuild | 4 --- ...-Install-examples-to-share-clFFT-examples.patch | 29 ---------------------- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/sci-libs/clfft/ChangeLog b/sci-libs/clfft/ChangeLog index 5ccf93b..7156dc3 100644 --- a/sci-libs/clfft/ChangeLog +++ b/sci-libs/clfft/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 12 Sep 2015; Marius Brehler <[email protected]> + -files/clfft-9999-Install-examples-to-share-clFFT-examples.patch, + clfft-9999.ebuild: + sci-libs/clfft: Patch merged upstream + *clfft-2.6.1 (06 Sep 2015) 06 Sep 2015; Marius Brehler <[email protected]> +clfft-2.6.1.ebuild, diff --git a/sci-libs/clfft/clfft-9999.ebuild b/sci-libs/clfft/clfft-9999.ebuild index 73577c7..da8499e 100644 --- a/sci-libs/clfft/clfft-9999.ebuild +++ b/sci-libs/clfft/clfft-9999.ebuild @@ -32,10 +32,6 @@ DEPEND="${RDEPEND}" # Therefore src_test() won't execute any test. RESTRICT="test" -PATCHES=( - "${FILESDIR}/${P}"-Install-examples-to-share-clFFT-examples.patch -) - pkg_pretend() { if [[ ${MERGE_TYPE} != binary ]]; then if [[ $(gcc-major-version) -lt 4 ]] || ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) ; then diff --git a/sci-libs/clfft/files/clfft-9999-Install-examples-to-share-clFFT-examples.patch b/sci-libs/clfft/files/clfft-9999-Install-examples-to-share-clFFT-examples.patch deleted file mode 100644 index 01965d9..0000000 --- a/sci-libs/clfft/files/clfft-9999-Install-examples-to-share-clFFT-examples.patch +++ /dev/null @@ -1,29 +0,0 @@ -Patch to fix location of examples: -https://github.com/clMathLibraries/clFFT/pull/108 - -From 8e34e31465231460d1bda73e34584bc7d4862be1 Mon Sep 17 00:00:00 2001 -From: Marius Brehler <[email protected]> -Date: Sun, 6 Sep 2015 12:01:55 +0200 -Subject: [PATCH] Install examples to share/clFFT/examples - ---- - src/examples/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt -index f93f0fb..0073a34 100644 ---- a/src/examples/CMakeLists.txt -+++ b/src/examples/CMakeLists.txt -@@ -47,7 +47,7 @@ FOREACH(FILE ${FILES}) - OUTPUT_NAME ${EXAMPLE} - RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME}) - -- INSTALL(FILES ${FILE} DESTINATION "share/clFFT") -+ INSTALL(FILES ${FILE} DESTINATION "share/clFFT/examples") - INSTALL(TARGETS ${EXAMPLE_NAME} -- RUNTIME DESTINATION "bin${SUFFIX_BIN}/examples") -+ RUNTIME DESTINATION "share/clFFT/examples") - ENDFOREACH() --- -2.4.6 -
