gentoo resync : 05.02.2020

5 files changed, 95 insertions, 3 deletions

diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index 8977ec462eb9..6fd4f0e73e84 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -1,7 +1,9 @@
+AUX dibbler-1.0.1-fno-common.patch 562 BLAKE2B c6219983aa421c20aecb345d12000eb6130bb0a785f8d9283c58220f5a330086137a5351111016b797cc79e37c5bf81cf0b435f6e7f48bce03bf657e82651b72 SHA512 2386188ca1760f47bea0727bc25c4c9b30086dc8948a7547d36df8b4c7f40b871241ec51b30b3e516b1642baa530ba2ce61222a85d95a4bcb45edf159482e512
 AUX dibbler-client 354 BLAKE2B c2d9359fdc169513c5c208591b048a9d5f93443e21a95c78d296f6e68bd5a7f3caa79bb8d70bec766e2a15f874e9fdb52bc231a8ae460d3f2ffb9e92f34ff9e1 SHA512 2ef18db1cd172f40291573a6f34209d6841f39f90b14a0731abf54cae6fbf90850d1cbeb3d6d985f0f9957c5a4228c794fc9b8d69c716bf0df7ee857b510de66
 AUX dibbler-client.service 134 BLAKE2B f425f3460ae1188b2a391e240dd8f64e3ed9b8114e0bcd2ff444c2f1f65b875c6c58aa70431118f07c54a6ed07a086856d8f9c64978288e116a2779e8ee7596c SHA512 419e40ac4110061e675cccd351b5a3e5f46e0c62d5169feb97eadee805d99b9caaae5f65fb9433808081d670db1cbb5ba6d9776e794f4cff624ec85906e28613
 AUX dibbler-relay 348 BLAKE2B c9a8d1f2b130e00e9d0f4ad517fc5256ec1d09cde6b66c8641cdf6b171b170944866842d76a4619f2294dd30de9670dc45775d16253e96a1ee4a668ece576285 SHA512 5eb62c4c7e9a4c5b558d0fed79a41b5a2db996349ab5ebfdff2f50d2bf0ba0e4293aab1a9bb089014aacaa3a502a7a13c14b3f3fe9510d1c0d91fca2b0674745
 AUX dibbler-server 354 BLAKE2B 08b1177bbe9f3f1f1be809dd9f3617368257072e22ad6fe1e1a671429a2e488ac47d2902defd34b60b0adf9b6aaf0db119c8edb4c4ce8d510df8e0f0a8b260dd SHA512 3d2f1df6263e3373988d5ba75479a7bed16c3a363809fdde582afeebab0cda746c91d02f8a9535e15ed1095c098f4ab3721322092bc692e0403f8c46f16adcd5
 DIST dibbler-1.0.1.tar.gz 4375118 BLAKE2B 1418a20ecf96f0793b25165d2790bb12aec0dc9ffbdf248f996f736e375f466a5853f698bc3da753dae57db4493a662cc8962e5d1fb6d9dd7c0c9d893128773e SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0
