gentoo resync : 15.01.2020

5 files changed, 58 insertions, 64 deletions

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index cd2f0da842a5..c14c3cbd0ace 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,6 +1,8 @@
-DIST facter-3.14.5.tar.gz 395892 BLAKE2B c8f98716f4abca8d5f32c1cbfa79437b4021b1994476a31f7c00fc092f02aa08ed01eff4357368e140763bd3d39a38915c99606914e697ff8c769c9f0dd26638 SHA512 387f3d4c654ce3231129dbf6c22ccb04023d73006e4709b330b11ac01ef55831c618d80171ffb8de455be2a12e339a2b52ab782b0ed97e2dbfeaca2692ed951d
+AUX facter-3.14.6-explicit-rspec-2.patch 480 BLAKE2B 60ebc035ea3e37628879628de36cd4c4ac9672e3fc00fec671f61b5c8cf646ccd95b1686f791032e66b7567f0f7f96cd4c9be7441f39e4e8f25346c8a4fa609c SHA512 a33322a1e2906c3ac400b798855158450a0465ed809d34bf033a868864c9e7aab0284c98c3eb85b27c8248ba6b3efb8f6cdb45219adac290151232bf87322153
+AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 DIST facter-3.14.6.tar.gz 397339 BLAKE2B 74fae02a70194fd85789428c779f000e6b6750f52ecb0c713d6b772b3592a1974835367b148d046f849d61704adf82d93f519b86ecfe0007fb492f880a2aebca SHA512 6c17ba200fe82a2223b76505c29c6fb7bce2bff6e795316ea0b91d2fc8bc42bed9b930ba9c5d7b3851fd36fe93fb20e81a9cbc919589d4012e989234be1ba787
-EBUILD facter-3.14.5.ebuild 2499 BLAKE2B 767fff9faedbc31625e70f487df2d68e454601ad17c09e5ab900b0d9331090165408b740b3a3b1d0ee777ebd18432af2d4e13308bb6972525c5fee50b2fde69f SHA512 1ddadc65a51b6c1e96eee2c113753c3ea127f2e03c485668eb8af10efe3e7db8c4aa8a1450d75d1036eb450402101aa67677bdddc9a247877f27ca6d1a5228f3
-EBUILD facter-3.14.6.ebuild 2501 BLAKE2B 2f48dce0a54cb7335299fb245f7576f3d39f50ac8c7fadf2232cdf02e23263ba75f1967ccd1f2542906075e83c73c62ed04a19670a04d3707a11b48aa9d8d868 SHA512 48d61d08e5eba09d4a227877aee96503bfd599da4fcfce4114b5f939a26c4c4feefa995f5382a1b371e7196aee57aac30515a2d7b8863b11dd3c2aded338cc2d
+DIST facter-3.14.7.tar.gz 398902 BLAKE2B e399fba120bee70b85fb7ea39ba0f719efd6b6509add4000a4eb220aa0f59e1ffe7457a8959cbb81be78ace04ba9ef3038c39d2c975e8c0c6071cd22aa5aae78 SHA512 33c187844642645b4ad780c6a5be4af0d860fb824e70935d60eb626267cae46f00487ea408fab28149472c58e80c33bdb4585e6eec18f16d817b014c3f2bc675
+EBUILD facter-3.14.6.ebuild 2138 BLAKE2B ab7bb01cf3ad624468c6e1e309d8c43af999ad184d6121fc664d84a6a7f1eb27d76ebffe0b6bd361ca7eb9c79ad8e68b3e6a6b95f3af3186f2a92760fe765996 SHA512 036c6ed5568ec55dbe8702b8a76dcc5ee8604142d007e8eee141140062479f61d3524ac83a19770e5b2060571bf96c803fc1bb2e4cbe4b81437c8394c0e3b7bb
+EBUILD facter-3.14.7.ebuild 2140 BLAKE2B d8ec8f180d5e63531e0a0ff535152ed38af95c8ed582bdb472f5bed28f0ff7d2fe9adaad6287be32764b98cdb393f7d4d9cd9a52e6694d615e7ed28c94e6f3bc SHA512 b9f989266d955a5de0f89f0ecd21fdeefeca162556fdeb56f4e9cef18e8ca13f1f29dac53196099fd2275370523931cd6cadf31d98559be76ba7b05111234a61
 EBUILD facter-9999.ebuild 2490 BLAKE2B 9c480e951320b78a43aac1c436d5008d3461de4a62f73f76e7ae6a1eb62d5ac0b4af8f58b2fe25738c892e68d3c014be43f0ac79a8ccfc065c0f1485dbc03428 SHA512 41a5ca3bbbbfb9e5c94271490e7d9a9a1a99ca76b9c3c3ccf5b9ac6b3da005101063ad9b6e3ae8c53e9335c1d55e8b3f8f528f1b759b85a40f6251217b8a7e76
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.6.ebuild b/dev-ruby/facter/facter-3.14.6.ebuild
index a4124fce9bdd..f43caea884f4 100644
--- a/dev-ruby/facter/facter-3.14.6.ebuild
+++ b/dev-ruby/facter/facter-3.14.6.ebuild
@@ -1,52 +1,53 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils multilib ruby-ng
+inherit cmake-utils eutils ruby-ng
 
 DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
 HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="debug test"
