commit:     2971152154f108650831c32a3f83023823ff7f6e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 20:37:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 20:58:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29711521

net-analyzer/hydra: add 9.2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/hydra/Manifest                             |  1 +
 .../hydra/{hydra-9999999.ebuild => hydra-9.2.ebuild}    | 17 ++++++++---------
 net-analyzer/hydra/hydra-9999999.ebuild                 | 16 +++++++---------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index fb6dd8eb493..8d6ee303deb 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,2 +1,3 @@
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B 
b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165
 SHA512 
58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 
9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba
 SHA512 
863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
+DIST hydra-9.2.tar.gz 614176 BLAKE2B 
102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7
 SHA512 
ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322

diff --git a/net-analyzer/hydra/hydra-9999999.ebuild 
b/net-analyzer/hydra/hydra-9.2.ebuild
similarity index 93%
copy from net-analyzer/hydra/hydra-9999999.ebuild
copy to net-analyzer/hydra/hydra-9.2.ebuild
index 3ff5496cc9b..913d3373903 100644
--- a/net-analyzer/hydra/hydra-9999999.ebuild
+++ b/net-analyzer/hydra/hydra-9.2.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic git-r3 toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra";
-EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra";
+SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/thc-${P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="
        debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp 
ncurses
        oracle pcre postgres rdp libssh subversion zlib
@@ -41,10 +43,8 @@ RDEPEND="
        subversion? ( dev-vcs/subversion )
        zlib? ( sys-libs/zlib )
 "
-DEPEND="
-       ${RDEPEND}
-       virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
        default
@@ -64,7 +64,6 @@ src_prepare() {
 src_configure() {
        # Note: the top level configure script is not autoconf-based
        tc-export CC PKG_CONFIG
-       append-cflags -fcommon
 
        export OPTS="${CFLAGS}"
 

diff --git a/net-analyzer/hydra/hydra-9999999.ebuild 
b/net-analyzer/hydra/hydra-9999999.ebuild
index 3ff5496cc9b..1cfceab9812 100644
--- a/net-analyzer/hydra/hydra-9999999.ebuild
+++ b/net-analyzer/hydra/hydra-9999999.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic git-r3 toolchain-funcs
+
+inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra";
 EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra";
+S="${WORKDIR}/thc-${P}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
 IUSE="
        debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp 
ncurses
        oracle pcre postgres rdp libssh subversion zlib
@@ -41,10 +42,8 @@ RDEPEND="
        subversion? ( dev-vcs/subversion )
        zlib? ( sys-libs/zlib )
 "
-DEPEND="
-       ${RDEPEND}
-       virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
        default
@@ -64,7 +63,6 @@ src_prepare() {
 src_configure() {
        # Note: the top level configure script is not autoconf-based
        tc-export CC PKG_CONFIG
-       append-cflags -fcommon
 
        export OPTS="${CFLAGS}"
 
@@ -92,7 +90,7 @@ src_configure() {
        hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' 
'-DHAVE_PCRE'
        hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' 
'-DLIBPOSTGRES'
        hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
-       hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' 
'-DLIBFREERDP2'
+       hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' 
'-DLIBFREERDP'
        # TODO: https://bugs.gentoo.org/686148
        #hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' 
'$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN'
        hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' 
'' '-DLIBSVN'

Reply via email to