gentoo resync : 05.12.2021

6 files changed, 170 insertions, 1 deletions

diff --git a/media-radio/direwolf/Manifest b/media-radio/direwolf/Manifest
index fd1da4b87c3b..9d54a216e455 100644
--- a/media-radio/direwolf/Manifest
+++ b/media-radio/direwolf/Manifest
@@ -1,7 +1,12 @@
 AUX 1.5-makefile.patch 17617 BLAKE2B 499ccaa4488fc098d1e080713badd0eb7bcd2c8c7c2b2210c9962cd3a6566c31dc447243164beb23b0d9941f8937d5a993c06eb28c945c64672d01015524f969 SHA512 ad79ea4a937bfa9e169d0e592406dd6aabe297fdc2b3aa6a84b32c01a6e9077b89a13ec5e4dd54fb6ebe4de57a27e87c9f59e30a7037a0e991587e639f182141
+AUX direwolf-1.5-respect-AR.patch 645 BLAKE2B 8649a2ef4372dc79b2eb4fc087eb58bac5c0fa83c2d0826fbc6f81a42159d699747c57568ec8e5b9fe28ffb3e9fee268e2aa98c6b2b76c3d705531bb5dcb5da2 SHA512 b4670d0a50d77b5eb4842da7471d662704f17f4bbd98e0c63988076e755368ff62e4c09ab1b448aca5654b568fee43925e38654765c184aa34231734aa34fe35
+AUX direwolf-1.5-respect-LDFLAGS.patch 781 BLAKE2B ce604ad005b6b1c93d9c8ddfa2a2ab81552e4f6b19d5b6e4e2f5534692e01159a4ce1294e7f21b1f772a18c57a95c6bf2aa2a9a5b6a254a1f58ab3c15c1d8795 SHA512 88e401076e90b65b4a6b314e0c957bda2dbb7b714ef7a4052ebbc2f32099e367b32ed3532386b97f12c9ea7175719b7d5409d27d78827f25efa9e7a9f95cff87
+AUX direwolf-1.6-use-standard-doc-dir.patch 1511 BLAKE2B 7ebb61c89e024f2ae3a3114cb74f2c74bead1d58566f10dbc1b06f42bb5763bb501332a7be12dfae5350de9cad9385a5060e067668f1a2c1ede3fbf6812b57bc SHA512 9452f7c522f0bdad0486ff188ce63ea5dfcf9c93ba14a1af302c5667c28d949d6946fb92bc3b8d0141c66a1c5874f8c1f903336bd7240c687f6bbe31c4c603d5
 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
-EBUILD direwolf-1.5-r1.ebuild 2168 BLAKE2B 3552637ff3f346267ab890cd4ffb77ab638dd074c2f30f6820a347bce9566243b2b17630b2444d40afcd4163a986c9d13f14e0565ff086618eb1c1faf4421bab SHA512 a4e5c4df51f1ab610b8577247522c09a6a985fc302a6c4345c0becf28143d1df768a2c5cc0480db1c1f27a9cab55bb3e12471ddf3d8c6deffaba1408135887a4
+DIST direwolf-1.6.tar.gz 22298168 BLAKE2B d0bffe78ecfdd7b41e4e2d458416e30e9151870d6890c3e4f65e44472699f0c1e1016fcbab5c30209978594ccaf567a8d53ae62194649e9df5cca4d4ea4689af SHA512 f29805dfea01ed5a81b133ac0a98455c2edfb6d18e0764db23c398475b11cc0e57c1c7c35c44cdaa5cf73129e8c18b836ad17dd3e9811e84277db0ef7b10bcd5
+EBUILD direwolf-1.5-r1.ebuild 2295 BLAKE2B acdb0f68dfef449865265bc6692f46a9966e71f2497cfc734762657fe4aa9e9ec92d68daa2c3f55aaa149b16ff118a18c13ab05d2d153209d78d06dd1cdec554 SHA512 354b9aaee3a0c5d13c629e275a3c080001e48ff2cca1e8025dd57447af74dcdc43d51a872f9d10b9ebb9b4a9b0db034cefe2373b7254c79dea08e9e7d342466d
+EBUILD direwolf-1.6.ebuild 1704 BLAKE2B 764a762ef16cbb2f7eb27af546c1fbcc534c6af5b0cbda96899c368d3b99a7fe48d111a430b924e8c97c7d2b285432cc92f2cecfb8e88ebde41426416f1fa614 SHA512 417362faeb7452929dfb4cd461f002be09952829f5d52202ba71128feeff824e448ea59859db9ef35eef31faf5fcf66e9e648ab5690943833e1ac39fd5d6dd46
 MISC metadata.xml 405 BLAKE2B 8ff48fe5c079a13419d626f07d42bcf22d19879d6cd5a48ca710a268ebe50656c83a40f92ce2dac49a7c049f3e58e4baa70a5b10d8be970fc52c5b37a034b9fd SHA512 802862b1c02705f44edd8e0a2f8e76ebee43217340c4c737bcc69a862a899847dbcdc7b3857f0052443152c3181985833e9f51455262b817187370e7bbc2c98e
diff --git a/media-radio/direwolf/direwolf-1.5-r1.ebuild b/media-radio/direwolf/direwolf-1.5-r1.ebuild
index ee2fa3ecbbd6..deef4a8a736a 100644
--- a/media-radio/direwolf/direwolf-1.5-r1.ebuild
+++ b/media-radio/direwolf/direwolf-1.5-r1.ebuild
@@ -30,6 +30,8 @@ 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
 
