gentoo resync : 28.04.2021

14 files changed, 1 insertions, 1175 deletions

diff --git a/net-dns/opendnssec/Manifest b/net-dns/opendnssec/Manifest
index 088067969c2a..a8570bb28d9f 100644
--- a/net-dns/opendnssec/Manifest
+++ b/net-dns/opendnssec/Manifest
@@ -1,26 +1,10 @@
-AUX opendnssec-1.3.14-drop-privileges.patch 906 BLAKE2B 8591de896d85a55957a2354fa638e34630c5b31c2126445ccc92f5b89e5165b2174b2904557fa7ca2ececfe784b131eae65beb689f438f938842793c142f6062 SHA512 cbc17153fcd617bcbc54a0b14111908635dae722f845f894d9c6769d77960433fa75c3ec0a5061af054167b4223f7f2946c3e3ba09c2bb55598f72f71d1c2106
-AUX opendnssec-1.3.14-use-system-trang.patch 706 BLAKE2B bbe3edcd766bc6f6adb2427b4cbf51ef5c02e5387ae1d65ca878d31bcdcd81f3f62aeb4eba2b4e7ecf276f707c18d86f935fcb42b352977a0c5e8ad24ca87f12 SHA512 e7d664f6ee548efeae7a015ceaf21b3fedc7654ed295ecd2440b0212015c1556b4f1bac978a2f804e7b6830181273484b428e1a363989eff067a9b3587937b7f
-AUX opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch 751 BLAKE2B 3c1053d916f1035c4fdc1f94fef825edc2fa04b64bd2bed4facbf3cfeb9e06514eea14b89b85be122b9b5a1f29aa284a7df899afd514d2719ebb017685df3a15 SHA512 f89fc43b96a76ed9af9ac4f28993037ee709d19e8cfeb53da2bdff2eb723c4200fe70aaac8b651998b9b6685343777316141dd0ee2ebc600f703d8dadca24d43
 AUX opendnssec-drop-privileges-2.0.x.patch 813 BLAKE2B 231537d3f8f40e1524eb76212abb7e00d965acaa39717de2c72e9d7ec93f866150510d971ba465f7a48c3eb588f1a78631ed33beef0ebe1fb369472f73062d80 SHA512 425eb123452183b4e4a3e87e9a71afa81684fe4af9c111d1bad3433ee640907cf3caa1065711f67286bb0336fd8d82e3f4bfeef94e3ff620bcbdaf960d4137b8
-AUX opendnssec-drop-privileges.patch 641 BLAKE2B 8ba78f6363424cbbef233c032f06704ad0a16af1056ff75f260200cfd42e45634ada74a83afba0fa45ed18d87b9b650fc1ddf5faa38db1821fd03c491e53a2ab SHA512 60cb666d821ae8880ccb789f8d2b60ea218a98e1b7b9393d8dc299be55efbd93efb9334ebf5cbf55f67ef1c58df1206dce906994bd9808e3db5a5bf9644a7f06
 AUX opendnssec-fix-localstatedir-2.0.x.patch 1161 BLAKE2B 28469aaad2878cdb1f58f247db0e7b9603ec9fab35ec9ded597dfba50889cd30e474cdaf2f0397e75147cb0374c049d9863f95f961eccce47a7e4874dae48fcc SHA512 1d07f2108238c041041c96b4efaaec1e75740ed54fbd6390fa45f5ccf7f631c1e8d4400bb9cb95023c8909ae10abc3c93aaa137f954921af75825c06a6d94d9a
-AUX opendnssec-fix-localstatedir.patch 1693 BLAKE2B 82220ef1f5c5da994fd01671436b9e47a5f0a08737e52a440866499792326389bc495de00305853dbdc6a08ef8b6288e509a8b2310461724f6f4d42aa2245614 SHA512 86700c97bb482f5fa6d99fe8f105c41e8798de542e6cf5fd4d6c14da11237e4fd11eccb2900de4893898d7855e31beb6572c709c2dad9774d5fe440673af2627
 AUX opendnssec-fix-run-dir-2.0.x.patch 1188 BLAKE2B c11d3e120dac17f4d9bb24c561cf67e33806c906391e0033677e1ecfa423ddae563cb20680a73b8dec4c50e0b1fd2dbc0cf0adb82c77e67f50a5f4a40e26a871 SHA512 293c2ceb336623ed52028ca3144c4249eaf426dd2eb84890be9f1ed53e27d4ff5fd6a699d41426ca57d6362c2f83dd8b3556691da2815235f72e69ab4ef45165
