gentoo resync : 31.05.2021

3 files changed, 0 insertions, 110 deletions

diff --git a/media-libs/hamlib/Manifest b/media-libs/hamlib/Manifest
index 446228cd1e5c..3d64c0a5918d 100644
--- a/media-libs/hamlib/Manifest
+++ b/media-libs/hamlib/Manifest
@@ -1,6 +1,3 @@
-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.1.tar.gz 2260629 BLAKE2B e53249f476005f3ec8afcbba6d875d913cdc45eb741fdb8b8718c1c5bda9cf8d50087165b72055600bc9ff364117f7d72235a3d68a9fb0882a77a6fdbf366605 SHA512 a5fca5dc89a7408628bc77fe22c6d8c77474b3dabee7b2b6d0b280becb6cb63f5619e4a620ad11aeb81b8412145b0f8cb0291a2d4cd3751c643cb1709b2dfa78
-EBUILD hamlib-3.3-r1.ebuild 2095 BLAKE2B fc8447042f8dfdaaf44a3a41bb6d0421fe16d6e7931d3f45bf2e583e1b086d4df69fc13eb2f936d736ba9099eaee3a3c1c83b6e61d91e05e1f5c85810edb65f9 SHA512 bdc9205557895c1b91ac3cdd740ac558f6e5b665f863e362c24a1cfa54770c631c8c469f9c70f466753a426aca4f1d873ac2c6a5b7244eaf6d9a5103814b99e7
 EBUILD hamlib-4.1.ebuild 2057 BLAKE2B cfc7560c85e7c826ffe23a87393a1eafc96805d5a2c0efd40ac538869bf5b66fe9ede92f3317421e5f84e516bc1556c52d4584df264f1dbc050b58a2fc37e5e4 SHA512 8fc1a8b6ce0943fcb8f53b341e39fd927fe108001f59e89ff45dd036c1213697a3044becf1ecf0ae821e17f45d629e2b0f235a45e57567171a83646fa78e7853
 MISC metadata.xml 325 BLAKE2B c1966def562280393eeb5b575d4e136525dc3cf36ef4e6c00dbeff7e0069a4d10eb16706f4b4e929eda1f046d18a8e25fd0025c74695eba1f9c10d19a9f55598 SHA512 fb6d5d77da29969e9b61921ae59e5d5c71b74cebd331867a546a6b2c568650f89191a39a3a1a73c58e1244fa5d13a090b45b866c21b3a3dd71cff0a812c149e5
diff --git a/media-libs/hamlib/files/hamlib-3.3-format-security.patch b/media-libs/hamlib/files/hamlib-3.3-format-security.patch
deleted file mode 100644
index bbf2de1d17d5..000000000000
--- a/media-libs/hamlib/files/hamlib-3.3-format-security.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fixes build error with format-securety (bug #714682)
-diff --git a/tests/rotctl_parse.c b/tests/rotctl_parse.c
-index 44308cc..aab1300 100644
---- a/tests/rotctl_parse.c
-+++ b/tests/rotctl_parse.c
-@@ -1009,7 +1009,7 @@ int rotctl_parse(ROT *my_rot, FILE *fin, FILE *fout, char *argv[], int argc)
-             /* The starting position of the source string is the first
-              * character past the initial '\'.
-              */
--            snprintf(cmd_name, sizeof(cmd_name), parsed_input[0] + 1);
-+            snprintf(cmd_name, sizeof(cmd_name), "%s", parsed_input[0] + 1);
- 
-             /* Sanity check as valid multiple character commands consist of
-              * alpha-numeric characters and the underscore ('_') character.
diff --git a/media-libs/hamlib/hamlib-3.3-r1.ebuild b/media-libs/hamlib/hamlib-3.3-r1.ebuild
deleted file mode 100644
index 556650e66628..000000000000
--- a/media-libs/hamlib/hamlib-3.3-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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
-}