gentoo resync : 25.03.2022

3 files changed, 176 insertions, 0 deletions

diff --git a/sci-libs/libgeotiff/Manifest b/sci-libs/libgeotiff/Manifest
index e0fb31e55a8a..5297ac15fdef 100644
--- a/sci-libs/libgeotiff/Manifest
+++ b/sci-libs/libgeotiff/Manifest
@@ -1,6 +1,9 @@
 AUX Doxyfile 9282 BLAKE2B 0dcda644c528df5bd495db1785ce0f3213f0ce0c3551205e9c043a52151b59e82704545d55521f1983ca2b77a93c20dc0e9ddcc6b446a6485e942f301e19e165 SHA512 cc0324c682d5f45f516f0a71311a9b6527c5c4cd6c1a4113503ad9023b72c64ef9c257008cda95d565723183f932f61f79aab73e123e7b7ecf8b7fdb30457fee
+AUX libgeotiff-1.7.1-gnuinstalldirs.patch 4645 BLAKE2B 40deb94bd4eeb55d59d7682b03e34b4b6e3889779a4a134324e4fdc11bcdfe0b1a9b1653256bfe3c58e42f24fc818d2b63e6f651f559efe2e99ce1f7c2badffe SHA512 64e0c4b7ad4e37b910332cc4128f8836ef0215478cc5e8b38b9168c83f6ee718dbf152ec456a983c5ae942d883613d9e201897f83f90e720d355151a765bfbf1
 DIST libgeotiff-1.6.0.tar.gz 537175 BLAKE2B 4b1430c9e80cdd4193f474484b295c151ecb9a654248e08527046f1aa35cfab0be59980edad2cc6ae90c1a7b0e03d46fd203affd5b01c83e0fd4435d5e56b2d3 SHA512 4c59598140d6c435a25aff6520e07a01a0153cac526df3b3e1366d5edc43cd82b15099da79ee8a2fb916e858f5a5d7421cfbf96bb485c91fac9e19c7209b7418
 DIST libgeotiff-1.7.0.tar.gz 541931 BLAKE2B 3c0843f8c86d6bbcedf9d07b45d2d676f1ccfaba7b5e40fa7f8d5f290b39da5cfaebe39567eab9e8add1b99042aad51d5104b81c2c05493d18d022d41e5b106b SHA512 8e294b5db89e88dbd4f7eb9d804be788ff3d14a1a14f721e9805b42cc797500596f0473dd8e5be6c1da01b56bdebc872df2b30470a2d96686f308019de10739a
+DIST libgeotiff-1.7.1.tar.gz 542779 BLAKE2B e26a14fcb463f4a9e5a3652b978223da6b11dcb4ec6a3b6068460f929a57e9affafdb652f16fad23a2da4612c6ae3c2624bfb4f26c96fc4290a33f1e0629b726 SHA512 af119040598f4349124848d9788ea1d0d2019e23fc48eaf4b0445320c51e91afa6c7e25b49738bdaf0aa4467a19104b00838d669da27dee77898c489fe5fe4c1
 EBUILD libgeotiff-1.6.0.ebuild 1263 BLAKE2B 501a0503040baacee952966b1a627e1cbb10d0ac266bf06ea0d57bf56d099e497d3802d96f5f29dd70432f0fd724a23cf5ea94ce00ab0c66b70279ebe85a9a7d SHA512 19963a11645ad5bc7ae9cc4eef2fd484502a5314fcc560a1dd954f09b7ec87522ef3fa03c1005eab8f46245b390cea8e02f8ba732144b7caa43dca3f52799a87
 EBUILD libgeotiff-1.7.0.ebuild 1270 BLAKE2B 5d024b10502e7c25b37cfdad9eb80bdd3b131b461cc1225c7b052a2b681a2ec6482c7d68674e241c43015368d5e6a8112acaa8c26440582082facd555d40645b SHA512 d75a127677f63589718d1663a769ef2070107d3197da858b28fea50fd32f34317fe759d128a108c44c9979aa179bad4514316de01173f769ebaf7668db0a9d73
+EBUILD libgeotiff-1.7.1-r1.ebuild 1233 BLAKE2B d86e8563522d1211540c689d9d9b620b78d434156d15116c2f5789f3765919d421fe118e6188dddc336d24c0d560bd8e3fc9a112d81321049dc15b44e344e64c SHA512 7fae2581ef7c3d73ac292418e289c6e22d4975615751f10bb1948ed76207972f41d93cea4abd627fc60653ff9d7d920d0253d1e3b598d30422b096ebc2321a36
 MISC metadata.xml 276 BLAKE2B 51ed91dbe57f48aa4af2c9fa6fc16fa70996a95e31096505ec3e9288f04182aaf09feb0cd3e2e1c45e37dcffc528c788995ee4c89ea73b3c736dd9ec6172788c SHA512 b0a243998a4962647e6e5bbf04f9d92837c969c5a2f44d1c752a032cf3f0308d0ad82dcab968781b8edb88aa49748e27da617e7c3587647d4637db0912a4cb95
diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch b/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch
new file mode 100644
index 000000000000..6fdcd9753f95
--- /dev/null
+++ b/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch
@@ -0,0 +1,120 @@
+https://github.com/OSGeo/libgeotiff/pull/74
+
+From d18deccb461990c826ceee8fbcc57a44502ace2e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 20 Mar 2022 02:55:50 +0000
+Subject: [PATCH] CMake: adopt GNUInstallDirs
+
+This makes it a lot easier for packagers (it happens by default
+if we've setup our environment correctly) to have files installed in the right
+places, including libdir, but also documentation, which can vary.
+
+This works cross-platform still but it means libgeotiff uses the
+standard options which CMake projects tend to use for such locations
+and therefore no special treatment is needed when packaging it.
+
+Fixes: https://github.com/OSGeo/issues/33
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ CMakeLists.txt     | 41 ++++++++++-------------------------
+ bin/CMakeLists.txt |  6 ++---
+ 2 files changed, 14 insertions(+), 33 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 001df67..1840258 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,6 +7,8 @@
+ ###############################################################################
+ PROJECT(GeoTIFF)
+ 
++include(GNUInstallDirs)
++
+ SET(GEOTIFF_LIB_NAME geotiff)
+ SET(GEOTIFF_LIBRARY_TARGET geotiff_library)
+ 
+@@ -239,38 +241,17 @@ SET(GEOTIFF_MAN_PAGES
+ 
+ #    ${PROJECT_BINARY_DIR}/geotiff_version.h
+ 
+-SET(DEFAULT_BIN_SUBDIR bin)
+-SET(DEFAULT_LIB_SUBDIR lib)
+-SET(DEFAULT_INCLUDE_SUBDIR include)
+-
+-# Locations are changeable by user to customize layout of GeoTIFF installation
+-# (default values are platform-specIFic)
+-SET(GEOTIFF_BIN_SUBDIR ${DEFAULT_BIN_SUBDIR} CACHE STRING
+-    "Subdirectory where executables will be installed")
+-SET(GEOTIFF_LIB_SUBDIR ${DEFAULT_LIB_SUBDIR} CACHE STRING
+-    "Subdirectory where libraries will be installed")
+-SET(GEOTIFF_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING
+-    "Subdirectory where header files will be installed")
+-
+-# Mark *_SUBDIR variables as advanced and dedicated to use by power-users only.
+-MARK_AS_ADVANCED(GEOTIFF_BIN_SUBDIR GEOTIFF_LIB_SUBDIR GEOTIFF_INCLUDE_SUBDIR)
+-
+-# Full paths for the installation
+-SET(GEOTIFF_BIN_DIR ${GEOTIFF_BIN_SUBDIR})
+-SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR})
+-SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR})
+-
+ # Install doc files
+ INSTALL(FILES
+     AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
+-    DESTINATION doc)
++    DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ 
+ # Install man pages
+-INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1)
++INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ 
+ 
+ # Install header files for development distribution
+-INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR})
++INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ ###############################################################################
+ # Build libxtiff library
+@@ -323,7 +304,7 @@ if(UNIX)
+       set_target_properties(
+         ${GEOTIFF_LIBRARY_TARGET}
+         PROPERTIES
+-        INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${GEOTIFF_LIB_DIR}")
++        INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+    endif()
+ endif()
+ 
+@@ -348,14 +329,14 @@ target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PRIVATE
+ target_include_directories(
+   ${GEOTIFF_LIBRARY_TARGET}
+   PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
+-         $<INSTALL_INTERFACE:${GEOTIFF_INCLUDE_DIR}>)
++         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+ 
+ INSTALL( TARGETS ${GEOTIFF_LIBRARY_TARGET}
+      EXPORT depends
+-     RUNTIME DESTINATION ${GEOTIFF_BIN_DIR}
+-     LIBRARY DESTINATION ${GEOTIFF_LIB_DIR}
+-     PUBLIC_HEADER DESTINATION ${GEOTIFF_INCLUDE_DIR}
+-     ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR} )
++     RUNTIME DESTINATION ${CMAKE_INSTALLL_BINDIR}
++     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ 
+ # Define grouping of source files in PROJECT file (e.g. Visual Studio)
+ SOURCE_GROUP("CMake Files" FILES CMakeLists.txt)
+diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
+index dad465f..c61585c 100644
+--- a/bin/CMakeLists.txt
++++ b/bin/CMakeLists.txt
+@@ -41,6 +41,6 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build - done: ${GEOTIFF_UTILITIES}")
+ # Targets installation
+ 
+ INSTALL(TARGETS ${GEOTIFF_UTILITIES}
+-    RUNTIME DESTINATION ${GEOTIFF_BIN_DIR}
+-    LIBRARY DESTINATION ${GEOTIFF_LIB_DIR}
+-    ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR})
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.1-r1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..fe5e5d7051fc
--- /dev/null
+++ b/sci-libs/libgeotiff/libgeotiff-1.7.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Library for reading TIFF files with embedded tags for geographic information"
+HOMEPAGE="https://trac.osgeo.org/geotiff/ https://github.com/OSGeo/libgeotiff"
+SRC_URI="https://download.osgeo.org/geotiff/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc jpeg +tiff zlib"
+
+DEPEND=">=sci-libs/proj-6.0.0:=
+	jpeg? ( virtual/jpeg:= )
+	tiff? ( >=media-libs/tiff-3.9.1 )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.1-gnuinstalldirs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_ZLIB=$(usex zlib)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		mkdir -p docs/api || die
+		cp "${FILESDIR}"/Doxyfile Doxyfile || die
+		doxygen -u Doxyfile || die "updating doxygen config failed"
+		doxygen Doxyfile || die "docs generation failed"
+	fi
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( docs/api/. )
+
+	cmake_src_install
+}