-AUX opendnssec-fix-run-dir.patch 1204 BLAKE2B 8109370737931c9172d7e89a02cf08cdb38524f91429c8526d27a18f90672586fc95eed671e3a2222698832e1df4cfad292950bd8b364af67ca9242e7dd074f4 SHA512 f604ab24731bd84498f33dc3213b937335e55f805d4913e80b037b91cc5bf14f406cb2af14cc455a9a23c45a3475ef1b3901c68760188d9e4a36d314d29f8f84
 AUX opendnssec-openssl1.1.patch 1823 BLAKE2B e94d97755bde512efa87751f99655903a9b9627d0a4896294f643d89adbf7aa6fa1a0edf9098d0d2a1fc059aeaf2e19f6c814807b9fd2716fdf98401e3c15b06 SHA512 17dac7598339ba5a8d1459c93c837344d926cd939b830502040e5c41514bb6261d25486dbfce5e2d9994c01d990dbf88108563aab1b04b02c6a69ba988503a73
 AUX opendnssec-use-system-trang.patch 618 BLAKE2B 32e1b6784f1666e0485e6109af40b06373fbdc974f90bf3a3d6fc564d7c69728151afc5a9f793c96a3be77593bb2679af9dee4456bf69e89367fa459f8b70435 SHA512 316b89a2c6ba56c4fe45d00ad1bc31316fa20ba7177a2cc0979c23f11aba4234cd2f0b8972f98e4f14be9535b704fdc3177a514a41c489eb43016f8ff878795c
 AUX opendnssec.confd 393 BLAKE2B 47f83e11292c01cb999fae36dbea2d0b45cb970493bfbab43c43682fe26e574e12bbe7f7096e71ff7bd0b8b49827f13e4de858a38868706fa769cc92ceb1f307 SHA512 17bd24efef9bd6b7a907c75126809a6012db23a6c8547169c41dbc62fc91775331f445905282bc6c2ef13357f92eccab5008d4605419d98acdb723806b63a924
-AUX opendnssec.confd-1.3.x 477 BLAKE2B e131ba95566a4d9cdab721551c7056c9ab07c0cd62b100ac4a84c4363a8ec96482758c13ec35f6188581764550364936123ea8011359278ef054f2ca03a509e0 SHA512 e45cd05e9d972dce5254f333ce21fd599ed905e8009f67de636c3a72dcd49e43fb75f702e21665dd3f19602fb9a5be5b6ff34e147ac4e29844560cc4f65f727c
 AUX opendnssec.initd 1854 BLAKE2B 358bcf513123f7a38b7795f142f56e6a186062d1ad80bb70bee46ba7ebe7a137b4d2830a6c27ae690add23e0296ed2bd3a7a5d7ee88e1ee7ee3a8a9631306916 SHA512 75bce27c152b55ba2ba7d0770c6f2149493ef4b145f2257328e7e4b6865ad2d644695a688c3e06be02705ac42752e031846551b80b560e19a73e595e5ad15def
-AUX opendnssec.initd-1.3.x 2870 BLAKE2B 925277b2343bc1297a5520115b987915b49c2a7f551243c9dabb9af652043d05f3fa34c0b76e54cf7c692b23c69cd7cab37a9b730e09cbc68ca0cb4c74b7b18d SHA512 d25f3106868a2d73f48cc12a555fa1b4a5281befe667cfa5bf982bf3bfd83b832d477eba857abaa00cfcb41b796c36257503121426c4c396595a3e7e018c5e03
-DIST opendnssec-1.3.18.tar.gz 1143889 BLAKE2B 0443a9d29de479257c05d024a756c176a342032eb17b105c04f5808ba550f1026815f191bce6ada13c54a7b7fea0f816d7754227f3d1c9ed76bc4d602785c2cf SHA512 5df39ba778c9b1245e88b81df7aa491bca0aad2943845284c4f8b4dd729fa69014d45f07bdf99a048ccf668a1c9675a8dd99efcec1abdbd4e06e9738fec6ab6d
-DIST opendnssec-1.4.12.tar.gz 1036392 BLAKE2B 3bfbcfe91d7da7c2e4b1c5439f7d55e15612ab6ace6af25fcb9c9eb7ddb2e1055e70684c2bd6bbae57a0c2eb78098b448f7dca198e0d6f9e2e812945a1f06cc2 SHA512 b72b76ab4aec8cc63cc9c020bef9a24b000fd00172a07cf43d57b3a33041bef9e107b71eb7271bb13c3566510599c6a1913cf986a724e169c42dc8bdac8d2e51
-DIST opendnssec-1.4.8.2.tar.gz 1043171 BLAKE2B 20b1fa0d97b776223314937061cd42f4fe0a924e58a159fd0399d23058e2b0fd44d55049947de26c36aade5b5599527fc03f09eeef4e20f8c9beee40dfbcd7fb SHA512 7f2e10b425f60947aca40c61509b07ddc4363105cc882b518ffa816437299d6f881411cb38325f27b3a34c2005953988b39c945362866dd0f1f7c6ef973bfa06
-DIST opendnssec-2.0.1.tar.gz 1101523 BLAKE2B 0446efd04e73e00d204c53164c3c6aaecb9f37014a110ee85d7e7b1728d225aafcf9e6ef31a7dd29cdf2e875e7b653ab6e8178cece65c47a1c5b027facc16130 SHA512 aa12818f92688e087acaff8a6771d2a7da733e04d9e821967d313c7ff880a1056f470b11988eba1e7aad606418c3a4587f654163d74f68e3f61943c74d86d052
 DIST opendnssec-2.0.3.tar.gz 1103355 BLAKE2B b64e729003de86e4139efaad60c9feae9f4e19c16a29fdced55d66f5896c4b7d76c4b8c57a8330d55c0c03e87de1ebe6ec49ef9d1b6e215be963680d2c805579 SHA512 4745a9ac317cc65d6f5b14be640687efd5fde2149541f692fb607a458378d27e903f175023c1aa16a777d17cef9cc68f1a84e7e7cdb233466d26756721b34424
