gentoo auto-resync : 26:05:2024 - 00:07:27

3 files changed, 65 insertions, 14 deletions

diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest
index 4c7e6427e60b..491953953965 100644
--- a/sys-apps/ethq/Manifest
+++ b/sys-apps/ethq/Manifest
@@ -1,4 +1,6 @@
 DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66c6969bbd5afca144a977a6215a2164cbefd975d0f599bd8503feca79ef9e38856d8c9e6943c2cd2c3f99f SHA512 72c38ecb0cb6c7d6f522d99f2a6ec08bd2c42065d5f83d86890706a52420006fcdb5774a1457a66ccd5e174113e09c2a4285d311af334616a01c32ad8753126d
+DIST ethq-0_6_3.tar.gz 32610 BLAKE2B c381eeea2192397084968894fb7f272b4129f1ffd6492b33c0012f0e2d874ba08f5feea3b218c7c57190c31997d39c78fce037e2a2fb55677d7ccf9009b2fab6 SHA512 400c443dab051f121542e81639036071386f79557bd60cf34d744ec5fde193464a0d745a3d818ea1a88698d02264440ec2008c7cd0f4e70a426f18e4f71e0fad
 EBUILD ethq-0.6.1.ebuild 1276 BLAKE2B 043dc1adb76edc174118b02571a21b295067bca218c018a08c8102ede19cbb88ee048ce0f5969fcf407b252cfaf378a9066a5aa8dc0f5dd7253b98c2026c534b SHA512 8596f0dcf1fae711abcf8b77b9033b8bab42448123970a931a9ba4fcf85a63d81cb90b7e2a9756ac18f3a1f160bb30c6b303baccd8c8db2d15aa8422c0b7ba6f
-EBUILD ethq-9999.ebuild 1218 BLAKE2B 9c8520e6b8dcb8fba8e0e883cfbd539982a598dad0ce068d7fa54a76a5d9ccc97318b887e0ed106136bc8c719d0cf97aaca840d4fda9b376cb9a8175ca3ff457 SHA512 f361726c46d55b5d8cb6da23546cedb138e3e302584d91f675dff1eb4b9be7e53cbafb08ec582f045d038e07b0d95d5f0d4ef14f2416ff7ba0657d2b1e125ea4
+EBUILD ethq-0.6.3.ebuild 1158 BLAKE2B 560a8f80eb2f5944afcfa4f8546d4f0be2cf09c39d8374f129ede4eaa0696702e0de1d06484d5a154482b54ad93c2e4bfbc006b6a0f0e0d27cfc5bed17d75d91 SHA512 dcefbf3b8c4525fc06c49c5c4c8d84da6781e518d4ed38174e071bc0ce48aa0101c6f2fea91769a230cac83382ff569719051bf345d0d89ada3663596307afc4
+EBUILD ethq-9999.ebuild 1050 BLAKE2B 10ff1a69740d6016cb0fcd498663e4e360ea0c881373764cce37eb9176d21b2828e0761f695cfd25765ad8f99cb24495df4fe66c4ff25eab4d996344c2a6a865 SHA512 1be99ff1491c4c783580658c6ac39ddb4ff271da4cde4ac87d5e8665956d0eae98eac03aa774134712f55effdeb22c29d7c544581839a20043a91608d3b5e604
 MISC metadata.xml 658 BLAKE2B ba812092d01392bf05b02254be6ec098178912f90708aa8ed3384206da40f32d655782abe08bcdfb7c4ddc4520f8485c24d6328d1a53e4abf5d0c604f9cc8bd7 SHA512 6d1c05d10d30a81c6ae45173bd3e6d3b4eeaff9c2210dd80e079609df873ae6f642469ed6e77446338a28c40a76e65cd1d3f11a44df3a09a894a9a0f373df68b
diff --git a/sys-apps/ethq/ethq-0.6.3.ebuild b/sys-apps/ethq/ethq-0.6.3.ebuild
new file mode 100644
index 000000000000..917a1697503d
--- /dev/null
+++ b/sys-apps/ethq/ethq-0.6.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+MY_PV=${PV//./_}
+MY_P=${PN}-${MY_PV}
+
+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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	# respect FLAGS, remove Werror and strip
+	sed -i  -e '/CXXFLAGS/s/= -O3/+=/' \
+		-e '/CXXFLAGS/s/ -Werror//' \
+		-e '/LDFLAGS/s/= -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_configure() {
+	# https://github.com/isc-projects/ethq/issues/30 (bug #879893)
+	filter-lto
+
+	default
+}
+
+src_test() {
+	local driver
+	for driver in tests/* ; do
+		"${S}"/ethq_test "$(basename "${driver%%-*}")" "${driver}" \
+			|| die "test failed on ${driver}"
+	done
+}
+
+src_install() {
+	einstalldocs
+	dobin ethq
+}
diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-9999.ebuild
index da954c3b0cc6..c414380f9b29 100644
--- a/sys-apps/ethq/ethq-9999.ebuild
+++ b/sys-apps/ethq/ethq-9999.ebuild
@@ -1,33 +1,30 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 EGIT_REPO_URI="https://github.com/isc-projects/${PN}.git"
 
-inherit git-r3 flag-o-matic toolchain-funcs
+inherit git-r3 flag-o-matic
 
 DESCRIPTION="Ethernet NIC Queue stats viewer"
 HOMEPAGE="https://github.com/isc-projects/ethq"
-SRC_URI=""
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS=""
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
 
-	# Respect FLAGS, remove Werror
+	# respect FLAGS, remove Werror and strip
 	sed -i  -e '/CXXFLAGS/s/= -O3/+=/' \
 		-e '/CXXFLAGS/s/ -Werror//' \
-		-e '/LDFLAGS/s/=/+=/' Makefile || die "sed failed for Makefile"
+		-e '/LDFLAGS/s/= -s/+=/' Makefile || die "sed failed for Makefile"
 
 	if ! use test ; then
 		sed -i '/TARGETS/s/ethq_test//' Makefile \
@@ -42,15 +39,10 @@ src_configure() {
 	default
 }
 
-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}" \
+		"${S}"/ethq_test "$(basename "${driver%%-*}")" "${driver}" \
 			|| die "test failed on ${driver}"
 	done
 }