gentoo resync : 16.09.2020

4 files changed, 0 insertions, 268 deletions

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index ce4aace094d4..4b7fe34341e4 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,10 +1,6 @@
-AUX libsigrok-0.3.0-configure-flags.patch 6291 BLAKE2B 24ca94ea005a1148fc3492c90aed9823a63620416e441d2a183573a1627a99a47fc76ca751b3903bc68664c5e117fb44bf693934794885db7fdd12370d9b934f SHA512 a7df284a3598dada9ddd63c7fe84b99fdec11a36724656c444a9deb80d0e29c633d85166d926279f3870d800b07816b50198c285a985304041134ad0c84f89c1
-AUX libsigrok-0.3.0-no-check-linkage.patch 980 BLAKE2B 44f84888190f6a683da93d8f9b2a1edb27d66713699765aa90955c4ef408fef8f8c06d9ca314acb40780c66992245e167f7c0a615e31d1b5ae76b455bbc9b180 SHA512 45d31733c9942cedd916819baa842ae9b68de7ac9f7fc5d440f93d5eb2ea13975c3a4ac7116d80d669c7f942f5342e616da208b83a98ea005fe6a62fab3db373
 AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91dda8bfda405057c6733ef8dc27dbc7094817709ce03a3db1904e4c4ce3ecbdc82da6d16c5719a3f93410a84f07cd4c4018a9ea SHA512 aa3fd492f736c0fe7af1c2ba4e41307731589cef78c480426113dcbae8abbf0ecc07bdc5e1b251103d5aa813f120c5ff7f76dd6d5e577ca8f2b9f29eac008025
 AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
-DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df SHA512 b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
-EBUILD libsigrok-0.3.0.ebuild 1732 BLAKE2B f3f00fd50eeedfdf542d4205c633433d70cd3a3638932505cc6576eef7216a27b5ba677aa2281d692f250df458f1b4b33a67cf7f0ca3355ac52f4269623be20e SHA512 aa54d6ef4f33da4498432d84fdfd390134b7ccc2715af7e74ae91a7307348eeec73b5787fe39dd20a35572fa8316a0d504bea9ea413e71821f9fb4d974d58b5e
 EBUILD libsigrok-0.5.2.ebuild 3878 BLAKE2B 469ae6df2e16a1d6d26f65631f8ed4c4587533c72f0b9f4c4846f04ecb7c094680aeb62e3ef4412f5dbb34d6d4ccc81e53deb0a21bd1765a9359918e79115dca SHA512 bd48c7fb6f8e6b49e86886153add093039adc1c939ee0dd0666973b0c2caa8417c2a775b88946b3e7915faf1df0f22c9e2ba878c90a2ff687eef7782f815f333
 EBUILD libsigrok-9999.ebuild 3679 BLAKE2B 7c80f57e327ebac43dbda70a5f07147d49db55bc6640f7f22a82709bc0527cc76a8744ca314b79952ee6fc291462b988668d6ca7ad297246932a4f92c720c0dd SHA512 0182a0ba019d158e2c1c66889e8d97c0857f946357fa2704946b024bece3e43d4410b8d147cbd71c82506264f7b3d38f98a165558e3a515522724f1575ff41fb
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/files/libsigrok-0.3.0-configure-flags.patch b/sci-libs/libsigrok/files/libsigrok-0.3.0-configure-flags.patch
deleted file mode 100644
index 16e13349360c..000000000000
--- a/sci-libs/libsigrok/files/libsigrok-0.3.0-configure-flags.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-https://sourceforge.net/p/sigrok/mailman/message/32459490/
-
-From de8690fe8aad81f963f14cf1bd7d6e7013d9d747 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 13 Jun 2014 19:09:35 -0400
-Subject: [PATCH] add explicit configure flags for ftdi/serial/usb libraries
-
-This makes it a lot easier for distros to control this functionality.
----
- configure.ac | 118 +++++++++++++++++++++++++++++++++++++++--------------------
- 1 file changed, 79 insertions(+), 39 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 496bc7a..f23e630 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -261,6 +261,18 @@ AC_ARG_ENABLE(zeroplus-logic-cube,
- 	[HW_ZEROPLUS_LOGIC_CUBE="$enableval"],
- 	[HW_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT])
- 
-+AC_ARG_ENABLE(libserialport,
-+	AC_HELP_STRING([--disable-libserialport],
-+	[disable libserialport support [default=detect]]))
-+
-+AC_ARG_ENABLE(libftdi,
-+	AC_HELP_STRING([--disable-libftdi],
-+	[disable libftdi support [default=detect]]))
-+
-+AC_ARG_ENABLE(libusb,
-+	AC_HELP_STRING([--disable-libusb],
-+	[disable libusb support [default=detect]]))
-+
- # Checks for libraries.
- 
- case "$host" in
-@@ -302,19 +314,28 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.10],
- 
- # libserialport is only needed for some hardware drivers. Disable the
- # respective drivers if it is not found.
--PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
--	[have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS";
--	LIBS="$LIBS $libserialport_LIBS";
--	SR_PKGLIBS="$SR_PKGLIBS libserialport"],
--	[have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="no";
-+if test "x$enable_libserialport" != "xno"; then
-+	PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
-+		[have_libserialport="yes"; LIB_CFLAGS="$LIB_CFLAGS $libserialport_CFLAGS";
-+		LIBS="$LIBS $libserialport_LIBS";
-+		SR_PKGLIBS="$SR_PKGLIBS libserialport"],
-+		[have_libserialport="no"])
-+	if test "x$enable_libserialport$have_libserialport" = "xyesno"; then
-+		AC_MSG_ERROR([libserialport support requested, but it was not found])
-+	fi
-+else
-+	have_libserialport="no"
-+fi
-+
-+# Define HAVE_LIBSERIALPORT in config.h if we found libserialport.
-+if test "x$have_libserialport" = "xno"; then
-+	HW_AGILENT_DMM="no"; HW_APPA_55II="no";
- 	HW_ATTEN_PPS3XXX="no"; HW_BRYMEN_DMM="no"; HW_CEM_DT_885X="no";
- 	HW_CENTER_3XX="no"; HW_COLEAD_SLM="no"; HW_CONRAD_DIGI_35_CPU="no";
- 	HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no";
- 	HW_MIC_985XX="no"; HW_NORMA_DMM="no"; HW_OLS="no";
--	HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"])
--
--# Define HAVE_LIBSERIALPORT in config.h if we found libserialport.
--if test "x$have_libserialport" != "xno"; then
-+	HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no";
-+else
- 	AC_DEFINE_UNQUOTED(HAVE_LIBSERIALPORT, [1],
- 		[Specifies whether we have libserialport.])
- fi
-@@ -340,43 +361,62 @@ fi
- 
- # libusb-1.0 is only needed for some hardware drivers. Disable the respective
- # drivers if it is not found.
--case "$host" in
--*freebsd*)
--	# FreeBSD comes with an "integrated" libusb-1.0-style USB API.
--	# This means libusb-1.0 is always available, no need to check for it,
--	# and no need to (potentially) disable any drivers if it's not found.
-+if test "x$enable_libusb" != "xno"; then
-+	case "$host" in
-+	*freebsd*)
-+		# FreeBSD comes with an "integrated" libusb-1.0-style USB API.
-+		# This means libusb-1.0 is always available, no need to check for it,
-+		# and no need to (potentially) disable any drivers if it's not found.
-+		have_libusb1_0="yes"
-+		;;
-+	*)
-+		PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16],
-+			[have_libusb1_0="yes"; LIB_CFLAGS="$LIB_CFLAGS $libusb_CFLAGS";
-+			LIBS="$LIBS $libusb_LIBS";
-+			SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
-+			[have_libusb1_0="no"])
-+		if test "x$enable_libusb$have_libusb1_0" = "xyesno"; then
-+			AC_MSG_ERROR([libusb support requested, but it was not found])
-+		fi
-+		;;
-+	esac
-+else
-+	have_libusb1_0="no"
-+fi
-+
-+# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
-+if test "x$have_libusb1_0" = "xno"; then
-+	HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no";
-+	HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no";
-+	HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no";
-+	HW_SYSCLK_LWLA="no"; HW_UNI_T_DMM="no";
-+	HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no";
-+	HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no";
-+else
- 	AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
- 		[Specifies whether we have a libusb.h header.])
--	;;
--*)
--	PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16],
--		[have_libusb1_0="yes"; LIB_CFLAGS="$LIB_CFLAGS $libusb_CFLAGS";
--		LIBS="$LIBS $libusb_LIBS";
--		SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
--		[have_libusb1_0="no"; HW_BRYMEN_BM86X="no"; HW_FX2LAFW="no";
--		HW_HANTEK_DSO="no"; HW_IKALOGIC_SCANALOGIC2="no";
--		HW_KECHENG_KC_330B="no"; HW_LASCAR_EL_USB="no";
--		HW_SYSCLK_LWLA="no"; HW_UNI_T_DMM="no";
--		HW_UNI_T_UT32X="no"; HW_VICTOR_DMM="no";
--		HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"])
--
--	# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
--	if test "x$have_libusb1_0" != "xno"; then
--		AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
--			[Specifies whether we have a libusb.h header.])
--	fi
--	;;
--esac
-+fi
- 
- # USB + FX2 firmware helper code is only compiled in if libusb-1.0 was found.
- AM_CONDITIONAL(NEED_USB, test "x$have_libusb1_0" != xno)
- 
- # libftdi is only needed for some hardware drivers. Disable them if not found.
--PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
--	[LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS";
--	LIBS="$LIBS $libftdi_LIBS";
--	SR_PKGLIBS="$SR_PKGLIBS libftdi"],
--	[HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no"])
-+if test "x$enable_libftdi" != "xno"; then
-+	PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
-+		[have_libftdi="yes"; LIB_CFLAGS="$LIB_CFLAGS $libftdi_CFLAGS";
-+		LIBS="$LIBS $libftdi_LIBS";
-+		SR_PKGLIBS="$SR_PKGLIBS libftdi"],
-+		[have_libftdi="no"])
-+	if test "x$enable_libftdi$have_libftdi" = "xyesno"; then
-+		AC_MSG_ERROR([libftdi support requested, but it was not found])
-+	fi
-+else
-+	have_libftdi="no"
-+fi
-+
-+if test "x$have_libftdi" = "xno"; then
-+	HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA="no"; HW_IKALOGIC_SCANAPLUS="no";
-+fi
- 
- # The Check unit testing framework is optional. Disable if not found.
- PKG_CHECK_MODULES([check], [check >= 0.9.4],
--- 
-2.0.0
-
diff --git a/sci-libs/libsigrok/files/libsigrok-0.3.0-no-check-linkage.patch b/sci-libs/libsigrok/files/libsigrok-0.3.0-no-check-linkage.patch
deleted file mode 100644
index f638c47b196e..000000000000
--- a/sci-libs/libsigrok/files/libsigrok-0.3.0-no-check-linkage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://sourceforge.net/p/sigrok/mailman/message/32459488/
-
-From 5326833697a73826babb6a43c74112da7368d2d6 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 13 Jun 2014 21:17:23 -0400
-Subject: [PATCH] do not add check to common cflags/libs
-
-Only the unittests use these flags, so don't go linking them in for
-the main library too.
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f23e630..d0654f1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -420,8 +420,7 @@ fi
- 
- # The Check unit testing framework is optional. Disable if not found.
- PKG_CHECK_MODULES([check], [check >= 0.9.4],
--	[have_check="yes"; LIB_CFLAGS="$LIB_CFLAGS $check_CFLAGS";
--	LIBS="$LIBS $check_LIBS"], [have_check="no"])
-+	[have_check="yes"], [have_check="no"])
- AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
- 
- # The OLS driver uses serial port file descriptors directly, and therefore
--- 
-2.0.0
-
diff --git a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild b/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
deleted file mode 100644
index 3c1c6c14e61a..000000000000
--- a/sci-libs/libsigrok/libsigrok-0.3.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils autotools ltprune
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
-
-LICENSE="GPL-3"
-SLOT="0/2"
-IUSE="ftdi serial static-libs test usb"
-RESTRICT="!test? ( test )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-	>=dev-libs/libzip-0.8:=[static-libs(+)]
-	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
-	serial? ( >=dev-libs/libserialport-0.1.0[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ${LIB_DEPEND} )"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	test? ( >=dev-libs/check-0.9.4 )
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.3.0-configure-flags.patch
-	epatch "${FILESDIR}"/${PN}-0.3.0-no-check-linkage.patch
-	eautoreconf
-
-	# Deal with libftdi-0.x & libftdi-1.x changes.
-	if has_version dev-embedded/libftdi:1 ; then
-		sed -i 's:libftdi >= 0.16:libftdi1 >= 0.16:g' configure || die
-	fi
-
-	# Fix implicit decl w/usleep.
-	sed -i '1i#include <unistd.h>' hardware/asix-sigma/asix-sigma.c || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable ftdi libftdi) \
-		$(use_enable serial libserialport) \
-		$(use_enable usb libusb) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}