commit:     f8c71641924952b7d4a38155d8897378b264ca18
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 02:38:19 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 03:25:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c71641

net-libs/libmnl: port to EAPI 7

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 net-libs/libmnl/libmnl-1.0.3-r1.ebuild | 12 +++++++-----
 net-libs/libmnl/libmnl-1.0.4.ebuild    |  9 +++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild 
b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
index 316073b5786..67fbdb2cc36 100644
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs usr-ldscript
+inherit toolchain-funcs usr-ldscript
 
 DESCRIPTION="Minimalistic netlink library"
 HOMEPAGE="https://netfilter.org/projects/libmnl/";
@@ -20,11 +20,13 @@ src_configure() {
 
 src_install() {
        default
+
        gen_usr_ldscript -a mnl
-       prune_libtool_files
+
+       find "${D}" -name '*.la' -delete || die
 
        if use examples; then
-               find examples/ -name 'Makefile*' -delete
+               find examples/ -name 'Makefile*' -delete || die
                dodoc -r examples/
                docompress -x /usr/share/doc/${PF}/examples
        fi

diff --git a/net-libs/libmnl/libmnl-1.0.4.ebuild 
b/net-libs/libmnl/libmnl-1.0.4.ebuild
index fd97a5559d2..794d9e30984 100644
--- a/net-libs/libmnl/libmnl-1.0.4.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs usr-ldscript
+inherit toolchain-funcs usr-ldscript
 
 DESCRIPTION="Minimalistic netlink library"
 HOMEPAGE="https://netfilter.org/projects/libmnl/";
@@ -22,10 +22,11 @@ src_install() {
        default
 
        gen_usr_ldscript -a mnl
-       prune_libtool_files
+
+       find "${D}" -name '*.la' -delete || die
 
        if use examples; then
-               find examples/ -name 'Makefile*' -delete
+               find examples/ -name 'Makefile*' -delete || die
                dodoc -r examples/
                docompress -x /usr/share/doc/${PF}/examples
        fi

Reply via email to