From 9de21ac99e17c24681466124f5b0f2f80dce1f11 Mon Sep 17 00:00:00 2001
From: Alarig Le Lay <alarig@swordarmor.fr>
Date: Mon, 7 Dec 2020 13:13:18 +0100
Subject: [PATCH 1/3] net-misc/FORT-validator: Old release cleanup

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr>
---
 .../FORT-validator-1.2.1.ebuild               | 77 -------------------
 net-misc/FORT-validator/Manifest              |  1 -
 2 files changed, 78 deletions(-)
 delete mode 100644 net-misc/FORT-validator/FORT-validator-1.2.1.ebuild

diff --git a/net-misc/FORT-validator/FORT-validator-1.2.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.2.1.ebuild
deleted file mode 100644
index ce424e3a5c..0000000000
--- a/net-misc/FORT-validator/FORT-validator-1.2.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fcaps systemd
-
-DESCRIPTION="FORT validator is an open source RPKI validator"
-HOMEPAGE="https://fortproject.net/validator?2"
-SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-MY_PN="fort"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="caps libressl"
-
-DEPEND="
-	acct-group/fort
-	acct-user/fort
-	caps? ( sys-libs/libcap )
-	dev-libs/jansson
-	libressl?	( dev-libs/libressl:0= )
-	!libressl?	( dev-libs/openssl:0= )
-"
-RDEPEND="
-	${DEPEND}
-	net-misc/rsync
-"
-BDEPEND="
-	sys-devel/autoconf
-	sys-devel/automake
-"
-
-PATCHES="${FILESDIR}/${PN}-skip-online-test.patch"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_install() {
-	newinitd "${FILESDIR}/${MY_PN}-initd" ${MY_PN}
-	newconfd "${FILESDIR}/${MY_PN}-confd" ${MY_PN}
-
-	emake DESTDIR="${D}" install
-	insinto /usr/share/${MY_PN}/
-	insopts -m0644 -o "${MY_PN}"
-	diropts -m0755 -o "${MY_PN}"
-	doins -r examples/tal/
-
-	dodoc -r examples/
-
-	insinto /etc/fort
-	newins "${FILESDIR}/fort-config.json" config.json
-
-	exeinto "/usr/libexec/${MY_PN}"
-	doexe fort_setup.sh
-
-	systemd_dounit "${FILESDIR}/${MY_PN}.service"
-}
-
-pkg_postinst() {
-	fcaps cap_net_bind_service usr/bin/fort
-
-	einfo ""
-	einfo "ARIN TAL is disabled by default because the ARIN Relying Party"
-	einfo "Agreement must be accepted beforehead. Start fort, run"
-	einfo ""
-	einfo "  su -s /bin/sh -c '${EROOT}/usr/libexec/${MY_PN}/fort_setup.sh /usr/share/${MY_PN}/tal/' fort"
-	einfo ""
-	einfo "as root and restart fort to enable it."
-	einfo "The configuration file generation will provide a config file, but a"
-	einfo "simpler one is shiped with the ebuid. Use the one you prefer."
-}
diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest
index 73c9852a8b..d6a678f998 100644
--- a/net-misc/FORT-validator/Manifest
+++ b/net-misc/FORT-validator/Manifest
@@ -1,3 +1,2 @@
-DIST FORT-validator-1.2.1.tar.gz 431832 BLAKE2B 25459e591a531dcf3326baec06c9e462611f1fd727bd79623d0f5eae0f02b2398e698ea6f0cf7608061f5e125afb056c7dff9b1dcc6fbe01332e573e8c4b1f15 SHA512 87d256a02ca6d3c00bb2245476c126b076f6c57e9eeaefb2dcb0dfed5763b5769731de08e4168c9ce701a2820eeda69c3bf054c8445b910948504fdb7b0b6b50
 DIST FORT-validator-1.3.0.tar.gz 444918 BLAKE2B 3a8fb8cce5c71d22ab402d6b6a1478f173641a3876bad04e9fde4373d2a6b49395ff692aa048579886a82a799ed7849fc51d86c798b0b0ea9c594b4eb532b367 SHA512 0aed86979e6b9c3142cc9a53d13a619dbe22a3e05bcc26f30fda5048ac3e9d31b83307fbd4a68543eaf948954dbaba54edbce9b90ab0189d15c3629b220d094c
 DIST FORT-validator-1.4.0.tar.gz 468621 BLAKE2B f531f06136e8052ca8a001c91c8209bba7f0da6dcbb8cbccf9d7b3d39e2366951f48f254614def4749a8eb3f83bf01afaf9e2b013eecbc8fcd0c4274c4c3496a SHA512 dfbd94c9fbd8a4eac9f43030ebfa005febc01e4a39fccdd58fbfcc79aadfe0eeb2f8a2f4836c8d14c3e957f58e91466650ff1a266144f4b4f731495f8a74e460

From 004ffa84d4e5133852aa7bc2a921547e97e8b2c0 Mon Sep 17 00:00:00 2001
From: Alarig Le Lay <alarig@swordarmor.fr>
Date: Mon, 7 Dec 2020 13:14:21 +0100
Subject: [PATCH 2/3] net-misc/FORT-validator: New release

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr>
---
 .../FORT-validator-1.4.1.ebuild               | 77 +++++++++++++++++++
 net-misc/FORT-validator/Manifest              |  1 +
 2 files changed, 78 insertions(+)
 create mode 100644 net-misc/FORT-validator/FORT-validator-1.4.1.ebuild