-EBUILD opendnssec-1.3.18-r1.ebuild 5719 BLAKE2B 33ed406b2fb2bfdcd7a33a67971ceed4986958b8016259693379726604342ef930ce9626e962125a02b315bc0fc2b07ab31cbd88c09060b3b08b48f51ffd5652 SHA512 098d741ffe09e814ce0697d6d9b824080efcb08548c932b8e1a78fa905c4e680fa193304cf51e75563c70cd939597fb30e858d90eeea5984b15a0810d4fd6e22
-EBUILD opendnssec-1.4.12-r1.ebuild 5806 BLAKE2B 96d15804c15759d8f5c6caa8284d583e30308cb6fa24d9d36b177d8505bb816ab6d899ddd82225c1102a4ac58b1f98110f53cb6bdf7c40255532dbf91cf8959e SHA512 67c7c4afec19bb5f2c22498fcb385c4ce1042fa1e98b3b12bd183d8999531facf1d878c1f0800d22d19f67e09259b2545c0738e609885178f8a294020517861d
-EBUILD opendnssec-1.4.8.2.ebuild 5856 BLAKE2B b9b4bf8e9d94743c7bd4189889e3071aeaacb71915749b542b59d28a86260affd402bbcd2b2f88896a791237bcc358e0bdc72f4e068e61b048bf98ec03e3cd74 SHA512 e9f000c17e6bb9bdcd66bc38e2b7c21ff3dce0da7dcda07e2062ccd64416cc563577cc6856bb279d575eb74896e89527a895fc825fcd2cda8431c8e14c372633
-EBUILD opendnssec-2.0.1-r1.ebuild 6789 BLAKE2B 996d5f5d1335513084428339fd2ccb9482a1901b5940bf77bfd19bda36f6b99a4dd40f0d35cbe4d90f7e5b9ca37566b6f65e5aed21174618a1e477f97cc0de6c SHA512 982583cba1c39f9591d710bb4dbb7cf5b53c4b7b9a073b01416097bf7b604a94582f564bf60b7e8d4de588300bcb77d826f7cb3a9987475a94901f3b67d1d7e1
 EBUILD opendnssec-2.0.3-r1.ebuild 6761 BLAKE2B 67105b5333460bf466ac4620a7efb093423321b5878e715475e0232ac9a74ff51534a75b4417abc6a26a46027c31585ff60cfe92eed03b0300a2fb5e3cf0363b SHA512 dc199e6aaa506090c25ba9ea9538cda922f67dcb509a3e6ddf6ddbc9d15300d0d5166720ca53b10be49f99a13c90a9f1aef7429a1c0e26b039cbdac28f5bcad6
