gentoo resync : 25.11.2020

3 files changed, 96 insertions, 2 deletions

diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index e665a7495095..d7f3ea3b1582 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,6 +1,7 @@
 AUX hamlib-3.3-format-security.patch 738 BLAKE2B 896d6023f68979400ba8782956da86b9d30878f661eb70ac40f595cf903739f29c11fe4a3d75135333c65148ff8d0e2fb8b81e03ea32520d16b0824e9262be01 SHA512 fea0ed27228de5177f1f849e237a517b32f3efd74efab4dfc858c75ae7339dacf942097016229faaa790396f6627160e0e4716dfb16eb496e91c5d8301134098
 DIST hamlib-3.3.tar.gz 2192119 BLAKE2B edefd8b8c75876c07fa498c98f7d6760985fdecc477bf6711e948071e45964bf7fdf6705b3172e56951366a7dfb0288e025eab66d3b6436d158649ae53ac39bd SHA512 4cf6c94d0238c8a13aed09413b3f4a027c8ded07f8840cdb2b9d38b39b6395a4a88a8105257015345f6de0658ab8c60292d11a9de3e16a493e153637af630a80
 DIST hamlib-4.0~rc2.tar.gz 2188867 BLAKE2B 02df21910266e47c99e3cd72fc815ed75b9b5f50b29b9a94aa6fc5ddac73b1a09d16caa0d5e4be71bfe44e1940b853a0a8e1303f23fbacf003da18eed198531c SHA512 6d192bbb1c98e76fdfd1dd6bde1d0fd8b668243332827ae609e7bb4a93a3fed9fda0b12363638f5e9df65d65fd2305dfd493bd37a99aca2f2bd5b0861e948d5b
+EBUILD hamlib-3.3-r1.ebuild 2098 BLAKE2B 71e21520f50d9d4edf8b6185fa7504bdac6462245f7ac13390738784fc58134f81a80985684595853b7a703cced26790f8b2009b4635e67cefb2f4e54ee85d08 SHA512 f2ef47cb0738712c29bc588ce4ebcba070ebc3d8d71ebf9649eeb1370c6f8102d7df30714f5d1f8d56badfec0919f6ce271d12fe035707a9742c3adf19e9b3da
 EBUILD hamlib-3.3.ebuild 2094 BLAKE2B 6efc59674c743530a54fc0d68e8750f5cc7eb3504d74ad1fd160a41e1dd0f3be87fb669c0d7fe6cd9de2001d55ba108cdbbbb5e62ee05c688c80f25a5db0b765 SHA512 ad1af776080acb8a0fe6dd960bbe8f1ace7feff5966b648b29b04d5e6017ba094f2ddeaecbc5b7df8e256689fcd5a4848c67db98cb02263caac66679ed4ce3c5
-EBUILD hamlib-4.0_rc2.ebuild 2061 BLAKE2B 5ab0f96f66021a25700c3bd1b8a8a1f8e5042531061abedf033ca69289a5d0111435ea0ad9d9186e88fbe01dc2a3e1db3af5d15c3a03bbd51acbc32734f36b25 SHA512 91baca3ec18afc7032b8418218366c65492ddaf2b5e65b1a9d468f46d7f851e1882ba53bd4050d331bd80aa862f56846b4465f0533df39ad2608ebc7bcdbc0ec
+EBUILD hamlib-4.0_rc2.ebuild 2063 BLAKE2B 3462b89e1a29d30dea53432b9bfe776257bbd133e35a55fb9b882dcac064f9f086c17cde3938a029b92be8ecd27909e124d03e78a19b4ec7a902414fb86e8c09 SHA512 a75e48f521015e950695712c2d41a5c826662fcd21e9b860f203118462413ff1f4fc44d9fe1d59001e28d6e07fe033a3f2e9e7cd4cb69b56fcd8a372ffa0cb8d
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/hamlib-3.3-r1.ebuild b/media-libs/hamlib/hamlib-3.3-r1.ebuild
new file mode 100644
index 000000000000..fba1a537a608
--- /dev/null
+++ b/media-libs/hamlib/hamlib-3.3-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Ham radio backend rig control libraries"
+HOMEPAGE="https://www.hamlib.org"
+SRC_URI="https://www.github.com/${PN}/${PN}/releases/download/${PVR}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc perl python tcl"
+
+RESTRICT="test"
+
+RDEPEND="
+	=virtual/libusb-0*
+	dev-libs/libxml2
+	sys-libs/readline:0=
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	tcl? ( dev-lang/tcl:0= )"
+
+DEPEND=" ${RDEPEND}
+	virtual/pkgconfig
+	dev-lang/swig
+	>=sys-devel/libtool-2.2
+	doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=( "${FILESDIR}"/hamlib-3.3-format-security.patch )
+
+DOCS=(AUTHORS NEWS PLAN README README.betatester README.developer TODO)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# fix hardcoded libdir paths
+	sed -i -e "s#fix}/lib#fix}/$(get_libdir)/hamlib#" \
+		-e "s#fix}/include#fix}/include/hamlib#" \
+		hamlib.pc.in || die "sed failed"
+
+	# Correct install target to whatever INSTALLDIRS says and use vendor
+	# installdirs everywhere (bug #611550)
+	sed -i -e "s#install_site#install#"	\
+	-e 's#MAKEFILE="Hamlib-pl.mk"#MAKEFILE="Hamlib-pl.mk" INSTALLDIRS=vendor#' \
+	bindings/Makefile.am || die "sed failed patching for perl"
+
+	# make building of documentation compatible with autotools-utils
+	sed -i -e "s/doc:/html:/g" doc/Makefile.am || die "sed failed"
+
+	eautoreconf
+
+	eapply "${PATCHES}"
+
+	eapply_user
+}
+
+src_configure() {
+	econf \
+		--libdir=/usr/$(get_libdir)/hamlib \
+		--disable-static \
+		--with-xml-support \
+		$(use_with perl perl-binding) \
+		$(use_with python python-binding) \
+		$(use_with tcl tcl-binding)
+}
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use doc && HTML_DOCS=( doc/html/ )
+	einstalldocs
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins hamlib.pc
+
+	echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib
+	doenvd "${T}"/73hamlib
+}
diff --git a/media-libs/hamlib/hamlib-4.0_rc2.ebuild b/media-libs/hamlib/hamlib-4.0_rc2.ebuild
index 48f31be1e14a..78dd7f26161c 100644
--- a/media-libs/hamlib/hamlib-4.0_rc2.ebuild
+++ b/media-libs/hamlib/hamlib-4.0_rc2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 MY_P=${P/_rc2/~rc2}
 
 inherit autotools python-single-r1