commit: c2ac73108b835b054a4ad7e4ffdfe666d2079ccd Author: Vladimir Pavljuchenkov <spiderx <AT> spiderx <DOT> dp <DOT> ua> AuthorDate: Sun May 5 10:09:39 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sat May 25 05:05:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ac7310
sys-apps/ethq: add 0.6.3, update live ebuild Closes: https://bugs.gentoo.org/927049 Signed-off-by: Vladimir Pavljuchenkov <spiderx <AT> spiderx.dp.ua> Closes: https://github.com/gentoo/gentoo/pull/36560 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> sys-apps/ethq/Manifest | 1 + .../ethq/{ethq-9999.ebuild => ethq-0.6.3.ebuild} | 24 +++++++++------------- sys-apps/ethq/ethq-9999.ebuild | 18 +++++----------- 3 files changed, 16 insertions(+), 27 deletions(-) diff --git a/sys-apps/ethq/Manifest b/sys-apps/ethq/Manifest index 3c03cf67dacc..cab1dbdd2f1e 100644 --- a/sys-apps/ethq/Manifest +++ b/sys-apps/ethq/Manifest @@ -1 +1,2 @@ DIST ethq-0_6_1.tar.gz 23475 BLAKE2B 04d933294ba432ed69108022b0a2b13c47537902f66c6969bbd5afca144a977a6215a2164cbefd975d0f599bd8503feca79ef9e38856d8c9e6943c2cd2c3f99f SHA512 72c38ecb0cb6c7d6f522d99f2a6ec08bd2c42065d5f83d86890706a52420006fcdb5774a1457a66ccd5e174113e09c2a4285d311af334616a01c32ad8753126d +DIST ethq-0_6_3.tar.gz 32610 BLAKE2B c381eeea2192397084968894fb7f272b4129f1ffd6492b33c0012f0e2d874ba08f5feea3b218c7c57190c31997d39c78fce037e2a2fb55677d7ccf9009b2fab6 SHA512 400c443dab051f121542e81639036071386f79557bd60cf34d744ec5fde193464a0d745a3d818ea1a88698d02264440ec2008c7cd0f4e70a426f18e4f71e0fad diff --git a/sys-apps/ethq/ethq-9999.ebuild b/sys-apps/ethq/ethq-0.6.3.ebuild similarity index 64% copy from sys-apps/ethq/ethq-9999.ebuild copy to sys-apps/ethq/ethq-0.6.3.ebuild index da954c3b0cc6..917a1697503d 100644 --- a/sys-apps/ethq/ethq-9999.ebuild +++ b/sys-apps/ethq/ethq-0.6.3.ebuild @@ -1,33 +1,34 @@ # 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 flag-o-matic -inherit git-r3 flag-o-matic toolchain-funcs +MY_PV=${PV//./_} +MY_P=${PN}-${MY_PV} DESCRIPTION="Ethernet NIC Queue stats viewer" HOMEPAGE="https://github.com/isc-projects/ethq"; -SRC_URI="" +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="" +KEYWORDS="~amd64 ~x86" 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 +43,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 } 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 }
