gentoo resync : 07.04.2018

3 files changed, 139 insertions, 0 deletions

diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index 5a05ea913fe7..dad0c40d9a08 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -1,4 +1,5 @@
 AUX xmr-stak-2.3.0.service 942 BLAKE2B a237a5273d6b1fc3a2dd69b121e1ca61471f9524ced84d3ae90082571148c563c4cdedf3085b246f8a8b5babc56c7cf742ea48f1f68165c443373f57efcd2139 SHA512 04ea288a2b51480db5ebde3926d453006aad1b8b028e6e60663ba8a11ad876ce2c4070a20715645187dd7e90898d2e865a286df170c82930622042ea14798359
+AUX xmr-stak-2.4.2-fix-paths.patch 2751 BLAKE2B 80aba77f8a34a0a6b198eef222013002193e167c5c76d83c62aedb29fcce8f2441d33d5d9095ec7163866cc4df5b0efc9f1127ae1db1552b26a2f561c811b3ad SHA512 ac8cc0559bbdd7c46dac3382179c1a76f597105675de39bd8024ad01026f598ff7ed7efeca3e82631c6aed0dbe1dff1d2c1b4939e2788f587ab78cdd8554c0cc
 AUX xmr-stak.service 915 BLAKE2B b2dd73404538be09624ebd71f4b45f946ad1fad7a8be9b91a448b9c88ea7499d7deb8595fef32072334fc2b4ebccf90093254fa04eda1afa85c69ba02f7ac86d SHA512 a10b4ca777339bc640d03462d317480083ee4a65617260473e4e65773ca3d4c4db472da3a32b6b1b301dccd8168d624df01ddc45e698419906611ac27015e126
 DIST xmr-stak-2.2.0.tar.gz 316309 BLAKE2B 8a5042e91eff1d7a49dcf50d67430f21459509443117150f59f861edb0c145e0f336cb617ea4f2a7edfd923493efbc8f5ce9cd134a7f7af14b270c8cfdd3cc24 SHA512 1ec30b1f97043307461816e61cb7afaf9e77cfad895b13f5facf98f34da8d9b8751d9885930b0a38777017978fb4f25bb3a69a1c2a5db47b1a851bc88cd7d78d
 DIST xmr-stak-2.3.0.tar.gz 333364 BLAKE2B f8824f545ea08267eb9f670f2aaba7cb2e98693e5603dee5fbe54bb3f3ebc21509f26bb0d10239b79675e3ce32a2f4b32b591fb3af51b4c716fbb84beeb7326e SHA512 2828789ac63ab3cb13e36c6f86d9cf82f21f15f51df873a8a3e42757d16357653823d28103f2a076afa67ce7ca277ec92c5aee25fc823806e85c3a8c80b4ae5d
@@ -7,6 +8,7 @@ DIST xmr-stak-2.4.2.tar.gz 334041 BLAKE2B 7d37ffd2e3d5f8a25692fe2ebdc8a75242fb02
 EBUILD xmr-stak-2.2.0.ebuild 1754 BLAKE2B fc921b9830ae5b06239be726cea03b03857c131341febfc28ba1eacd69bdc274ec10522da0d3921ed6c993a5be56177deaa4ebe95d422af878f7f8c47a888295 SHA512 5543e31a61d53b7c8e8dd42d23814eda07d672803dd66d1eaec9a1aa822a31f1044750aacf61366782b644eec4f5fdad5de4cacbc5248a737666b02598012f61
 EBUILD xmr-stak-2.3.0.ebuild 1793 BLAKE2B 641ebf7cf99fe4bc01716b1b5d11f5b080016bae70c7ccd7aeae7a683f94c222d48595467e20567aed12293c21369ee60f5e25a3ef410b318f50af5ea1035cc8 SHA512 d1b4034de433e600054f4e4028b2abc6092d3655c473b130679afb97b1d523f9c551bc79b868c01ce494f7ac4f65334f942124aa545a12b10aa9847ca5e5b23b
 EBUILD xmr-stak-2.4.1.ebuild 1793 BLAKE2B 641ebf7cf99fe4bc01716b1b5d11f5b080016bae70c7ccd7aeae7a683f94c222d48595467e20567aed12293c21369ee60f5e25a3ef410b318f50af5ea1035cc8 SHA512 d1b4034de433e600054f4e4028b2abc6092d3655c473b130679afb97b1d523f9c551bc79b868c01ce494f7ac4f65334f942124aa545a12b10aa9847ca5e5b23b