+IUSE="test"
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-cpp/cpp-hocon-0.1.4-r1"
-COMMON_DEPEND="
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
 	>=dev-libs/leatherman-1.0.0:=
 	dev-libs/openssl:0=
 	sys-apps/util-linux
 	app-emulation/virt-what
 	net-misc/curl
-	>=dev-libs/boost-1.54:=[nls]
+	dev-libs/boost:=[nls]
 	>=dev-cpp/yaml-cpp-0.5.1
 	!<app-admin/puppet-4.0.0"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${BDEPEND}
-	${COMMON_DEPEND}"
+DEPEND="${RDEPEND}"
 
 # restore ${S} and override all phases exported by ruby-ng.eclass
 S="${WORKDIR}/${P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.6-explicit-rspec-2.patch
+)
+
 pkg_setup() {
 	ruby-ng_pkg_setup
 }
@@ -60,15 +61,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# be explicit about the version of rspec we test with
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		CMakeLists.txt || die
-	# be more lenient for software versions for tests
-	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
-		-e '/rspec/ s/2.11.0/2.11/' \
-		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
-	# patches
-	default
 	cmake-utils_src_prepare
 }
 
@@ -82,15 +74,9 @@ src_configure() {
 	ruby-ng_src_configure
 
 	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
 		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
 	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
 	cmake-utils_src_configure
 }
 
diff --git a/dev-ruby/facter/facter-3.14.5.ebuild b/dev-ruby/facter/facter-3.14.7.ebuild
index dbf4788a2881..9eddae0a3f54 100644
--- a/dev-ruby/facter/facter-3.14.5.ebuild
+++ b/dev-ruby/facter/facter-3.14.7.ebuild
@@ -1,52 +1,53 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils multilib ruby-ng
+inherit cmake-utils eutils ruby-ng
 
 DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
 HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="debug test"
+IUSE="test"
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-cpp/cpp-hocon-0.1.4-r1"
-COMMON_DEPEND="
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
 	>=dev-libs/leatherman-1.0.0:=
 	dev-libs/openssl:0=
 	sys-apps/util-linux
 	app-emulation/virt-what
 	net-misc/curl
-	>=dev-libs/boost-1.54:=[nls]
+	dev-libs/boost:=[nls]
 	>=dev-cpp/yaml-cpp-0.5.1
 	!<app-admin/puppet-4.0.0"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${BDEPEND}
-	${COMMON_DEPEND}"
+DEPEND="${RDEPEND}"
 
 # restore ${S} and override all phases exported by ruby-ng.eclass
 S="${WORKDIR}/${P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.6-explicit-rspec-2.patch
+)
+
 pkg_setup() {
 	ruby-ng_pkg_setup
 }
@@ -60,15 +61,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# be explicit about the version of rspec we test with
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		CMakeLists.txt || die
-	# be more lenient for software versions for tests
-	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
-		-e '/rspec/ s/2.11.0/2.11/' \
-		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
-	# patches
-	default
 	cmake-utils_src_prepare
 }
 
@@ -82,15 +74,9 @@ src_configure() {
 	ruby-ng_src_configure
 
 	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
 		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
 	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
 	cmake-utils_src_configure
 }
 
diff --git a/dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch b/dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch
new file mode 100644
index 000000000000..cd8f9f614d11
--- /dev/null
+++ b/dev-ruby/facter/files/facter-3.14.6-explicit-rspec-2.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -205,7 +205,7 @@
+ if (RUBY_FOUND)
+     find_program(BUNDLER_PATH NAMES bundle.bat bundle)
+     if (BUNDLER_PATH)
+-        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
++        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec-2 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
+     endif()
+ endif()
+ add_test(NAME "facter\\ smoke" COMMAND facter)
diff --git a/dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch b/dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch
new file mode 100644
index 000000000000..26c193c12b57
--- /dev/null
+++ b/dev-ruby/facter/files/facter-3.14.6-fix-static-libcpp-hocon.patch
@@ -0,0 +1,9 @@
+--- a/cmake/FindCPPHOCON.cmake
++++ b/cmake/FindCPPHOCON.cmake
+@@ -1,5 +1,5 @@
+ include(FindDependency)
+-find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.a")
++find_dependency(CPPHOCON DISPLAY "cpp-hocon" HEADERS "hocon/config.hpp" LIBRARIES "libcpp-hocon.so")
+ 
+ include(FeatureSummary)
+ set_package_properties(CPPHOCON PROPERTIES DESCRIPTION "A C++ parser for the HOCON configuration language" URL "https://github.com/puppetlabs/cpp-hocon")