7 files changed, 65 insertions, 66 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 59e958dffa43..fcc9c619f3a9 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
index f3911ec9d51e..4c7e6427e60b 100644
--- a/sys-apps/ethq/Manifest
+++ b/sys-apps/ethq/Manifest
@@ -1,6 +1,4 @@
-DIST ethq-0_5_0.tar.gz 15830 BLAKE2B b18326f1564d08f94500aa934838053a3b84b78f3d6fa90984c3730ac8922fbe3fd5141d5e9ff4a2c8db54bb8d2c2e493f5583f46b287324d4327583f29b8bf5 SHA512 989978e0dfbb553497f5325807f2d09e4e2842de9df5f5717e832312141adba3e99ef1d57dde4ac0fdd2919c9f5a0eadef5b5f76a300ab4ac7e881c8509fbbec
 DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66c6969bbd5afca144a977a6215a2164cbefd975d0f599bd8503feca79ef9e38856d8c9e6943c2cd2c3f99f SHA512 72c38ecb0cb6c7d6f522d99f2a6ec08bd2c42065d5f83d86890706a52420006fcdb5774a1457a66ccd5e174113e09c2a4285d311af334616a01c32ad8753126d
-EBUILD ethq-0.5.0.ebuild 1163 BLAKE2B e44cdf337ce09cd74b5acd6181e42ee3770b1c0dd6208103c6124520bfd37f58a5f80ea937575cbe77f067561847b9f71c590cef9f6509aca4e84ea5ddda562b SHA512 c008cfb872f7f0521e441ee51f3da5b74ebc17529bf1eaed7a9e4d7c23e36e86421708a44f42c463e94bc945af8cb8c9b78c20a0e5cd178eb30a9d5f223e69fb
-EBUILD ethq-0.6.1.ebuild 1156 BLAKE2B 9a67a1ac0e32dce08d4f1f6ff1062d5ad1e7336bb4a317171a89777e77deafa7ab16e2ca2b7b4e2861c0d8f5fb17bb0fa7e3b5f9a02d42b7f0e9eb99ab4682f3 SHA512 4737c046c04429b3fab79cf3432aa6e737ef298c6d1f06f29862bd2347f622627c108d7298412dff2aec188a8c35515b20f15ba9fc50504f96633600d77f9852
-EBUILD ethq-9999.ebuild 1098 BLAKE2B c45d997f816b538b2fbe6ab67b77e53a93b2b69844b1141964e32161178735007c1a46e2bd966c18ebb58fe4cde24d4f4a180bee3cc92ad8bb29ff116b9c34dc SHA512 96cfb486a19f344a781c19820c2d99c2c3dad542d27bb18bbbf9904da8a65c89baf9c31078472c9955f91c51dbb6160a3c92ce1c76b74f6819f5c643556e4cae
+EBUILD ethq-0.6.1.ebuild 1276 BLAKE2B 043dc1adb76edc174118b02571a21b295067bca218c018a08c8102ede19cbb88ee048ce0f5969fcf407b252cfaf378a9066a5aa8dc0f5dd7253b98c2026c534b SHA512 8596f0dcf1fae711abcf8b77b9033b8bab42448123970a931a9ba4fcf85a63d81cb90b7e2a9756ac18f3a1f160bb30c6b303baccd8c8db2d15aa8422c0b7ba6f
+EBUILD ethq-9999.ebuild 1218 BLAKE2B 9c8520e6b8dcb8fba8e0e883cfbd539982a598dad0ce068d7fa54a76a5d9ccc97318b887e0ed106136bc8c719d0cf97aaca840d4fda9b376cb9a8175ca3ff457 SHA512 f361726c46d55b5d8cb6da23546cedb138e3e302584d91f675dff1eb4b9be7e53cbafb08ec582f045d038e07b0d95d5f0d4ef14f2416ff7ba0657d2b1e125ea4
 MISC metadata.xml 658 BLAKE2B ba812092d01392bf05b02254be6ec098178912f90708aa8ed3384206da40f32d655782abe08bcdfb7c4ddc4520f8485c24d6328d1a53e4abf5d0c604f9cc8bd7 SHA512 6d1c05d10d30a81c6ae45173bd3e6d3b4eeaff9c2210dd80e079609df873ae6f642469ed6e77446338a28c40a76e65cd1d3f11a44df3a09a894a9a0f373df68b
