gentoo auto-resync : 30:01:2024 - 23:49:25

4 files changed, 79 insertions, 70 deletions

diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index 78b181e7503e..f956b4de7dc3 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -5,8 +5,8 @@ AUX direwolf-1.6-use-standard-doc-dir.patch 1511 BLAKE2B 7ebb61c89e024f2ae3a3114
 AUX direwolf-gpsd-API-9.patch 7419 BLAKE2B 961156fb5c2f04979d01b9cdbdd1d28438faad3841c8245b1e07a9cc75fe22391e399998644bf62b3b48053a0cd7dfe00eae8d4858531bc290857548db52a746 SHA512 1cfd04cf51758ad3657952dde3023fb959020a85f842c1bea7fc8e6ce3f14d5f6a1bcae40188e7989b795806a7e099def5661e13a9b636e98d3103fea166b5a0
 AUX direwolf-kiss.service 157 BLAKE2B d0fef86335f3fecd7234dc75a670747c96ea774e136d4cf89a455fe66d5f65c2c777ddc9ae2e277e16ceee2a7ccea14ddb151bc9c334c8f5ff300d64798570b8 SHA512 bdeda52f52a9e1fb1b9611877d7c52c7e70c559aaab88471d82ceb872d8bbe5aefb5d938e59c4e3aa815f00c1506a85be224a48396f476842e60e2e451fa75fa
 AUX direwolf.service 154 BLAKE2B 1284b0f93085f5e8a8cd8452b86c0ddf4b8abf9c01496bfc8534e3b21f0268acb53c365fbf70b6a1e69fd02e34a78887f65d1374f339d03ddf492faf473a563f SHA512 43a98ebfa7c9fa7c21e4044496ff2f5cddac7c2298253167e6db5a23c849485080444db1ed45c0cdf55e9681b66d9cfc9bfaf830353bee9c71345cb6d0bbd4e8
-DIST direwolf-1.5.tar.gz 17996557 BLAKE2B 6860075b764248f1e0ff06e2a533e2e31f65851ea45d74fb0aca11827940c6df0a8bab4b6b78aa98847ee54b2b344d3c5fc8da6947f9113d2fac6d3ea427d68b SHA512 c23e2ccebd47235f76a9583e14cf8e8df299b8f7456a6388534536e7b1114b3d9b9efee43da2c1708e01a0b9534db0ed93314368e20e9002bfcd5b3a2855d8a5
 DIST direwolf-1.6.tar.gz 22298168 BLAKE2B d0bffe78ecfdd7b41e4e2d458416e30e9151870d6890c3e4f65e44472699f0c1e1016fcbab5c30209978594ccaf567a8d53ae62194649e9df5cca4d4ea4689af SHA512 f29805dfea01ed5a81b133ac0a98455c2edfb6d18e0764db23c398475b11cc0e57c1c7c35c44cdaa5cf73129e8c18b836ad17dd3e9811e84277db0ef7b10bcd5
-EBUILD direwolf-1.5-r1.ebuild 2295 BLAKE2B acdb0f68dfef449865265bc6692f46a9966e71f2497cfc734762657fe4aa9e9ec92d68daa2c3f55aaa149b16ff118a18c13ab05d2d153209d78d06dd1cdec554 SHA512 354b9aaee3a0c5d13c629e275a3c080001e48ff2cca1e8025dd57447af74dcdc43d51a872f9d10b9ebb9b4a9b0db034cefe2373b7254c79dea08e9e7d342466d
+DIST direwolf-1.7.tar.gz 20587417 BLAKE2B 8264f1712958dcbd2888608bd032621cc4d8117ce5d6c3f4ea3e7b0a5237c4b5aab825f758538986e421debe9ba6ea5f4d75039471cf8557716867c800965efd SHA512 e09b14d7a036546e042da8b536b70d07f485d6a7224b19f5626b33e43a21c48200591fd6680ca1ee4b3c9fb5909d6f1c54ae8160877d51e06278fe19516abe1e
 EBUILD direwolf-1.6.ebuild 1723 BLAKE2B 08a5a74df6874cdc8347718c37154a21ccfed2ba28007e3827f03b6ef6232b0ed6966030581630c05a6a7c5baf2fbc6b094bc6af603b2c2b40fda88b4907e9a9 SHA512 7ade70d20dc2e729ef0caa548ac2f28fa689f4aa58fcb3efc343ac54baa379ebbeab22d80ec9ed6fef20341017f1df11c65cca3f498ebfb5a7606d1146509154
