gentoo resync : 15.02.2018

6 files changed, 51 insertions, 28 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index a1ef4db6a235..0652bc60fcb5 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 85d52aaa7191..49c9ddd1f4cb 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -1,9 +1,11 @@
 AUX cpuminer-opt.service 690 BLAKE2B f95dff31fb5ff12da8b8ae282bba4c0fd15b5c0aa7e0f2b87f94a901a8e15ea5c81e6704fe5e81681383a3d82c41516174c4cae3a6dc59c9d2af618197f32189 SHA512 d175754246d61d08d615af52c3499d67e4d8c6a5166f07ea4fd646f3000ca7afed99f9b436785c50141a86b5faf017be4b2d1d5d2f9e3921a6171e4223be9b4c
 DIST cpuminer-opt-3.8.0.1.tar.gz 1656058 BLAKE2B 685e5a7813f32e276a1cdd179c5d518c670e323b185270cce7368aa2f2c7b80a77076280d8604609d184e9e94776067050e65b722b20f1efdd5a4c3caba397c3 SHA512 0b7de89d37334c0c9867b65362c8664547a5b1f840446c071259cdd00848e9aab9ea3c160665a5d72efe9f50322f3c2e45f01035671b8eb4f341cb53abdd8452
 DIST cpuminer-opt-3.8.0.tar.gz 1656474 BLAKE2B 145126762aeb245d042c1a208b60fd4727b450b77ab2585043b13b82b61b947dea0db2489de08e619dcd54b8eb1ec429f83f21ce1e49c34e140f585eccdd14f0 SHA512 c610d58236c5d84a850e68e172d3fdfede5b86aefa8ff09890ffc43d47efd4754aeb345f6b5fd48b6afcbc771541418f6fde1c9e621ad89c17d2dad4c16151f9
+DIST cpuminer-opt-3.8.1.1.tar.gz 1657624 BLAKE2B d408d3da10ea6c0d91d0aa7097e52fb233f9a3c8f921c638899d18f99c1b1522c2d627d6869af6e650929da251f2bf6df87882ffb7169ac5a5633608d9399565 SHA512 f41e175492514c96d088c7f11aec88796b63d91aa8496794fac2222db24090685b4c76439bff39b5c074a5527494dfa8d1be6611b0040f5fca6436a80ea933f4
 DIST cpuminer-opt-3.8.1.tar.gz 1654969 BLAKE2B b8805e748b71d3c7049d5c97dd74a51da55f88c697963c938a372ff5ff0ac72fcabce81b86f373fdca2dcef7393bba3f53c049bc30dfbd02691ff5e9630cf5bc SHA512 800edbecf5edb0902adc54480a4984602c19087d55675212832ce24df109b7d66544d9db78112a04c3c374521737e2680013d354b6ff8195a17abeb213e2a556
 EBUILD cpuminer-opt-3.8.0.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.0.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
+EBUILD cpuminer-opt-3.8.1.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-3.8.1.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 EBUILD cpuminer-opt-9999.ebuild 1002 BLAKE2B 33f93d5f53ddd1f52e0dca9e3afbc7c61e54c74618ad6e8d65b106c95240f3e108ae1f4b8aa47c3994309791caaac7623099a9cc6e6bf3b3b949db84a73d20ed SHA512 fdd3205d085d5f45b65becdf5157cbd9817e9aba9f8436e78bab45baaa77287a6e9a563fd959d7559d6794747ec24204ee566db22dda3f18e75b5ec8db51d0bf
 MISC metadata.xml 333 BLAKE2B f7851fe0d55d729c75e3934fa32ab578c57d3dfc4a1634cc8dcca655f0d4ab1a6bb56d0b9c347dedb6cedf3d5a5a7a1bb9662856733970b1cc8db288c26be4a2 SHA512 770d39605bb1afa7d7643b4fc8f295e449f90175ae0d31c8a5023bfc9ba233c9e80ebf1dfbf81c4b86af8dc1d66bc336a4464748f162119b35fcb695cd54e656
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-3.8.1.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.1.1.ebuild
new file mode 100644
index 000000000000..a1f4a660f6b9
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-3.8.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl libressl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:0
+	dev-libs/jansson
+	curl? ( >=net-misc/curl-7.15[ssl] )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto $(use_with curl)
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	doins cpuminer-conf.json
+}
diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index c0ce413d5eab..9adc778920ee 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -1,6 +1,5 @@
-AUX noninteractive-build.patch 513 BLAKE2B cc4042e4f82541eef27584d0e3122b217c5a8e29fa718442f64df0c85d85fb58c6712b51b8c94a4c34baac6106f5e3e27a86f9c1e62402a65434f4b827d7f419 SHA512 c4542db2557bfff82d7494b2e0540f485cc1a20c649eae0435f7d9fcdaf6b094c27cf91a2ce7fe1fc275a2774a846a5341b0cd7b96e5d1fe5946a7d2a0cca51d
 DIST pybitmessage-0.4.2.tar.gz 547565 BLAKE2B 8cb7bc0407601f06c5d0040fa03372e95c34e21aed79021001f7067b3340c60a08f7ab7d2c6578e78e1f7bf09a5adc5805252a27cf8e1bda27de6d1495382e35 SHA512 5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917
