gentoo resync : 20.02.2019

10 files changed, 73 insertions, 102 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 3850088c43cc..a50749121e15 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ctorrent/Manifest b/net-p2p/ctorrent/Manifest
index e14888500b39..235949db336c 100644
--- a/net-p2p/ctorrent/Manifest
+++ b/net-p2p/ctorrent/Manifest
@@ -2,7 +2,5 @@ AUX ctorrent-3.3.2-empty-path-components.patch 838 BLAKE2B 429629e3a774738f49251
 AUX ctorrent-3.3.2-negative-ints.patch 442 BLAKE2B 5580122a22c750e253f6a229f83b4db37d2222a0cdf4c0b3cce217164ac558b622e426c064d211aa13a83e372754240e57753a401ff5d6b3aa071a5679ced8a2 SHA512 edc950552e3497d91a98ba320d4fbc49284f07f9a130230a765427b91e1dcde099610d5be16c4b9c9969a446d8908c18dd3884eb207901ae46e4b696d1215150
 AUX ctorrent-CVE-2009-1759.patch 10951 BLAKE2B 852f88d508f7b8d00f3e09d8076985adb16bc3e741adc3df8a152cfb79e5c4bf66759a4eec01405dbd706e0eb357f8dcef5004cbc99ed4fc55fe00330df67de2 SHA512 9ab3080fc58564e48f5404bb29affe621d4d5c52ded858378354084a350e9f7932d579433cdc25b684627116c728b70affe8a352a316eb028cab1f326c13ee20
 DIST ctorrent-dnh3.3.2.tar.gz 219053 BLAKE2B a05958e85721b8a119a9ee9fdf80071456420b023767bda1c19d9021646236745ee6515bea1213ea3a513fad47ae0f7ecb843504e8015b5ed23b964e16b08f4c SHA512 e59b2b899b8603e42a5754d5ce65f661b135b8e107140e0472af379b2b06ee2985239ed0ebf19dcaef788e617b99eac35ad32ad2d10352e2fcf5a6dc084d27dd
-EBUILD ctorrent-3.3.2-r2.ebuild 621 BLAKE2B acad04bb8ba23b8fa5c4ac763e3e5092af0ab3582a36b9232d13b616c2a427fb8ff6ce847e863b902d9f276ce71b5b5ea9818c7139459c3de51a630bd11e8071 SHA512 e7bf0ab4e23771852cbba7d7bd17b9c6695fa84a797b5ef200e68f02606bbedbd26277648856b036a2f025ad2122720340aadd81de7a831336910aaec36cac1c
-EBUILD ctorrent-3.3.2-r3.ebuild 680 BLAKE2B dff20a05e5188fb28a465226cfda971e1df04bf741d8c0795c258b8baae9b6caefc7cad93ec7f7f54ec18ce1d816a448eff62cfe8b96ead73be7849227c3e67a SHA512 6c8022bfd0f631159d44af684fb5c2a57dbb21f9694787dc720374d17f0b7d7474517ac54d06c164fdc1422570036cf67ef07c4483b81789af335fe3bb582be5
-EBUILD ctorrent-3.3.2-r4.ebuild 696 BLAKE2B 2e2af93af6dd6c81dfba804692662b1ee8b8bf25d16121538ce8a5364631aa09db83e533cc3a3180f7876826c368c250002a42f279879babb4c892690e5de3e5 SHA512 a451cbe636f25c5b474b00d94b31ea1c0475d918686a11928a46cc217b4522f168c19864fcf3006e43b0bd6fa957a5ad1bfd2e51f8603a2cf79e7ff4177f2434
+EBUILD ctorrent-3.3.2-r4.ebuild 694 BLAKE2B be756d2644593efa2f072372680cb640b416bbcc6cb26f99fd11b8a355ee69c00aff6e7003a39a28a9f5083319e345efb7f0bb026f7b391dde49030b26f2be75 SHA512 cab13a3afeefebc5a166603926ee448dbed9053e7821acce81003c7150d8539fa4243131a38f56999dfaa8accb734cd744c84e4910a17d5d3fe291891e79aaa7
 MISC metadata.xml 245 BLAKE2B 135efc8148ddf902795388aef90e078b6e9793d8913798723b71abd479a0468bd68be0f21ab36508835ab5e4e5618a0e16d601aabc3755022df6b52075e51036 SHA512 2614273ab49d7d71d4a7c39fde414a2337c4f62fa92f9b803d900dcae5c79299c894a1161ff14269d20f436376c5388b3e3f0cd3ad9d2b6ae766366c7029d6bb
diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild
deleted file mode 100644
index a93b57767ba5..000000000000
--- a/net-p2p/ctorrent/ctorrent-3.3.2-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${PN}-dnh${PV}"
-
-DESCRIPTION="Enhanced CTorrent is a BitTorrent console client written in C and C++"
-HOMEPAGE="http://www.rahul.net/dholmes/ctorrent/"
-SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-CVE-2009-1759.patch
-	epatch "${FILESDIR}"/${P}-negative-ints.patch
-}
diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild
deleted file mode 100644
index ba96a9a0cf3b..000000000000
--- a/net-p2p/ctorrent/ctorrent-3.3.2-r3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_P="${PN}-dnh${PV}"
-
-DESCRIPTION="Enhanced CTorrent is a BitTorrent console client written in C and C++"
-HOMEPAGE="http://www.rahul.net/dholmes/ctorrent/"
-SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-CVE-2009-1759.patch
-	epatch "${FILESDIR}"/${P}-negative-ints.patch
-	epatch "${FILESDIR}"/${P}-empty-path-components.patch
-}
diff --git a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
index c175d7cf5520..d921f9ff3729 100644
--- a/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
+++ b/net-p2p/ctorrent/ctorrent-3.3.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dtorrent/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ppc ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="libressl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index e87255ff7f87..7b03ca2acac6 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,6 +1,4 @@
-DIST ncdc-1.19.1.tar.gz 354308 BLAKE2B dc2f7e821c22d0ac1efbd6241ffcfc36f76676b90569aa459cd1a85b7e517104320757fd83ed918b0e2ea3ba4bd8343849b81f6700a25b968fa3db24c5ea2193 SHA512 36eda8c582ddb40ef732151ecc1654eae927a6a004430d8d27528b3c57ae5e1b06c23a867d8e1624ee4365031325fd7ced2888dd64ff129431bba9ff4171f189
 DIST ncdc-1.20.tar.gz 367688 BLAKE2B 33bf6cd92146b0cf3d188cec4b5c29f0860f91cbdf7a1ab33789985a61b706647591513fb596f89b21d3d8aebf683316397b94f184aac928a93e23fc17030e82 SHA512 0f20d6584aab1e69bcb3a93271a8542c5968adee5fd198b375dc258996b60ee5f642eac5d5e91c5513e367bbfd42eda80ede9e6e93ab38279c33e8da557010a7
-EBUILD ncdc-1.19.1.ebuild 711 BLAKE2B 05614f129f74b44f41462d23ec94416d92753639528dec6c8f0482758d64c0a42afc00e8f0fbf8b9eff17165388147897e747491bd47b34ca405ebcda40e1e5b SHA512 9e93fca4e84fa42cb986d30a405b3789767e80768c6b1813e21b01df840ff26a0cdf87bef8d71c443594ce616ab63d622a9114c1cc1c85e280759244217dbc8c
-EBUILD ncdc-1.20.ebuild 645 BLAKE2B 0c035e385fdb7173393241437340ec4e9b6011d880fba89262ed6f941b475c83dd38b95fa69094138580876a43e6df85d9812151150c85b35eefa778a04f90a7 SHA512 111d2014723fad67e9f3c945e52e8b19e0cf2ee12729d7852ef7cdad963b51baae7dda9c8404b98b46fa6a8b05e284a6350fdf8ddaac00b0ff6dab9018ad8814
+EBUILD ncdc-1.20.ebuild 644 BLAKE2B 22e5a3c7f3116a937729866cb2f8ee4ad56a53018fdc5bfc61e5f029efc2215510667d22dc3a4bf803fdec390f09f8f6e690e27cf1a3cdfa60e077bd3b045c32 SHA512 16ef83bb091cf2a2573f167d127294956de168817158eba3f294eb7e73c9e5ad27b04f1093f02197a58df5d70c0f418f845ba7c6b8325566c61c81f5428c4a1e
 EBUILD ncdc-9999.ebuild 696 BLAKE2B 8fa87cdbb1ffc14650b8fa57a679460630e92f3d7061f0f12a48c0fd5ccdccddf58a1a19de94dd6dc0c2ec0d57996e2ba7b8fccf213d86c2ffd83de2903d3b00 SHA512 2198381e38d5da4d2c5fdc3382144ca341319fc72a643e8b66dca7f8dc470d1a5cfda7ecc453e235145a6dde8ee85803a4559b3adfb98b8e53938154ecf8a1c6
 MISC metadata.xml 458 BLAKE2B b26f2357e1b243dd7425edb1ac7a7bd3fa253a713e969c6f7387e79b24f4a31b7105920f0552437c48d33ebac806ddd5f1d3ec44fa21a500254ba1e33505c828 SHA512 737260611d6d3a7562eefd1ad477616572d1ce6b5bc2ab67b0685c7c8c09efd0f274da5576eec24fa714547b062232d7030e3d946bfaa94fd9db7eae271976c1