-EBUILD dibbler-1.0.1.ebuild 1191 BLAKE2B 06e6fde0956cc4989f15b4f95c695c4ce3ef1d460c1d992a5250c07268286644c181b179631df9e87a2e483662676b9434730bfb9c05147b9538a3ce86497f7f SHA512 1d2dcff9ec38d8e9521a8a1e5fddba4a0738d809b739e0d033f592bcee6b36ad3b22ed4a818a6a31f8854b080333c9669e8bf87ff8df20336652c98e8ccd9bf0
-MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
+EBUILD dibbler-1.0.1-r2.ebuild 1377 BLAKE2B 564d335fb52c3c4dd702028a9d706caedce5e26d8a2762dcac524b65028ad94389d4ea0b1aa1ad4c647c214907a819a96a4c17584350fd2aa988a534712bba8b SHA512 717e52ec0d5c90e708f5437ffa294e34fe1c548e9d3fb923466090f14c9e66853901018877832369a7c6f38f53ee3b706ecd1f2ef8799f46cb199dfbf96e26f1
+EBUILD dibbler-1.0.1.ebuild 1232 BLAKE2B 5d096c882545cb1c0dcb50e5dfc8cb6787cd100aa3ddf5e92df19695e04d3abb1cb3b9eccc115b9514273746bf232ee64eed5adf2723374ef63bac0bdcdda831 SHA512 a7a2693956d8c9cb85023dbe460899acd3f9fea9bc673558f9a15f2e6c2acad694ed918a2e9b8dc4b2c5c1ff0dae202ef405f3620e4cbcbf962cbf08c36c6d9b
+MISC metadata.xml 350 BLAKE2B 88539009202645f314ed13bd5d4ebca86b45658a3d9de79596c337b262f6a37911efdb52defb0ea6e6a07ef8977cf1f3410a5d19359197df1d2c769f279856a7 SHA512 41de174499d1f04980b349af4c88d4fa396dee28edde06eeda3a144bed48f2a20d333f4b6ea7f0137e9ebbd3f47cc2019960084bec1bb8525daa6c06da90c0e9
diff --git a/net-misc/dibbler/dibbler-1.0.1-r2.ebuild b/net-misc/dibbler/dibbler-1.0.1-r2.ebuild
new file mode 100644
index 000000000000..9490ae32650f
--- /dev/null
+++ b/net-misc/dibbler/dibbler-1.0.1-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 systemd
+
+DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
+HOMEPAGE="http://klub.com.pl/dhcpv6/"
+SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86"
+IUSE="doc resolvconf"
+
+RDEPEND="resolvconf? ( virtual/resolvconf )"
+DEPEND="${RDEPEND}
+	doc? (
+		|| (
+			dev-texlive/texlive-latexextra
+			dev-tex/floatflt
+		)
+	)"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf
+to suit your needs. They are stored in /etc/dibbler"
+
+src_configure() {
+	econf $(use_enable resolvconf)
+}
+
+src_compile() {
+	default
+	# devel documentation is broken and users should consult the online version
+	# http://klub.com.pl/dhcpv6/doxygen/
+	use doc && emake -C doc/ user
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	dosbin dibbler-{client,relay,server}
+	doman doc/man/*.8
+
+	insinto /etc/dibbler
+	doins doc/examples/*.conf
+	keepdir /var/lib/dibbler
+
+	dodoc AUTHORS CHANGELOG RELNOTES TODO
+	use doc && dodoc doc/dibbler-user.pdf
+
+	doinitd "${FILESDIR}"/dibbler-{client,relay,server}
+	systemd_dounit "${FILESDIR}"/dibbler-client.service
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/dibbler/dibbler-1.0.1.ebuild b/net-misc/dibbler/dibbler-1.0.1.ebuild
index 6e7824899da4..e4bbf0482849 100644
--- a/net-misc/dibbler/dibbler-1.0.1.ebuild
+++ b/net-misc/dibbler/dibbler-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -23,6 +23,7 @@ DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.co
 to suit your needs. They are stored in /etc/dibbler"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fno-common.patch
 	epatch_user
 }
 
diff --git a/net-misc/dibbler/files/dibbler-1.0.1-fno-common.patch b/net-misc/dibbler/files/dibbler-1.0.1-fno-common.patch
new file mode 100644
index 000000000000..d08b6bbd212f
--- /dev/null
+++ b/net-misc/dibbler/files/dibbler-1.0.1-fno-common.patch
@@ -0,0 +1,25 @@
+--- a/Port-linux/interface.c
++++ b/Port-linux/interface.c
+@@ -43,6 +43,9 @@
+ #include <linux/sockios.h>
+ #include <linux/if_ether.h>
+ 
++int interface_auto_up;
++int interface_do_message;
++
+ void daemon_log(int loglevel, const char *fmt,...)
+ {
+     char buf[255];
+--- a/Port-linux/interface.h
++++ b/Port-linux/interface.h
+@@ -23,8 +23,8 @@
+ extern "C" {
+ #endif
+ 
+-int interface_auto_up;
+-int interface_do_message;
++extern int interface_auto_up;
++extern int interface_do_message;
+ 
+ typedef enum { IFSTATUS_UP, IFSTATUS_DOWN, IFSTATUS_ERR } interface_status_t;
+ 
diff --git a/net-misc/dibbler/metadata.xml b/net-misc/dibbler/metadata.xml
index 7d273a80ff68..d88cf30d7acd 100644
--- a/net-misc/dibbler/metadata.xml
+++ b/net-misc/dibbler/metadata.xml
@@ -5,4 +5,7 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<use>
+		<flag name="resolvconf">Use resolvconf to handle /etc/resolv.conf updates</flag>
+	</use>
 </pkgmetadata>