gentoo resync : 25.08.2020

5 files changed, 141 insertions, 40 deletions

diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index 862a372c4e3e..ef0d7e42ed71 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -1,7 +1,9 @@
+AUX editorconfig-core-c-0.12.3-no-static-libs.patch 2732 BLAKE2B 0ce8fd79ba40701c9723d127dfe7faa1f6fc0e20d43d858df9831959a7f7f06a776720e69e5946d6b22a3bad11a958823faf922b8bbd69d601f7e3e2cda5ee34 SHA512 33cdd54d79f2d28e11b2c458b41d720c6763549b41835f2aeb6601e009f9928f43ea4d27264609c5651c81680b696be3795ddb9b50cd44337a6ed8c4aa35ee73
 DIST editorconfig-core-c-0.12.1.tar.gz 65369 BLAKE2B 30296b64bd215a8b51d3b4d6146ce5eac13cb1a8ba8a25d0faabcc22989503d9d73bc138240b475eb7ea4eecd5f5bbbf347519b1696373daf55ffd27fc772f4c SHA512 3517f7db84d632615ba651eeafab6730739b7bf01f4ea34fbca65f58463fbbcbabc101587b289a7922b55708453262c65569077c51087424d47d0676dc1db686
 DIST editorconfig-core-c-0.12.2.tar.gz 67002 BLAKE2B 6b808366acc8d0a96fc47cb74d620a4028978d7114b4a64d6799527276442f1d39ba8d5611530f873c78b7c49893c5edecec84dcc6f2616ba2663cb36fa92d0d SHA512 6ab3e4f7f95c83c0781064ca15bb70394bb947f9d4cd1348224f02e25c65021d14439b913775d7cfafb93476158799c34438fa548adf3c7ec6dbfd6f1052a046
 DIST editorconfig-core-c-0.12.3.tar.gz 67701 BLAKE2B d5e6310f770099f542eb81f4ca7ec975e74c49f481c4e8e07832a7f9fc0882e2cb65da5b4b18ad926786d7ac92c3deb6ac0a547188bd68d350143258796ad1b8 SHA512 4a17cd6317bd45f8b0131070165d852569d020f1cf74e72b44057b97672184b4992aee54aae6e3222c669fdce8bb6b1f3482235e6518acffcef05e1d74087e6e
 EBUILD editorconfig-core-c-0.12.1.ebuild 901 BLAKE2B 541ba2ea83d46ae92146d81fc61f33c28135596ada38f0eca29a8a8e4bf556cd8ccd640cb8c346e2e0df799bc821cd9649d96d4e6800019d4540bfc58cf973f3 SHA512 84b2b7388a7df7ac9d7de0d3ba136d513bc005f729ca833d9f2dcb1ee06087d3935c37b82ac2e85184500b157c08b014e1432eff4f09449f3d20e21efc6cd98d
 EBUILD editorconfig-core-c-0.12.2.ebuild 908 BLAKE2B 4e06c5be8aec27b1d41da5854e34385c1dbfece7cb9a8f1a33c7e694bcf056f32f957b641a430c9a6bd1299da1e364090c566c8d939a3fdd82b38e8a3b77b8e0 SHA512 457bac4c77fee133a9af5c4aa65d5312dffd5dd52a000e5965fd0117845545d7ce482ef1d7473d2e3d8cca40b0e5a9957a8fd6dca455bc4d84ee62a86bab6adb