+EBUILD xmr-stak-2.4.2-r1.ebuild 1886 BLAKE2B 551770a4783297d2b6a13101a280b591b5823eb81decab94754cd27fec91c29c9c67f1180bc1f957c092b6690be13065a4f35db97e2ab5e37e56f1fe597b2ef9 SHA512 7ae6ef7168282a09273ec03932c48fa030c5e2e5b2d36476c9638b65e803ca98397cfa6b27ce2454d047eaa7a04d86468a1073bb766b9f900169da99f3d12765
 EBUILD xmr-stak-2.4.2.ebuild 1793 BLAKE2B 641ebf7cf99fe4bc01716b1b5d11f5b080016bae70c7ccd7aeae7a683f94c222d48595467e20567aed12293c21369ee60f5e25a3ef410b318f50af5ea1035cc8 SHA512 d1b4034de433e600054f4e4028b2abc6092d3655c473b130679afb97b1d523f9c551bc79b868c01ce494f7ac4f65334f942124aa545a12b10aa9847ca5e5b23b
 EBUILD xmr-stak-9999.ebuild 1793 BLAKE2B 641ebf7cf99fe4bc01716b1b5d11f5b080016bae70c7ccd7aeae7a683f94c222d48595467e20567aed12293c21369ee60f5e25a3ef410b318f50af5ea1035cc8 SHA512 d1b4034de433e600054f4e4028b2abc6092d3655c473b130679afb97b1d523f9c551bc79b868c01ce494f7ac4f65334f942124aa545a12b10aa9847ca5e5b23b
 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch b/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch
new file mode 100644
index 000000000000..cd71554b3770
--- /dev/null
+++ b/net-p2p/xmr-stak/files/xmr-stak-2.4.2-fix-paths.patch
@@ -0,0 +1,68 @@
+From 3bbf91be9f510ef999c62ae2d42a094d271299b7 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Fri, 6 Apr 2018 14:56:44 -0400
+Subject: [PATCH 1/2] Use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH
+
+Use EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH to control the path to which the executable and libraries are installed.
+---
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 15a2684c..66c2f6f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -535,23 +535,23 @@ target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend)
+ # do not install the binary if the project and install are equal
+ if( NOT CMAKE_INSTALL_PREFIX STREQUAL PROJECT_BINARY_DIR )
+     install(TARGETS xmr-stak
+-            RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++            RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${EXECUTABLE_OUTPUT_PATH}")
+     if(CUDA_FOUND)
+         if(WIN32)
+             install(TARGETS xmrstak_cuda_backend
+-                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
+         else()
+             install(TARGETS xmrstak_cuda_backend
+-                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
+         endif()
+     endif()
+     if(OpenCL_FOUND)
+         if(WIN32)
+             install(TARGETS xmrstak_opencl_backend
+-                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++                RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
+         else()
+             install(TARGETS xmrstak_opencl_backend
+-                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++                LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_PATH}")
+         endif()
+     endif()
+ else()
+
+From c1d907ee03795fdce80daba6395e2a7eb1333930 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Fri, 6 Apr 2018 15:11:07 -0400
+Subject: [PATCH 2/2] Allow EXECUTABLE and LIBRARY paths to be set
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66c2f6f8..1ff7fbb4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -522,8 +522,8 @@ else()
+     add_executable(xmr-stak ${SRCFILES_CPP})
+ endif()
+ 
+-set(EXECUTABLE_OUTPUT_PATH "bin")
+-set(LIBRARY_OUTPUT_PATH "bin")
++set(EXECUTABLE_OUTPUT_PATH "bin" CACHE STRING "Path to place executables")
++set(LIBRARY_OUTPUT_PATH "bin" CACHE STRING "Path to place libraries")
+ 
+ target_link_libraries(xmr-stak ${LIBS} xmr-stak-c xmr-stak-backend)
+ 
diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.2-r1.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..046820ffa943
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.4.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/fireice-uk/xmr-stak.git"
+	EGIT_BRANCH="dev"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/fireice-uk/xmr-stak/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Unified all-in-one Monero miner"
+HOMEPAGE="https://github.com/fireice-uk/xmr-stak"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cuda devfee hwloc opencl ssl webserver"
+
+DEPEND="cuda? ( dev-util/nvidia-cuda-toolkit )
+	hwloc? ( sys-apps/hwloc )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:0= )
+	webserver? ( net-libs/libmicrohttpd )"
+RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.2-fix-paths.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	if ! use devfee; then
+		sed -i -e 's!fDevDonationLevel = .*;!fDevDonationLevel = 0.0;!' xmrstak/donate-level.hpp || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCUDA_ENABLE=$(usex cuda)
+		-DHWLOC_ENABLE=$(usex hwloc)
+		-DMICROHTTPD_ENABLE=$(usex webserver)
+		-DOpenCL_ENABLE=$(usex opencl)
+		-DOpenSSL_ENABLE=$(usex ssl)
+		-DLIBRARY_OUTPUT_PATH=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	systemd_newunit "${FILESDIR}"/${PN}-2.3.0.service ${PN}.service
+	dodir /etc/xmr-stak
+}
+
+pkg_postinst() {
+	if [ ! -e "${ROOT}etc/xmr-stak/main.config" ]; then
+		ewarn "To use xmr-stack:"
+		if use cuda || use opencl; then
+			ewarn "As root or as a user that is a member of the 'video' group,"
+		fi
+		ewarn "run:"
+		ewarn "/usr/bin/xmr-stak --cpu /etc/xmr-stak/cpu.config --amd /etc/xmr-stak/amd.config --nvidia /etc/xmr-stak/nvidia.config -c /etc/xmr-stak/main.config"
+		ewarn "If the systemd will be used, xmr-stak can now be terminated and 'systemctl start xmr-stak' can be used."
+	fi
+}