gentoo resync : 06.12.2017

6 files changed, 53 insertions, 45 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 1f817d3498fa..5ff7b8c7216e 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 70bda9eb2108..f777ba9c37ac 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,4 +1,3 @@
-AUX airdcpp-webclient-2.1.0-disable-automagic.patch 1106 BLAKE2B 421618ab9ddef03e16f2c9d4d98338a3e2848954864cc39c155cf71af23e796245c1fba6c32f4e539c24a84cee2f7776a0edfdc1a589d3af2342155105693f51 SHA512 9e16724429869d03138142188b3105e6cd360a6e99595329702fbe5724ce98a951c5c6ae1649df205eeb6203fd99a97957bc82da842234791223690296bbdaac
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
 DIST airdcpp-webclient-2.2.1.tar.gz 845507 SHA256 19286ab01fab6be27dbb5ccbcbc09bcc9dacc3108fb3b285916803933e36421e SHA512 97c5b32e590b2fc735fe4978c1a173272c55f84fe97212f7cd1e8bd4a279553c1d992573185781aeceafbbe6bb51303ddb2cd164c748fa798993a661f3abfb81 WHIRLPOOL 6aca14b4af57a1138cd98fe68b7eb49c4d13da6bdf4e4e47ce6f26810d17516376d6e7599ca88c9a364208d9ba1d41436816bcc3ec0177875f72ae6c40a1842b
diff --git a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.1.0-disable-automagic.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.1.0-disable-automagic.patch
deleted file mode 100644
index 4e8360e69677..000000000000
--- a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.1.0-disable-automagic.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit 8ca829a832db304769ac0d107471ab23d4ce3cce
-Author: Louis Sautier <sautier.louis@gmail.com>
-Date:   Wed Jun 21 23:10:03 2017 +0200
-
-    Add options to disable libnatpnp and tbb support
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4d8a49c7..826fce3b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,6 +47,10 @@ endif()
- 
- 
- # OPTIONS
-+OPTION(ENABLE_NATPMP "Enable support for the NAT-PMP protocol via libnatpmp"
-+  ON)
-+OPTION(ENABLE_TBB "Enable support of the TBB library to improve performance"
-+  ON)
- 
- # 1.x had a different default value
- unset(INSTALL_RUNTIME_PATH CACHE)
-@@ -99,12 +103,16 @@ find_package (OpenSSL REQUIRED)
- find_package (Threads REQUIRED)
- find_package (Iconv REQUIRED)
- find_package (Miniupnpc REQUIRED)
--find_package (LibNatpmp)
-+if(ENABLE_NATPMP)
-+  find_package (LibNatpmp)
-+endif()
- find_package (Git)
- find_package (LevelDB REQUIRED)
- find_package (websocketpp REQUIRED)
- find_package (Backtrace)
--find_package (TBB)
-+if(ENABLE_TBB)
-+  find_package (TBB)
-+endif()
- 
- if (NOT BUILD_SHARED_LIBS)
-   # Shared LevelDB libraries are linked against Snappy already
diff --git a/net-p2p/mktorrent/Manifest b/net-p2p/mktorrent/Manifest
index c64180ffb344..bc8128f98de7 100644
--- a/net-p2p/mktorrent/Manifest
+++ b/net-p2p/mktorrent/Manifest
@@ -1,3 +1,5 @@
-DIST mktorrent-1.0.tar.gz 23089 SHA256 6f8e562af6366e0d9bde76e434f740b55722c6c3c555860dbe80083f9d1d119f SHA512 f103c8860c008796c2dc604fcabce7374264fd7814237fcad5f9dab0fe10e927b0e2d9b58e7462dd198265a7d83fe30fd68313c7dce4029d8c331a6f2d4622de WHIRLPOOL 2a907fe846ae5a35dbb38fbd6707a89121d34b9658f1afa682db14da9254cc58ed376fc23c834753409769643868294b0f1354fd7d9d567ec0cff49ee713b163
+DIST mktorrent-1.0.tar.gz 23089 BLAKE2B debfdbf2691fd1baa9f1647ef1cd64a4e5d8cbcabd77fb7c8a4b7ec5c1abbf4fa56ae54ea51afc58b0807cde8d525c4ac7106d38576e52a71e2776ba0bfcacda SHA512 f103c8860c008796c2dc604fcabce7374264fd7814237fcad5f9dab0fe10e927b0e2d9b58e7462dd198265a7d83fe30fd68313c7dce4029d8c331a6f2d4622de
+DIST mktorrent-1.1.tar.gz 23314 BLAKE2B 97893553c99f3a6f994876b4689db2536cdaef30f9a392cf3ef800d5d92323336f836a9a3f92aff807a449bcc8553582275c4b36d98e1a1e99835945a7f4b43d SHA512 2a7ce83950711cf5be098693ad79273b29bcd8a5ef345ea296c7b6b83c532dd3463b347c7137234f1890cb4ea663ee5a5b1878591bc8fb4386d94e4f65410859
 EBUILD mktorrent-1.0-r1.ebuild 773 BLAKE2B 2d2be9f07b8d12e50d14fb7855abd73c86ad881c213da8d53de7c216a9e93b4fb52cfa2d0f825ce147b83871cb3c638fddc556ff67ff24af7d996abd461b7fc2 SHA512 0d0bb8c9cd8c14d7c6ecbd7bc7b59576ad1a1ba2ee27afba9ad2e2231e8fd48d47f657097d27f266ebe5a708e4c1e1cac1f9ddcad00838ccba757b89771e3b84
