gentoo auto-resync : 07:01:2025 - 06:41:06

3 files changed, 17 insertions, 45 deletions

diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index 5da9776b8c24..c8c541392a09 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -1,4 +1,3 @@
-AUX isomaster-1.3.14-include-path.patch 840 BLAKE2B e1247441758fb0ac40da3f2144187e62a80080181bb41bdddcf08de9745cfc3006bbe1a89db57c16a90365b41cb9411b942a1a46c8502dba7544ae6146ee4b4f SHA512 d25e5b8b81623b75377ba5ded5fe43d70a0879bc7956d3c1a60f9f417405cf7ebce808c4145c314a2c968561d8d26e7b8bba5488076593230e49824029626a6a
 DIST isomaster-1.3.17.tar.bz2 257663 BLAKE2B c62d0d2fe220fe3578f3d306815793f45a81b147628d2318b574e0c26876ddfa45169deb108ff332bf8e896a44734424402080843bdd713c68ea935b836220bb SHA512 77e7eee6f1e649442af921d629c4710fdf6fb009cbd429644bfb2eb2e66607b861d8855dc7d08a312eba444d1be180b1bb98f09d22cc25ab96f40e5c020c4ba1
-EBUILD isomaster-1.3.17.ebuild 1504 BLAKE2B 0e56fad61256119f02e62924f252940c1ea475644f5d4640c2dfd50faff9d3d81c4ae01b23fc61775beb7f8b8d623a17fb1af827019ae82376383d8c406da8d0 SHA512 f68a971bf81b9b738e0e3e2aed8e3eef8e40753e4d815652b87b1e9862cbc255f782cb5460facec040cff64c0bb9a093a7701c4100bbfa0caa1978f60e3f092e
+EBUILD isomaster-1.3.17-r1.ebuild 1595 BLAKE2B feffce1054880363050fc99f7b0e5c3fe04455b580932abd03baf5f9ff86b6f963f1c04699394d726344d9161712798b6fa0f15166be4b62379e7f7ca9217730 SHA512 1a209076deb14a33924d3924e574ec91202ff6a2c9bd0cb77bb7c1e8f2131d47e5a2cf09d331819515395c938190bd6cfb84ad093d0a6b9f85be744df6f16e4b
 MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
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 <sebastian@pipping.org>
-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
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[@]}"
 }