4 files changed, 8 insertions, 94 deletions
diff --git a/net-misc/ubridge/Manifest b/net-misc/ubridge/Manifest
index 79ff6d3969e9..ba7de2c3f4a3 100644
--- a/net-misc/ubridge/Manifest
+++ b/net-misc/ubridge/Manifest
@@ -1,6 +1,3 @@
-AUX ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch 1008 BLAKE2B d518f3d2b5fc5fd9c6c15c39f755d05b04738dc8cd443b55019ba14d858a9796d2e73190a4956f1f13896d30e2cf49f203755c37d3ccfeb73b484da3421a37f1 SHA512 d9afe86a35ff50d9455bac90c0a0fbe830816c043c4580bff10e1a556ef3b0de92a697188b3efcf5f87ce8672015320b5795f393a6916e2d96619c465344c80b
-DIST ubridge-0.9.18.tar.gz 64340 BLAKE2B 7ac540ccf180adc8bf0bb0d440d6a0335626181ba680f7f94cea43d6b6b70745cd64f8ee8048aa1621b7407fea83cf03039147ffe38236e70970c014771ab09b SHA512 f2c9e9d0242f61363a3f4ce6f1acf4013245ff0854a7f64c96d6b8737bd3cc505a38aaf43a0928e2a5a88bcd39f786e00fab68748ad56770d18d713005750c60
 DIST ubridge-0.9.19.tar.gz 66911 BLAKE2B c9de0485b84fa7cb78edb6651f0022c6e3f3d6e62aa2e1c56927c62d540ae1efaee25225bc7eb843ad688b7bd0aa39eb8a2ff1015a5c01f2d23d5a798b21ff14 SHA512 b693a64569ba17fcb40f8a7894fcc205efba17fc3103150bb6f1d7a8a165505c88251e75f56d003f4c4337e97bffa57b5948156e42d01a2938b8d969a088ff32
-EBUILD ubridge-0.9.18.ebuild 1089 BLAKE2B 26e9f3dde16372a76c98da998844c51dc1adb387c8fad068ac412e1ae37285f438f6b6b1e336bf46857bcb5fcd3c8e97bf0d3dfe4aa7fdb93f461c80f9af1e2f SHA512 d86fba30cb6d18dbc74b2da231c2c89df2b72d5614c3b11554d0d2f47db336a4e8d3cbf5223949df55f123b0392d3388935646149a76ff6beaa286e2c3a82dc3
-EBUILD ubridge-0.9.19.ebuild 1088 BLAKE2B 1d245e3e42f59ec29020ca56f0fbf62fdfba85ea76d8b631de0975e8575a0c73a2d3c927e9eba8118e5dcc31c6e7bee22775b34cc2ec4052ba8ff07477b23989 SHA512 b5c830250f102b0fb544fc3c2c83bb3b6748bf99cde68786007eb7a92aec2b6b641001781e347d8f243fe3c830a2895c1f3c3a252541cdc49c14885a7f93c5e5
+EBUILD ubridge-0.9.19-r1.ebuild 1117 BLAKE2B 9f71532fe59ded8d6ea4d1996e974744ebf18d1448c5f898ac4247174f436d39da0abe2f7d8d6fb14522bf9a98ea5b093a321f262a57f9fc91cc83acc28857bc SHA512 762e55e1953fa31359df4bf00525ab818e10b21b0fca0490b94a6aa6e289fa055c1c3c5abf993577d269c260b84f9fee4aa0aa7fe81064f07614f7e54669f9c6
 MISC metadata.xml 731 BLAKE2B ccb0eaa22a34a4351cae1ee7d0adf747c4e0e6007c00d130e6d374d6edf1a4e11554364dbd805cdafbb7788be682a2d0758df9b3af96c29bc115ca4e099e24cb SHA512 c0b772033113c8563d1c3b28e53407fa7dd3b1627bd892c0a8c4c6a454c6ade97537b2e82f7d907af184cb089c55d01b9dbb431d7d946e8a2723fa8e6a7f329f
