gentoo resync : 13.10.2019

4 files changed, 2 insertions, 216 deletions

diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 874f6e48a7e3..d5ba51c43836 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,14 +1,10 @@
 AUX hydra-8.0-configure.patch 1089 BLAKE2B 7aa67a47f3fa8174b0a72b86e4bdf743750450559327ec8da31506b817d59a0f3e6b96f32acc4a8658f98845053f50ff089c57f16b9251bc0daa38795a93e2ac SHA512 d7fbc56b9d0fd6cc89ca689a07c0dcf618827bfaafb332217b695b38cc6382c32aedfec4c046575dc34c0946c9b0212a22d82554a296697d1b922ad45084a0bd
 AUX hydra-8.4-configure.patch 1217 BLAKE2B 005cd700dd32e56405afa7a37d630aa8b2fe66f94b16b1fe09e6a5172aa5ef1c5e6896b697717e6b0524b5fd8b41443a8c5a734b1273843e54a6aebaed563c62 SHA512 18d76ac35660955a07ba435bf00ceebcd62423fd08c97237f7aa3be4187532f454997008be5395b2d8ae9d66e10204f76905481034c3e5cb1761aec2b02e32c3
 DIST hydra-8.1.tar.gz 559031 BLAKE2B a3d2b52508a1d03a2f3d6cecf7100543487b5a0f6210dd6128d3ab48ad16ca3a8fad49709163830049ed8b9bb6891861f9c3f5fd5a6179b0a87a072877e829af SHA512 7608dd365865e5976bea446faedaad9f0334e7572fd0ee47a601c471471fc7c8a922c7114f4df08705b34b29144d3a6552e66148adf6b0f92c67301119c94959
-DIST hydra-8.5.tar.gz 1193694 BLAKE2B bf202ccf58f64e2b57a15b5aaf8d4357b8d37d0a634179d2b4fe0c7d63da1e363b02e8578de7d984c75f1e764fc95477aecac9643954c05acbcc63865e066b0a SHA512 67fd92bd5983a94314334471c526b71ca77dec6e359e55f4fb2fc78160e2065957b6c9af1ff694bcc5334893a8b5e0fe1b39d984248bde4e55dc2a9f9a8b1271
-DIST hydra-8.6.tar.gz 1200238 BLAKE2B d9470be5280ec51dfcb701cc3dd87ffaef7076c990a30e833c3fe7bc0f2b951f40eae26dab28ebbb1116f3d5e884a3c0819a5913c68e714a3b8597af75140829 SHA512 d5d70b5df54fbc556c6db9e9e44b869f29e54aca03dc3cc9e1777d310fcf604b9602ba08250c5bb0d009963dc0ca5c169e61d3f64d7ec2383760fc819d6b6c61
 DIST hydra-8.9.1.tar.gz 1186320 BLAKE2B 97c29cda5e26197ed66aa29555b0e4de3ef5b08bf65aa09fd0d564ee5f63825af71d6a41c4552a06a4c86a98dab5a69913c0b0200fe4e5068284ec7fc1f1061b SHA512 68b07dcb22bc55937e79035954417d820691e3a1eea169c959886ce6a741f545efe7879f31f41a1751779c923410dcc67fe8914bb9b5cf567edfc6fad3997d72
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 EBUILD hydra-8.1.ebuild 2231 BLAKE2B 95092e808318ddde9e4dfdffde525efba03a9327fcee14ea7e3b02c21b823d9d2b546a4a60e69d045fc2866ad30660ab796406a09c520aa4d09d1933a8fe1df2 SHA512 77b003b5e8c5118dc81c318974ae2af2b0e973a272eccf3666ada23ed2712762792c725c1d2f5b3bb1df37277d3a6951ea92dd3995ea79ec97bb053ab339cac5
-EBUILD hydra-8.5-r1.ebuild 2385 BLAKE2B 21d08357ab57670feb857ec4151df73eb760957c195514c890b5906698347d607211323c9905be22ea94fce87b270b9ae07cdf170d16041ecdb052ef9684d835 SHA512 7f9d38cf69559f85cc90a77d455c23ab08eff9cc4f32d2d93d12128ad903ec901462433b7870b10d4d221982eb496d4f72eadf060eff8d0dcd0ff600e19c1180
-EBUILD hydra-8.6-r1.ebuild 2384 BLAKE2B cb3e96abad9e6cf477042c583516373e774efaee1088218a092adeabbf2120e6807f5d29f92c338ab58f4a740041e5f0c993880c04d6fb3edba021d1ecbc99b6 SHA512 c6c98e5b9a379c058fc7bb041136bfc05d15f68e0af5873582af93826662a5e90d91aab32238efefc5f66fdc81f3f2a5626769d9ca85d41d0ab2bf145e17cb9e
 EBUILD hydra-8.9.1.ebuild 2366 BLAKE2B ba12d4eca5289fcb1142dafd6114a037097ebcf61e3cdf08c0befacdcbd799358b8db0df251201bcb3a9e690063c3a6b7bafe2917b3bb2fdfff4acbdfeae761c SHA512 1888c365da61c5e2e873dc4c7d76cc0f0e30d6638d9416df8857deb84bc844e7ae0ce3f71c897c1eedd1b9e1efdcbdef9b1cd9eac23b89df4b4a5147a6f68bdc
 EBUILD hydra-9.0.ebuild 3633 BLAKE2B fef1fb1edc77744dcd5e24321e4e67bd4f215c9439396455809b35a6f37409b379049356ea3f4fcb066b4ee772bff328023fe5fcc9528441b4e5a8767845331d SHA512 e9b1be609ea4c7ba487fab8865943a7f319e2040f6cdb42db78dd6dba9288f7c2307f76fb30d26db738f96d3564503f31db1b69d2c3c3e3b363f8417c9e26452
 EBUILD hydra-9999999.ebuild 3571 BLAKE2B 1bdb57bf900c1a3a3ae3e63858cef8dec1408d544f101d90485f11cb7705bafce7e708ee2006bed412e0cdb31238e8bd9719014ec416540d6f7ab88f1b7e8656 SHA512 dfd6138ea0fdcdd1c839eb1a2e094749e23cc6603c61e9975db6e5d94d792492c87fb918977307dde72fde2042690375b306c440280aad44c8d5ba622c2dcb77
-MISC metadata.xml 571 BLAKE2B 15177ec654ebb1b0a8afe4fcf48578579765545b0a8c1477900b7bfb24718f2645ae1b4fbdeb7110e3a2958be58869bf57181d6d9518a26f0e6f7d751fec2d3e SHA512 41e64b2953d3512bebf56e82ba27690ef3cfa87ae6b6508838e0678229c06f7bea6b9cf50046c41c76f519fdf23b08971fbe3cd5176b2b4f3875ee66e78d7e5f
+MISC metadata.xml 570 BLAKE2B fba8cf56f3f091fdf16a86ee3a1b964e9dfc0cae8a32e6fb81b8ccec3f1efe47dfac838c86fadd80e736d4a82233e8f84695c0a0987d4f426ab88fe0841df70f SHA512 45d0573055b0fe5f820e92cd43627e5c48dee8a1151ef06c7f65dddb8078ff62197bd5c8bbd1e1b12a42df61e399f2e3bff337201fa37df085339de24c8b50ba
diff --git a/net-analyzer/hydra/hydra-8.5-r1.ebuild b/net-analyzer/hydra/hydra-8.5-r1.ebuild
deleted file mode 100644
index 78edf98bb463..000000000000
--- a/net-analyzer/hydra/hydra-8.5-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Parallelized network login hacker"
-HOMEPAGE="https://www.thc.org/thc-hydra/"
-SRC_URI="
-	https://github.com/vanhauser-thc/thc-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="firebird gtk idn libressl mysql ncp oracle pcre postgres ssl subversion"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/ncurses:=
-	firebird? ( dev-db/firebird )
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	idn? ( net-dns/libidn:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=net-libs/libssh-0.4.0 )
-	subversion? ( dev-vcs/subversion )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.4-configure.patch
-)
-S=${WORKDIR}/thc-${P}
-
-src_prepare() {
-	default
-
-	# None of the settings in Makefile.unix are useful to us
-	: > Makefile.unix
-
-	sed -i \
-		-e 's:|| echo.*$::' \
-		-e '/\t-$(CC)/s:-::' \
-		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
-		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
-		Makefile.am || die
-}
-
-src_configure() {
-	export OPTS="${CFLAGS}"
-
-	if ! use subversion; then
-		sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die
-	fi
-
-	if ! use mysql; then
-		sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die
-	fi
-
-	# Linking against libtinfo might be enough here but pkg-config --libs tinfo
-	# would require a USE=tinfo flag and recent linkers should drop libcurses
-	# as needed
-	sed -i \
-		-e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \
-		configure || die
-
-	# Note: despite the naming convention, the top level script is not an
-	# autoconf-based script.
-	export NCP_PATH=$(usex ncp /usr/$(get_libdir) '')
-	export NCP_IPATH=$(usex ncp /usr/include '')
-	sh configure \
-		--prefix=/usr \
-		--nostrip \
-		$(use gtk && echo --disable-xhydra) \
-			|| die
-
-	if use gtk ; then
-		cd hydra-gtk && \
-		econf
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake XLIBPATHS=''
-	use gtk && emake -C hydra-gtk
-}
-
-src_install() {
-	dobin hydra pw-inspector
-	use gtk && dobin hydra-gtk/src/xhydra
-	dodoc CHANGES README
-}
diff --git a/net-analyzer/hydra/hydra-8.6-r1.ebuild b/net-analyzer/hydra/hydra-8.6-r1.ebuild
deleted file mode 100644
index c1e0721b8577..000000000000
--- a/net-analyzer/hydra/hydra-8.6-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Parallelized network login hacker"
-HOMEPAGE="https://www.thc.org/thc-hydra/"
-SRC_URI="
-	https://github.com/vanhauser-thc/thc-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="firebird gtk idn libressl mysql ncp oracle pcre postgres ssl subversion"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/ncurses:=
-	firebird? ( dev-db/firebird )
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	idn? ( net-dns/libidn:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ncp? ( net-fs/ncpfs )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=net-libs/libssh-0.4.0 )
-	subversion? ( dev-vcs/subversion )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.4-configure.patch
-)
-S=${WORKDIR}/thc-${P}
-
-src_prepare() {
-	default
-
-	# None of the settings in Makefile.unix are useful to us
-	: > Makefile.unix
-
-	sed -i \
-		-e 's:|| echo.*$::' \
-		-e '/\t-$(CC)/s:-::' \
-		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
-		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
-		Makefile.am || die
-}
-
-src_configure() {
-	export OPTS="${CFLAGS}"
-
-	if ! use subversion; then
-		sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die
-	fi
-
-	if ! use mysql; then
-		sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die
-	fi
-
-	# Linking against libtinfo might be enough here but pkg-config --libs tinfo
-	# would require a USE=tinfo flag and recent linkers should drop libcurses
-	# as needed
-	sed -i \
-		-e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \
-		configure || die
-
-	# Note: despite the naming convention, the top level script is not an
-	# autoconf-based script.
-	export NCP_PATH=$(usex ncp /usr/$(get_libdir) '')
-	export NCP_IPATH=$(usex ncp /usr/include '')
-	sh configure \
-		--prefix=/usr \
-		--nostrip \
-		$(use gtk && echo --disable-xhydra) \
-			|| die
-
-	if use gtk ; then
-		cd hydra-gtk && \
-		econf
-	fi
-}
-
-src_compile() {
-	tc-export CC
-	emake XLIBPATHS=''
-	use gtk && emake -C hydra-gtk
-}
-
-src_install() {
-	dobin hydra pw-inspector
-	use gtk && dobin hydra-gtk/src/xhydra
-	dodoc CHANGES README
-}
diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml
index 3a5ee322a93f..27f48a7d774b 100644
--- a/net-analyzer/hydra/metadata.xml
+++ b/net-analyzer/hydra/metadata.xml
@@ -7,7 +7,7 @@
 <use>
 <flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag>
 <flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag>
-<flag name="mongodb">MongoDB support through <pkg>dev-libs/libmongo-client</pkg></flag>
+<flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag>
 <flag name="ncp">NCP protocol (NetWare) support through <pkg>net-fs/ncpfs</pkg></flag>
 </use>
 </pkgmetadata>