diff --git a/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild
new file mode 100644
index 0000000000..ce424e3a5c
--- /dev/null
+++ b/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fcaps systemd
+
+DESCRIPTION="FORT validator is an open source RPKI validator"
+HOMEPAGE="https://fortproject.net/validator?2"
+SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+MY_PN="fort"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="caps libressl"
+
+DEPEND="
+	acct-group/fort
+	acct-user/fort
+	caps? ( sys-libs/libcap )
+	dev-libs/jansson
+	libressl?	( dev-libs/libressl:0= )
+	!libressl?	( dev-libs/openssl:0= )
+"
+RDEPEND="
+	${DEPEND}
+	net-misc/rsync
+"
+BDEPEND="
+	sys-devel/autoconf
+	sys-devel/automake
+"
+
+PATCHES="${FILESDIR}/${PN}-skip-online-test.patch"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${MY_PN}-initd" ${MY_PN}
+	newconfd "${FILESDIR}/${MY_PN}-confd" ${MY_PN}
+
+	emake DESTDIR="${D}" install
+	insinto /usr/share/${MY_PN}/
+	insopts -m0644 -o "${MY_PN}"
+	diropts -m0755 -o "${MY_PN}"
+	doins -r examples/tal/
+
+	dodoc -r examples/
+
+	insinto /etc/fort
+	newins "${FILESDIR}/fort-config.json" config.json
+
+	exeinto "/usr/libexec/${MY_PN}"
+	doexe fort_setup.sh
+
+	systemd_dounit "${FILESDIR}/${MY_PN}.service"
+}
+
+pkg_postinst() {
+	fcaps cap_net_bind_service usr/bin/fort
+
+	einfo ""
+	einfo "ARIN TAL is disabled by default because the ARIN Relying Party"
+	einfo "Agreement must be accepted beforehead. Start fort, run"
+	einfo ""
+	einfo "  su -s /bin/sh -c '${EROOT}/usr/libexec/${MY_PN}/fort_setup.sh /usr/share/${MY_PN}/tal/' fort"
+	einfo ""
+	einfo "as root and restart fort to enable it."
+	einfo "The configuration file generation will provide a config file, but a"
+	einfo "simpler one is shiped with the ebuid. Use the one you prefer."
+}
diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest
index d6a678f998..817dd6d4bc 100644
--- a/net-misc/FORT-validator/Manifest
+++ b/net-misc/FORT-validator/Manifest
@@ -1,2 +1,3 @@
 DIST FORT-validator-1.3.0.tar.gz 444918 BLAKE2B 3a8fb8cce5c71d22ab402d6b6a1478f173641a3876bad04e9fde4373d2a6b49395ff692aa048579886a82a799ed7849fc51d86c798b0b0ea9c594b4eb532b367 SHA512 0aed86979e6b9c3142cc9a53d13a619dbe22a3e05bcc26f30fda5048ac3e9d31b83307fbd4a68543eaf948954dbaba54edbce9b90ab0189d15c3629b220d094c
 DIST FORT-validator-1.4.0.tar.gz 468621 BLAKE2B f531f06136e8052ca8a001c91c8209bba7f0da6dcbb8cbccf9d7b3d39e2366951f48f254614def4749a8eb3f83bf01afaf9e2b013eecbc8fcd0c4274c4c3496a SHA512 dfbd94c9fbd8a4eac9f43030ebfa005febc01e4a39fccdd58fbfcc79aadfe0eeb2f8a2f4836c8d14c3e957f58e91466650ff1a266144f4b4f731495f8a74e460
+DIST FORT-validator-1.4.1.tar.gz 468737 BLAKE2B d1cbe115ba4d5e650d83e5793773028d545d7e56e8a7247ddc10673e0925ff278ebbc35f1161423d6f2b0bea6c8cb3416d8d87afea8c414bb69b5b95b9c8bf06 SHA512 aac4039bfad71fe9d9747abf8b2121d8b801c07feac83238c994b406241d2fefcf46bebc899298be84fddb90bbc345b117613a4bd4d45fbb38da89d1040ed393

From bb6e66c395bef7a6cfe5bc2497b90ddf3b59b330 Mon Sep 17 00:00:00 2001
From: Andrew Ammerlaan <andrewammerlaan@riseup.net>
Date: Mon, 7 Dec 2020 15:01:31 +0100
Subject: [PATCH 3/3] dev-ruby/thin: use ruby_add_depend for deps

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
---
 dev-ruby/thin/thin-1.8.0.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev-ruby/thin/thin-1.8.0.ebuild b/dev-ruby/thin/thin-1.8.0.ebuild
index 2dc21df4c2..e20cdff472 100644
--- a/dev-ruby/thin/thin-1.8.0.ebuild
+++ b/dev-ruby/thin/thin-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 inherit ruby-fakegem
 
@@ -15,9 +15,11 @@ LICENSE="Ruby"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="dev-ruby/eventmachine
-		dev-ruby/daemons
-		dev-ruby/rack"
+ruby_add_depend "
+	dev-ruby/eventmachine
+	dev-ruby/daemons
+	dev-ruby/rack
+"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"