gentoo resync : 14.05.2020

3 files changed, 0 insertions, 160 deletions

diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 2cafc305cf5a..b20face1c539 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,10 +1,7 @@
-AUX libgit2-0.99.0-pkg-config.patch 2871 BLAKE2B 642bffd7dd418a323994657df152dbc0f53ed4e42fc3e7501f9e3fffeedaaa19502aca3e84b43f5dbbbdde858719ef704efeaa7039ee46f645b228eb3783d1d9 SHA512 2489e9b3632567561ad2d542f2f62227d03681429eebc83be73a5d249bd3e429cde22bd145f1119760309894d30c0e5f324c93bb06fa9004b380f78811a19578
 DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
 DIST libgit2-0.28.5.tar.gz 4998481 BLAKE2B 71a3502af125a3d1c91700539d5e235a62922b32ca5e62288581b496f4cb680c01bfe70ae092ab730fc45df1dd96c2c9167f51d551a50acd57c857b4ea07634d SHA512 abfea885f46444b0304ae57c32c06f4252afb0093c924da5e1ba10aaed952824d1b84036adb79b5b8ad8bea56a6331a51c62f3b9839aead16c7b26cb4554b53a
-DIST libgit2-0.99.0.tar.gz 5307975 BLAKE2B 2ff6c48d29844c8efd292b636c018403f49ae5eef1ef41e2c8755cc35d935677fa965b52c05724aa133f8542a266bb0e0fabb34fcf710127332bd6137ea4ff12 SHA512 e38e18da0e6ed1e5c8198c9eb2c362b21da2d0b9c8bc23309d2f70183549f4b9f23a6db8ce5f1f0f24b373e6427039c2a845b62dd74f91b02cfe8954f961a91b
 DIST libgit2-1.0.0.tar.gz 5312324 BLAKE2B 4106b934d32233e9df8a405570a83c3b7ab097e3301dc973230df511f992733e237e1fdc48924522b16a6d202dc4e81461f522e0f5fd867c9f3ad261921af3ba SHA512 7e3b6582dd1567fd5ebfc829a98e22acfd5566ba08f2fb9b7a6783fa87f5e8952ac67f1a2c13adb543e56753d858e73a03204bac17a096c72f5daf4ba376d904
 EBUILD libgit2-0.28.4.ebuild 1648 BLAKE2B 3f281a4dc503b2692a451fa10786aff3a8dff090fc311d38ec0cba20fedd13018683e78674df806b4f7370e6a8ac5c09943b9e3fe7b30691c82056deaa286ae9 SHA512 87dbeaafba6af0bca7cc509dcdae5ef8ac5848aa2af048b555424be1be60a0da2329750fd4a9b2858b37ba8bb2c109b4b99d6a31ae15cb5187bb79a507fe5bfc
 EBUILD libgit2-0.28.5.ebuild 1656 BLAKE2B 33741203200169f36f1bc5d1d1d02343c64c1b83073b6b20ca356a822b80859bd0d7d645ccaf12549b8ef8739be17e03184d9c873f50f6f2f12ab6fe8bed9570 SHA512 cb24af6bf368eec37269693ee9a05f247d6d306863d6ffd8aa61a895ab6f72e5696059dceb447af122e973efd2cfad93bf10e3ad7d784f2f0af46c266b8bed8c