diff --git a/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch b/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
deleted file mode 100644
index 4d4825f477aa..000000000000
--- a/net-misc/ubridge/files/ubridge-0.9.16_add_slotted_iniparser-4.1+_support.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur a/Makefile b/Makefile
---- a/Makefile	2019-05-20 10:02:14.000000000 +0300
-+++ b/Makefile	2019-05-20 10:32:04.972039000 +0300
-@@ -67,7 +67,7 @@
- 
- ifeq ($(SYSTEM_INIPARSER),1)
-     CFLAGS += -DUSE_SYSTEM_INIPARSER
--    LIBS += -liniparser
-+    LIBS += -liniparser4
- else
-     SRC += src/iniparser/iniparser.c   \
- 	   src/iniparser/dictionary.c
-diff -ur a/src/parse.h b/src/parse.h
---- a/src/parse.h	2019-05-20 10:02:14.000000000 +0300
-+++ b/src/parse.h	2019-05-20 10:32:04.968039000 +0300
-@@ -24,7 +24,7 @@
- #include "ubridge.h"
- 
- #ifdef USE_SYSTEM_INIPARSER
--#include <iniparser.h>
-+#include <iniparser4/iniparser.h>
- #else
- #include "iniparser/iniparser.h"
- #endif
-diff -ur a/src/ubridge.c b/src/ubridge.c
---- a/src/ubridge.c	2019-05-20 10:02:14.000000000 +0300
-+++ b/src/ubridge.c	2019-05-20 10:32:04.968039000 +0300
-@@ -26,7 +26,7 @@
- #include <pthread.h>
- 
- #ifdef USE_SYSTEM_INIPARSER
--#include <iniparser.h>
-+#include <iniparser4/iniparser.h>
- #else
- #include "iniparser/iniparser.h"
- #endif
diff --git a/net-misc/ubridge/ubridge-0.9.18.ebuild b/net-misc/ubridge/ubridge-0.9.18.ebuild
deleted file mode 100644
index adfeeba6492c..000000000000
--- a/net-misc/ubridge/ubridge-0.9.18.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit fcaps toolchain-funcs
-
-DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
-HOMEPAGE="https://github.com/GNS3/ubridge"
-SRC_URI="https://github.com/GNS3/ubridge/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3+"
-
-RDEPEND="
-	acct-group/ubridge
-	dev-libs/iniparser:4=
-	net-libs/libpcap"
-
-DEPEND="${RDEPEND}"
-
-# Bugs: https://bugs.gentoo.org/647588
-#       https://github.com/GNS3/ubridge/issues/60
-PATCHES=( "${FILESDIR}/${PN}-0.9.16_add_slotted_iniparser-4.1+_support.patch" )
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		SYSTEM_INIPARSER=1
-}
-
-src_install() {
-	exeinto /usr/bin
-	exeopts -m 710 -g ubridge
-	doexe ubridge
-
-	dodoc README.rst
-}
-
-pkg_postinst() {
-	fcaps -g ubridge -m 4710 -M 0710 cap_net_raw,cap_net_admin \
-		"${EROOT}"/usr/bin/ubridge
-
-	einfo "\nNOTE: To read packets from the network interfaces with ubridge as"
-	einfo "normal user you have to add trusted users to the \"ubridge\" group.\n"
-}
diff --git a/net-misc/ubridge/ubridge-0.9.19.ebuild b/net-misc/ubridge/ubridge-0.9.19-r1.ebuild
index 5c359bef8f37..f2b58fb26ca2 100644
--- a/net-misc/ubridge/ubridge-0.9.19.ebuild
+++ b/net-misc/ubridge/ubridge-0.9.19-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 fcaps toolchain-funcs
+inherit fcaps flag-o-matic toolchain-funcs
 
 DESCRIPTION="Bridge for UDP tunnels, Ethernet, TAP and VMnet interfaces"
 HOMEPAGE="https://github.com/GNS3/ubridge"
@@ -15,16 +15,16 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	acct-group/ubridge
-	dev-libs/iniparser:4=
+	>=dev-libs/iniparser-4.1-r2:=
 	net-libs/libpcap"
 
 DEPEND="${RDEPEND}"
 
-# Bugs: https://bugs.gentoo.org/647588
-#       https://github.com/GNS3/ubridge/issues/60
-PATCHES=( "${FILESDIR}/${PN}-0.9.16_add_slotted_iniparser-4.1+_support.patch" )
-
 src_compile() {
+	# 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)
+
 	emake \
 		CC="$(tc-getCC)" \
 		SYSTEM_INIPARSER=1