-EBUILD editorconfig-core-c-0.12.3.ebuild 1023 BLAKE2B 137e85dc9b8755ee15fc24f65a153e17db8ca153120979b6810b94256b15a99f03e360ccc28a95058b0e7e9d1458e643f136e78a139f3a24f19ecaca90d85eb6 SHA512 9140af3b2e1d1b5f12d78c37ac38c3f79143a9bbc0cbdcaa04ec690fe1beebb346fbc58a22a15def09896662eaee2a1604c566b58ddaa37a30f60e1a03b4d2b7
+EBUILD editorconfig-core-c-0.12.3-r1.ebuild 742 BLAKE2B 9ee9b9c888d05628c7927154a1c26f407e26d731e9c226636e6a3e28155c9b39a3cd5089265a6e6418ceabc2e51b1e8e80be6ef202c7582b7065cbbb1dce2eda SHA512 7c156ff80dda7e1918067e4e19a99eb25e30112478748e5bb97db6a4021ee044c85c666b3ca32b6e07ce6ef7d3d0a58c5f813eccacfc9b6a22b678fcc4b0ee1a
+EBUILD editorconfig-core-c-0.12.3-r2.ebuild 864 BLAKE2B ea50011f62f7c5f4f59f051865d924ac0a9f32d8253b2b7ed805e5a782d0d11fc552c8a49398dfc4c6d0525650c94bbec1e6286862ed2367537480ab9000e5cb SHA512 e35bedfc956d726984996ac1380e45b022c2f6e0fe5df64191428afeed84736c045a79d4dae2dc1b83818754834993a845f27ea8ac1092aa616b37d948e3cc3d
 MISC metadata.xml 388 BLAKE2B d2a5f28be0aea3f3aefd1b8e82e337b87e67192b96bea1e2e0e5073e44f8c54d3f0380a089118d405c417d42ee6d978919dc8e0212a36ee0d3808b706846ad70 SHA512 fbaff22b9f648c2e94d68904cbb23de8ee0340641c626d5a533992837ec6405b65a96872bfdedce3a75351ac73e344d5faed1a51f63a4330f65e4aa8190ffed4
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r1.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r1.ebuild
new file mode 100644
index 000000000000..828fb761bded
--- /dev/null
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="EditorConfig core library written in C"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cli doc"
+
+BDEPEND="app-doc/doxygen"
+DEPEND="dev-libs/libpcre2:="
+RDEPEND="${DEPEND}
+	cli? ( !dev-python/editorconfig-core-py[cli] )"
+
+PATCHES=( "${FILESDIR}/${P}-no-static-libs.patch" )
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+
+	if ! use cli; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r2.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r2.ebuild
new file mode 100644
index 000000000000..02055e6d7f0d
--- /dev/null
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="EditorConfig core library written in C"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+IUSE="cli doc"
+
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="dev-libs/libpcre2:="
+RDEPEND="${DEPEND}
+	cli? ( !dev-python/editorconfig-core-py[cli] )"
+
+PATCHES=( "${FILESDIR}/${P}-no-static-libs.patch" )
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc 'ON' 'OFF')
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_src_install
+
+	if ! use cli; then
+		rm -r "${ED}/usr/bin" || die
+	fi
+}
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild
deleted file mode 100644
index 98408d4748d3..000000000000
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="EditorConfig core library written in C"
-HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
-SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cli doc"
-CDEPEND="dev-libs/libpcre:="
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	cli? ( !dev-python/editorconfig-core-py[cli] )"
-
-src_prepare() {
-	sed -e 's:OUTPUT_NAME editorconfig_static:OUTPUT_NAME editorconfig:' \
-		-i src/lib/CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=()
-	use doc && mycmakeargs+=(-DINSTALL_HTML_DOC=ON)
-	cmake-utils_src_configure
-	sed -e "s:/share/doc/editorconfig\":/share/doc/${PF}\":" \
-		-i "${BUILD_DIR}/doc/cmake_install.cmake" || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	use cli || rm -rf "${ED}/usr/bin"
-}
diff --git a/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch b/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch
new file mode 100644
index 000000000000..369b806467be
--- /dev/null
+++ b/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch
@@ -0,0 +1,69 @@
+From 4fa85f00f824b1dd5d1244c77667ea497d94f02b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 11 Jul 2020 21:11:58 +0200
+Subject: [PATCH] Do not build static lib if BUILD_STATICALLY_LINKED_EXE=OFF
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/lib/CMakeLists.txt | 36 +++++++++++++++++++++++-------------
+ 1 file changed, 23 insertions(+), 13 deletions(-)
+
+diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
+index 353ab1c..12db621 100644
+--- a/src/lib/CMakeLists.txt
++++ b/src/lib/CMakeLists.txt
+@@ -44,16 +44,18 @@ if(WIN32)
+ endif()
+ target_link_libraries(editorconfig_shared ${PCRE2_LIBRARIES})
+ 
+-add_library(editorconfig_static STATIC ${editorconfig_LIBSRCS})
+-set_target_properties(editorconfig_static PROPERTIES
+-    OUTPUT_NAME editorconfig_static
+-    VERSION ${PROJECT_VERSION})
++if(BUILD_STATICALLY_LINKED_EXE)
++    add_library(editorconfig_static STATIC ${editorconfig_LIBSRCS})
++    set_target_properties(editorconfig_static PROPERTIES
++        OUTPUT_NAME editorconfig_static
++        VERSION ${PROJECT_VERSION})
+ 
+-# We need to link Shwapi since we use PathIsRelative
+-if(WIN32)
+-    target_link_libraries(editorconfig_static Shlwapi)
++    # We need to link Shwapi since we use PathIsRelative
++    if(WIN32)
++        target_link_libraries(editorconfig_static Shlwapi)
++    endif()
++    target_link_libraries(editorconfig_static ${PCRE2_LIBRARIES})
+ endif()
+-target_link_libraries(editorconfig_static ${PCRE2_LIBRARIES})
+ 
+ # EditorConfig package name for find_package() and the CMake package registry.
+ # On UNIX the system registry is usually just "lib/cmake/<package>".
+@@ -65,11 +67,19 @@ set(editorconfig_CONFIG_EXPORT_NAME "${config_package_name}Targets")
+ set(editorconfig_CONFIG_INSTALL_LIBDIR
+     "${CMAKE_INSTALL_LIBDIR}/cmake/${config_package_name}")
+ 
+-install(TARGETS editorconfig_shared editorconfig_static
+-    EXPORT ${editorconfig_CONFIG_EXPORT_NAME}
+-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++if(BUILD_STATICALLY_LINKED_EXE)
++    install(TARGETS editorconfig_static
++        EXPORT ${editorconfig_CONFIG_EXPORT_NAME}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++else()
++    install(TARGETS editorconfig_shared
++        EXPORT ${editorconfig_CONFIG_EXPORT_NAME}
++        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++endif()
+ 
+ configure_file(
+     ${CMAKE_CURRENT_SOURCE_DIR}/editorconfig.pc.in
+-- 
+2.27.0
+