-EBUILD libgit2-0.99.0-r1.ebuild 1807 BLAKE2B 0ca4832f7431c13be6a1905f4d1b1013749f13c634bb37a33c02e27ea86c184ab657dc338e9ba6de8f3e5c0f59ace25e935fe59bd6328a65a472f1927786b72c SHA512 fc887680be388fd765236eea01890398e3113e338f896ce12161e559c8cd1e1f4c27b46db781a3606a9e19e530b0020fdad48b0e2d0f713a914b5a8aa77709b6
 EBUILD libgit2-1.0.0-r1.ebuild 1707 BLAKE2B c92ce64bff80f7732b336ee8fee1be4fdd35e785d6c0b1d2b596fbbdb20a4d4c5b89c89be7fa78f6f9557574b2b97a7bc9bd657fd45e1cb58166a29d3ad5a98e SHA512 25469f44f82e9a25562c5fa1cb5a9c86fe5531aff961a4f6cdebc7b09fbdfe60266a7dad7bd2251dd1d59881f922cca0f84c394e115ecbc09ab1efad9444d5ac
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/files/libgit2-0.99.0-pkg-config.patch b/dev-libs/libgit2/files/libgit2-0.99.0-pkg-config.patch
deleted file mode 100644
index 4a60037c612a..000000000000
--- a/dev-libs/libgit2/files/libgit2-0.99.0-pkg-config.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From fbda0575b133a57d8f5d264742098994c7624c99 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= <kloczko.tomasz@gmail.com>
-Date: Wed, 19 Feb 2020 12:54:19 +0000
-Subject: [PATCH] Fix #5410: fix installing libgit2.pc in wrong location
-
-Remove using custom PKG_BUILD_PREFIu, PKG_BUILD_LIBDIR and
-PKG_BUILD_INCLUDEDIR variables.
-Use cmake CMAKE_INSTALL_PREFIX, LIB_INSTALL_DIR, INCLUDE_INSTALL_DIR instead.
-This patch fixes install libgit2.pc file in correct location and simpifies
-cmake module.
----
- cmake/Modules/PkgBuildConfig.cmake | 39 +++---------------------------
- 1 file changed, 4 insertions(+), 35 deletions(-)
-
-diff --git a/cmake/Modules/PkgBuildConfig.cmake b/cmake/Modules/PkgBuildConfig.cmake
-index 1c0079eb0..e4c574431 100644
---- a/cmake/Modules/PkgBuildConfig.cmake
-+++ b/cmake/Modules/PkgBuildConfig.cmake
-@@ -1,10 +1,5 @@
- # pkg-config file generation
- #
--# Uses the following globals:
--# - PKG_BUILD_PREFIX: the build location (aka prefix). Defaults to CMAKE_INSTALL_PREFIX
--# - PKG_BUILD_LIBDIR: the libdir location. Defaults to ${prefix}/lib.
--# - PKG_BUILD_INCLUDEDIR: the includedir location. Defaults to ${prefix}/include.
--#
- 
- function(pkg_build_config)
-     set(options)
-@@ -29,37 +24,11 @@ function(pkg_build_config)
-         message(FATAL_ERROR "Missing VERSION argument")
-     endif()
- 
--    if (DEFINED PKG_BUILD_PREFIX)
--        set(PKGCONFIG_PREFIX "${PKG_BUILD_PREFIX}")
--    else()
--        set(PKGCONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
--    endif()
--
--    if(DEFINED PKG_BUILD_LIBDIR)
--        if (IS_ABSOLUTE ${PKG_BUILD_LIBDIR})
--            set(PKGCONFIG_LIBDIR ${PKG_BUILD_LIBDIR})
--        else()
--            set(PKGCONFIG_LIBDIR "\${prefix}/${PKG_BUILD_LIBDIR}")
--        endif()
--    else()
--        set(PKGCONFIG_LIBDIR "\${prefix}/lib")
--    endif()
--
--    if(DEFINED PKG_BUILD_INCLUDEDIR)
--        if (IS_ABSOLUTE ${PKG_BUILD_INCLUDEDIR})
--            set(PKGCONFIG_INCLUDEDIR ${PKG_BUILD_INCLUDEDIR})
--        else()
--            set(PKGCONFIG_INCLUDEDIR "\${prefix}/${PKG_BUILD_INCLUDEDIR}")
--        endif()
--    else()
--        set(PKGCONFIG_INCLUDEDIR "\${prefix}/include")
--    endif()
--
-     # Write .pc "header"
-     file(WRITE "${PKGCONFIG_FILE}"
--        "prefix=\"${PKGCONFIG_PREFIX}\"\n"
--        "libdir=\"${PKGCONFIG_LIBDIR}\"\n"
--        "includedir=\"${PKGCONFIG_INCLUDEDIR}\"\n"
-+        "prefix=\"${CMAKE_INSTALL_PREFIX}\"\n"
-+        "libdir=\"${LIB_INSTALL_DIR}\"\n"
-+        "includedir=\"${INCLUDE_INSTALL_DIR}\"\n"
-         "\n"
-         "Name: ${PKGCONFIG_NAME}\n"
-         "Description: ${PKGCONFIG_DESCRIPTION}\n"
-@@ -105,6 +74,6 @@ function(pkg_build_config)
- 
-     # Install .pc file
-     install(FILES "${PKGCONFIG_FILE}"
--        DESTINATION "${PKGCONFIG_PREFIX}/${PKGCONFIG_LIBDIR}/pkgconfig"
-+        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
-     )
- endfunction()
--- 
-2.25.1
-
diff --git a/dev-libs/libgit2/libgit2-0.99.0-r1.ebuild b/dev-libs/libgit2/libgit2-0.99.0-r1.ebuild
deleted file mode 100644
index c986f95f0cfa..000000000000
--- a/dev-libs/libgit2/libgit2-0.99.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake python-any-r1
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${P/_/-}
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/0.99"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
-IUSE="examples gssapi libressl +ssh test +threads trace"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/zlib
-	net-libs/http-parser:=
-	gssapi? ( virtual/krb5 )
-	ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pkg-config.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# relying on forked http-parser to support some obscure URI form
-	sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace ON OFF)
-		-DUSE_GSSAPI=$(usex gssapi ON OFF)
-		-DUSE_SSH=$(usex ssh)
-		-DTHREADSAFE=$(usex threads)
-		-DUSE_HTTP_PARSER=system
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]] ; then
-		# repo::iterator::fs_preserves_error fails if run as root
-		# since root can still access dirs with 0000 perms
-		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
-	else
-		local TEST_VERBOSE=1
-		cmake_src_test -R offline
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	dodoc docs/*.{md,txt}
-
-	if use examples ; then
-		find examples -name '.gitignore' -delete || die
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}