-MISC metadata.xml 906 BLAKE2B 87ce475aaab1ed562daa0c2102e206f32abc25b9fd77932bd6a33e5f31990864dd0da48e48e7165debc10ae0653f6bed364c12a52df48dd448e29590bf6f7141 SHA512 9cddc6b15c7a959cb885bc639c19e166ee202dd4b45db50c9bbb3b61fe9e84311f023a3d34cfc44e689cf81df092211fa4cb88427fb143c113bdfc1e7897112e
+MISC metadata.xml 717 BLAKE2B a78c51d08bd665681b9977050e8337fbe95adface07632923e7bfa7f5ca9cbef0443bf8ada06480b862219720d71669220eeeca21d06edf68ba3452667faa861 SHA512 203b2e6d467ecd5832d7a56a9d31d37f6427c6cf3d9ad45d4b18d4b9b3f74ac53dcfb03bea0bd2c68d34a9474992216c198173e65c8f7edc00f61ead434c2b1d
diff --git a/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch
deleted file mode 100644
index 7c9f72355d20..000000000000
--- a/net-dns/opendnssec/files/opendnssec-1.3.14-drop-privileges.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: conf/conf.xml.in
-===================================================================
---- conf/conf.xml.in	(revision 3022)
-+++ conf/conf.xml.in	(working copy)
-@@ -38,12 +38,10 @@
- 	</Common>
- 
- 	<Enforcer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<Datastore><SQLite>@OPENDNSSEC_STATE_DIR@/kasp.db</SQLite></Datastore>
- 		<Interval>PT3600S</Interval>
-@@ -56,12 +54,10 @@
- 	</Enforcer>
- 
- 	<Signer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 		<WorkerThreads>8</WorkerThreads>
-@@ -80,12 +76,10 @@
- 	</Signer>
- 
- 	<Auditor>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 	</Auditor>
diff --git a/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch b/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch
deleted file mode 100644
index 39678408264a..000000000000
--- a/net-dns/opendnssec/files/opendnssec-1.3.14-use-system-trang.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN opendnssec-1.3.0rc3.old/conf/Makefile.am opendnssec-1.3.0rc3/conf/Makefile.am
---- opendnssec-1.3.0rc3.old/conf/Makefile.am	2011-07-01 21:15:25.000000000 +0200
-+++ opendnssec-1.3.0rc3/conf/Makefile.am	2011-07-01 21:17:00.000000000 +0200
-@@ -7,7 +7,7 @@
- XML =	conf.xml kasp.xml zonelist.xml signconf.xml zonefetch.xml
- XSL=	kasp2html.xsl
- 
--TRANG=	$(srcdir)/trang/trang.jar
-+TRANG=	/usr/bin/trang
- 
- sysconfdir = @sysconfdir@/opendnssec
- datadir = @datadir@/opendnssec
-@@ -25,7 +25,7 @@
- .rnc.rng:
- 	@test -x "${JAVA}" || \
- 		(echo "java is required for converting RelaxNG Compact to RelaxNG"; false)
--	${JAVA} -jar ${TRANG} $< $@
-+	${TRANG} $< $@
- 
- regress: $(RNG)
- 	@test -x "${XMLLINT}" || \
diff --git a/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch b/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch
deleted file mode 100644
index a0676dd091be..000000000000
--- a/net-dns/opendnssec/files/opendnssec-1.3.18-eppclient-curl-CVE-2012-5582.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN opendnssec-1.3.18.orig/plugins/eppclient/src/epp.c opendnssec-1.3.18/plugins/eppclient/src/epp.c
---- opendnssec-1.3.18.orig/plugins/eppclient/src/epp.c	2014-07-21 11:16:10.000000000 +0200
-+++ opendnssec-1.3.18/plugins/eppclient/src/epp.c	2016-03-23 22:25:18.679354984 +0100
-@@ -390,7 +390,7 @@
-     curl_easy_setopt(curl, CURLOPT_URL, url);
-     curl_easy_setopt(curl, CURLOPT_CONNECT_ONLY, 1L);
-     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
--    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1L);
-+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2L);
-     curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_ALL);
-     curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, curlerr);
-     curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
diff --git a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch b/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
deleted file mode 100644
index c1972bbc3d1b..000000000000
--- a/net-dns/opendnssec/files/opendnssec-drop-privileges.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- conf/conf.xml.in.orig	2013-05-12 22:36:47.530988182 +0200
-+++ conf/conf.xml.in	2013-05-12 22:37:56.459817918 +0200
-@@ -38,12 +38,10 @@
- 	</Common>
- 
- 	<Enforcer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- <!-- NOTE: Enforcer worker threads are not used; this option is ignored -->
- <!--
- 		<WorkerThreads>4</WorkerThreads>
-@@ -60,12 +58,10 @@
- 	</Enforcer>
- 
- 	<Signer>
--<!--
- 		<Privileges>
- 			<User>opendnssec</User>
- 			<Group>opendnssec</Group>
- 		</Privileges>
---->
- 
- 		<WorkingDirectory>@OPENDNSSEC_STATE_DIR@/tmp</WorkingDirectory>
- 		<WorkerThreads>4</WorkerThreads>
diff --git a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch b/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
deleted file mode 100644
index 3958c6c70ccf..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-localstatedir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -urN opendnssec-1.3.0rc2.old/Makefile.am opendnssec-1.3.0rc2/Makefile.am
---- opendnssec-1.3.0rc2.old/Makefile.am	2011-06-02 13:48:56.000000000 +0200
-+++ opendnssec-1.3.0rc2/Makefile.am	2011-06-02 13:49:19.000000000 +0200
-@@ -31,11 +31,11 @@
- 
- install-data-hook:
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/tmp
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signconf
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/unsigned
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/opendnssec/signed
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/tmp
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
- 
-diff -urN opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4 opendnssec-1.3.0rc2/m4/opendnssec_common.m4
---- opendnssec-1.3.0rc2.old/m4/opendnssec_common.m4	2011-06-02 13:48:56.000000000 +0200
-+++ opendnssec-1.3.0rc2/m4/opendnssec_common.m4	2011-06-02 13:49:36.000000000 +0200
-@@ -18,7 +18,7 @@
- OPENDNSSEC_LIBEXEC_DIR=$full_libexecdir/opendnssec
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
--OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/opendnssec"
-+OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec"
- OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
- 
- AC_SUBST([OPENDNSSEC_BIN_DIR])
diff --git a/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch b/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch
deleted file mode 100644
index fe5b504344cf..000000000000
--- a/net-dns/opendnssec/files/opendnssec-fix-run-dir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur opendnssec-1.3.12.orig/m4/opendnssec_common.m4 opendnssec-1.3.12/m4/opendnssec_common.m4
---- opendnssec-1.3.12.orig/m4/opendnssec_common.m4	2013-01-31 13:46:01.122201232 +0100
-+++ opendnssec-1.3.12/m4/opendnssec_common.m4	2013-01-31 13:54:47.648861211 +0100
-@@ -19,7 +19,7 @@
- OPENDNSSEC_DATA_DIR=$full_datadir/opendnssec
- OPENDNSSEC_SYSCONF_DIR=$full_sysconfdir/opendnssec
- OPENDNSSEC_LOCALSTATE_DIR="$full_localstatedir/lib/opendnssec"
--OPENDNSSEC_PID_DIR="$full_localstatedir/run/opendnssec"
-+OPENDNSSEC_PID_DIR="${destdir}/run/opendnssec"
- 
- AC_SUBST([OPENDNSSEC_BIN_DIR])
- AC_SUBST([OPENDNSSEC_SBIN_DIR])
-diff -ur opendnssec-1.3.12.orig/Makefile.am opendnssec-1.3.12/Makefile.am
---- opendnssec-1.3.12.orig/Makefile.am	2013-01-31 13:46:01.122201232 +0100
-+++ opendnssec-1.3.12/Makefile.am	2013-01-31 13:47:08.569951675 +0100
-@@ -37,8 +37,8 @@
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signconf
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/unsigned
- 	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/opendnssec/signed
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/run/opendnssec
-+
-+
- 
- docs:
- 	(cd libhsm; $(MAKE) doxygen)
diff --git a/net-dns/opendnssec/files/opendnssec.confd-1.3.x b/net-dns/opendnssec/files/opendnssec.confd-1.3.x
deleted file mode 100644
index 63121af7f0ca..000000000000
--- a/net-dns/opendnssec/files/opendnssec.confd-1.3.x
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Variables containing default binaries used in the opendnssec
-# initscript. You can alter them to another applications/paths
-# if required.
-
-CHECKCONFIG_BIN=/usr/bin/ods-kaspcheck
-CONTROL_BIN=/usr/sbin/ods-control
-ENFORCER_BIN=/usr/sbin/ods-enforcerd
-SIGNER_BIN=/usr/sbin/ods-signerd
-EPPCLIENT_BIN=/usr/sbin/eppclientd
-EPPCLIENT_PIDFILE=/run/opendnssec/eppclientd.pid
diff --git a/net-dns/opendnssec/files/opendnssec.initd-1.3.x b/net-dns/opendnssec/files/opendnssec.initd-1.3.x
deleted file mode 100644
index f4c9fa3c149b..000000000000
--- a/net-dns/opendnssec/files/opendnssec.initd-1.3.x
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="An open-source turn-key solution for DNSSEC"
-
-depend() {
-	use logger
-}
-
-checkconfig() {
-	if [ -z "${CHECKCONFIG_BIN}" ]; then
-		# no config checker configured, skip config check
-		return 0
-	fi
-	if [ -x "${CHECKCONFIG_BIN}" ]; then
-		output=$(${CHECKCONFIG_BIN} 2>&1| grep -v -E "^/etc/opendnssec/(conf|kasp).xml validates")
-		if [ -n "$output" ]; then
-			echo $output
-		fi
-
-		errors=$(echo $output | grep ERROR | wc -l)
-		if [ $errors -gt 0 ]; then
-			ewarn "$errors error(s) found in OpenDNSSEC configuration."
-		fi
-		return $errors
-	fi
-	eerror "Unable to execute ${CHECKCONFIG_BIN:-config binary}"
-	# can't validate config, just die
-	return 1
-}
-
-start_enforcer() {
-	if [ -n "${ENFORCER_BIN}" ] && [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer start > /dev/null
-		eend $?
-	else
-		if [ -n "${ENFORCER_BIN}" ]; then
-			eerror "OpenDNSSEC Enforcer binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Enforcer not used."
-	fi
-}
-
-stop_enforcer() {
-	if [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer stop > /dev/null
-		eend $?
-	fi
-}
-
-start_signer() {
-	if [ -n "${SIGNER_BIN}" ] && [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Signer"
-		${CONTROL_BIN} signer start > /dev/null 2>&1
-		eend $?
-	else
-		if [ -n "${SIGNER_BIN}" ]; then
-			eerror "OpenDNSSEC Signer binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Signer not used."
-	fi
-}
-
-stop_signer() {
-	if [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Signer"
-		${CONTROL_BIN} signer stop > /dev/null 2>&1
-		eend $?
-	fi
-}
-
-start_eppclient() {
-	if [ -n "${EPPCLIENT_BIN}" ] && [ -x "${EPPCLIENT_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Eppclient"
-		start-stop-daemon \
-			--start \
-			--user opendnssec --group opendnssec \
-			--exec "${EPPCLIENT_BIN}" \
-			--pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
-		eend $?
-	else
-		# eppclient is ofptional so if we use the default binary and it
-		# is not used we won't die
-		if [ -n "${EPPCLIENT_BIN}" ] && \
-				[ "${EPPCLIENT_BIN}" != "/usr/sbin/eppclientd" ]; then
-			eerror "OpenDNSSEC Eppclient binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Eppclient not used."
-	fi
-}
-
-stop_eppclient() {
-	if [ -x "${EPPCLIENT_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Eppclient"
-		start-stop-daemon \
-			--stop \
-			--exec "${EPPCLIENT_BIN}" \
-			--pidfile "${EPPCLIENT_PIDFILE}" > /dev/null
-		eend $?
-	fi
-}
-
-start() {
-	checkconfig || return $?
-	test -d /run/opendnssec || mkdir -p /run/opendnssec
-	chown opendnssec:opendnssec /run/opendnssec
-	start_enforcer || return $?
-	start_signer || return $?
-	start_eppclient || return $?
-}
-
-stop() {
-	stop_eppclient
-	stop_signer
-	stop_enforcer
-	sleep 5
-}
diff --git a/net-dns/opendnssec/metadata.xml b/net-dns/opendnssec/metadata.xml
index f81a154f2ecf..05f2788d1508 100644
--- a/net-dns/opendnssec/metadata.xml
+++ b/net-dns/opendnssec/metadata.xml
@@ -5,8 +5,6 @@
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="auditor">Enables auditing capabilities for OpenDNSSEC</flag>
-		<flag name="eppclient">Enables support for automatic submission of DNSSEC keys to an upstream epp server</flag>
 		<flag name="signer">Enables signing capabilities for OpenDNSSEC</flag>
 		<flag name="opensc">Enables support for storing DNSSEC keys through a <pkg>dev-libs/opensc</pkg> PKCS#11 interface</flag>
 		<flag name="softhsm">Enables support for storing DNSSEC keys in a <pkg>dev-libs/softhsm</pkg> PKCS#11 object</flag>
diff --git a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild b/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
deleted file mode 100644
index a37fb6fc331a..000000000000
--- a/net-dns/opendnssec/opendnssec-1.3.18-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-auditor +curl debug doc eppclient mysql +signer +sqlite test ${PKCS11_IUSE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/ldns
-	curl? ( net-misc/curl )
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	softhsm? ( dev-libs/softhsm:* )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-# test? dev-util/cunit # Requires running test DB
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-	eppclient? ( curl )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir.patch"
-	"${FILESDIR}/${PN}-fix-run-dir.patch"
-	"${FILESDIR}/${PN}-1.3.14-drop-privileges.patch"
-	"${FILESDIR}/${PN}-1.3.14-use-system-trang.patch"
-	"${FILESDIR}/${PN}-1.3.18-eppclient-curl-CVE-2012-5582.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/portage/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	local i
-
-	for i in eppclient mysql; do
-		if use ${i}; then
-			ewarn
-			ewarn "Usage of ${i} is considered experimental."
-			ewarn "Do not report bugs against this feature."
-			ewarn
-		fi
-	done
-
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# $(use_with test cunit "${EPREFIX}/usr/") \
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var/" \
-		--disable-static \
-		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		--disable-auditor \
-		$(use_with curl) \
-		$(use_enable debug timeshift) \
-		$(use_enable eppclient) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install update scripts
-	insinto /usr/share/opendnssec
-	use sqlite && doins enforcer/utils/migrate_keyshare_sqlite3.pl
-	use mysql && doins enforcer/utils/migrate_keyshare_mysql.pl
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{conf,kasp,zonelist,zonefetch}.xml
-	use eppclient && fowners root:opendnssec /etc/opendnssec/eppclientd.conf
-
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd-1.3.x opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd-1.3.x opendnssec
-	use auditor || sed -i 's/^CHECKCONFIG_BIN=.*/CHECKCONFIG_BIN=/' "${D}"/etc/conf.d/opendnssec
-}
-
-pkg_postinst() {
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-	if use auditor; then
-		ewarn
-		ewarn "Please note that auditor support has been disabled in this version since it"
-		ewarn "it depends on ruby 1.8 which has been removed from the portage tree."
-		ewarn "USE=auditor is only provided for this warning but will not install the"
-		ewarn "auditor anymore."
-		ewarn
-	fi
-}
diff --git a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild b/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
deleted file mode 100644
index 7204fc6a5df8..000000000000
--- a/net-dns/opendnssec/opendnssec-1.4.12-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools eutils multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +mysql +signer sqlite test ${PKCS11_IUSE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/ldns
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	softhsm? ( dev-libs/softhsm:* )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir.patch"
-	"${FILESDIR}/${PN}-fix-run-dir.patch"
-	"${FILESDIR}/${PN}-drop-privileges.patch"
-	"${FILESDIR}/${PN}-use-system-trang.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/portage/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	local patch
-	default
-	for patch in "${PATCHES[@]}"; do
-		epatch "$patch"
-	done
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var/" \
-		--disable-static \
-		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		$(use_enable debug timeshift) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install update scripts
-	insinto /usr/share/opendnssec
-	if use sqlite; then
-		doins enforcer/utils/migrate_*sqlite*
-	fi
-	if use mysql; then
-		doins enforcer/utils/migrate_*mysql*
-	fi
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
-	local v
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-
-	for v in $REPLACING_VERSIONS; do
-		case $v in
-			1.3.*)
-				ewarn ""
-				ewarn "You are upgrading from version 1.3."
-				ewarn ""
-				ewarn "Please be aware of the following:"
-				ewarn "  * OpenDNSSEC now supports both input and output adapters for"
-				ewarn "    AXFR and IXFR in addition to file transfer."
-				ewarn "    -> The zonefetch.xml file has been replaced by addns.xml"
-				ewarn "       to support this enhancement."
-				ewarn "    -> changes to the KASP database mean that a database"
-				ewarn "       migration is required to upgrade to 1.4 from earlier"
-				ewarn "       versions of OpenDNSSEC."
-				ewarn "  * The auditor is no longer supported."
-				ewarn ""
-				ewarn "You can find more information here:"
-				ewarn "  * /usr/share/doc/opendnssec*/MIGRATION*"
-				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+zone+fetcher+to+DNS+adapters"
-				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+from+earlier+versions+of+OpenDNSSEC"
-				ewarn ""
-			;;
-		esac
-	done
-}
diff --git a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild b/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
deleted file mode 100644
index fa23c0bf555a..000000000000
--- a/net-dns/opendnssec/opendnssec-1.4.8.2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +mysql +signer sqlite test ${PKCS11_IUSE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/ldns
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	softhsm? ( dev-libs/softhsm:* )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir.patch"
-	"${FILESDIR}/${PN}-fix-run-dir.patch"
-	"${FILESDIR}/${PN}-drop-privileges.patch"
-	"${FILESDIR}/${PN}-use-system-trang.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/portage/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var/" \
-		--disable-static \
-		--with-database-backend=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		$(use_enable debug timeshift) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install update scripts
-	insinto /usr/share/opendnssec
-	if use sqlite; then
-		doins enforcer/utils/migrate_keyshare_sqlite3.pl
-		doins enforcer/utils/migrate_adapters_1.sqlite3
-	fi
-	if use mysql; then
-		doins enforcer/utils/migrate_keyshare_mysql.pl
-		doins enforcer/utils/migrate_adapters_1.mysql
-	fi
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,signconf,unsigned,signed,tmp}
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
-	local v
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-
-	for v in $REPLACING_VERSIONS; do
-		case $v in
-			1.3.*)
-				ewarn ""
-				ewarn "You are upgrading from version 1.3."
-				ewarn ""
-				ewarn "Please be aware of the following:"
-				ewarn "  * OpenDNSSEC now supports both input and output adapters for"
-				ewarn "    AXFR and IXFR in addition to file transfer."
-				ewarn "    -> The zonefetch.xml file has been replaced by addns.xml"
-				ewarn "       to support this enhancement."
-				ewarn "    -> changes to the KASP database mean that a database"
-				ewarn "       migration is required to upgrade to 1.4 from earlier"
-				ewarn "       versions of OpenDNSSEC."
-				ewarn "  * The auditor is no longer supported."
-				ewarn ""
-				ewarn "You can find more information here:"
-				ewarn "  * /usr/share/doc/opendnssec*/MIGRATION*"
-				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+zone+fetcher+to+DNS+adapters"
-				ewarn "  * https://wiki.opendnssec.org/display/DOCS/Migrating+from+earlier+versions+of+OpenDNSSEC"
-				ewarn ""
-			;;
-		esac
-	done
-}
diff --git a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild b/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
deleted file mode 100644
index b93dc8f5ab2b..000000000000
--- a/net-dns/opendnssec/opendnssec-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P/_}"
-PKCS11_IUSE="+softhsm opensc external-hsm"
-inherit autotools eutils multilib user
-
-DESCRIPTION="An open-source turn-key solution for DNSSEC"
-HOMEPAGE="https://www.opendnssec.org/"
-SRC_URI="https://www.${PN}.org/files/source/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc +mysql readline +signer sqlite test ${PKCS11_IUSE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-lang/perl
-	dev-libs/libxml2
-	dev-libs/libxslt
-	net-libs/ldns
-	mysql? (
-		virtual/mysql
-		dev-perl/DBD-mysql
-	)
-	opensc? ( dev-libs/opensc )
-	readline? ( sys-libs/readline:0 )
-	softhsm? ( dev-libs/softhsm:* )
-	sqlite? (
-		dev-db/sqlite:3
-		dev-perl/DBD-SQLite
-	)
-"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? (
-		app-text/trang
-	)
-"
-
-REQUIRED_USE="
-	^^ ( mysql sqlite )
-	^^ ( softhsm opensc external-hsm )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-fix-localstatedir-2.0.x.patch"
-	"${FILESDIR}/${PN}-fix-run-dir-2.0.x.patch"
-	"${FILESDIR}/${PN}-drop-privileges-2.0.x.patch"
-	"${FILESDIR}/${PN}-use-system-trang.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( MIGRATION NEWS )
-
-check_pkcs11_setup() {
-	# PKCS#11 HSM's are often only available with proprietary drivers not
-	# available in portage tree.
-
-	if use softhsm; then
-		PKCS11_LIB=softhsm
-		if has_version ">=dev-libs/softhsm-1.3.1"; then
-			PKCS11_PATH=/usr/$(get_libdir)/softhsm/libsofthsm.so
-		else
-			PKCS11_PATH=/usr/$(get_libdir)/libsofthsm.so
-		fi
-		elog "Building with SoftHSM PKCS#11 library support."
-	fi
-	if use opensc; then
-		PKCS11_LIB=opensc
-		PKCS11_PATH=/usr/$(get_libdir)/opensc-pkcs11.so
-		elog "Building with OpenSC PKCS#11 library support."
-	fi
-	if use external-hsm; then
-		if [[ -n ${PKCS11_SCA6000} ]]; then
-			PKCS11_LIB=sca6000
-			PKCS11_PATH=${PKCS11_SCA6000}
-		elif [[ -n ${PKCS11_ETOKEN} ]]; then
-			PKCS11_LIB=etoken
-			PKCS11_PATH=${PKCS11_ETOKEN}
-		elif [[ -n ${PKCS11_NCIPHER} ]]; then
-			PKCS11_LIB=ncipher
-			PKCS11_PATH=${PKCS11_NCIPHER}
-		elif [[ -n ${PKCS11_AEPKEYPER} ]]; then
-			PKCS11_LIB=aepkeyper
-			PKCS11_PATH=${PKCS11_AEPKEYPER}
-		else
-			ewarn "You enabled USE flag 'external-hsm' but did not specify a path to a PKCS#11"
-			ewarn "library. To set a path, set one of the following environment variables:"
-			ewarn "  for Sun Crypto Accelerator 6000, set: PKCS11_SCA6000=<path>"
-			ewarn "  for Aladdin eToken, set: PKCS11_ETOKEN=<path>"
-			ewarn "  for Thales/nCipher netHSM, set: PKCS11_NCIPHER=<path>"
-			ewarn "  for AEP Keyper, set: PKCS11_AEPKEYPER=<path>"
-			ewarn "Example:"
-			ewarn "  PKCS11_ETOKEN=\"/opt/etoken/lib/libeTPkcs11.so\" emerge -pv opendnssec"
-			ewarn "or store the variable into /etc/portage/make.conf"
-			die "USE flag 'external-hsm' set but no PKCS#11 library path specified."
-		fi
-		elog "Building with external PKCS#11 library support ($PKCS11_LIB): ${PKCS11_PATH}"
-	fi
-}
-
-pkg_pretend() {
-	if has_version "<net-dns/opendnssec-1.4.10"; then
-		################################################################################
-		eerror "You are already using OpenDNSSEC."
-		eerror "In order to migrate to version >=2.0.0 you need to upgrade to"
-		eerror "version >=1.4.10 first:"
-		eerror ""
-		eerror "   emerge \"<net-dns/opendnssec-2\""
-		eerror ""
-		eerror "See https://github.com/opendnssec/opendnssec/blob/2.0/master/MIGRATION"
-		eerror "for details."
-		eerror ""
-		die "Please upgrade to version >=1.4.10 first for proper db migraion"
-	fi
-
-	check_pkcs11_setup
-}
-
-pkg_setup() {
-	enewgroup opendnssec
-	enewuser opendnssec -1 -1 -1 opendnssec
-
-	# pretend does not preserve variables so we need to run this once more
-	check_pkcs11_setup
-}
-
-src_prepare() {
-	local patch
-	default
-	for patch in "${PATCHES[@]}"; do
-		epatch "$patch"
-	done
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--without-cunit \
-		--localstatedir="${EPREFIX}/var" \
-		--disable-static \
-		--with-enforcer-database=$(use mysql && echo "mysql")$(use sqlite && echo "sqlite3") \
-		--with-pkcs11-${PKCS11_LIB}=${PKCS11_PATH} \
-		$(use_with readline) \
-		$(use_enable signer)
-}
-
-src_compile() {
-	default
-	use doc && emake docs
-}
-
-src_install() {
-	default
-
-	# remove useless .la files
-	find "${ED}" -name '*.la' -delete
-
-	# Remove subversion tags from config files to avoid useless config updates
-	sed -i \
-		-e '/<!-- \$Id:/ d' \
-		"${ED}"/etc/opendnssec/* || die
-
-	# install db update/migration stuff
-	insinto /usr/share/opendnssec/db
-	if use sqlite; then
-		doins enforcer/utils/convert_mysql_to_sqlite
-	fi
-	if use mysql; then
-		doins enforcer/utils/convert_sqlite_to_mysql
-	fi
-
-	insinto /usr/share/opendnssec/db/sql
-	if use sqlite; then
-		doins enforcer/src/db/schema.sqlite
-	fi
-	if use mysql; then
-		doins enforcer/src/db/schema.mysql
-	fi
-
-	insinto /usr/share/opendnssec/db/1.4-2.0_db_convert
-	doins enforcer/utils/1.4-2.0_db_convert/find_problematic_zones.sql
-	doins enforcer/utils/1.4-2.0_db_convert/README.md
-	if use sqlite; then
-		doins enforcer/utils/1.4-2.0_db_convert/sqlite_convert.sql
-		doins enforcer/utils/1.4-2.0_db_convert/convert_sqlite
-	fi
-	if use mysql; then
-		doins enforcer/utils/1.4-2.0_db_convert/convert_mysql
-		doins enforcer/utils/1.4-2.0_db_convert/mysql_convert.sql
-	fi
-
-	# patch scripts to find schema files
-	sed -i \
-		-e 's,^SCHEMA=../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
-		-e 's,^SCHEMA=../../src/db/,SCHEMA=/usr/share/opendnssec/db/sql/,' \
-		"${ED}"/usr/share/opendnssec/db/convert_* \
-		"${ED}"/usr/share/opendnssec/db/1.4-2.0_db_convert/convert_*
-
-	# fix permissions
-	fowners root:opendnssec /etc/opendnssec
-	fowners root:opendnssec /etc/opendnssec/{addns,conf,kasp,zonelist}.xml
-	fowners opendnssec:opendnssec /var/lib/opendnssec/{,enforcer,signconf,signed,signer,unsigned}
-
-	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
-}
-
-pkg_postinst() {
-	local v
-	if use softhsm; then
-		elog "Please make sure that you create your softhsm database in a location writeable"
-		elog "by the opendnssec user. You can set its location in /etc/softhsm.conf."
-		elog "Suggested configuration is:"
-		elog "    echo \"0:/var/lib/opendnssec/softhsm_slot0.db\" >> /etc/softhsm.conf"
-		elog "    softhsm --init-token --slot 0 --label OpenDNSSEC"
-		elog "    chown opendnssec:opendnssec /var/lib/opendnssec/softhsm_slot0.db"
-	fi
-	for v in $REPLACING_VERSIONS; do
-		case $v in
-			1.4.*)
-				ewarn ""
-				ewarn "You are upgrading from version 1.4."
-				ewarn ""
-				ewarn "A migration is needed from 1.4 to 2.0."
-				ewarn "For details see /usr/share/doc/${P}/MIGRATION*"
-				ewarn ""
-				ewarn "For your convenience the mentioned migration scripts and README"
-				ewarn "have been installed to /usr/share/${PN}/db/1.4-2.0_db_convert"
-				ewarn ""
-			;;
-		esac
-	done
-}