gentoo auto-resync : 21:08:2023 - 09:43:30

4 files changed, 125 insertions, 4 deletions

diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest
index 71f7a97cbe79..a5ff5f07ae27 100644
--- a/net-libs/libad9361-iio/Manifest
+++ b/net-libs/libad9361-iio/Manifest
@@ -1,7 +1,10 @@
 AUX libad9361-iio-0.2-cmake-gnuinstalldirs.patch 1815 BLAKE2B b6836af3ce9f1bf3d8eae92ff42cf38e11227fe02af032246c3f3344e92a2399175a6e0f1faf09e2e2124615fbc95283a5817aba7aad4d7b3dc500f01750bf37 SHA512 546e2d0e71ff6c0fc201a3ef41fb0d63e728da72fc89c5a92a0a5bf17cd8f7fb63bb094ebd82573d4ac26abd484857bd5d998a6e220a3ab8e0775304c20b1971
 AUX libad9361-iio-0.2-fix-lld-tests.patch 2089 BLAKE2B fb462846e61b94e9b1a0aaa444c24fbdec12c12d19761dac402b70914ed7b88ed0821015d2d9bf6a6eef8b860b40642727649597f74af2a4d6a4cb18b5ffd8fc SHA512 6d79873358441229e024b99c722138bd76f8a228d5aad79432c212be88b6bfc3e662fa63ccce355ac4ea1e732f20d3c51ded1fbf51785f68e57eea6668ef32b1
 AUX libad9361-iio-0.2-libdir-pkgconfig.patch 513 BLAKE2B 77291cea5d1dfa99646673881b5c7acf248928103476605946aa4decc09bc87aaf210378bea2846cd1ab1b8717ed54baa8c1028c0223b53a28b86a06021fe2e2 SHA512 9d161de025db149ad27b6e6ce6b9b1a7b4f4c6293b3936a2f8bb004bcdc70e88680d781c76e882cd2d1b2afcecd0b3624e45e8864f2b45bb19b20bc3f80dacb1
+AUX libad9361-iio-0.3-cmake-gnuinstalldirs.patch 2218 BLAKE2B 5275c4eaaed38f38140e33157ba5a4d64465f74c295592133aff7a40e7fa4e2cb15d35c25ffb2e9a110ae34aee17f9bedcff6f3b2fbab19be0bd095fa48139b7 SHA512 e70adbccfe3dcd599b34de7c941e07274f552226915933496d5655fce0037d630b37028d4252b710bb9c4c72a3a400387c66cda8c09579d932eabac904dacc05
 DIST libad9361-iio-0.2.tar.gz 167678 BLAKE2B 9880114bc53f3d4975dbe0773f8d112e40b0df47e34985bdc68c5b6740aee2c140ced39353929a793c2b327b5811461436ceb2934c2a71fc7b92b218092d468d SHA512 f95fa955531198ab33c16d41685d23140e875b2eafa1da10cdf60a7bf1ae760e86e2d3d28c9ab36a3a7b7a90e36bb53456dec1d6e537a1574a5505b7595e764c
+DIST libad9361-iio-0.3.tar.gz 188475 BLAKE2B bdd3733ece66f1b34075821316ce054537059297964cc4bd92bc4c768d1253a2b6d1822bf6cce20082395b0f7d72ccc63a5002608f8042494a6a543a3e0369a4 SHA512 904f81fead71a9c93ccdcdb8822247fc8c496920abb9b13ea4b2b0465d50f5c0115ffc8d226496e76f7bb23b466031556129b18a1f35c65c30dcb3b0c1aeeff9
 EBUILD libad9361-iio-0.2-r1.ebuild 763 BLAKE2B 9fbbe38e6efba6f01640b339a6d6e08a5695bd6c1ffffefd970057b5b989fd988607071166f8759109f7c71527b3fe404e38c0b025016f9bbfb78d5184c54656 SHA512 ebc2dd5a8882762d7308f740b6cd690b4ace1e496f646ef490381973d0f1c598e87115ae0e5a5be9b4d7c6a0ae2b6d4aa23c83a91c43e7f4872b23d42e9b0eef
