net-libs/libmnl: upgrade to 1.0.4
Upgrade from version 1.0.3 to 1.0.4.
TEST=precq passes
BUG=chromium:1136467
Change-Id: Iff9add6157c030727cf7caeb6a172aa0b0eb110b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2461806
Auto-Submit: Michael Pishchagin <mblsha@google.com>
Reviewed-by: Benjamin Gordon <bmgordon@chromium.org>
Commit-Queue: Michael Pishchagin <mblsha@google.com>
Tested-by: Michael Pishchagin <mblsha@google.com>
diff --git a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1 b/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
deleted file mode 100644
index 4b7e44f..0000000
--- a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Minimalistic netlink library
-EAPI=4
-HOMEPAGE=http://netfilter.org/projects/libmnl
-IUSE=examples static-libs
-KEYWORDS=*
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://www.netfilter.org/projects/libmnl/files/libmnl-1.0.3.tar.bz2
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=2a4ed845fb7d2441dbdef11917c90f5f
diff --git a/metadata/md5-cache/net-libs/libmnl-1.0.4 b/metadata/md5-cache/net-libs/libmnl-1.0.4
new file mode 100644
index 0000000..7722398
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libmnl-1.0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Minimalistic netlink library
+EAPI=7
+HOMEPAGE=https://netfilter.org/projects/libmnl/
+IUSE=examples static-libs split-usr
+KEYWORDS=*
+LICENSE=LGPL-2.1
+SLOT=0/0.2.0
+SRC_URI=https://www.netfilter.org/projects/libmnl/files/libmnl-1.0.4.tar.bz2
+_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb usr-ldscript 766f0a506b45f02361ad1b8ca205b7e1
+_md5_=6215b272d1fd5302d4079c2dac07d83f
diff --git a/net-libs/libmnl/Manifest b/net-libs/libmnl/Manifest
index 4c25949..683230c 100644
--- a/net-libs/libmnl/Manifest
+++ b/net-libs/libmnl/Manifest
@@ -1 +1 @@
-DIST libmnl-1.0.3.tar.bz2 337375 RMD160 77ece88026148eab0f12ae77b2ea9c67d4210181 SHA1 c27e25f67c6422ebf893fc3a844af8085a1c5b63 SHA256 6f14336e9acdbc62c2dc71bbb59ce162e54e9af5c80153e92476c5443fe784de
+DIST libmnl-1.0.4.tar.bz2 301270 BLAKE2B e24ae3e7a8bcfe35a04256c495bb3e9a5ec41b6bea9b7ffa0a8ebc82ce847921d4a44e5be3558239fee5008c10541a9ac3614d1a6b80d280b632a76da16be5e8 SHA512 e2bbfb688fe41913d53c74ba7ec95b4e88ee2c52b556b8608185f2fcbd629665423a3b37f877f84426ba257cf6040fa701539d67166b00b8e3e2dfde6831a2f9
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
deleted file mode 100644
index 0ba7789..0000000
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/libmnl-1.0.3-r1.ebuild,v 1.3 2013/06/24 21:21:43 vapier Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Minimalistic netlink library"
-HOMEPAGE="http://netfilter.org/projects/libmnl"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="*"
-IUSE="examples static-libs"
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- gen_usr_ldscript -a mnl
- prune_libtool_files
-
- if use examples; then
- find examples/ -name 'Makefile*' -delete
- 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
new file mode 100644
index 0000000..324d507
--- /dev/null
+++ b/net-libs/libmnl/libmnl-1.0.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs usr-ldscript
+
+DESCRIPTION="Minimalistic netlink library"
+HOMEPAGE="https://netfilter.org/projects/libmnl/"
+SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/0.2.0"
+KEYWORDS="*"
+IUSE="examples static-libs"
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ gen_usr_ldscript -a mnl
+
+ find "${D}" -name '*.la' -delete || die
+
+ if use examples; then
+ find examples/ -name 'Makefile*' -delete || die
+ dodoc -r examples/
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/net-libs/libmnl/metadata.xml b/net-libs/libmnl/metadata.xml
index 978c174..8e3ebff 100644
--- a/net-libs/libmnl/metadata.xml
+++ b/net-libs/libmnl/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription lang="en">
libmnl is a minimalistic user-space library oriented to Netlink developers.
There are a lot of common tasks in parsing, validating, constructing of both
@@ -13,4 +16,3 @@
<remote-id type="cpe">cpe:/a:netfilter:libmnl</remote-id>
</upstream>
</pkgmetadata>
-
