4 files changed, 3 insertions, 110 deletions
diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index 007ce7b4ecc4..bc804c0228a0 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -5,7 +5,5 @@ AUX dibbler-client.service 134 BLAKE2B f425f3460ae1188b2a391e240dd8f64e3ed9b8114
 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-r2.ebuild 1342 BLAKE2B aaa10aa5fb467c1b65ecc559250cc5fd633ed915d1e4b2cd8526ac9b5f1774b02370f25b25b2c9ff958c388134d1b0ea3656481ef3d21c92d242d63e27efbea8 SHA512 4e9d53563f94dc14fa9cdce3fa1fa93a0ac931568aa118e535edb073446d48ea83cc19bde4fe1c8aff09a65b58c8de4581f1c598cb64f7c80f954d55a91803a3
-EBUILD dibbler-1.0.1-r3.ebuild 1377 BLAKE2B 1ef90dcbeb577d64045077879e9987339685d5c58d3d85d698a255284ba69424085b855377ec9cfc78a62d0454c5979a2241a247b2e03e7474cf9b7cdcdd7bb3 SHA512 ceba9d31bd4b2a3edbb6e2ccf50751448c74246c5a612318686e3509d97a2582c530aeaceb797df5ac0f09cf114687cd8260bdfcbc39461ad169e29708924a2e
-EBUILD dibbler-1.0.1.ebuild 1204 BLAKE2B 09a671ebfaa7cd2281884d3a8207ff154b21dbad83b74d4bb24b28631ab4c468247853051c131366a7f918626751099d006cdd7e19588c10a4c1fdbb25c116f9 SHA512 26ebe42082faacbfe6bbe138f972638910c556cc282c9771d520f776adc66ec09d7768c00509e72934df48532d60c31a8fedfe288b6a2ad770fe13cfc1ecd64f
+EBUILD dibbler-1.0.1-r3.ebuild 1375 BLAKE2B 9cdbbfd5c677c843be51e1995678e517beba4a9fcb9a4ca8eb1b56a486eae44a0d905c6807884dac3486e204a8d876a6de3d8081aaac2f7f6754871910057315 SHA512 dc5f6e83562f2172000a60e210b9b0d28371a5555097c6b3f7e6abc98009f16600e2b78040c22f54d3e25fbe21c48a115e21f9bcf93d705b4e2de0141ec2dc17
 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
deleted file mode 100644
index 64f7775868c1..000000000000
--- a/net-misc/dibbler/dibbler-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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 )"
-
-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-r3.ebuild b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild
index 3bc3e0296bbb..be80b56206bd 100644
--- a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild
+++ b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips x86"
 IUSE="doc resolvconf"
 
 RDEPEND="resolvconf? ( virtual/resolvconf )"
diff --git a/net-misc/dibbler/dibbler-1.0.1.ebuild b/net-misc/dibbler/dibbler-1.0.1.ebuild
deleted file mode 100644
index 610fb4e2bfae..000000000000
--- a/net-misc/dibbler/dibbler-1.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils readme.gentoo 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"
-
-DEPEND="doc? ( dev-texlive/texlive-latexextra )"
-RDEPEND=""
-
-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_prepare() {
-	epatch "${FILESDIR}"/${P}-fno-common.patch
-	epatch_user
-}
-
-src_compile() {
-	emake
-	# 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() {
-	readme.gentoo_create_doc
-
-	dosbin dibbler-{client,relay,server}
-	doman doc/man/*.8
-
-	insinto /etc/dibbler
-	doins doc/examples/*.conf
-	dodir /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
-}