-MISC metadata.xml 405 BLAKE2B 8ff48fe5c079a13419d626f07d42bcf22d19879d6cd5a48ca710a268ebe50656c83a40f92ce2dac49a7c049f3e58e4baa70a5b10d8be970fc52c5b37a034b9fd SHA512 802862b1c02705f44edd8e0a2f8e76ebee43217340c4c737bcc69a862a899847dbcdc7b3857f0052443152c3181985833e9f51455262b817187370e7bbc2c98e
+EBUILD direwolf-1.7.ebuild 1784 BLAKE2B 6fbd07e98525b7997bd5d2282de7201c3cf1843aa065850c3c8ddaa4fd4766172bd7b9bc893fbd22dcbf4611847fd04fd925e5a380cd1c6763739b5078bf1789 SHA512 77dd2b119cde4bf374b08fdf2533dc1a6632a8496ef07e3c3ed0ea5eb5470c026b70969628357ac0f46e486bc23755078bce7727466e72e3aa8112fb65192472
+MISC metadata.xml 504 BLAKE2B 8e96fe7f1ffd627a72ccf69f41b5317c82bfd5d56c0851505c9b8a0c4072fe6ed29fd1c2d794acc21c0b87b1cf4acade81c460856762df66d8bc93153e6c1a01 SHA512 2f5f34c0f0e77a5ac578659d00bccb084b5968a4dbfa0a9efa62e2723361275dec37d1482cc09940488f4e4800a7094031eaa1a7b479029220065afe1d7546a9
diff --git a/media-radio/direwolf/direwolf-1.5-r1.ebuild b/media-radio/direwolf/direwolf-1.5-r1.ebuild
deleted file mode 100644
index deef4a8a736a..000000000000
--- a/media-radio/direwolf/direwolf-1.5-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux Fans"
-HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md"
-SRC_URI="https://github.com/wb2osz/direwolf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gps hamlib udev"
-
-RDEPEND="
-	media-libs/alsa-lib:=
-	gps? ( sci-geosciences/gpsd )
-	hamlib? ( media-libs/hamlib:= )
-	udev? ( virtual/libudev )
-"
-BDEPEND="hamlib? ( virtual/pkgconfig )"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md README.md doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf doc/APRS-Telemetry-Toolkit.pdf doc/APRStt-Implementation-Notes.pdf doc/APRStt-interface-for-SARTrack.pdf doc/APRStt-Listening-Example.pdf doc/Going-beyond-9600-baud.pdf doc/Raspberry-Pi-APRS.pdf doc/Raspberry-Pi-APRS-Tracker.pdf doc/Raspberry-Pi-SDR-IGate.pdf doc/README.md doc/Successful-APRS-IGate-Operation.pdf doc/User-Guide.pdf doc/WA8LMF-TNC-Test-CD-Results.pdf direwolf.conf dw-start.sh sdr.conf telemetry-toolkit/telem-m0xer-3.txt telemetry-toolkit/telem-balloon.conf telemetry-toolkit/telem-volts.conf )
-
-INSTALLDIR="${D}"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PV}-makefile.patch"
-	eapply "${FILESDIR}/direwolf-gpsd-API-9.patch"
-	eapply "${FILESDIR}/direwolf-1.5-respect-LDFLAGS.patch"
-	eapply "${FILESDIR}/direwolf-1.5-respect-AR.patch"
-
-	eapply_user
-
-	if use gps ; then
-		sed -i -e 's/#enable_gpsd/enable_gpsd/' Makefile.linux || die "Sed failed!"
-	fi
-
-	if use hamlib; then
-		sed -i -e 's/#enable_hamlib/enable_hamlib/' Makefile.linux || die "Sed failed!"
-	fi
-
-	if use udev ; then
-		sed -i -e 's/#enable_cm108/enable_cm108/' Makefile.linux || die "Sed failed!"
-	fi
-}
-
-src_compile() {
-	tc-export AR CC
-
-	emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
-	dodir /usr
-	dodir /usr/bin
-	keepdir /var/log/direwolf
-	emake DESTDIR="${D}" install
-	insinto /etc/direwolf/
-	doins direwolf.conf
-	einstalldocs
-	systemd_dounit "${FILESDIR}"/direwolf.service
-	systemd_dounit "${FILESDIR}"/direwolf-kiss.service
-}
diff --git a/media-radio/direwolf/direwolf-1.7.ebuild b/media-radio/direwolf/direwolf-1.7.ebuild
new file mode 100644
index 000000000000..f60c6c1ec98d
--- /dev/null
+++ b/media-radio/direwolf/direwolf-1.7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd udev
+
+DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux Fans"
+HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md"
+SRC_URI="https://github.com/wb2osz/direwolf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+IUSE="gps hamlib test udev"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-dns/avahi
+	media-libs/alsa-lib
+	gps? ( sci-geosciences/gpsd:= )
+	hamlib? ( media-libs/hamlib:= )
+	udev? ( virtual/libudev:= )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6-use-standard-doc-dir.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_GPSD=$(usex !gps)
+		-DCMAKE_DISABLE_FIND_PACKAGE_hamlib=$(usex !hamlib)
+		-DCMAKE_DISABLE_FIND_PACKAGE_udev=$(usex !udev)
+		-DUNITTEST=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# Fix udev rule installation path
+	udev_dorules "${ED}"/etc/udev/rules.d/99-direwolf-cmedia.rules
+	rm "${ED}"/etc/udev/rules.d/99-direwolf-cmedia.rules || die
+
+	keepdir /var/log/direwolf
+
+	# Pre-CMake, we installed a default config to /etc/direwolf.
+	# Should we do that now?
+	#insinto /etc/direwolf/
+	#doins direwolf.conf
+
+	systemd_dounit "${FILESDIR}"/direwolf.service
+	systemd_dounit "${FILESDIR}"/direwolf-kiss.service
+}
+
+pkg_postinst() {
+	udev_reload
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		einfo "The default configuration files are at:"
+		einfo " - ${EROOT}/usr/share/doc/${PF}/conf/direwolf.conf"
+		einfo " - ${EROOT}/usr/share/doc/${PF}/conf/sdr.conf"
+		einfo "Copy these to the /etc/direwolf/ directory to modify them."
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/media-radio/direwolf/metadata.xml b/media-radio/direwolf/metadata.xml
index ed31d15c4b98..3bfb034b6d0d 100644
--- a/media-radio/direwolf/metadata.xml
+++ b/media-radio/direwolf/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>rich0@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>radio@gentoo.org</email>
+		<name>Radio</name>
+	</maintainer>
 	<use>
 		<flag name="hamlib">Enables support by the Hamlib amateur radio rig control library</flag>
 	</use>