From 403c8ef4d2409391e98c11dbabb2f8732dfbc87e Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 17 May 2026 01:25:13 +0200 Subject: [PATCH] app-admin/clog: Use patch instead of sed, update DESCRIPTION Bug: https://bugs.gentoo.org/677188 Signed-off-by: Andreas Sturmlechner --- app-admin/clog/clog-1.3.0-r1.ebuild | 12 +++------ .../clog/files/clog-1.3.0-doc-path.patch | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 app-admin/clog/files/clog-1.3.0-doc-path.patch diff --git a/app-admin/clog/clog-1.3.0-r1.ebuild b/app-admin/clog/clog-1.3.0-r1.ebuild index 5c7a122a81f98..36c8ddc82bae3 100644 --- a/app-admin/clog/clog-1.3.0-r1.ebuild +++ b/app-admin/clog/clog-1.3.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit cmake -DESCRIPTION="clog is a colorized log tail utility" +DESCRIPTION="Colorized log tail utility" HOMEPAGE="https://gothenburgbitfactory.org/clog/" SRC_URI="https://github.com/GothenburgBitFactory/clog/releases/download/v${PV}/${P}.tar.gz" @@ -15,11 +15,7 @@ KEYWORDS="~amd64 ~x86 ~x64-macos" RESTRICT="test" # No test suite on tar.gz PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-gcc13.patch - "${FILESDIR}"/${PN}-1.3.0-musl.patch + "${FILESDIR}"/${P}-doc-path.patch # bug 677188 + "${FILESDIR}"/${P}-gcc13.patch + "${FILESDIR}"/${P}-musl.patch ) - -src_prepare() { - sed -i -e 's|share/doc/clog|share/clog|' CMakeLists.txt || die - cmake_src_prepare -} diff --git a/app-admin/clog/files/clog-1.3.0-doc-path.patch b/app-admin/clog/files/clog-1.3.0-doc-path.patch new file mode 100644 index 0000000000000..30da78fa58f45 --- /dev/null +++ b/app-admin/clog/files/clog-1.3.0-doc-path.patch @@ -0,0 +1,26 @@ +From 67d9da292879a442f05cc9eb08627c6dcc7c88bc Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 17 May 2026 01:23:12 +0200 +Subject: [PATCH] Fix doc install path + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73bdf53..fe562c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,7 +17,7 @@ set (PACKAGE_TARNAME "${PACKAGE}") + set (PACKAGE_VERSION "${VERSION}") + set (PACKAGE_STRING "${PACKAGE} ${VERSION}") + +-SET (CLOG_DOCDIR share/doc/clog CACHE STRING "Installation directory for doc files") ++SET (CLOG_DOCDIR share/clog CACHE STRING "Installation directory for doc files") + SET (CLOG_BINDIR bin CACHE STRING "Installation directory for the binary") + + message ("-- Configuring cmake.h") +-- +2.54.0 +