commit: 00bf0487dbb811dda18eaa7626e6c9e38b15bf6f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Apr 26 16:34:24 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Apr 26 16:53:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00bf0487
dev-libs/libgit2: Remove broken 0.99.0 Closes: https://bugs.gentoo.org/712270 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-libs/libgit2/Manifest | 1 - .../libgit2/files/libgit2-0.99.0-pkg-config.patch | 81 ---------------------- dev-libs/libgit2/libgit2-0.99.0-r1.ebuild | 76 -------------------- 3 files changed, 158 deletions(-) diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest index 0e8c90c9ea9..44d732a7aa8 100644 --- a/dev-libs/libgit2/Manifest +++ b/dev-libs/libgit2/Manifest @@ -1,4 +1,3 @@ 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 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 4a60037c612..00000000000 --- 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.tom...@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 c986f95f0cf..00000000000 --- 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 -}
