gentoo resync : 02.01.2018

7 files changed, 4 insertions, 109 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7cc19e881832..4c28dc16e9f8 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 2fa1f9b80931..1529476b2894 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -5,5 +5,5 @@ DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f831
 DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
 EBUILD libssh-0.7.4.ebuild 2478 BLAKE2B 86cdd0d7445a37fbff25a82b79cd910645525a668e534abcf96a6e4ca9846d5d20fbe8c4891bd4878f0bfb315a283b3a970565963c59fe6a51d5d56d9382994a SHA512 1c7b902fd9dbd2e4826be08c9d326dd3bf858e8ebedfe489ddcef917c888f225742967b93cdf8d647bb42ff4e5938b463e3e7526afd76986b7561399ffb10079
 EBUILD libssh-0.7.5-r1.ebuild 2572 BLAKE2B 69e64c210aa7948dc9c8d04b1603768eb87cd5ef12ef79d8f7d41654f781476c6d7f2d06f5ec0e9517ecaa6387e9736d482c9facc10c8410b2d50baf47ec99fc SHA512 6653cd6ca61bea75ab815e219c8a8f4bf03d99a8b25c3d948f3bf6ecd363b0ffded197a57cef7bf392a4dd08069d58992155b5fef38121d9e4eb524459a703f4
-EBUILD libssh-9999.ebuild 2125 BLAKE2B 6223d1b45116af8db14325eeb11e1fbb40f8086235c2692fe73f02d95e30017149ea8526b710fda0e5ec30457befb74b567f5f4cf3014e55d2fb77ae9fdbae2e SHA512 9dbb0ee5cafac2165d993d204b52d49425a1257ccc27e4c1631c152c97849a03273a4a996b5e03c365c19ebad6130d14d96edad2d086116dc5a01d8bbd79fa01
+EBUILD libssh-9999.ebuild 2128 BLAKE2B 394967b5e90dbeddbfa8f2fc9fcf17afc0f2c282bf25c5efc8a0e3786573dd9750bcdc63732610bc87e9b779c29014753acc95d239d6b9c3b67a412f908d09a9 SHA512 49e17db7bce80cc8b70ac3ba51f874007e0f09b8407a7e2af3cde79c5d2ec713aed317d258b4cefb7b753b790219c882931cc06154187683dacc83e2a5ab7cb5
 MISC metadata.xml 648 BLAKE2B bd4e4be029fdb3ef1e5ce2e16b6f5b922bf43c32ff4ecd50a67db98f9f7669022caf96d965fc85065b5ea8ac65b5547bc3d62d1da6bebdbc5a9a877be5a23c18 SHA512 4e99644645a43ccf7c479c6808ecb2dfe9f9aba69518ab1e2a1289732b926d853ff5554c69fff71e4bb572d12af298ebe19ecb1086da2e8675153b5c42faf589
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 193f9eb86e6f..2e283ca1245c 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit cmake-multilib git-r3
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-EGIT_REPO_URI="git://git.libssh.org/projects/libssh.git"
+HOMEPAGE="https://www.libssh.org/"
+EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 
 LICENSE="LGPL-2.1"
 KEYWORDS=""
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 3a93521e9f03..9d0d84b4a3bc 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -4,6 +4,5 @@ DIST libssh2-1.7.0.tar.gz 811714 BLAKE2B 488f6b9ea2bf072aba17e8d70136e9bf64b38a4
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 EBUILD libssh2-1.7.0.ebuild 1210 BLAKE2B cdddf4b8ed193788df0129598198a626053e53a47e7d13910ce4ba5eaf9587f5c3d6abbbd087fbbc939687b7a96ebc9ee7f6425ff807836cda5d59c963084f8c SHA512 feed1680c4b5909b5bacbc12e30a43e9e0e15279643ca118f76a8216c7ec29a25475fb5c6e2f76a37c87d243135c66ad8c9b42a96634628acf2eb28c97462615
 EBUILD libssh2-1.8.0-r1.ebuild 1288 BLAKE2B 4db050dec0f5a23329cdd0d7714464b61c9880b196f15277b50df616194d0cdde0065d396bbbb38ed88600afdfb42140909a2158c7d2244686b77ffe78e8671a SHA512 ea7e26409aea9709824b276095ab2269b916a6df69619bf979d61752d8340bc55fdfa8119a953d8e559cfb5c8af2d96cf26f1e9bcc449132c9981a507a1780b8
-EBUILD libssh2-1.8.0.ebuild 1290 BLAKE2B c3ace9749345e641f1d5927adad97002c96ae5345f79056b036e9a7327e004f828b049fab0d2098c836d329adfd102215410cf4faab5964ad19f27cd0a7e2155 SHA512 016ba030248775b968094fc2e0edad87268801a7350e1cea405347ac508e31fd81fce560b82b12aaf58bcfe7a27a176c0cee3a4c2c0e1622019140ed15e6e237
 EBUILD libssh2-9999.ebuild 1131 BLAKE2B c0bba5c19c03822bc3734f2504bef8239e330be3570af8a29abacd90cf1149e2b575156d4d2cd0f9dc3a571abf8c9008fcaaf0587a86c74cb92b9cfeff8671d3 SHA512 ee0431b63ddf905e1efe49eac35a48c7e956a8a3bc03ec48de73f076a226699ae3eba22b1b0798f458d414ff46cc2f29815b0cbed96609021050e510290ea9f1
 MISC metadata.xml 432 BLAKE2B b528bab0bd90699af37096d4b6a4e06767e39011b4ef299600c8d35987768693224869ef5e05255ff28edb0ae8e14c38a04e20df953391a3df527d8609700a8f SHA512 c0fd5dce9a697c02886aeea4e001695bf51c6cec82a1c32d58a839dbd63f0085f9005c3504d40bd858bcca80ec2018bbf44bca64dd7692029e158612da39cabd
