gentoo resync : 28.04.2019

3 files changed, 46 insertions, 4 deletions

diff --git a/net-libs/libprotoident/Manifest b/net-libs/libprotoident/Manifest
index 14a3ba1bf1c4..c423e70b9f6a 100644
--- a/net-libs/libprotoident/Manifest
+++ b/net-libs/libprotoident/Manifest
@@ -1,4 +1,6 @@
 DIST libprotoident-2.0.12.tar.gz 571466 BLAKE2B 604dee2d33f7944615211ee3ab0a3ba610354bd604bcbf5296d58698ab963b5e667ea3e08fc2df62dfdb1e7dc7a336a57be6e61b6f410fdd7a96f3b46c35d70c SHA512 b8ba13ce9286a026062f47ffe3bf9407b408f64fbf0521aeebaf0e39e6ddf70cfbc6574f8e9c0f35fc2c2e5f9c4e71e200536665988f88c65bbdbeb9b7baed16
+DIST libprotoident-2.0.13.tar.gz 592008 BLAKE2B b8e4ecf5fdc1b40881709e9a572148e666f6d1a56c00cca39efd81caba3c3344a57bbc57e0794a92d1ec23bac3c928ac2b06323c1785cb8fc08cb33f55f2195c SHA512 905c97ba3f994d7b63c95ee80bc7b2c2be13b86745d072f5aecb4df88f791c02dcda3f851f01b5cca3cd36ad87379759789238a8c05f3209a5aad3d854e6ff20
 EBUILD libprotoident-2.0.12.ebuild 750 BLAKE2B 2983aae00b276a2a02b1e6c4ce7fc31759f35596ea38035f78ec6be5c3cc430cafad517f39c6909c03f37784fb17060269ab567378699216b3ed737e8c14b2ce SHA512 2e31e2aefa07348e63fd459c44ab68555e63a2194b0b33fbadb9895d4a51a447337bcc0d862d716765b716964271837b67d6566d1f5e45ee805cc031d9c0fda6
-EBUILD libprotoident-9999.ebuild 770 BLAKE2B f89f6d3feed6cca0e4e69d6656338e1dbb61e95223b3d37a575180f4e4f0e686e0719a7cf69de52b6dd20b370377bf2c30ba9694281d85745381c698efdd409c SHA512 0ad2d0ab2ffa956bcee2adfb7873d30f455dd7e75af76c910df54d327409b2267de44c3ec038cb743986634f7797e8469dbdb2cb7ff01575b9dde7beab069800
+EBUILD libprotoident-2.0.13.ebuild 755 BLAKE2B bb6a60f761e7e0aaf4990ac71b1a7fed86f10028df8829db8ddb43d196d617732648e7c93c8ce7a6cc98253f74a0c67f0cd7cf1868d0c789e891a37361769e5c SHA512 e52dd8c021325e157c632cbbf4c157322d8e777a2b2b0759811097b11a924ab4bb76f1be3f6899b5a042c6fd0710130407b32bbff52a542ace03ed8431a9771c
+EBUILD libprotoident-9999.ebuild 783 BLAKE2B 6cc2e12379d71d21a3031969cca20dfadc9d256eaeddf65b67fcf88e33b3a4f3ebbd8def18755e46d337f69ad9927e8e2fbd4b0229d18e2af79c8dc3e5a3a4fd SHA512 4adfded1639d62cd0b5d8ab7685dd1e74a0cd3c65d56d86282fad7a3421be57fabd8361da7c6359763b8fc63069eced42864a9a4253bf10417b4521d131cf938
 MISC metadata.xml 360 BLAKE2B 17e614f06987241150e84b3738ef722bf680c8a9601307140767b78500a709849e71242774ecaa9c423771331365b4ba9e4293a859365527bfe11031339d91a7 SHA512 3de118bb358e064950487fffd58a49bb2fd5fc6597e6f3d0bf96a93d955e4879727fae386bdaf1a4a89388e471217903ce92b520edf257e1d1e66a6099e04b37
diff --git a/net-libs/libprotoident/libprotoident-2.0.13.ebuild b/net-libs/libprotoident/libprotoident-2.0.13.ebuild
new file mode 100644
index 000000000000..8d80ce7cabdc
--- /dev/null
+++ b/net-libs/libprotoident/libprotoident-2.0.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A library that performs application layer protocol identification for flows"
+HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
+SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs tools"
+
+DEPEND="
+	>=net-libs/libtrace-4.0.1
+	>=net-libs/libflowmanager-3.0.0
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/-Werror/d' \
+		lib/Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libprotoident/libprotoident-9999.ebuild b/net-libs/libprotoident/libprotoident-9999.ebuild
index 397ba5fb9253..89b8578c07c5 100644
--- a/net-libs/libprotoident/libprotoident-9999.ebuild
+++ b/net-libs/libprotoident/libprotoident-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils git-r3
+EAPI=7
+inherit autotools git-r3
 
 DESCRIPTION="A library that performs application layer protocol identification for flows"
 HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
@@ -38,5 +38,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }