gentoo resync : 27.03.2021

3 files changed, 36 insertions, 30 deletions

diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
index bd51cebd1e2e..6df95d56d09b 100644
--- a/net-analyzer/httping/Manifest
+++ b/net-analyzer/httping/Manifest
@@ -1,5 +1,5 @@
 AUX httping-2.2.1-flags.patch 161 BLAKE2B be0f5f8df2fd89f46f15b3ef6c0c06e9f04573a822a6ce6e559471e3db586d69de0e440e3b9c4f401f30ab741d9eb85077ead8d3f9d4c026e7398609602f7c2e SHA512 037f53e3f23247ddc5f33ef846bafe32e3f818242b92375d7145fa244c9a8aeeac2d3b1138cbffa792a9564a5e4e96274ff457a13be0c4b228033d47b21748d6
 DIST httping-2.5.tgz 71400 BLAKE2B da261827a4e2276816dbb2f9a6bac989f4ec0e7fc4b7686d51e57f8d4078ec3f94acef032b7042774e9cff57c8158696026e45d44ae1fbb00e52175c9c08b9a5 SHA512 397ce2eac91c9aede0eb19823bfca4e7f98c263937f5954c8a48d5248a251d2030e31f18decb7f7f8b0118ec0e16ec0a84ea4c943ccde7056b80de162954c355
-EBUILD httping-2.5.ebuild 1428 BLAKE2B 77b40c43c97804902ce94b28f83609e82422ab21e24ed34d9c3ac9311feff5aae2124c93b5de4c76dc30c468c5dee76f216ddd1174e496a71ed3901198c7c392 SHA512 62a92641c16ec8f2c53b6fc118072e6eea2501396b4637a3710085665249b0c01db1772800681fa1455d458d466282a41b91eb618930ac44f1fa979478ba7f64
-EBUILD httping-9999999.ebuild 1382 BLAKE2B 83dd9fea5843d43c1fe09cbbbd16e4056e6328bac8bcd5f78a9002b52ffbe0303cf529156532a2fa5548601ea44558abbe36c1c8c0b40b1fc6aa09318131b5c9 SHA512 43b214c43ac7a7d1aab26afb168ebc980930f721599d793638f8e8a53ff806220cc48b67003a64ada4f59ba9cfc0162458db1d22182a0d927e51fcf78f2d0f70
+EBUILD httping-2.5.ebuild 1560 BLAKE2B 3dc0a7aea896284679d038846a704219136eb3d768188007bea4f07cbda0ad703b3db4e187c6498c6abf449eb99b44553bb6f868759f174fadac31fc7498ce6a SHA512 e7d99142fcb82609ac1a468d99ea9f87bc9a10a4503f348fd94136958a082e9d0fdd6c044c10e57641c450dd483bf9627a371268d4cf354d4a95e35260d68da0
+EBUILD httping-9999999.ebuild 1506 BLAKE2B 29a2272df0be59b758ed4f5de8ad94e0305e79e7aba60a924e3ac92785352b55d5afa3d55611f1664a65beb97146eef303a2bfae95cd4d738f4e01c2db4eeae5 SHA512 b9edc81d9982e1c781488a6be16d38de7bbb0fdcc91910e276d1cc2c3f8eb20534e8f3e1d24dfcca017741fcb06297dfcf73f048d6a425428449c6f724355e8b
 MISC metadata.xml 433 BLAKE2B 6bca45194b043ea0bb44817c421644879a6ae6c0628239f27b2e3647d6fb16bf4df1fb3af3359b1d914f4486adf27106d926a278f5b132906c5e2aa568f4c16d SHA512 152e5d9ad060dfb5610ae4d5a4d70ed0f0a07fdfad6ce9cea65b61c425262e884202b44bc718a0a5dd385595002ae4fe8256499e649de3ce9fad9639fbb60360
diff --git a/net-analyzer/httping/httping-2.5.ebuild b/net-analyzer/httping/httping-2.5.ebuild
index b4f856e559ba..b454614720f8 100644
--- a/net-analyzer/httping/httping-2.5.ebuild
+++ b/net-analyzer/httping/httping-2.5.ebuild
@@ -1,30 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="http protocol ping-like program"
-HOMEPAGE="http://www.vanheusden.com/httping/"
-SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
+HOMEPAGE="https://www.vanheusden.com/httping/"
+SRC_URI="https://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
-IUSE="debug fftw libressl l10n_nl ncurses ssl +tfo"
+IUSE="debug fftw l10n_nl ncurses ssl +tfo"
 
 RDEPEND="
 	fftw? ( sci-libs/fftw:3.0 )
 	ncurses? ( sys-libs/ncurses:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
+	ssl? ( dev-libs/openssl:0= )
 "
+DEPEND="${RDEPEND}"
+BDEPEND="ncurses? ( virtual/pkgconfig )"
 
 # This would bring in test? ( dev-util/cppcheck ) but unlike
 # upstream we should only care about compile/run time testing
@@ -43,13 +39,21 @@ src_prepare() {
 		mkdir nl || die
 		mv httping-nl.1 nl/httping.1 || die
 	fi
+
 }
 
 src_configure() {
 	# not an autotools script
 	echo > makefile.inc || die
 
-	use ncurses && LDFLAGS+=" $( $( tc-getPKG_CONFIG ) --libs ncurses )"
+	if use ncurses ; then
+		local ncurses_flags="$($(tc-getPKG_CONFIG) --libs ncurses)"
+
+		# Don't require ncurses with unicode support
+		# bug #731950
+		sed -i -e "s/-lncursesw/${ncurses_flags}/" Makefile || die
+		append-ldflags "${ncurses_flags}"
+	fi
 }
 
 src_compile() {
diff --git a/net-analyzer/httping/httping-9999999.ebuild b/net-analyzer/httping/httping-9999999.ebuild
index 32a92c0aead0..c3e262a43ac8 100644
--- a/net-analyzer/httping/httping-9999999.ebuild
+++ b/net-analyzer/httping/httping-9999999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs
+
+inherit git-r3 toolchain-funcs flag-o-matic
 
 DESCRIPTION="like ping but for HTTP requests"
 HOMEPAGE="https://www.vanheusden.com/httping/"
@@ -10,21 +11,15 @@ EGIT_REPO_URI="https://github.com/flok99/httping"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug fftw libressl l10n_nl ncurses ssl +tfo"
+IUSE="debug fftw l10n_nl ncurses ssl +tfo"
 
 RDEPEND="
 	fftw? ( sci-libs/fftw:3.0 )
 	ncurses? ( sys-libs/ncurses:0= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	ncurses? ( virtual/pkgconfig )
+	ssl? ( dev-libs/openssl:0= )
 "
+DEPEND="${RDEPEND}"
+BDEPEND="ncurses? ( virtual/pkgconfig )"
 
 # This would bring in test? ( dev-util/cppcheck ) but unlike
 # upstream we should only care about compile/run time testing
@@ -49,7 +44,14 @@ src_configure() {
 	# not an autotools script
 	echo > makefile.inc || die
 
-	use ncurses && LDFLAGS+=" $( $( tc-getPKG_CONFIG ) --libs ncurses )"
+	if use ncurses ; then
+		local ncurses_flags="$($(tc-getPKG_CONFIG) --libs ncurses)"
+
+		# Don't require ncurses with unicode support
+		# bug #731950
+		sed -i -e "s/-lncursesw/${ncurses_flags}/" Makefile || die
+		append-ldflags "${ncurses_flags}"
+	fi
 }
 
 src_compile() {