diff --git a/net-p2p/ncdc/ncdc-1.19.1.ebuild b/net-p2p/ncdc/ncdc-1.19.1.ebuild
deleted file mode 100644
index d58a060fb102..000000000000
--- a/net-p2p/ncdc/ncdc-1.19.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="https://dev.yorhel.nl/ncdc"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="geoip"
-
-RDEPEND="app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	net-libs/gnutls
-	sys-libs/ncurses:0[unicode]
-	sys-libs/zlib
-	geoip? ( dev-libs/geoip )"
-DEPEND="${RDEPEND}
-	dev-util/makeheaders
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch_user && eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with geoip)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/net-p2p/ncdc/ncdc-1.20.ebuild b/net-p2p/ncdc/ncdc-1.20.ebuild
index adb724675d71..c1ade22353e2 100644
--- a/net-p2p/ncdc/ncdc-1.20.ebuild
+++ b/net-p2p/ncdc/ncdc-1.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="geoip"
 
 RDEPEND="app-arch/bzip2
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index cd6940a2eb20..38bac803f5f7 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -4,9 +4,11 @@ DIST xmr-stak-2.7.0.tar.gz 376873 BLAKE2B 78dd64acf7fbae46bf150d97b00c8443fbd097
 DIST xmr-stak-2.7.1.tar.gz 376919 BLAKE2B bdbd3f7ca522e200db072679f21ee79dc99167cf512f19008ca6b591d0c7ba73f58b68e0d2d7a2622cb88438922e28a4c78e4cbf9d617e28881cc37e1db8c08a SHA512 f33afa259ffde23bd0b5dd8efceadd98e4e176ccabbb68e79eb7cfcc88af9444e897c552e1eea2e3798291309847451ebfa1c44d5310e192014cf6b2aa5eb530
 DIST xmr-stak-2.8.0.tar.gz 388733 BLAKE2B cc75b2d80d7d9761b192f8d0752dde29d49c561675c63151f6cb915399dad715d133a17f2fa64c58ce8720a8de0a46bdb963c21571e29be3f99f0db3164aff40 SHA512 48803a9eb10e92763992dcbedb28b41735adf7da404312fe8358161cecef562bfc777a0b78ef90953db9c2a093adb30c4f9cd637f0613c949ff3b326662d2876
 DIST xmr-stak-2.8.2.tar.gz 388342 BLAKE2B bcdfbebb2f8b8aba9be97a1591921e267852cf7a1c3685b3cc3858a3ca0e06498eaf969bd09c27f294ecac6a8fbc969b600ec0bbf33331d555e1f13cfbaa0402 SHA512 eb29ebc6c0a31bd274ff094558e93da0191ab219adc8b7fd47efec02ebe49feb441bb0224b4f3e0ce012588002c450f7a12c0ce3792b7f309bdb9045b06e1906
+DIST xmr-stak-2.8.3.tar.gz 389352 BLAKE2B db4a52b99a950d81f6ae67b6a96f2cc7cbb5f86553c5a17b429ee7e7e84e486c81f62d9e45c9317d11160e86a89715102bf73281fff3e8a75cc93f68c52ee9c4 SHA512 ed930a93c59acfd086ad24403f58f4b545602f35c9641655b423657da24ed66ddff80c555d6bc364a09ba5a1015f66b20fa7f3d4bcfd75a0316f3ce30b9b9dd7
 EBUILD xmr-stak-2.7.0.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-2.7.1.ebuild 1887 BLAKE2B c8762738f4a5bb50a7c7583709340177a8417e98edab569d8768a92a861ae6980fc6f95e2bd553a728af8178c0d3e6347cab4196bcbaace8b546b99743cdf3c3 SHA512 67d55d31c95d2e7ce96f1618f246aed70dce2ae16f956cc6e1e0440e4d32e0abd13fe7acb414326be3ec202029029d5f1b05ecc8b89685d8ec986bf85cfc630e
 EBUILD xmr-stak-2.8.0.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
 EBUILD xmr-stak-2.8.2.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
+EBUILD xmr-stak-2.8.3.ebuild 1887 BLAKE2B 7201b3135446ebe64b22fd6cb88402aa1d8d898e5c67cddb7b22398b50aed25c2f8dcf3e1c3f6e95b8e8a09275847355324391df2b31f55a517b86c05773ae08 SHA512 0266f6bc24791060ff5b5c80e3b0b4e899b9a9880118472576782e1c212952d745c4494d118c77c630b0d44e0a4e838d16bdcf84a46e5ee06fc50084b338d5c7
 EBUILD xmr-stak-9999.ebuild 1890 BLAKE2B 15f6c550c1f5a6ed2f9911972ff3c500ec9cd6292e1362b4b0b06aff52f681117fa176bcd8f65351c11901d1492d7dd617ca151a064e888bf874e7450f449ff2 SHA512 bf26e77719e5ac167555cd1efbb8e0d1ab7bf67c78d6f937a1cef9ca8ab8fc8555bf81adc2a65b9de39c77c0553ea70d0da947ced88e1cef046a38cd355e3c6c
 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild b/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild
new file mode 100644
index 000000000000..3244143bb5fe
--- /dev/null
+++ b/net-p2p/xmr-stak/xmr-stak-2.8.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}"
+
+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
+	doinitd "${FILESDIR}"/${PN}
+	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 -C /etc/xmr-stak/pools.txt"
+		ewarn "xmr-stak can now be terminated and 'systemctl start xmr-stak' or '/etc/init.d/xmr-stak start' can be used."
+	fi
+}