gentoo resync : 13.10.2019

3 files changed, 38 insertions, 10 deletions

diff --git a/sys-apps/thunderbolt-software-user-space/Manifest b/sys-apps/thunderbolt-software-user-space/Manifest
index dd1cadbea87b..c1341e58d865 100644
--- a/sys-apps/thunderbolt-software-user-space/Manifest
+++ b/sys-apps/thunderbolt-software-user-space/Manifest
@@ -1,5 +1,6 @@
-DIST thunderbolt-software-user-space-0.9.2.tar.gz 14485 BLAKE2B 8a471888fefbbd7949454b176845b4162b08736d60a86b53f2330e115b776d1ef25b1a706e6fc76661551339525876ddfb621c52301d9327b0c7be0b1abd1f9c SHA512 fbd5902f3f06d3cfec309a972fe5dc32e87eab39668b2c07401bd79ad9af2210f8db41ecdd30cfae34ba24b03dc47df439c2fcd2e74da55d1101237f723b4540
+AUX thunderbolt-software-user-space-0.9.3-cmake.patch 521 BLAKE2B ca7756afc0504e0d9df159da7db7e6d334e271fcf404f0700e66454de71cff17cb0b32970cab0569582a32a40739eefb82ae64ea9cccc5657588b9b9ea11c149 SHA512 b34a3833eaf772cb07540199a2096af88cc02aacefaf45ac0a8f91abcbedb0e499c587a5e241fb5f7cbf334a4aee80cc1416aa775bc69480e3a5bd3497cffa9b
+DIST thunderbolt-software-user-space-0.9.3-tbtadm.1.tar.xz 1160 BLAKE2B 2710f2acea71a7301a121a564bc7625c73b7c983622f9d50f544836facbda7c8cbc29055c81706ec0d8fe5aaa8d254872f9c9740b2b9235642b1264380ad17c1 SHA512 3a5b5e5bfc6b7e2a0f2cd09428e315d6895a217bfda7faacd3817e85b3201192f6dd6b26d10071721164bb9c49731aead1d8249ad6652fdba9d38074fcb74907
 DIST thunderbolt-software-user-space-0.9.3.tar.gz 22186 BLAKE2B afc614d0d2f7de3c23988e08c0053d24a04be51d22986497e3863b76ad59f1a8a9e2ab323210df27a3fa2f07ab05122666a3c6bfde146250f0854b2dfb6748f8 SHA512 b8bcb31d864376c644f9813abf2d090cc3239271df8a8e71ff7d5e398e993d4d01e94ba5fc1bc13d7dd0fa861b4b918a6df0724ca43f54a5e706ec67f3c7846b
-EBUILD thunderbolt-software-user-space-0.9.2.ebuild 735 BLAKE2B 37f618fe655c62cc0140c7d3e539df741471b28aeba4d97a91dca9e6a26cfdc7f6b5c9f2a1f6055c71d837e07a1861a628923043e5e4aae72c2747e832ae9889 SHA512 74eff6a383a5fcab2415d1a6491d4afa402acb8675cf5f8ee6371296c2aa769a5ecbf030e30398b45c02760a6dcf5ca13dc6d5b7141a5180e67017101f25a334
+EBUILD thunderbolt-software-user-space-0.9.3-r1.ebuild 964 BLAKE2B 259ee639da8ecd28297ecfac280875da106fa9949a3569b3bd3d50875c4e38ccab5bf2875b86d2856ebfd5d9b04da5db29dea2469a1a307e6da3f421b82d4b16 SHA512 d40f6bc0df14267e8aba49ec2ab27046b24f48d01b3b8a89397030bd2fd8b77552696c6997cdfce65e99241077f1313ab75e0e348d6876fe648db9a3158e2d88
 EBUILD thunderbolt-software-user-space-0.9.3.ebuild 730 BLAKE2B 065c2025f3a2de5c3e337b4677ba5452b5a1d431c216ad923acc656a8c7f9f0372f6783da4456f2975c3d62193963ff0ed6b5aa916f9f5933b78ca133d050ce8 SHA512 7f454e304a976c2efe4364e579c455aabab22b0ceda17ef12a911b40d57705c3fdc99461c40c939dbe717318fab7ff79695699806c02afd4dc23e7c3c410b746
 MISC metadata.xml 554 BLAKE2B 0ccaeead65893d20860bfb9e81f00aff2959c23e2e1754ab67342b0c4b027ed255d249f1b03146f98677933dae84982e01fce130b276785471b5a730fe2d2998 SHA512 70ddc8c30381a7a2288f1aff50eb932ef418bb72ac0f7b60e15b4846133ddff8b3de77bff9e4bb40a336f5077c1bc1dca9c574eb5fa3a53c0f3f083511b185d2
diff --git a/sys-apps/thunderbolt-software-user-space/files/thunderbolt-software-user-space-0.9.3-cmake.patch b/sys-apps/thunderbolt-software-user-space/files/thunderbolt-software-user-space-0.9.3-cmake.patch
new file mode 100644
index 000000000000..68d50bb282c5
--- /dev/null
+++ b/sys-apps/thunderbolt-software-user-space/files/thunderbolt-software-user-space-0.9.3-cmake.patch
@@ -0,0 +1,15 @@
+'For DEB', so why do they install it by default?
+Only redundant here, and a minor QA offence.
+
+--- a/CMakeLists.txt	2018-02-14 09:42:31.000000000 +0100
++++ b/CMakeLists.txt	2019-09-30 23:47:11.529985366 +0200
+@@ -102,9 +102,4 @@
+ set(CPACK_PACKAGE_FILE_NAME
+     "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
+ 
+-# For DEB
+-install(FILES ${CPACK_RESOURCE_FILE_LICENSE}
+-        DESTINATION share/doc/${CPACK_PACKAGE_NAME}
+-        RENAME copyright)
+-
+ include(CPack)
diff --git a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.2.ebuild b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
index 98f4f364ebe1..da1c56e10ab8 100644
--- a/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.2.ebuild
+++ b/sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
@@ -1,27 +1,39 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit cmake-utils linux-info
+
 DESCRIPTION="Thunderbolt(TM) user-space components"
 HOMEPAGE="https://github.com/intel/thunderbolt-software-user-space"
-SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~asturm/distfiles/${P}-tbtadm.1.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="
-app-text/txt2tags
-dev-libs/boost
-"
+DEPEND="dev-libs/boost:="
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
 pkg_pretend() {
 	CONFIG_CHECK="THUNDERBOLT"
 	ERROR_THUNDERBOLT="This program talks to the thunderbolt kernel driver, so please enable it."
 	CONFIG_CHECK="HOTPLUG_PCI"
-	ERROR_HOTPLUG_PCI="Thunderpolt needs pci hotplug support, so please enable it."
+	ERROR_HOTPLUG_PCI="Thunderbolt needs pci hotplug support, so please enable it."
 	check_extra_config
 }
+
+src_prepare() {
+	cmake-utils_src_prepare
+	cmake_comment_add_subdirectory docs
+}
+
+src_install() {
+	cmake-utils_src_install
+	doman tbtadm.1
+}