-MISC metadata.xml 246 BLAKE2B a0c5746fa07fdf99825243b0f14d84efb2246db7f1d246a08baa811fb33b46318c2768b8f708b34a7529686fc540ea0e8aa6ead06cf78078c409cc643e1c2370 SHA512 ccfd5352b45fa0f1013a55f9daf8ce794904dd8c0d586d6ec732df83f776d28b78ca134c0a2cd5003c9d42b0b44419754cb5b19649100949536075c39a2b543c
+EBUILD mktorrent-1.1.ebuild 830 BLAKE2B 75b7710cf11b4f3a1e0723c22d8fc6d3cb7efb44f5b957a42a1914e5da74e3335f29c171e403286403963fcf0ad24e344ebe9c3ab49082a320d24a0783c52f53 SHA512 e8690211216e6f2dfde34d30c238afff786efec1e9bc1c4d82f49846ae62de537c74da03d9a8ab4fd80cac7854266722d657e976df3179fbc827097df2eab591
+MISC metadata.xml 446 BLAKE2B f5298ced2a3c59bc990eebd8d183815e8449191b11e48e31aea3948944cf67e79ab649922c104a0a644d8f4de6bab044175a2bb64fe3124f4a317fb98be7deb9 SHA512 6dc7c65acabf5e556235a4c5e95d77301d8aa92acf2d82d6c50afe761095637c8f08616d40b6a34270894ba9baf9bfef33f060e3c8fe67e3ee92a9bfad1f68b7
diff --git a/net-p2p/mktorrent/metadata.xml b/net-p2p/mktorrent/metadata.xml
index 36ce80cda8c8..7b6a20b87b7d 100644
--- a/net-p2p/mktorrent/metadata.xml
+++ b/net-p2p/mktorrent/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>holgersson@posteo.de</email>
+		<name>Nils Freydank</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">mktorrent</remote-id>
+		<remote-id type="github">Rudde/mktorrent</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-p2p/mktorrent/mktorrent-1.1.ebuild b/net-p2p/mktorrent/mktorrent-1.1.ebuild
new file mode 100644
index 000000000000..75ea9fc65c96
--- /dev/null
+++ b/net-p2p/mktorrent/mktorrent-1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Simple command line utility to create BitTorrent metainfo files"
+HOMEPAGE="https://github.com/Rudde/mktorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Rudde/mktorrent.git"
+else
+	SRC_URI="https://github.com/Rudde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="threads +ssl debug"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	tc-export CC
+
+	emake \
+		USE_LONG_OPTIONS=1 \
+		USE_LARGE_FILES=1 \
+		DEBUG=$(usex debug) \
+		USE_OPENSSL=$(usex ssl) \
+		USE_PTHREADS=$(usex threads)
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+}