gentoo resync : 18.12.2020

6 files changed, 250 insertions, 3 deletions

diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest
index c5728404a647..3805dd7691a0 100644
--- a/dev-libs/miniz/Manifest
+++ b/dev-libs/miniz/Manifest
@@ -1,3 +1,7 @@
+AUX Config.cmake.in 65 BLAKE2B 520fd3e379b53671d4bb9cb62567ec0f569c711d18019b428914967c57189b5e5f55aa589d0469f1c2891a68f285626e88395c2fef04f677bdf4a26633651526 SHA512 040e97901dea4890625a5bf80db145af432dcb0aa6159ac35e496b027ab3d35132392f45e734ab74002505148c7f879efc72595c6cce99469b8526786af3e7de
+AUX miniz-2.1.0-export-cmake-build-targets.patch 6592 BLAKE2B 96b279e4ae5888e8604a99d40ae0000927f5c654b9ef6d0ea95a57e97dc0a43d87004e5bb9750b92926445b75dfcb6313994eb6b3db1cbbcf2e78d891c5bf3df SHA512 61cccaac9734183416320de302c06987db186930e455ad1b78ba2a87c10f6b2965ea9e70d192bf22a26b487c4592b70da7a99ffaeec9e132f0e5adf0f66ece9d
+AUX miniz.pc.in 315 BLAKE2B d05cd14a7acb4039e5f0521a68e6e5eeed00849a5b5d639fbbd4de45c1e0eab8ed33a22cc608761ab1dd1e1142021b8e5bfbf8e9bab589bfb2545701828f5f7b SHA512 8c1828759a45c58a96bebaac9fa5196d95be85a76be8d4fdd30eb2b4db5dbe582a7e0156fc9a4249c84426bbe69b30d31b2faf162c8d619810012afe6e1ad0ed
 DIST miniz-2.1.0.tar.gz 104502 BLAKE2B 9a7b3818b454809cdfec523d98f13bef3a52e27b6d3857d289438978d12997e38c71aa97fffe060a6b765f8fbbdd8fe8cebced4a45d9f1f040dd3e39cf2a8055 SHA512 e0aba16afdf230d1e54d0a9cedd336b0b158b02744839f0547e14ee47a97fc1a6668f3a181bd46e969b01b158af18dc8ed3c0a4210b3b620242338a2788806b3
-EBUILD miniz-2.1.0.ebuild 636 BLAKE2B 517fbd2edb6ed5c3a7441f04e13a430f3099bd1bc5a494e1b20a96e17bebe37d58960da22412af2f642000f918b0101bbc7322f2f7d2097e0f2740dce03b6aaf SHA512 df07a3b77e72ec2f07178655e3cf4c3424440e14a081332e9437661316607ccc44a327e0acab7f4a3bdddb2518710c4e7c3104527a249ebf87d6ebe476a6d8a3
+EBUILD miniz-2.1.0-r1.ebuild 711 BLAKE2B 639316c2389f57bda50c675671aa829accfe17111a869c63d6defacc73f63562ead4f47f723e6dfec3216f2bd6e7e8a392bfb2d1bda3d20e320ed4f59d2b6f20 SHA512 756f4f758d18cb07dd5e3ebdb62722847360452b2526cddb7e015f3996b4049333342d26cd6d728d4c79b5e4792bc2052276e1fd8cbd0444d4f8eac49750edba
+EBUILD miniz-9999.ebuild 868 BLAKE2B 4c35c1ff7de11247e71860fbe61c973b77d456db29a87cf01b3e34a83df0d61b3a2b3d0f5a938081cf1f6f578a97a1489e292ee50b46d1e0ece1bc049b70b7b6 SHA512 9cfb04128eaa89af0a0d005ca8aa03a410addb3953d6522be5c480bbb93e765c1c2b6dbc145c91d57fc9931d7267bca47eb34e711561f4bc2ca7835cf98647bb
 MISC metadata.xml 1067 BLAKE2B 4360a8656cd006529dd8955d1905daa17e2a51c2ec5dabe6bc692ebdca70ca2a06d588d9e6dc6989c773922172e32ded9a7c1d65e41907468a2df5d1f18b1abc SHA512 8e36cbda8ad79dccaf7cd95eb9675e306c276d2173b0e1944d21b924f518ab0085fc4262eafa23aa3870633f198d8622b1d05866336b5551111b8750f16f220c
