gentoo resync : 15.01.2020

4 files changed, 76 insertions, 47 deletions

diff --git a/dev-cpp/cpp-hocon/Manifest b/dev-cpp/cpp-hocon/Manifest
index 5f1365849bee..bd3c96984c72 100644
--- a/dev-cpp/cpp-hocon/Manifest
+++ b/dev-cpp/cpp-hocon/Manifest
@@ -1,3 +1,5 @@
-DIST cpp-hocon-0.1.4.tar.gz 157988 BLAKE2B 3b9e3ec2c386446a2c1d078867b03fbfe2adc8160877288597c648eaf4af6e34f09b673780e6fb81ce9bd1724c1e3d6efc1102985d344a4d1d7bb48b15916190 SHA512 f5ee6c5e7eaa5139bb3c421fd8b7c0da337daec99dce7f426d567ced0036b7c49a396b1b9bdbaa8023cd776a5a942175082a4b30280d4211a0db51483324be42
-EBUILD cpp-hocon-0.1.4-r1.ebuild 1012 BLAKE2B 4d57a1fb57ce39b31469ef5fb1298b07f485b3d2e74b6add0c83d11a0c5093c13e49cf9f6a350ad5917c9157d41b7181f790cd8d0d9f9d9906f881e35dd93252 SHA512 1cd0c36dd4a21e9a09ba5b1fd443108ebbc41851cb6ebf833c6768cadf992f32bdb1cea7df16626352d4fc6e50e4d3dadb3b7c340305d96f2e22943b3a465033
+AUX cpp-hocon-0.2.1-cmake.patch 1792 BLAKE2B 2caf382ed29013b85d989f827a07430aa40dcc2ea8c7357c3efd3e2b41c2be95f385297f021c54125bbc2695e753c7ab97f3e78a16497c11e980bb9a6f41eab0 SHA512 7b039ba0b668b9578f908c1bfe20ca725c8bc753f6b68f8540d3eddc8323f865096d0cb4e9274ef09d210a72844aed54888506be20c964b91c8bbd5e01a4229a
+DIST cpp-hocon-0.2.1-boost-filesystem.patch 1004 BLAKE2B f1e8db5e00283b526a45155a705f25efcbe790a08518697facb70ec0adee21a0a954258c09527ee75d50b91cde4824193596c2a53af4f2613ddd709862840a14 SHA512 1c73065ace6ec957b0d7241f680e475708deedad43d2a200b4877350e0712dbf13aea8b0c12c7a0d02c12e2c0b3f201ae85b952969eb66e390276bed83a5d7ad
+DIST cpp-hocon-0.2.1.tar.gz 158108 BLAKE2B 4b7097768d4fcbc72df5c63fb036b12bb08108a0e1ef57ec182c64c2aa337b56197c8c10dea8f26f64a273b578d4c1b53a898024558d95e99d2ba1b3778c2414 SHA512 fcc377da7923b77436a6f2787d5b8b1b573f239de4f059c4a5949cbb1a755fd12024b9155f5e44cf60141181942f3e9a2a8fad07ee0b1d516fe2cd4a88d4ac8b
+EBUILD cpp-hocon-0.2.1.ebuild 722 BLAKE2B 8bfd9e61c65ace0b422081b6f6d21dd40635bf89c2ea44b1c5c015e3338acb420e6ea00cf86ca24dd71e24776610ceaacea04da4a92b99fee912db138a54ab53 SHA512 4fd9d69a49ca6b2e28ced52e9b9415e7588da611ce07e45740ffc558aa9add2b946cbba6b0edde021526b705b9b9824a40f0352a666938f05ecb0167a6efaccc
 MISC metadata.xml 433 BLAKE2B 5b3b4e23af7ff914d5b4a3ba6425f469273ef8fb513766a07b3d66110688df34dfd68b43812905bea98cc39c2b3df06b5614bf504a78f4c2ce0c6d56bfe483a3 SHA512 7f890317b6cdfc71563359d575446ccf489d6ffb79ba541566fa747e4a0c1e077ec7f7c5263d96035bbfe77f6631cfb9000f715c348ed543492b7dc4cc7cd305
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild
deleted file mode 100644
index 752c94b6d592..000000000000
--- a/dev-cpp/cpp-hocon/cpp-hocon-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Provides C++ support for the HOCON configuration file format"
-HOMEPAGE="https://github.com/puppetlabs/cpp-hocon"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 sparc x86"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	>=sys-devel/gcc-4.9.3:*
-	>=dev-libs/boost-1.54:=[nls]
-	>=dev-libs/leatherman-0.9.3:=
-	"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-	)
-	if use debug; then
-		mycmakeargs+=(
-			-DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
diff --git a/dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild b/dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild
new file mode 100644
index 000000000000..9c58708c6dc8
--- /dev/null
+++ b/dev-cpp/cpp-hocon/cpp-hocon-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Provides C++ support for the HOCON configuration file format"
+HOMEPAGE="https://github.com/puppetlabs/cpp-hocon"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/puppetlabs/cpp-hocon/commit/caab275509826dc5fe5ab2632582abb8f83ea2b3.patch -> ${PN}-0.2.1-boost-filesystem.patch"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/boost-1.54:=[nls]
+	>=dev-libs/leatherman-0.9.3:=
+	"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.2.1-cmake.patch )
diff --git a/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch b/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch
new file mode 100644
index 000000000000..8e0ddb924a46
--- /dev/null
+++ b/dev-cpp/cpp-hocon/files/cpp-hocon-0.2.1-cmake.patch
@@ -0,0 +1,48 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,8 @@
+ string(TOUPPER ${PROJECT_C_NAME} PROJECT_NAME_UPPER)
+ string(TOLOWER ${PROJECT_C_NAME} PROJECT_NAME_LOWER)
+ 
++include(GNUInstallDirs)
++
+ # Common cmake setup
+ if (NOT CMAKE_BUILD_TYPE)
+     message(STATUS "Defaulting to a release build.")
+@@ -42,7 +44,7 @@
+     set(BOOST_COMPONENTS regex)
+ endif()
+ 
+-list(APPEND BOOST_COMPONENTS thread date_time chrono system program_options)
++list(APPEND BOOST_COMPONENTS thread date_time chrono filesystem system program_options)
+ 
+ # Add other dependencies
+ find_package(Boost 1.54 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -77,7 +77,10 @@
+ set_target_properties(libprojectsrc PROPERTIES POSITION_INDEPENDENT_CODE true)
+ 
+ add_library(lib${PROJECT_NAME} $<TARGET_OBJECTS:libprojectsrc>)
+-set_target_properties(lib${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
++set_target_properties(
++    lib${PROJECT_NAME}
++    PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
++    OUTPUT_NAME ${PROJECT_NAME})
+ target_link_libraries(lib${PROJECT_NAME}
+     ${LEATHERMAN_LIBRARIES}
+     ${Boost_LIBRARIES}
+@@ -88,7 +91,11 @@
+ symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h")
+ 
+ # This correctly handles DLL installation on Windows.
+-leatherman_install(lib${PROJECT_NAME})
+-install(DIRECTORY inc/hocon DESTINATION include)
++install(
++    TARGETS lib${PROJECT_NAME}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(DIRECTORY inc/hocon DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ add_subdirectory(tests)