commit: 1eef5769290ff936a6c84f47026943c9ffb01acd Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Tue Aug 19 14:43:51 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Tue Aug 19 15:44:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eef5769
dev-libs/libansilove: do not install static libs Closes: https://bugs.gentoo.org/961730 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../libansilove-1.4.1-cmake_minimum_required.patch | 48 ---------------------- ...ve-1.4.2.ebuild => libansilove-1.4.2-r1.ebuild} | 8 +++- dev-libs/libansilove/libansilove-9999.ebuild | 23 ++++++++--- 3 files changed, 24 insertions(+), 55 deletions(-) diff --git a/dev-libs/libansilove/files/libansilove-1.4.1-cmake_minimum_required.patch b/dev-libs/libansilove/files/libansilove-1.4.1-cmake_minimum_required.patch deleted file mode 100644 index 1a602cdb0d48..000000000000 --- a/dev-libs/libansilove/files/libansilove-1.4.1-cmake_minimum_required.patch +++ /dev/null @@ -1,48 +0,0 @@ -From dbfacae73f54b145cffc64ba79ff1abc5a322a28 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Bar=C4=87?= <[email protected]> -Date: Thu, 20 Mar 2025 21:18:42 +0100 -Subject: [PATCH] build: bump cmake_minimum_required - 3.1 -> 3.10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bug: https://bugs.gentoo.org/951672 -Signed-off-by: Maciej Barć <[email protected]> ---- - CMakeLists.txt | 2 +- - example/CMakeLists.txt | 2 +- - fuzz/CMakeLists.txt | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 095db79..1acb286 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.10) - - set(LIB_VERSION_MAJOR 1) - set(LIB_VERSION_MINOR 4) -diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt -index 51f6142..f100cb2 100644 ---- a/example/CMakeLists.txt -+++ b/example/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.10) - - set(CMAKE_C_STANDARD 99) - set(CMAKE_C_STANDARD_REQUIRED ON) -diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt -index f1a9102..10190a5 100644 ---- a/fuzz/CMakeLists.txt -+++ b/fuzz/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.10) - - set(CMAKE_C_COMPILER clang) - --- -2.48.1 diff --git a/dev-libs/libansilove/libansilove-1.4.2.ebuild b/dev-libs/libansilove/libansilove-1.4.2-r1.ebuild similarity index 79% rename from dev-libs/libansilove/libansilove-1.4.2.ebuild rename to dev-libs/libansilove/libansilove-1.4.2-r1.ebuild index 44bf7e4d03dc..57632b60fbea 100644 --- a/dev-libs/libansilove/libansilove-1.4.2.ebuild +++ b/dev-libs/libansilove/libansilove-1.4.2-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/ansilove/libansilove/"; if [[ "${PV}" == *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"; + EGIT_REPO_URI="https://github.com/ansilove/${PN}"; else SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" @@ -28,3 +28,9 @@ RDEPEND=" DEPEND=" ${RDEPEND} " + +src_install() { + cmake_src_install + + find "${ED}" -type f -iname "*.a" -delete || die +} diff --git a/dev-libs/libansilove/libansilove-9999.ebuild b/dev-libs/libansilove/libansilove-9999.ebuild index 6d3f98240c35..158c01cb38f7 100644 --- a/dev-libs/libansilove/libansilove-9999.ebuild +++ b/dev-libs/libansilove/libansilove-9999.ebuild @@ -6,20 +6,31 @@ EAPI=8 inherit cmake DESCRIPTION="library to convert ANSi and artscene related file formats into PNG images" -HOMEPAGE="https://github.com/ansilove/libansilove"; +HOMEPAGE="https://github.com/ansilove/libansilove/"; if [[ "${PV}" == *9999* ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/ansilove/${PN}.git"; + + EGIT_REPO_URI="https://github.com/ansilove/${PN}"; else - SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/ansilove/${PN}/archive/refs/tags/${PV}.tar.gz + -> ${P}.gh.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi LICENSE="BSD-2" SLOT="0" -RDEPEND="media-libs/gd:2=[png]" -DEPEND="${RDEPEND}" +RDEPEND=" + media-libs/gd:2=[png] +" +DEPEND=" + ${RDEPEND} +" + +src_install() { + cmake_src_install -PATCHES=( "${FILESDIR}/libansilove-1.4.1-cmake_minimum_required.patch" ) + find "${ED}" -type f -iname "*.a" -delete || die +}
