gentoo resync : 20.03.2021

4 files changed, 45 insertions, 10 deletions

diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index d2225bdde6ed..103f9286316a 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -7,6 +7,8 @@ AUX ssldump-0.9-openssl-0.9.8.compile-fix.patch 449 BLAKE2B 35a7860d59c63d9749e1
 AUX ssldump-0.9-prefix-fix.patch 554 BLAKE2B 797544d1bd63e476379f2c6a9df8e6377cb839a179e3eaee47b00d35c967249e050a5a235efcf4c8606f5c7ec3e354b6a869c372bb0ddd215f1b21ecedaf2383 SHA512 55a11a1ec6e76039b474dabb2a9b5e647c66231d0ab12620dc5513335da3057bcedb36df1a5e19480be7f4a7004aaecc4d21abd8420149a79fb48abc981d1ff8
 DIST ssldump-0.9b3.tar.gz 137435 BLAKE2B e42eeac4daa99a62537ac7ee5152428664fed40256ec10f7c61621f9bbd06476d280af1a6c517eaff253058e3720a282e88604b2f1de0c7ad1b5328597879449 SHA512 ea81558a243950ab43354c9f33c0a4feae0ae859bc2bd6e6b58838a01f4a1e7a6447f2a9ab1fa40bbe8dbd6c3630c489c17fc9c066cacfddfb64269b0cd5090a
 DIST ssldump-1.1.tar.gz 187436 BLAKE2B 3cafd7263762a7a326fb30722a918bcfaae5b43eedca37a0b5c341efc510e935671dc7ebf71eb807fcacbfce5f77896f310b634028713deb5516390fcfc21f65 SHA512 00ff449d3818a27fbcb46316733428f6a623488e758a67fcb7ee4390835e3279e7242aa0134ddc158740cb8323f5fd9869bd50efb35189dce977d4768d9636c2
+DIST ssldump-1.3.tar.gz 122819 BLAKE2B 8a96746939eb8d9ba33340ff112b1bc5b436a7eb5756fda494065c8f8fd7d6ec9c1c28d8f7f880d25856f24749fd8a8a98d4104753bb68772b2583dafef099b8 SHA512 6da4db890a30673278b17eb00201b6c2535ba476b769bed6ed4e31c06744f32e299d0f0dd6420aa7255e2c982a378cd721d7bf51dd0aeb23211ab678d1e5f26e
 EBUILD ssldump-0.9_beta3.ebuild 1431 BLAKE2B 4451fa21e460c7554d7cfaa05f1ad7b0cff8af134a619e8262a7f1cb8159218974f5e3034da807818228ce7b93554b616a607a56f924becb12bfe14c60a1e5d4 SHA512 ce3c6eb328a86b04693bdb308ff3debd9486ed3304e0cff38f48d7a076ce4b8ef5394e066887ac69d658fbd29cfa54881a57f5a2b72aed9fe68f19cd80de9480
-EBUILD ssldump-1.1.ebuild 932 BLAKE2B b0941b455b7fff8d0af2a9002dce7139fdfa7ec4bd29905d9d114daf8f33f8e8d4413d74352429f44e66d9b153bc8c3d6b66d9ff7797e667c6c89c3bba92ae38 SHA512 4c8a236aa5f84a61490278627f0e40258e3929e55e0812a29f80ee1ea7c47b2df0c8f954a9cae5142453c6e0965b40d0066e0178e73cb021a121cc4b82c23423
-MISC metadata.xml 359 BLAKE2B f35ef1086c0c3c4aa4f9131d63ce2f014ed376a841502dc0de02f6261b8358f6aa1e01ff55c87f39fb5ad71478c70e98497f1bc3b25034d374ba58064393b495 SHA512 c80158a4a7334b16b28fe0462cc82e70c03674bde862f6858ab6f67645cb3d856fb41bfe5480690fa25c85b0a5205bc2f6cf2febb45fd355a949da92024fc1ee
+EBUILD ssldump-1.1.ebuild 938 BLAKE2B 06f060fa831fad3f474a9ec17143b75f0a775b6e54436213f232f867e18063b876f92037256be91f4f65a10dc79dd0754426ec314691d6112a3825badccd24fd SHA512 d07b96f75e830924757e1b7f3473dc05d907aa1a92fe228495ad10225ae5533d5a31d90da45769e30144ce430830b4c961a3eeab2150adaeceaa88fc88ce9b92
+EBUILD ssldump-1.3-r1.ebuild 671 BLAKE2B a671056fbf79208e795c53ccc693ddc97530cb27af6439739cc80f69c85436e8f7ffd3bf539426f5c252241f600cc8b90413150692403bfaa12afef4b7047761 SHA512 adbb68839511cc2f66dc46fbe4077c46db8a2386f08fdb69edf2f66a83d0494c246c41e5618d218815086d6872ac45f9c8c87e3246ab64cb6226bd8f367aaf22
+MISC metadata.xml 359 BLAKE2B 6cfa34e7b48e628a649c1e0775e8fde048226ba01436a3c275844089fbbe14f0588be44a2fc9ee6a4e89cc16ad1e479a53c926a4c3ba9edabe910bfb7d19bccd SHA512 e3eadb3bc57cdd5909cd93907f9d12a6541d303070a860bed60b10f5e018b6571d89f5100be0ff3800b2da5c58c40e3095cdfa43105273c389714c182ff33fe1
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 12203e1a761b..8d1a6814136b 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/net-analyzer/ssldump/ssldump-1.1.ebuild b/net-analyzer/ssldump/ssldump-1.1.ebuild
index 6263f65aa674..84bf5b42e215 100644
--- a/net-analyzer/ssldump/ssldump-1.1.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
 
 DESCRIPTION="An SSLv3/TLS network protocol analyzer"
 HOMEPAGE="https://github.com/adulau/ssldump/"
@@ -12,16 +13,14 @@ SRC_URI="
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ssl"
 
 RDEPEND="
 	net-libs/libpcap
 	ssl? ( >=dev-libs/openssl-1:0= )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	tc-export CC
@@ -29,7 +28,7 @@ src_configure() {
 	econf \
 		$(usex ssl --with-openssl-inc="${EPREFIX}/usr/include" '') \
 		$(usex ssl --with-openssl-lib="${EPREFIX}/usr/$(get_libdir)" '') \
-		$(usex ssl --with-openssl="${EPREFIX}/usr") \
+		$(usex ssl --with-openssl="${EPREFIX}/usr" '--without-openssl') \
 		--with-pcap-inc="${EPREFIX}/usr/include" \
 		--with-pcap-lib="${EPREFIX}/usr/$(get_libdir)"
 }
diff --git a/net-analyzer/ssldump/ssldump-1.3-r1.ebuild b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild
new file mode 100644
index 000000000000..ddd41125cefe
--- /dev/null
+++ b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="An SSLv3/TLS network protocol analyzer"
+HOMEPAGE="https://github.com/adulau/ssldump/"
+SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	dev-libs/json-c:=
+	net-libs/libnet:1.1
+	net-libs/libpcap
+	>=dev-libs/openssl-1:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin ssldump
+	doman ssldump.1
+	dodoc ChangeLog CREDITS README
+}