-DIST pybitmessage-0.6.2.tar.gz 1053815 BLAKE2B 28ed1a836771318f59986532aaa8b87c0c6d195988f02fc977c3b21b423145cc5b732bc1d4ed9978c26c0edb1c040844c9c00ec4db6418ae1e938bae335ed118 SHA512 4aaa0f6b1cc04de01154bb5c90416901e51abb4465c62269ab07abb7da980ac07f2f548ae7a3780da9f3efe89d3b841b004996c5e33bc2638e58efcbecc8baef
+DIST pybitmessage-0.6.3.2.tar.gz 1118048 BLAKE2B 56245d2b6126fd0b325f20a829d4aa3d89d74fed48863ba236c74b33b074be5c88fd7d70bd08a9b4a1499aaf7e414f55c2f5ca93dca5769eaaf90c2082bc0cac SHA512 57bdbf10417973b4414f1a184b375a2dd6db1a07a6bc5596b5d256589eeae3c7343692be0f0aa681244c550d2b2d91773d9383d97c56eb48562d8099908c0261
 EBUILD pybitmessage-0.4.2.ebuild 1491 BLAKE2B bd2a91e4a9142decd90587706e12319806e7ac3d25ed239cf0ad3bef70288b8e8383f5b0c247239778d7cd9e5f3ae56ba41beb32d19a82fa817b7473ab117f63 SHA512 158c5280052bcc4d359f96232e712c85167b088253b08c623c1453e8e8d261edcea09c4c8ae0f9fc72ffeaee63ec8084c6391b1989e6f293adf1bfe98f5fc1cf
-EBUILD pybitmessage-0.6.2-r2.ebuild 1716 BLAKE2B b4445af49eb0f40bd7a3425031ffa94ee88ebf5e00a48db22a7ce13fd99a403af909d4ff24bb8db1510a9d6744d8c3553273e13a95c2e3b60c0e7f547b5f7188 SHA512 e77e1c10e68a1e622137f7a1d312b609a2c28c8b29995393534203484023b97e8aa948dd33c3eeaaa74989201f1a65a5724d1b748d7913d74ac2752b22c18ee9
+EBUILD pybitmessage-0.6.3.2.ebuild 1621 BLAKE2B 6260d3d042de67118062754a877486386748d84d58a451b7e465a04ab1041533254c180d7cdcddb63a410c7f73878a83fba01e4a536e0837b0185bc567e3e858 SHA512 2aa6c1862601a86cfc543fb331baf6959dff52799d969abe7c0b9ad36a40c1bf67ada9869e69196ed7f39879c3af0d318ccb4823d33830ab30bac4b5c037f293
 MISC metadata.xml 1125 BLAKE2B 91ce6c7afd6e759f0f7d5a049653cf970f7cf28d5061e9ccc9866dbf88c5a60cb3e518564ceb01551a830c419cdf47f905a4a744a73205725f50d966d022fe54 SHA512 04950f304ca8c087baa7dc370ff08da07bae555481798848d2ddddda33de318be83fc6a648428ff72419af857dd9bd1bdf0b43866b40e149f33dd834e9c7d9cb
diff --git a/net-p2p/pybitmessage/files/noninteractive-build.patch b/net-p2p/pybitmessage/files/noninteractive-build.patch
deleted file mode 100644
index 889711a7dce2..000000000000
--- a/net-p2p/pybitmessage/files/noninteractive-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Temporary workaround for a build system that wants you to press
-"Return" interactively.
-
-https://github.com/Bitmessage/PyBitmessage/issues/993
-
-diff --git a/setup.py b/setup.py
-index 2c769a6..166ab14 100644
---- a/setup.py
-+++ b/setup.py
-@@ -163,7 +163,7 @@ if __name__ == "__main__":
-         print "Press Return to continue"
-         try:
-             nothing = raw_input()
--        except NameError:
-+        except EOFError,NameError:
-             pass
- 
-     here = os.path.abspath(os.path.dirname(__file__))
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.3.2.ebuild
index 10ef7b3f1fbb..5dc0e77b7621 100644
--- a/net-p2p/pybitmessage/pybitmessage-0.6.2-r2.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-0.6.3.2.ebuild
@@ -16,7 +16,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="P2P communications protocol"
 HOMEPAGE="https://bitmessage.org/"
-SRC_URI="https://github.com/Bitmessage/${MY_PN}/archive/v${PV}.tar.gz
+SRC_URI="https://github.com/Bitmessage/${MY_PN}/archive/${PV}.tar.gz
 	-> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
@@ -50,8 +50,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/noninteractive-build.patch")
-
 src_install () {
 	distutils-r1_src_install
 	dodoc README.md
@@ -59,10 +57,6 @@ src_install () {
 	# The man page is not installed because it's basically empty.
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 }