[gentoo-commits] proj/sci:master commit in: dev-libs/boost-compute/files/, dev-libs/boost-compute/

["Justin Lecher" <jlec@gentoo.org>]

commit:     4912235ae628f7dcbfb9988813f168e737e05aba
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Tue Sep  8 09:12:34 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 09:12:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4912235a

dev-libs/boost-compute: Install includes to /usr/include/boost/compute

Package-Manager: portage-2.2.20.1

 dev-libs/boost-compute/ChangeLog                   |  8 ++++++++
 dev-libs/boost-compute/boost-compute-0.4-r1.ebuild |  1 -
 ...ute-9999.ebuild => boost-compute-0.4-r2.ebuild} | 22 +++++++++-------------
 dev-libs/boost-compute/boost-compute-9999.ebuild   | 21 +++++++--------------
 ...te-0.4-Fix-install-destination-of-headers.patch | 22 ++++++++++++++++++++++
 5 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/dev-libs/boost-compute/ChangeLog b/dev-libs/boost-compute/ChangeLog
index 1beef49..e7d434f 100644
--- a/dev-libs/boost-compute/ChangeLog
+++ b/dev-libs/boost-compute/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*boost-compute-0.4-r2 (08 Sep 2015)
+
+  08 Sep 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +boost-compute-0.4-r2.ebuild,
+  +files/boost-compute-0.4-Fix-install-destination-of-headers.patch,
+  -boost-compute-0.4-r1.ebuild, boost-compute-9999.ebuild:
+  dev-libs/boost-compute: Install includes to /usr/include/boost/compute
+
   05 Jun 2015; Marius Brehler <marbre@linux.sungazer.de>
   boost-compute-9999.ebuild, metadata.xml:
   dev-libs/boost-compute: Update HOMEPAGE, SRC_URI and github remote-id: project

diff --git a/dev-libs/boost-compute/boost-compute-0.4-r1.ebuild b/dev-libs/boost-compute/boost-compute-0.4-r1.ebuild
deleted file mode 120000
index 9782d2a..0000000
--- a/dev-libs/boost-compute/boost-compute-0.4-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-boost-compute-9999.ebuild
\ No newline at end of file

diff --git a/dev-libs/boost-compute/boost-compute-9999.ebuild b/dev-libs/boost-compute/boost-compute-0.4-r2.ebuild
similarity index 51%
copy from dev-libs/boost-compute/boost-compute-9999.ebuild
copy to dev-libs/boost-compute/boost-compute-0.4-r2.ebuild
index 93b8d7b..bd588d2 100644
--- a/dev-libs/boost-compute/boost-compute-9999.ebuild
+++ b/dev-libs/boost-compute/boost-compute-0.4-r2.ebuild
@@ -8,25 +8,21 @@ inherit eutils cmake-utils
 
 DESCRIPTION="A header-only C++ Computing Library for OpenCL"
 HOMEPAGE="https://github.com/boostorg/compute"
+SRC_URI="https://github.com/boostorg/compute/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+S="${WORKDIR}/compute-${PV}"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/boostorg/compute.git git://github.com/boostorg/compute.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/boostorg/compute/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/compute-${PV}"
-fi
+
+PATCHES=(
+	"${FILESDIR}/${P}"-Fix-install-destination-of-headers.patch
+	"${FILESDIR}/${P}"-CMakeLists.patch
+)
+
 
 RDEPEND="
 	dev-libs/boost
 	virtual/opencl
 "
 DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-0.4-CMakeLists.patch
-)

diff --git a/dev-libs/boost-compute/boost-compute-9999.ebuild b/dev-libs/boost-compute/boost-compute-9999.ebuild
index 93b8d7b..f4c2059 100644
--- a/dev-libs/boost-compute/boost-compute-9999.ebuild
+++ b/dev-libs/boost-compute/boost-compute-9999.ebuild
@@ -4,29 +4,22 @@
 
 EAPI=5
 
-inherit eutils cmake-utils
+inherit eutils cmake-utils git-r3
 
 DESCRIPTION="A header-only C++ Computing Library for OpenCL"
 HOMEPAGE="https://github.com/boostorg/compute"
+EGIT_REPO_URI="https://github.com/boostorg/compute.git git://github.com/boostorg/compute.git"
+KEYWORDS=""
 
 LICENSE="Boost-1.0"
 SLOT="0"
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/boostorg/compute.git git://github.com/boostorg/compute.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/boostorg/compute/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/compute-${PV}"
-fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-0.4-Fix-install-destination-of-headers.patch
+)
 
 RDEPEND="
 	dev-libs/boost
 	virtual/opencl
 "
 DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-0.4-CMakeLists.patch
-)

diff --git a/dev-libs/boost-compute/files/boost-compute-0.4-Fix-install-destination-of-headers.patch b/dev-libs/boost-compute/files/boost-compute-0.4-Fix-install-destination-of-headers.patch
new file mode 100644
index 0000000..c37ddd5
--- /dev/null
+++ b/dev-libs/boost-compute/files/boost-compute-0.4-Fix-install-destination-of-headers.patch
@@ -0,0 +1,22 @@
+From 3df0527cad686a4e9a3cd84ead97702cf8964da3 Mon Sep 17 00:00:00 2001
+From: Marius Brehler <marius.brehler@tu-dortmund.de>
+Date: Tue, 8 Sep 2015 10:35:56 +0200
+Subject: [PATCH] Fix install destination of headers
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3695681..56b47b6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -109,4 +109,4 @@ install(
+ )
+ 
+ # install header files
+-install(DIRECTORY include/boost DESTINATION include/compute)
++install(DIRECTORY include/boost DESTINATION include)
+-- 
+2.4.6
+