diff --git a/dev-libs/miniz/files/Config.cmake.in b/dev-libs/miniz/files/Config.cmake.in
new file mode 100644
index 000000000000..0865ae961005
--- /dev/null
+++ b/dev-libs/miniz/files/Config.cmake.in
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
diff --git a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
new file mode 100644
index 000000000000..6f8429222700
--- /dev/null
+++ b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
@@ -0,0 +1,179 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,15 @@
+-PROJECT(miniz C)
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.12)
++
++project(miniz)
++
++include(GNUInstallDirs)
++
++set(MINIZ_API_VERSION 2)
++set(MINIZ_MINOR_VERSION 1)
++set(MINIZ_PATCH_VERSION 0)
++set(MINIZ_VERSION
++    ${MINIZ_API_VERSION}.${MINIZ_MINOR_VERSION}.${MINIZ_PATCH_VERSION})
++
+ if(CMAKE_BUILD_TYPE STREQUAL "")
+   # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up
+   # differentiation between debug and release builds.
+@@ -8,45 +18,122 @@
+ CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif ()
+
+-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
++option(BUILD_EXAMPLES "Build examples" ON)
++option(BUILD_SHARED_LIBS "Build shared library instead of static" ON)
++
++set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+
++include(GenerateExportHeader)
++
++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
++add_library(${PROJECT_NAME} ${miniz_SOURCE})
++generate_export_header(${PROJECT_NAME})
++
++if(NOT BUILD_SHARED_LIBS)
++string(TOUPPER ${PROJECT_NAME} PROJECT_UPPER)
++set_target_properties(${PROJECT_NAME}
++	PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${PROJECT_UPPER}_STATIC_DEFINE)
++else()
++set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden)
++endif()
++
++set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${MINIZ_VERSION})
++set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${MINIZ_API_VERSION})
++
++file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
++
++target_compile_definitions(${PROJECT_NAME}
++  PRIVATE $<$<C_COMPILER_ID:GNU>:_GNU_SOURCE>)
+
+-add_library(miniz ${miniz_SOURCE})
+-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
++# pkg-config file
++configure_file(miniz.pc.in ${CMAKE_BINARY_DIR}/miniz.pc @ONLY)
+
+-set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
+-set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
+-set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
+-set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c")
+-set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c")
+-set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c")
+-set(MINIZ_TESTER_SRC_LIST
+-    "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp")
++install(FILES
++  ${CMAKE_BINARY_DIR}/miniz.pc
++  DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
++
++
++set_property(TARGET ${PROJECT_NAME} PROPERTY
++  INTERFACE_${PROJECT_NAME}_MAJOR_VERSION ${MINIZ_API_VERSION})
++set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY
++  COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION
++)
++
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
++  RUNTIME  DESTINATION ${CMAKE_INSTALL_BINDIR}
++  ARCHIVE  DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  # users can use <miniz.h> or <miniz/miniz.h>
++  INCLUDES DESTINATION include ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
++)
++
++include(CMakePackageConfigHelpers)
++write_basic_package_version_file(
++  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
++  VERSION ${MINIZ_VERSION}
++  COMPATIBILITY AnyNewerVersion
++)
++
++export(EXPORT ${PROJECT_NAME}Targets
++  FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Targets.cmake"
++  NAMESPACE ${PROJECT_NAME}::
++)
++configure_file(Config.cmake.in
++  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
++  @ONLY
++)
++
++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
++install(EXPORT ${PROJECT_NAME}Targets
++  FILE
++    ${PROJECT_NAME}Targets.cmake
++  NAMESPACE
++    ${PROJECT_NAME}::
++  DESTINATION
++    ${ConfigPackageLocation}
++)
++install(
++  FILES
++    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
++    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
++  DESTINATION
++    ${ConfigPackageLocation}
++  COMPONENT
++    Devel
++)
++
++if(BUILD_EXAMPLES)
++  set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
++  set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
++  set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
++  set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c")
++  set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c")
++  set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c")
++  set(MINIZ_TESTER_SRC_LIST
++      "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp"
++      "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp")
+
+-add_executable(example1 ${EXAMPLE1_SRC_LIST})
+-target_link_libraries(example1 miniz)
+-add_executable(example2 ${EXAMPLE2_SRC_LIST})
+-target_link_libraries(example2 miniz)
+-add_executable(example3 ${EXAMPLE3_SRC_LIST})
+-target_link_libraries(example3 miniz)
+-add_executable(example4 ${EXAMPLE4_SRC_LIST})
+-target_link_libraries(example4 miniz)
+-add_executable(example5 ${EXAMPLE5_SRC_LIST})
+-target_link_libraries(example5 miniz)
+-add_executable(example6 ${EXAMPLE6_SRC_LIST})
+-target_link_libraries(example6 miniz)
+-if(${UNIX})
+-    target_link_libraries(example6 m)
+-endif()
++  add_executable(example1 ${EXAMPLE1_SRC_LIST})
++  target_link_libraries(example1 miniz)
++  add_executable(example2 ${EXAMPLE2_SRC_LIST})
++  target_link_libraries(example2 miniz)
++  add_executable(example3 ${EXAMPLE3_SRC_LIST})
++  target_link_libraries(example3 miniz)
++  add_executable(example4 ${EXAMPLE4_SRC_LIST})
++  target_link_libraries(example4 miniz)
++  add_executable(example5 ${EXAMPLE5_SRC_LIST})
++  target_link_libraries(example5 miniz)
++  add_executable(example6 ${EXAMPLE6_SRC_LIST})
++  target_link_libraries(example6 miniz)
++  if(${UNIX})
++      target_link_libraries(example6 m)
++  endif()
+
+-# add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
+-# target_link_libraries(miniz_tester miniz)
++  # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
++  # target_link_libraries(miniz_tester miniz)
++endif(BUILD_EXAMPLES)
+
+-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
+-    ARCHIVE  DESTINATION lib
+-    LIBRARY DESTINATION lib
+-    )
+-file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+-install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+\ No newline at end of file
++set(INCLUDE_INSTALL_DIR "include")
++
++install(FILES ${INSTALL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
diff --git a/dev-libs/miniz/files/miniz.pc.in b/dev-libs/miniz/files/miniz.pc.in
new file mode 100644
index 000000000000..51128735847c
--- /dev/null
+++ b/dev-libs/miniz/files/miniz.pc.in
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: @PROJECT_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @MINIZ_VERSION@
+URL: @PROJECT_HOMEPAGE_URL@
+
+Requires:
+Libs: -L${libdir} -lminiz
+Cflags: -I${includedir}
\ No newline at end of file
diff --git a/dev-libs/miniz/miniz-2.1.0.ebuild b/dev-libs/miniz/miniz-2.1.0-r1.ebuild
index 1141b3f020ce..cc26fba366c0 100644
--- a/dev-libs/miniz/miniz-2.1.0.ebuild
+++ b/dev-libs/miniz/miniz-2.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake
 
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+DESCRIPTION="A lossless, high performance data compression library"
 HOMEPAGE="https://github.com/richgel999/miniz"
 SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -16,8 +16,13 @@ IUSE=""
 
 DOCS=( ChangeLog.md LICENSE readme.md )
 
+PATCHES=(
+	"${FILESDIR}/${P}-export-cmake-build-targets.patch"
+)
+
 src_prepare() {
-	sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt
+	cp "${FILESDIR}/Config.cmake.in" .
+	cp "${FILESDIR}/miniz.pc.in" .
 
 	cmake_src_prepare
 }
@@ -25,5 +30,9 @@ src_prepare() {
 src_configure() {
 	CMAKE_BUILD_TYPE=Release
 
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=OFF
+	)
+
 	cmake_src_configure
 }
diff --git a/dev-libs/miniz/miniz-9999.ebuild b/dev-libs/miniz/miniz-9999.ebuild
new file mode 100644
index 000000000000..7bdf95f3cf88
--- /dev/null
+++ b/dev-libs/miniz/miniz-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A lossless, high performance data compression library"
+HOMEPAGE="https://github.com/richgel999/miniz"
+SRC_URI=""
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/richgel999/miniz.git"
+else
+	SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples static-libs"
+
+DOCS=( ChangeLog.md LICENSE readme.md )
+
+src_prepare() {
+	sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE=Release
+
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		-DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+	)
+
+	cmake_src_configure
+}