gentoo resync : 15.01.2020

5 files changed, 168 insertions, 9 deletions

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index cf2928b36364..517a3570f4ae 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -3,8 +3,10 @@ AUX libsigrok-0.3.0-no-check-linkage.patch 980 BLAKE2B 44f84888190f6a683da93d8f9
 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df SHA512 b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
 DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b SHA512 5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
 DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da SHA512 48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517
+DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
 EBUILD libsigrok-0.3.0.ebuild 1724 BLAKE2B 1c426bf94a8f83078ea74d094c8c43ce044ac6fe6c94548f47a15c203cc06295de43b6e72d97cffcb4a7a0ec11fecda611217e5d04541ec108f0a4d647773838 SHA512 e6ff926a3e3b0b4e753969c734603d934844c3099a3ba6eb6b81b5e938fa3e113014d46b1ce2cff977940a2099920d30e41f9a3bad5eea4ba41454196f801829
-EBUILD libsigrok-0.4.0.ebuild 2137 BLAKE2B 124389b23f9cd4723145af3b08e171bf002ef3eea9b8f5d5cd3465b8f53f393624d35d2e2e23674fc08411bc53f59f93a6e5421b9ea3833977d87e6683334c02 SHA512 8ff6e5b057ad29fcca715d9545d431c3e9f254be2006dbf442e1f9f814f63e27cf611abdd6d88e758c7e17ef8ab9cddd26a0b5e5bf5e426a915e2737e1fac629
-EBUILD libsigrok-0.5.1.ebuild 2365 BLAKE2B 9d927e3dfed88bb3f366e990d662bf37ec574c30c992c3ea62b8fac39ce8ae38a08c332460ef80a9b5e2d424db46fb46e48921dd4cbc40ada16bfe456bf33801 SHA512 d086054cb05b5380dc7479157dcd3505eab22130d88fce116843cb77f10bf795f1dbb8cb85d068ff43d337bcd8cff930eb785d67ce343c9d88ac30c6d8d24f64
-EBUILD libsigrok-9999.ebuild 3629 BLAKE2B 4abc8dc5330c1cfa5a4bb5432a84b0bbbb2d605e93da69178e254e22ec21703d5a893705fe009ebff195a154bd221fcd990036b7e54f222920ddd8334af18b82 SHA512 903e174fb8a339ad7e3e471a2415b4e3bc4a5c0395078b0df95d8ade75e2a8d720e2aefb8d1ada3039bcc866bc0eac6583c4ed7f55b064ec70271d55c7e70027
+EBUILD libsigrok-0.4.0.ebuild 2133 BLAKE2B 5385b1cf0a9accbb5172b95cb0e91efe6439d204c0cb734f4d9e01fae933e3a2c647e3fc2011e25955a92ab05714ad7de796e58023cee7afac9a8749b8089c4d SHA512 e299140f57d33d72c5f1cbf0723704f56b837106d71f91ca3c62dd691e982ffac0c9fcc561673821f00bbe0e3f265c148853e444bb2298ebcd8b0fb444fba194
+EBUILD libsigrok-0.5.1.ebuild 2363 BLAKE2B f4ead74620b10b97b32a94400f56e56bd54f8c4a80cddbbf837ac5edb185d65eb110ae83621f86412e1335a2a05ba480482fab1faeac332d091f1d5675b0181d SHA512 114eeb66a774f8a3739215a3029a7e65e94204497eadcd097f3a6e3f56ffa1a79d754ccfb22910520fd1c69389fef7286c40061ce42a285959cef5c7c5910c0c
+EBUILD libsigrok-0.5.2.ebuild 3641 BLAKE2B 3c7b23e7e1fca072d969bac0adb61c44344c30f856f2b54b87fbf2a43b25a1d4edb0a7726256f30f4c741c8c446b93e0c73b1b3a4bb5d8772eeb94d0ed6b236b SHA512 3a821aa28e6349b69312e863051a52a2f3030b412ce608ffb936f811640a9d54e07718af2766be5923921318c999f703e3faadea4bd2be0c8ad7fd443c560767
+EBUILD libsigrok-9999.ebuild 3644 BLAKE2B cc90f93d924687e2e213a24d844276ab2424fd55505743ca93777c616cb4d1a442e40fa9f0edc93d3b99296d35836fa730c79e21db12805deca5ea31ec712c91 SHA512 88a23335faf959585fe92d4dd94c49c1d9634b747884e8c9bfa9ef16b822f145444f3866abc681c534b3b12097e76172ff4471d1e3d2ffdd3c5e186ec63c19c8
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
index c778d842eb25..a360d4392473 100644
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils python-single-r1 java-pkg-opt-2
 
diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
index 9be12225b2ba..a55893a01993 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 udev xdg-utils
 
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
new file mode 100644
index 000000000000..b34f77155e08
--- /dev/null
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+USE_RUBY="ruby26 ruby25 ruby24"
+RUBY_OPTIONAL="yes"
+
+inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
+
+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/4"
+IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
+# 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(+)]
+	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
+	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
+	ruby? ( $(ruby_implementations_depend) )
+	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
+	parport? ( sys-libs/libieee1284[static-libs(+)] )
+	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
+	usb? ( virtual/libusb:1[static-libs(+)] )"
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	static-libs? ( ${LIB_DEPEND} )
+	java? ( >=virtual/jre-1.4 )"
+DEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	test? ( >=dev-libs/check-0.9.4 )
+	cxx? ( app-doc/doxygen )
+	java? (
+		>=dev-lang/swig-3.0.6
+		>=virtual/jdk-1.4
+	)
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-lang/swig-3.0.6
+	)
+	ruby? ( >=dev-lang/swig-3.0.8 )
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${P}
+
+pkg_setup() {
+	use ruby && ruby-ng_pkg_setup
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+}
+
+sigrok_src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+each_ruby_prepare() {
+	sigrok_src_prepare
+}
+
+src_prepare() {
+	use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare
+	sigrok_src_prepare
+	eapply_user
+	use python && python_copy_sources
+}
+
+sigrok_src_configure() {
+	econf \
+		$(use_with ftdi libftdi) \
+		$(use_with parport libieee1284) \
+		$(use_with serial libserialport) \
+		$(use_with usb libusb) \
+		$(use_enable cxx) \
+		$(use_enable java) \
+		$(use_enable static-libs static) \
+		"${@}"
+}
+
+each_ruby_configure() {
+	RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python
+}
+
+each_python_configure() {
+	cd "${BUILD_DIR}"
+	sigrok_src_configure --disable-ruby --enable-python
+}
+
+src_configure() {
+	python_setup
+	sigrok_src_configure --disable-ruby --disable-python
+	use ruby && ruby-ng_src_configure
+	use python && python_foreach_impl each_python_configure
+}
+
+each_ruby_compile() {
+	emake ruby-build
+}
+
+each_python_compile() {
+	cd "${BUILD_DIR}"
+	emake python-build
+}
+
+src_compile() {
+	default
+	use ruby && ruby-ng_src_compile
+	use python && python_foreach_impl each_python_compile
+}
+
+src_test() {
+	emake check
+}
+
+each_ruby_install() {
+	emake ruby-install DESTDIR="${D}"
+}
+
+each_python_install() {
+	cd "${BUILD_DIR}"
+	emake python-install DESTDIR="${D}"
+	python_optimize
+}
+
+src_install() {
+	default
+	use python && python_foreach_impl each_python_install
+	use ruby && ruby-ng_src_install
+	use udev && udev_dorules contrib/*.rules
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index 22fa3622f092..5c3c959d1d21 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 USE_RUBY="ruby26 ruby25 ruby24"
 RUBY_OPTIONAL="yes"
 
@@ -134,6 +134,7 @@ each_ruby_install() {
 each_python_install() {
 	cd "${BUILD_DIR}"
 	emake python-install DESTDIR="${D}"
+	python_optimize
 }
 
 src_install() {