diff --git a/net-libs/libssh2/libssh2-1.8.0.ebuild b/net-libs/libssh2/libssh2-1.8.0.ebuild
deleted file mode 100644
index 3cc10e06541a..000000000000
--- a/net-libs/libssh2/libssh2-1.8.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-inherit autotools-multilib
-
-DESCRIPTION="Library implementing the SSH2 protocol"
-HOMEPAGE="http://www.libssh2.org/"
-SRC_URI="http://www.${PN}.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="gcrypt libressl static-libs test zlib"
-
-DEPEND="
-	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-DOCS=( NEWS README )
-
-PATCHES=( "${FILESDIR}"/${PN}-1.8.0-libgcrypt-prefix.patch )
-
-src_prepare() {
-	sed -i -e 's|mansyntax.sh||g' tests/Makefile.am || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	# Disable tests that require extra permissions (bug #333319)
-	use test && local -x ac_cv_path_SSHD=
-
-	local myeconfargs=(
-		$(use_with zlib libz)
-		$(usex gcrypt --with-libgcrypt --with-openssl)
-	)
-	autotools-utils_src_configure
-}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 35f673c0c035..9077bf767c24 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,7 +1,5 @@
 DIST miniupnpc-2.0.20170509.tar.gz 86055 BLAKE2B 7da640c4baac58aa26965a670877953b4c2d27aff08b604366bad6913b30c152d52120099f37c6250eeed97396ff412a4dd6000179070a82eebd3c052596b0d0 SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f
-DIST miniupnpc-2.0.20171102.tar.gz 86363 BLAKE2B 755cc85bbac7f7c9b480612c12c46c09eaa7089dc9f458027805ffb4836631efafbead4bbb5e5313d1267e3110bc4b24c726c34250da3afd1ab0f1f96d53a654 SHA512 5af68a58bef587ea5cc405155b1aca4438de3b56d5fb7e11945edd79e5cbdbf44c708b7f1ad3c3fde6bf4710de69782acf30cfcce327c5a906f4eb8f76a6ba37
 DIST miniupnpc-2.0.20171212.tar.gz 86607 BLAKE2B fce582c4125192f74f6ffb174295020af1c9b574b2094f5565a5e49641820a2d9cef719de59cb94bfd207182505237c22cf58425e1a7b47f5dfe2eb84c07d3c5 SHA512 d25708f4e2ef7311878ba6d17cb506f4bfe5c9cc6b7a79e4168f143ca9da8b96beb018c42dd735f0b23806668eba2308b7de26d1b506d91c23f79c7ed77399a0
 EBUILD miniupnpc-2.0.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271
-EBUILD miniupnpc-2.0.20171102.ebuild 1273 BLAKE2B 2fff06efc3482305a3a45a9e94bf1dca939c234d66d26ed9649d547b0e98c517cb1018bb1bd14209b88129fd113a4b64fce712f782da10dcb4a860e1d8d1497e SHA512 9de720f270d9a5d214ce314b85722b0b8a0db75d2e6624a7528d0fee12e993ac40ee5442ce0ec89bf65d03a018015b86894425b43a2d547e98e6ac25a99e1012
 EBUILD miniupnpc-2.0.20171212.ebuild 1273 BLAKE2B 2fff06efc3482305a3a45a9e94bf1dca939c234d66d26ed9649d547b0e98c517cb1018bb1bd14209b88129fd113a4b64fce712f782da10dcb4a860e1d8d1497e SHA512 9de720f270d9a5d214ce314b85722b0b8a0db75d2e6624a7528d0fee12e993ac40ee5442ce0ec89bf65d03a018015b86894425b43a2d547e98e6ac25a99e1012
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20171102.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20171102.ebuild
deleted file mode 100644
index 918bc210ceaf..000000000000
--- a/net-libs/miniupnpc/miniupnpc-2.0.20171102.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="UPnP client library and a simple UPnP client"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/16"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6 kernel_linux static-libs"
-
-RDEPEND=""
-DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
-
-src_prepare() {
-	eapply_user
-
-	# These bins are not installed, upnpc-static requires building static lib
-	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
-
-	if ! use static-libs; then
-		sed -i \
-			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
-			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
-			Makefile || die
-	fi
-}
-
-# Upstream cmake causes more trouble than it fixes,
-# so we'll just stay with the Makefile for now.
-
-src_compile() {
-	tc-export CC AR
-	emake upnpc-shared $(usex static-libs upnpc-static '')
-}
-
-src_test() {
-	emake -j1 HAVE_IPV6=$(usex ipv6) check
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
-		install
-
-	dodoc README Changelog.txt
-}