-EBUILD libad9361-iio-9999.ebuild 758 BLAKE2B d81208c182f607eee214db6105ba729fdcfa9bf3dd7d5df44986ee7592732498fed33e10e6ad34f44ffab2349233a38b2b6ddcc2b3a946e190b87f13c6c98272 SHA512 7b1dfa6f5520e84dc6dacc02baeb2be2aee6a115f1c794a6cbc41b2938c55679508cc1742f7da57ac0306e0d264dfc3d8d9a8a578870dc3d1d9da53e235e3410
+EBUILD libad9361-iio-0.3.ebuild 1082 BLAKE2B d563c4dd59dc38b91d508245eee20ca5c4fcec9972454746110958fed9e7f73014a8adc393ffba05ffd1dcf20892a0444c00673246abe013988261f744246dfb SHA512 ceebdd408d68839ab64fdda37696c0d11a3c066f411c67b83fd7e3126fb7004ac3024b774b15d02ca8e804fdfe292f60a217c20cc4393124085832510a3f921e
+EBUILD libad9361-iio-9999.ebuild 1030 BLAKE2B 4b443c8a18453d16b2c57113aea9cf7d3f3a740ef5369cd6ff8a1284aa75a708a4d3b1347bcfeab3d46d56aff38af258cc7a875e7e82d38868777a9713155398 SHA512 7433d6e64c475e292c950184aebad3472d1e0384bde3347b1877876ca8a1074008463364284f0ab53ecd4f72d50704c1a4d5aed5e3a5345e7c62b9cfbebd997a
 MISC metadata.xml 442 BLAKE2B 4aaee897fc8e0ec7c1081c20bcee1470aaeebd3f14252177861cbaff053a29c4b4b6a5476015252d8a75e8dd191d45e3c3c6f0cd6a08f41d3374831f3c392ac0 SHA512 b8e19d2f3382733f2756c406a7f08635956973c32cd8ec400bed18445dffb51d0595c09040de74bf907d32f6119976326b4ba914d29e74e65a9bc7eb1d3016cc
diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.3-cmake-gnuinstalldirs.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.3-cmake-gnuinstalldirs.patch
new file mode 100644
index 000000000000..9df6ed6dede2
--- /dev/null
+++ b/net-libs/libad9361-iio/files/libad9361-iio-0.3-cmake-gnuinstalldirs.patch
@@ -0,0 +1,57 @@
+From ef3d58506132072834637f887bc47eb4d0c52a73 Mon Sep 17 00:00:00 2001
+From: Julien Malik <julien.malik@unseenlabs.fr>
+Date: Mon, 29 Nov 2021 17:52:13 +0100
+Subject: [PATCH] cmake: Honor GNUInstallDirs for installation
+
+Library installation dir can be lib, lib64 or lib/<multiarch-tuple>.
+Use the installation paths given by GNUInstallDirs by default, as done in libiio
+
+Signed-off-by: Julien Malik <julien.malik@unseenlabs.fr>
+---
+ CMakeLists.txt | 20 +++++++++-----------
+ 1 file changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 04d5c45..475a448 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,10 +70,6 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD|DragonFly|OpenBSD|NetBSD")
+ endif()
+ add_definitions(-D_POSIX_C_SOURCE=200809L -D__XSI_VISIBLE=500 -DLIBAD9361_EXPORTS=1)
+ 
+-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+-	CACHE PATH "Installation directory for libraries")
+-mark_as_advanced(INSTALL_LIB_DIR)
+-
+ find_library(LIBIIO_LIBRARIES iio)
+ find_path(LIBIIO_INCLUDEDIR iio.h)
+ 
+@@ -109,19 +105,21 @@ configure_file(libad9361-iio.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libad9361-i
+ 
+ set(LIBAD9361_PC ${CMAKE_CURRENT_BINARY_DIR}/libad9361.pc)
+ configure_file(libad9361.pc.cmakein ${LIBAD9361_PC} @ONLY)
+-install(FILES ${LIBAD9361_PC} DESTINATION ${INSTALL_LIB_DIR}/pkgconfig)
+ 
++include(GNUInstallDirs)
+ if(NOT SKIP_INSTALL_ALL)
+ 	install(TARGETS ad9361
+-		ARCHIVE DESTINATION lib
+-		LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+-		RUNTIME DESTINATION bin
+-		FRAMEWORK DESTINATION lib
+-		PUBLIC_HEADER DESTINATION include)
++		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++		LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++		FRAMEWORK DESTINATION ${OSX_INSTALL_FRAMEWORKSDIR}
++		PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
++
++	install(FILES ${LIBAD9361_PC} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif()
+ 
+ set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc)")
+-include(GNUInstallDirs)
++
+ set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc")
+ 
+ find_package(Doxygen)
diff --git a/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild
new file mode 100644
index 000000000000..4150b0e0fb58
--- /dev/null
+++ b/net-libs/libad9361-iio/libad9361-iio-0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc"
+HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+fi
+IUSE="doc"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+RDEPEND="net-libs/libiio:="
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
+	"${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
+	"${FILESDIR}"/${PN}-0.3-cmake-gnuinstalldirs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOC="$(usex doc)"
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${P}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use doc; then
+		mv "${ED}/usr/share/doc/ad93610-doc" "${ED}/usr/share/doc/${P}" || die
+	fi
+}
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
index 596e74764626..f26413486b48 100644
--- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,17 +12,33 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
 fi
+IUSE="doc"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
 
 RDEPEND="net-libs/libiio:="
 DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch
 	"${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch
-	"${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch
 )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_DOC="$(usex doc)"
+		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${P}"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use doc; then
+		mv "${ED}/usr/share/doc/ad93610-doc" "${ED}/usr/share/doc/${P}" || die
+	fi
+}