gentoo resync : 17.02.2021

3 files changed, 5 insertions, 90 deletions

diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index e61dac1aa809..9eb80025fd94 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,5 +1,3 @@
 DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db
-DIST cgminer-4.9.2.tar.bz2 1476371 BLAKE2B 01ff700cb5dc2fb12709da41aeaa22c6fc6b9dc6fb1e12116eef3a382ad328961b8d6ddd6ac6fce47ab8084c96e1a7be74a697b3d885c7e78dfadf07b678ad24 SHA512 48371657c84f09ad8c500a29ca85f35af70eb8720d9d97b565cd8c5356289d889ee60c06f37c0507a53c8f50ae827a77fa0c41609bac6b1e8849ad26b55d67d4
-EBUILD cgminer-4.10.0.ebuild 2535 BLAKE2B 209b11cdd7ea3dea70747378e290ddf89e1d346c67865c68d3f4c280c24464e53af95e8e7fee26753665f764695413d41e3e82ad17669efca3a095a2fe38f2cf SHA512 8c118c370b87d5305b017978c6f2109c1686220408c654815c37bce3889e40c67c1efe04fb19d388bf238e3aeda3b759d1a9f801cb110095e36dc2358d7ec58a
-EBUILD cgminer-4.9.2.ebuild 2392 BLAKE2B 7579e4fd7d03d4dfeb6ad364ee14f64e6aff87cc5736ccaf6f005abd76d669e54b5e5ed1675a1e5b40c6f03a63d5ada7d3b063474007937518a7d8ebc1547216 SHA512 916b5e886acd4643624417b51678913615c5cb05bcdbb735e543a92653e10948720d9cd7e5f7f16b1ffe544e50aaed6115d850460f77f13cc024d3ac10bb47f4
+EBUILD cgminer-4.10.0.ebuild 2561 BLAKE2B c83adfe93051f23be466d8d324da27690ec96dfa6887e93668f510f09f8b43b7c5bb6351a2941b4d02ee67b50965cdf42fb722b49c877ec5e9da5d2683452df6 SHA512 3ad82b78ee9796f264ae259b0b1e60fa95b73c50b772ffa427f113eab9d373723d27592780282a9d1c36f3352e6dad220a56c23b60c4fb7a3d5acd3440e76ee2
 MISC metadata.xml 2137 BLAKE2B 8bb2fd05a390c5c5ec5ca3dde384ab611311d50256668208184dfb978ac5a0debd75ec63cd35159dcde36b2a964d0bedf6aaf3422261f998f2262c1007c3ab29 SHA512 6cf1454188266ffdab67a7caa27ece041cfc4c3cb4fc76b7fe5fa24bed30002df717afe4e8693532a4f78b077374200cb2a9e91b460372193f1b623238d50b38
diff --git a/net-misc/cgminer/cgminer-4.10.0.ebuild b/net-misc/cgminer/cgminer-4.10.0.ebuild
index 1ac87f413dbc..bcfc4b2aa996 100644
--- a/net-misc/cgminer/cgminer-4.10.0.ebuild
+++ b/net-misc/cgminer/cgminer-4.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,8 @@ IUSE="doc examples udev hardened ncurses ${HARDWARE}"
 
 REQUIRED_USE="|| ( ${HARDWARE} )"
 
-RDEPEND="net-misc/curl
+RDEPEND="
+	net-misc/curl
 	>=dev-libs/jansson-2.6
 	virtual/libusb:1[udev]
 	ncurses? ( sys-libs/ncurses:0= )
@@ -29,6 +30,7 @@ BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	use hardened && append-cflags "-no-pie"
+	append-cflags -fcommon
 
 	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
 	export PKG_CONFIG="$(tc-getPKG_CONFIG)"
diff --git a/net-misc/cgminer/cgminer-4.9.2.ebuild b/net-misc/cgminer/cgminer-4.9.2.ebuild
deleted file mode 100644
index 6cf544e6b085..000000000000
--- a/net-misc/cgminer/cgminer-4.9.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
-HOMEPAGE="https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer"
-SRC_URI="http://ck.kolivas.org/apps/cgminer/${P}.tar.bz2"
-#SRC_URI="http://ck.kolivas.org/apps/cgminer/4.5/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-HARDWARE="ants1 ants2 ants3 avalon avalon2 avalon4 bab bflsc bitforce bitfury bitmine_A1 blockerupter cointerra drillbit hashfast hashratio icarus klondike knc minion modminer sp10 sp30"
-IUSE="doc examples udev hardened ncurses ${HARDWARE}"
-
-REQUIRED_USE="|| ( ${HARDWARE} )"
-
-RDEPEND="net-misc/curl
-	>=dev-libs/jansson-2.6
-	virtual/libusb:1[udev]
-	ncurses? ( sys-libs/ncurses:0= )
-	udev? ( virtual/libudev )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-src_configure() {
-	use hardened && append-cflags "-no-pie"
-
-	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
-	export PKG_CONFIG=/usr/bin/pkg-config
-	econf $(use_with ncurses curses) \
-		$(use_enable ants1) \
-		$(use_enable ants2) \
-		$(use_enable ants3) \
-		$(use_enable avalon) \
-		$(use_enable avalon2) \
-		$(use_enable avalon4) \
-		$(use_enable bab) \
-		$(use_enable bitmine_A1) \
-		$(use_enable bflsc) \
-		$(use_enable bitforce) \
-		$(use_enable bitfury) \
-		$(use_enable blockerupter) \
-		$(use_enable cointerra) \
-		$(use_enable drillbit) \
-		$(use_enable hashfast) \
-		$(use_enable hashratio) \
-		$(use_enable icarus) \
-		$(use_enable klondike) \
-		$(use_enable knc) \
-		$(use_enable minion) \
-		$(use_enable modminer) \
-		$(use_enable sp10) \
-		$(use_enable sp30) \
-		$(use_enable udev) \
-		--disable-forcecombo \
-		--with-system-libusb \
-		--with-system-jansson
-	# sanitize directories (is this still needed?)
-	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h
-}
-
-src_install() { # How about using some make install?
-	dobin cgminer
-
-	if use udev; then
-		insinto /lib/udev/rules.d
-		use udev && doins 01-cgminer.rules
-	fi
-
-	if use doc; then
-		dodoc AUTHORS NEWS README API-README
-		use icarus || use bitforce || use modminer && dodoc FPGA-README
-		use avalon || use bflsc && dodoc ASIC-README
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc api-example.php miner.php API.java api-example.c example.conf
-	fi
-}