commit: 3baff999862c0fb54bd916143648d69708c69671 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Jan 7 02:02:44 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Jan 7 05:18:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3baff999
app-cdr/isomaster: update for unslotted iniparser Have not really revised this ebuild, but fwiw also move the configs into src_compile (no reason to do this in pkg_setup). Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> .../files/isomaster-1.3.14-include-path.patch | 25 ---------------- ...er-1.3.17.ebuild => isomaster-1.3.17-r1.ebuild} | 34 ++++++++++------------ 2 files changed, 16 insertions(+), 43 deletions(-) diff --git a/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch deleted file mode 100644 index 520a355e595f..000000000000 --- a/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 50113aa660d2a867f3f8bfd67e1ba601c8b5294a Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <[email protected]> -Date: Mon, 27 Jan 2020 23:33:49 +0100 -Subject: [PATCH] Add missing (Gentoo specific) include path for iniparser 4 - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 8f4f23b..124a035 100644 ---- a/Makefile -+++ b/Makefile -@@ -65,7 +65,7 @@ CPPFLAGS += -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -DDEFAULT_E - CPPFLAGS += -D_FILE_OFFSET_BITS=64 - - ifdef USE_SYSTEM_INIPARSER --CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) -+CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) -I/usr/include/iniparser4 - endif - - OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o --- -2.24.1 - diff --git a/app-cdr/isomaster/isomaster-1.3.17.ebuild b/app-cdr/isomaster/isomaster-1.3.17-r1.ebuild similarity index 80% rename from app-cdr/isomaster/isomaster-1.3.17.ebuild rename to app-cdr/isomaster/isomaster-1.3.17-r1.ebuild index bfed4c776be9..547f5024b765 100644 --- a/app-cdr/isomaster/isomaster-1.3.17.ebuild +++ b/app-cdr/isomaster/isomaster-1.3.17-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit toolchain-funcs xdg-utils +inherit flag-o-matic toolchain-funcs xdg-utils DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images" HOMEPAGE="http://littlesvr.ca/isomaster"; @@ -14,36 +14,34 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="nls" -RDEPEND=">=dev-libs/iniparser-4.1:4 +RDEPEND=">=dev-libs/iniparser-4.1-r2:= x11-libs/gtk+:2" DEPEND="${RDEPEND} virtual/pkgconfig nls? ( >=sys-devel/gettext-0.19.1 )" # bug 512448 -PATCHES=( - "${FILESDIR}"/${PN}-1.3.14-include-path.patch -) +src_prepare() { + default + rm -f configure || die #274361 + rm -R iniparser-4.1 || die +} + +src_compile() { + tc-export AR CC + + # iniparser.pc only exists in >=4.2 and it changes headers location + has_version '>=dev-libs/iniparser-4.2' && + append-cflags $($(tc-getPKG_CONFIG) --cflags iniparser || die) -pkg_setup() { myisoconf=( DEFAULT_EDITOR=leafpad MYDOCPATH=/usr/share/doc/${PF}/bkisofs USE_SYSTEM_INIPARSER=1 - LIB_INIPARSER=iniparser4 PREFIX=/usr - ) + ) use nls || myisoconf+=( WITHOUT_NLS=1 ) -} -src_prepare() { - default - rm -f configure || die #274361 - rm -R iniparser-4.1 || die -} - -src_compile() { - tc-export AR CC emake "${myisoconf[@]}" }
