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

[Aisha Tammy]

commit:     a079c3a271171977d853989ed0411941ba118521
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Fri Sep 25 20:56:35 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Fri Sep 25 20:56:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a079c3a2

dev-libs/boost-compute: fix libdir installation

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 dev-libs/boost-compute/boost-compute-0.4-r1.ebuild | 25 --------------------
 dev-libs/boost-compute/boost-compute-0.5.ebuild    | 23 ------------------
 dev-libs/boost-compute/boost-compute-1.74.0.ebuild |  5 +++-
 dev-libs/boost-compute/boost-compute-9999.ebuild   | 23 ------------------
 .../files/boost-compute-0.4-CMakeLists.patch       | 14 -----------
 .../files/boost-compute-1.74.0-libdir.patch        | 13 +++++++++++
 dev-libs/boost-compute/metadata.xml                | 27 ++++++++++++++++------
 7 files changed, 37 insertions(+), 93 deletions(-)

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 100644
index 2c52edf3c..000000000
--- a/dev-libs/boost-compute/boost-compute-0.4-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost
-	virtual/opencl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/compute-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}"-CMakeLists.patch )

diff --git a/dev-libs/boost-compute/boost-compute-0.5.ebuild b/dev-libs/boost-compute/boost-compute-0.5.ebuild
deleted file mode 100644
index 8ae88db9d..000000000
--- a/dev-libs/boost-compute/boost-compute-0.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost
-	virtual/opencl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/compute-${PV}"

diff --git a/dev-libs/boost-compute/boost-compute-1.74.0.ebuild b/dev-libs/boost-compute/boost-compute-1.74.0.ebuild
index f01c5c268..c400c83bf 100644
--- a/dev-libs/boost-compute/boost-compute-1.74.0.ebuild
+++ b/dev-libs/boost-compute/boost-compute-1.74.0.ebuild
@@ -19,7 +19,7 @@ fi
 
 LICENSE="Boost-1.0"
 SLOT="0"
-IUSE="benchmark bolt cache cuda eigen examples opencv qt tbb test threads vtk"
+IUSE="benchmark bolt cache cpp11 cuda eigen examples opencv qt tbb test threads vtk"
 
 RDEPEND="
 	dev-libs/boost
@@ -27,9 +27,12 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-libdir.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBOOST_COMPUTE_USE_OFFLINE_CACHE=$(usex cache)
+		-DBOOST_COMPUTE_USE_CPP11=$(usex cpp11)
 		-DBOOST_COMPUTE_THREAD_SAFE=$(usex threads)
 		-DBOOST_COMPUTE_HAVE_EIGEN=$(usex eigen)
 		-DBOOST_COMPUTE_HAVE_OPENCV=$(usex opencv)

diff --git a/dev-libs/boost-compute/boost-compute-9999.ebuild b/dev-libs/boost-compute/boost-compute-9999.ebuild
deleted file mode 100644
index fd7276a2d..000000000
--- a/dev-libs/boost-compute/boost-compute-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost
-	virtual/opencl
-"
-DEPEND="${RDEPEND}"

diff --git a/dev-libs/boost-compute/files/boost-compute-0.4-CMakeLists.patch b/dev-libs/boost-compute/files/boost-compute-0.4-CMakeLists.patch
deleted file mode 100644
index 86d3a9e29..000000000
--- a/dev-libs/boost-compute/files/boost-compute-0.4-CMakeLists.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Install the BoostComputeConfig to /usr/lib/cmake instead of /usr/share/cmake.
-
-Patch by Marius Brehler.
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -81,7 +81,7 @@ configure_file(
- # install cmake config file
- install(
-   FILES ${BoostCompute_BINARY_DIR}/BoostComputeConfig.cmake
--  DESTINATION share/cmake/BoostCompute
-+  DESTINATION lib/cmake/BoostCompute
- )
- 
- # install header files

diff --git a/dev-libs/boost-compute/files/boost-compute-1.74.0-libdir.patch b/dev-libs/boost-compute/files/boost-compute-1.74.0-libdir.patch
new file mode 100644
index 000000000..9b35a5284
--- /dev/null
+++ b/dev-libs/boost-compute/files/boost-compute-1.74.0-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d0327ca..e52a62a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,7 +122,7 @@ configure_file(
+ # install cmake config file
+ install(
+   FILES ${BoostCompute_BINARY_DIR}/BoostComputeConfig.cmake
+-  DESTINATION lib/cmake/BoostCompute
++  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/BoostCompute
+ )
+ 
+ # install header files

diff --git a/dev-libs/boost-compute/metadata.xml b/dev-libs/boost-compute/metadata.xml
index f41b18fa7..21973c648 100644
--- a/dev-libs/boost-compute/metadata.xml
+++ b/dev-libs/boost-compute/metadata.xml
@@ -2,20 +2,33 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>marbre@××××××××××××××.de</email>
-		<name>Marius Brehler</name>
+		<email>gentoo@×××××.cc</email>
+		<name>Aisha Tammy</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>sci@g.o</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<longdescription>
-Boost.Compute is a GPU/parallel-computing library for C++ based on
-OpenCL. The core library is a thin C++ wrapper over the OpenCL API
-and provides access to compute devices, contexts, command queues
-and memory buffers.
-</longdescription>
+		Boost.Compute is a GPU/parallel-computing library for C++ based on
+		OpenCL. The core library is a thin C++ wrapper over the OpenCL API
+		and provides access to compute devices, contexts, command queues
+		and memory buffers.
+	</longdescription>
 	<upstream>
 		<remote-id type="github">boostorg/compute</remote-id>
 	</upstream>
+	<use>
+		<flag name="benchmark">build benchmark examples</flag>
+		<flag name="bolt">build bolt examples and tests</flag>
+		<flag name="cpp11">enable C++11 features in examples and tests</flag>
+		<flag name="cache">use offline cache for opencl binaries in examples and tests</flag>
+		<flag name="cuda">build cuda examples and tests</flag>
+		<flag name="eigen">build eigen examples and tests</flag>
+		<flag name="opencv">build opencv examples and tests</flag>
+		<flag name="qt">build qt examples and tests</flag>
+		<flag name="tbb">build examples and tests using tbb backend</flag>
+		<flag name="threads">build thread safe examples and tests</flag>
+		<flag name="vtk">build vtk examples and tests</flag>
+	</use>
 </pkgmetadata>