Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

5 files changed, 8 insertions, 76 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 38fdfd30ef4f..cb67d9f07dd2 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/tvrss/Manifest b/net-p2p/tvrss/Manifest
index 62346d63dc18..fcf142b6e504 100644
--- a/net-p2p/tvrss/Manifest
+++ b/net-p2p/tvrss/Manifest
@@ -1,3 +1,3 @@
 DIST tvrss-1.8beta.tar.gz 19753 BLAKE2B 5adf657f82e51e25808ef20ebb166738a2ea0c9f3f399abf0dbdbd54a7148f7a58180e600a394006043f37e4e869e0f60d24d71ae84a75dca4375fd7223e14ea SHA512 8f1d8de1915c5e0cbfa17aebaca6ae8811a90f40e863f82465fd6bd5e0be9d8c401ead7e010b39195e0e3b3291c86ed94cbcfaf0913b3571ef96c5da519369f2
-EBUILD tvrss-1.8_beta.ebuild 516 BLAKE2B 2b9231d88292201ac5ddca2a92837b393e202d565ac39c4a65d993a89324e3e7f5c58a93a68a91887a02bf0b59915f3d370edf52301dd278c97fd1e8f11014de SHA512 318b673c7a31b8dab48aac31e001d928c3b1e9f0f721afc3df1fc412ada866bbb1583dbf358b36eae1ed6e805162c2f04b7e0003ad52c125446969b41a17512d
+EBUILD tvrss-1.8_beta.ebuild 561 BLAKE2B 31c967e154c10a7aa30620add0f8e0dccf21e3eacb7b431203ed0f624f1a447c13a14ed24c2e727443927f09ee5dbcdabb969d5263d7dff89d217893286a7afc SHA512 b5c75b3a10aea5a3bd89e2142d17e4678a5b1a4bec4f5d58261304b6ba4d0f28198f8a4c75ff38bbbd6e68b3c2812862557a3ffca84eca8feb708490833e2ab4
 MISC metadata.xml 243 BLAKE2B bbee62602dfee6eeea2af55d54245187371b28b3173c2633b6d788f28250eec1bbd3a484dd46a69a32ceb2439f032dee5c2803f613fe8d8e9e48c105cdcaae76 SHA512 596c7555138f2f3c72d510cdd83fcdc7f95d96e2aa7af2247795e4bd9b7cd1a5b02d4fd32c311354735d221dcec79b9183f8d23730580b650d940fcb4bb23d4f
diff --git a/net-p2p/tvrss/tvrss-1.8_beta.ebuild b/net-p2p/tvrss/tvrss-1.8_beta.ebuild
index 14cc2962f0af..dfbd3277784a 100644
--- a/net-p2p/tvrss/tvrss-1.8_beta.ebuild
+++ b/net-p2p/tvrss/tvrss-1.8_beta.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="2"
 
-MY_P="${PN}-$(ver_rs 2 '')"
+inherit versionator
+
+MY_P="${PN}-$(replace_version_separator 2 '')"
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="TV RSS is a tool for automating torrent downloads"
 HOMEPAGE="http://tvtrss.sourceforge.net/"
 SRC_URI="mirror://sourceforge/tvtrss/${MY_P}.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
-
 DEPEND="x11-libs/gtk+:2
 	>=dev-lang/perl-5.8.6
 	dev-perl/XML-RAI
@@ -22,5 +22,5 @@ DEPEND="x11-libs/gtk+:2
 	dev-perl/Gtk2"
 
 src_install() {
-	dobin tvrss
+	dobin ${S}/tvrss
 }
diff --git a/net-p2p/xmr-stak/Manifest b/net-p2p/xmr-stak/Manifest
index a1678146726f..811b3214d2c8 100644
--- a/net-p2p/xmr-stak/Manifest
+++ b/net-p2p/xmr-stak/Manifest
@@ -1,7 +1,5 @@
 AUX xmr-stak-2.3.0.service 942 BLAKE2B a237a5273d6b1fc3a2dd69b121e1ca61471f9524ced84d3ae90082571148c563c4cdedf3085b246f8a8b5babc56c7cf742ea48f1f68165c443373f57efcd2139 SHA512 04ea288a2b51480db5ebde3926d453006aad1b8b028e6e60663ba8a11ad876ce2c4070a20715645187dd7e90898d2e865a286df170c82930622042ea14798359
 DIST xmr-stak-2.4.3.tar.gz 335672 BLAKE2B 570fbb86144ba1a283c9a1733476e90caf24dcf0048733007ec189342a0e375f65cca74afb88ca7b08370a7db9a9a7d146f0c9a4a2cd57c480ec5b26928e98fa SHA512 a1e38c25827af8f88c1fdeed0fb3e731e92ac632d846f63dfe6fcb634eec0496e1d64b2745e6dc040dabc55a90963f587442e912c5aa72c9208cebffcc06db7c
-DIST xmr-stak-2.4.4.tar.gz 337845 BLAKE2B d66e650aea8a299ec77c183b321330ca1a3faee11a17046e0d88e8a11bb4649f2305de1287d77f9346071e217762d2e6a44bd26a37173db05ab648ed1e20ba60 SHA512 3cd0bbf2b489458888aa02302a1652093ceae38c085a16441bc2f6e315a82e0e00755544df0c75178a66e567a44e9d7537056b0fa5f3e7c7aee9a13b013c2411
 EBUILD xmr-stak-2.4.3-r1.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
-EBUILD xmr-stak-2.4.4.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
 EBUILD xmr-stak-9999.ebuild 1831 BLAKE2B 9d7c8bdb772dc55ad83bd1a96f248058d4873495415f8cbeadee1f3e994a0a7f30d33faa3411cfc5fb760ba429e13ec3767a361e3f9f439d356ccab1a6761f5c SHA512 7bb651dcaa3bc5392b4f5e3b2c06dcf74c012c0feab69bf1a8622eaeea3da555500b4757a432b88eab6b23e4ee1fcc736092cfc01a74bc7f7da4ab35cb093afc
 MISC metadata.xml 655 BLAKE2B b80afc4405c0f0338c31463311fa46276f911ba47a0816173f0df698d847d48a35dcc8123fe249bb06ed967d268480809a6f4781beb0175bf37f38f463736a6f SHA512 c37afc09cdaaace2b64c153907fc0124a41aee2045bc8615257f454fe14187cac802b4249f36922a2d2206dd8ff0c00163418cc921dc8bccb9515cd8c3dd5ebb
diff --git a/net-p2p/xmr-stak/xmr-stak-2.4.4.ebuild b/net-p2p/xmr-stak/xmr-stak-2.4.4.ebuild
deleted file mode 100644
index 0b8976d77f85..000000000000
--- a/net-p2p/xmr-stak/xmr-stak-2.4.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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}"
-
-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
-}