@@ -47,6 +49,8 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export AR CC
+
 	emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
 }
 
diff --git a/media-radio/direwolf/direwolf-1.6.ebuild b/media-radio/direwolf/direwolf-1.6.ebuild
new file mode 100644
index 000000000000..39412b6150f1
--- /dev/null
+++ b/media-radio/direwolf/direwolf-1.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 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 ~x86"
+IUSE="gps hamlib test udev"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	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() {
+	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
+}
diff --git a/media-radio/direwolf/files/direwolf-1.5-respect-AR.patch b/media-radio/direwolf/files/direwolf-1.5-respect-AR.patch
new file mode 100644
index 000000000000..1a833cc06ba8
--- /dev/null
+++ b/media-radio/direwolf/files/direwolf-1.5-respect-AR.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.linux b/Makefile.linux
+index 3d433bd..bf8ed3d 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -474,7 +474,7 @@ ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a
+ # UTM, USNG, MGRS conversions.
+ 
+ geotranz.a : error_string.o  mgrs.o  polarst.o  tranmerc.o  ups.o  usng.o  utm.o
+-	ar -cr $@ $^
++	$(AR) -cr $@ $^
+ 
+ error_string.o : geotranz/error_string.c
+ 	$(CC) $(CFLAGS) -c -o $@ $^
+@@ -502,7 +502,7 @@ utm.o : geotranz/utm.c
+ # We don't need the others in that same directory.
+ 
+ misc.a : strlcpy.o strlcat.o
+-	ar -cr $@ $^	
++	$(AR) -cr $@ $^
+  
+ strlcpy.o : misc/strlcpy.c
+ 	$(CC) $(CFLAGS) -I. -c -o $@ $^
diff --git a/media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch b/media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch
new file mode 100644
index 000000000000..38dddcc281fd
--- /dev/null
+++ b/media-radio/direwolf/files/direwolf-1.5-respect-LDFLAGS.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile.linux b/Makefile.linux
+index 7418a63..3d433bd 100644
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -447,7 +447,7 @@ atest : atest.c demod.o demod_afsk.o demod_psk.o demod_9600.o \
+ # Multiple AGWPE network or serial port clients to test TNCs side by side.
+ 
+ aclients : aclients.c ax25_pad.c fcs_calc.c textcolor.o misc.a
+-	$(CC) $(CFLAGS) -g -o $@ $^ 
++	$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
+ 
+ 
+ # Talk to a KISS TNC.
+@@ -466,7 +466,7 @@ cm108 : cm108.c textcolor.o misc.a
+ # Touch Tone to Speech sample application.
+ 
+ ttcalc : ttcalc.o ax25_pad.o fcs_calc.o textcolor.o misc.a
+-	$(CC) $(CFLAGS) -g -o $@ $^ 
++	$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
+ 
+ 
+ # -----------------------------------------  Libraries  --------------------------------------------
diff --git a/media-radio/direwolf/files/direwolf-1.6-use-standard-doc-dir.patch b/media-radio/direwolf/files/direwolf-1.6-use-standard-doc-dir.patch
new file mode 100644
index 000000000000..1377ba0b4fab
--- /dev/null
+++ b/media-radio/direwolf/files/direwolf-1.6-use-standard-doc-dir.patch
@@ -0,0 +1,50 @@
+From bfb62c085b0841818a5aaa0d2096c0d26f409553 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 26 Nov 2021 04:57:44 +0000
+Subject: [PATCH] Use standard doc directory (a la GNUInstallDirs)
+
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ CMakeLists.txt | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 139cb4d..e5da77c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -233,16 +233,12 @@ if (WIN32 OR CYGWIN)
+   set(INSTALL_MAN_DIR "man")
+   set(INSTALL_DATA_DIR "data")
+ else()
+-  set(INSTALL_BIN_DIR "bin")
+-  set(INSTALL_DOC_DIR "share/doc/${CMAKE_PROJECT_NAME}")
++  set(INSTALL_BIN_DIR "${CMAKE_INSTALL_BINDIR}")
++  set(INSTALL_DOC_DIR "${CMAKE_INSTALL_DOCDIR}")
+   set(INSTALL_CONF_DIR "${INSTALL_DOC_DIR}/conf")
+   set(INSTALL_SCRIPTS_DIR "${INSTALL_DOC_DIR}/scripts")
+-  if(FREEBSD)
+-    set(INSTALL_MAN_DIR "man/man1")
+-  else()
+-    set(INSTALL_MAN_DIR "share/man/man1")
+-  endif()
+-  set(INSTALL_DATA_DIR "share/${PROJECT_NAME}")
++  set(INSTALL_MAN_DIR "${CMAKE_INSTALL_MANDIR}/man1")
++  set(INSTALL_DATA_DIR "${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}")
+ endif(WIN32 OR CYGWIN)
+ 
+ # requirements
+-- 
+2.34.1
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5da77c..ae7ea25 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,6 +225,7 @@ elseif (C_GCC)
+ endif()
+ 
+ # set installation directories
++include(GNUInstallDirs)
+ if (WIN32 OR CYGWIN)
+   set(INSTALL_BIN_DIR ".")
+   set(INSTALL_DOC_DIR "doc")