diff --git a/sys-apps/ethq/ethq-0.5.0.ebuild b/sys-apps/ethq/ethq-0.5.0.ebuild
deleted file mode 100644
index a22a412539ae..000000000000
--- a/sys-apps/ethq/ethq-0.5.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV//./_}
-MY_P=${PN}-${MY_PV}
-
-inherit toolchain-funcs
-
-DESCRIPTION="Ethernet NIC Queue stats viewer"
-HOMEPAGE="https://github.com/isc-projects/ethq"
-SRC_URI="https://github.com/isc-projects/ethq/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Respect FLAGS
-	sed -i \
-		-e '/CXXFLAGS/s/= -O3/+=/' \
-		-e 's/ -Werror//' \
-		-e '/LDFLAGS/s/=/+=/' Makefile || die "sed failed for Makefile"
-
-	if ! use test ; then
-		sed -i '/TARGETS/s/ethq_test//' Makefile \
-			|| die "sed failed for USE flag test"
-	fi
-}
-
-src_compile() {
-	# override for ncurses[tinfo]
-	emake CXX="$(tc-getCXX)" LIBS_CURSES="$($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_test() {
-	local driver
-	for driver in tests/* ; do
-		"${S}"/ethq_test "${driver##*/}" "${driver}" \
-			|| die "test failed on ${driver}"
-	done
-}
-
-src_install() {
-	einstalldocs
-	dobin ethq
-}
diff --git a/sys-apps/ethq/ethq-0.6.1.ebuild b/sys-apps/ethq/ethq-0.6.1.ebuild
index 172f1ef054f7..9165d5a82da5 100644
--- a/sys-apps/ethq/ethq-0.6.1.ebuild
+++ b/sys-apps/ethq/ethq-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 MY_PV=${PV//./_}
 MY_P=${PN}-${MY_PV}
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Ethernet NIC Queue stats viewer"
 HOMEPAGE="https://github.com/isc-projects/ethq"
@@ -37,6 +37,13 @@ src_prepare() {
 	fi
 }
 
+src_configure() {
+	# https://github.com/isc-projects/ethq/issues/30 (bug #879893)
+	filter-lto
+
+	default
+}
+
 src_compile() {
 	# override for ncurses[tinfo]
 	emake CXX="$(tc-getCXX)" LIBS_CURSES="$($(tc-getPKG_CONFIG) --libs ncurses)"
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
index 11b6f2389400..da954c3b0cc6 100644
--- a/sys-apps/ethq/ethq-9999.ebuild
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 EGIT_REPO_URI="https://github.com/isc-projects/${PN}.git"
 
-inherit git-r3 toolchain-funcs
+inherit git-r3 flag-o-matic toolchain-funcs
 
 DESCRIPTION="Ethernet NIC Queue stats viewer"
 HOMEPAGE="https://github.com/isc-projects/ethq"
@@ -35,6 +35,13 @@ src_prepare() {
 	fi
 }
 
+src_configure() {
+	# https://github.com/isc-projects/ethq/issues/30 (bug #879893)
+	filter-lto
+
+	default
+}
+
 src_compile() {
 	# override for ncurses[tinfo]
 	emake CXX="$(tc-getCXX)" LIBS_CURSES="$($(tc-getPKG_CONFIG) --libs ncurses)"
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index d79ba1f3b1f6..fbca99690e9e 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -2,6 +2,9 @@ DIST moar-1.22.3-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086
 DIST moar-1.22.3.tar.gz 2799819 BLAKE2B 681297e9a84f6846d7ea6cd591403fd3100079fc8418ce5841a50755927239eca5abbfc0477d1a74e3af687ef1ebe372d4f708c38a64ba61b3095ac161f1cb8e SHA512 377cdf4916b036088f48abd4aa9818f002dd5ab025a54f4d91626380bb3d370daf046da6f3dc31fcc11a375d7da1a84288fb3e2e3357181a6ecc6a46af78c452
 DIST moar-1.23.6-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086fb7a14b1d1023caf7594cbda16772776751a80d44f451a9c5c765bd03d25687a63b5a00c4a50603b4598162920d840 SHA512 44c924339dbde95b647c464a00382786dfd8adfc72f307a9df63ed39f85fefe76260fde082a39738fb97c571217e8d591bdeada054dbe75ed56aa0156e7cf2fa
 DIST moar-1.23.6.tar.gz 2801847 BLAKE2B d9e638d15ac363d3787fcce4bdc640c497a400ecaf5f40763dd8efed28cc3f5e479733d4b1f9a457395e4b9dda844748459a07fa674f50e3d6b630755af3ac4f SHA512 94103263f2c07464fbc0c5a90519a3a03ef5f163a67ca451a703c11bf46b98011b6e29a038b08bb47dc08230c28ae822ced49f2aec2bf8b6e83c6a4c1f330aa4
+DIST moar-1.23.7-deps.tar.xz 37188500 BLAKE2B a5c92f8e56d4c7588265132f33089f1086fb7a14b1d1023caf7594cbda16772776751a80d44f451a9c5c765bd03d25687a63b5a00c4a50603b4598162920d840 SHA512 44c924339dbde95b647c464a00382786dfd8adfc72f307a9df63ed39f85fefe76260fde082a39738fb97c571217e8d591bdeada054dbe75ed56aa0156e7cf2fa
+DIST moar-1.23.7.tar.gz 2802061 BLAKE2B 767efc6919415f342a3c31dc99692f23d991c22e92f2c7387765aa63ab591c5791d9bf5c6ddea704456924c55b976af141af7b39e726fe651262fce21dd353fe SHA512 56958508d9ee710cb91df90f6b18bb7f0db95444e65eb8fa80a5ee33c4ad99f4f4482c1eec1ef44b64906e016e9465002571fa141ce03eeeaecc62cba102ead0
 EBUILD moar-1.22.3.ebuild 984 BLAKE2B 59e8ecfe756c1a600b9ca5e39bc43663264434288be4e7a1a7064c8e2b7dbbf47f130ebe847e6385e28d92aba622d5999a1f48777fe2eae62cf0aec56c24d78e SHA512 a4e31acdd2bc81ff9789e9b1c871a3d080dccf2532c4210f7c1b4a02b2a6366a98cf46eb785f9b896523ef401b71c4e3cda313c9162f1d8ea6151a2b54db8fd7
 EBUILD moar-1.23.6.ebuild 986 BLAKE2B e9f5c41907da162be3ffaea0fe77bc7aea55176d4c15ad3833fc72806c7bd24fdcb9ccf9b389d20ea037628f6c6858553465dd5f6710971d46ae0489d7acc28a SHA512 a65b9b98e31c52869882d4b0b4ad855383a2ddd444c74883d70a64be377c4d6706eed78d930ebbfc7cc61a83cad793d4f0d9d652ab96ac03d59753456f226b6a
+EBUILD moar-1.23.7.ebuild 986 BLAKE2B e9f5c41907da162be3ffaea0fe77bc7aea55176d4c15ad3833fc72806c7bd24fdcb9ccf9b389d20ea037628f6c6858553465dd5f6710971d46ae0489d7acc28a SHA512 a65b9b98e31c52869882d4b0b4ad855383a2ddd444c74883d70a64be377c4d6706eed78d930ebbfc7cc61a83cad793d4f0d9d652ab96ac03d59753456f226b6a
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.23.7.ebuild b/sys-apps/moar/moar-1.23.7.ebuild
new file mode 100644
index 000000000000..7ba82f9aa27b
--- /dev/null
+++ b/sys-apps/moar/moar-1.23.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Pager designed to do the right thing without any configuration"
+HOMEPAGE="https://github.com/walles/moar"
+SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# moarvm: https://github.com/walles/moar/issues/143
+RDEPEND="!dev-lang/moarvm"
+BDEPEND="
+	test? (
+		app-arch/bzip2
+		app-arch/xz-utils
+	)
+"
+
+src_compile() {
+	# https://github.com/walles/moar/blob/master/build.sh#L28
+	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
+}
+
+src_test() {
+	# From test.sh (we don't run that because it has some linting etc)
+	ego test -timeout 20s ./...
+}
+
+src_install() {
+	dobin moar
+	doman moar.1
+	einstalldocs
+}