[gentoo-commits] repo/gentoo:master commit in: net-libs/libprotoident/

[Jeroen Roovers]

commit:     41b8b24cdbb2ce84fb60e262b4bfd843f1f0ca98
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 10:01:05 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 10:02:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b8b24c

net-libs/libprotoident: Version 2.0.13

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-libs/libprotoident/Manifest                        |  1 +
 ...toident-9999.ebuild => libprotoident-2.0.13.ebuild} | 18 ++++++++----------
 net-libs/libprotoident/libprotoident-9999.ebuild       |  6 +++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/net-libs/libprotoident/Manifest b/net-libs/libprotoident/Manifest
index eeda9ad52f8..b7a5dc11e05 100644
--- a/net-libs/libprotoident/Manifest
+++ b/net-libs/libprotoident/Manifest
@@ -1 +1,2 @@
 DIST libprotoident-2.0.12.tar.gz 571466 BLAKE2B 604dee2d33f7944615211ee3ab0a3ba610354bd604bcbf5296d58698ab963b5e667ea3e08fc2df62dfdb1e7dc7a336a57be6e61b6f410fdd7a96f3b46c35d70c SHA512 b8ba13ce9286a026062f47ffe3bf9407b408f64fbf0521aeebaf0e39e6ddf70cfbc6574f8e9c0f35fc2c2e5f9c4e71e200536665988f88c65bbdbeb9b7baed16
+DIST libprotoident-2.0.13.tar.gz 592008 BLAKE2B b8e4ecf5fdc1b40881709e9a572148e666f6d1a56c00cca39efd81caba3c3344a57bbc57e0794a92d1ec23bac3c928ac2b06323c1785cb8fc08cb33f55f2195c SHA512 905c97ba3f994d7b63c95ee80bc7b2c2be13b86745d072f5aecb4df88f791c02dcda3f851f01b5cca3cd36ad87379759789238a8c05f3209a5aad3d854e6ff20

diff --git a/net-libs/libprotoident/libprotoident-9999.ebuild b/net-libs/libprotoident/libprotoident-2.0.13.ebuild
similarity index 69%
copy from net-libs/libprotoident/libprotoident-9999.ebuild
copy to net-libs/libprotoident/libprotoident-2.0.13.ebuild
index 397ba5fb925..8d80ce7cabd 100644
--- a/net-libs/libprotoident/libprotoident-9999.ebuild
+++ b/net-libs/libprotoident/libprotoident-2.0.13.ebuild
@@ -1,18 +1,16 @@
 # 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
 
 DESCRIPTION="A library that performs application layer protocol identification for flows"
 HOMEPAGE="https://research.wand.net.nz/software/libprotoident.php"
-EGIT_REPO_URI="https://github.com/wanduow/libprotoident"
-EGIT_BRANCH="develop"
+SRC_URI="https://research.wand.net.nz/software/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0/2"
-KEYWORDS=""
-IUSE="static-libs +tools"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs tools"
 
 DEPEND="
 	>=net-libs/libtrace-4.0.1
@@ -25,9 +23,9 @@ RDEPEND="
 src_prepare() {
 	default
 
-	sed -i -e '/-Werror/d' lib/Makefile.am || die
-
-	eautoreconf
+	sed -i \
+		-e '/-Werror/d' \
+		lib/Makefile{.am,.in} || die
 }
 
 src_configure() {
@@ -38,5 +36,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }

diff --git a/net-libs/libprotoident/libprotoident-9999.ebuild b/net-libs/libprotoident/libprotoident-9999.ebuild
index 397ba5fb925..89b8578c07c 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
 }