gentoo auto-resync : 02:09:2023 - 16:16:36

3 files changed, 15 insertions, 26 deletions

diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index 171449dceba7..4d3df45e375f 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -1,9 +1,8 @@
 AUX oidentd-2.0.7-init 837 BLAKE2B ab01ed3d6675f6196edcf7712c9f2e77369edc2481433788e63a3a82e591831869623723002f49a4498ed10ba7657f51dbc795895384213e473eba950e7ba7be SHA512 ebd072d86fa879017bb43f8f9cdd0ea563f337b558552ebdc27c980376889dfd22f2d6bdeb424ca3e2dbe62a78ceb80208ee26398aed0c38c4f973646d6d80d3
 AUX oidentd-2.2.2-confd 69 BLAKE2B 37fac35c28304f92942844ee7652f52496cdc4c66da67d449127c3e9b61c715afb25cae7379137d8b9e2863d44e72535734c595c8edcc18f94b8c3841cd216ab SHA512 639f062b61b3aac829d6d16497d548290d8de3e161a1d8037b689593374b89028243b9369109b1b4b55d125ec665f1433bb971ea873a2e6e1b6b15eabfad8e6a
-AUX oidentd-2.5.0-respect-ar.patch 250 BLAKE2B e756da25bca3a2e98be1a625c99f33b20ebb237cd7a3fe8f6e01664db328636451bd7af70cc16e08e45344511660787836358f92c2fa1806998dcf35f73fdc10 SHA512 6ddb24e88e864359faf8f6aa6a28de01067b0cc20c349e8c9f6ec4dafde26636e7cce3e11e137c12cd868f0de85546462be599333966ad8bf850cea5afc9b62c
 AUX oidentd-3.0.0-ipv6-masquerade.patch 2302 BLAKE2B c291c43037d7b30e15b0c4599614a06fd6a0f3bc66bc2ae83c8c22ace90eda3f4b43b6e9606710fc0fa6eb1baa2aba9b8bbfb65a5be0b774e6cbf0d39e161b9d SHA512 7cfacf126cd2369c71729380d75b662540ae4d7f1e8ee0510fc1d9f99d78d9538aa03d927dbb642c31e36d3d9b9df86fb5036e8abcf3145b9287046189642c9c
-DIST oidentd-2.5.0.tar.xz 195536 BLAKE2B ea6327fc415811b7050503daa393639f5740e9c1681794cfadf447e4968024aed7e0367ba804209d236c295777f856297b62c1d7e307c268c3d9fad9b240b7f5 SHA512 31ff2cad2afaa9f07a0aa35ad904047de78f168f9e6d6a3fcf7397eb89e6b930c30741eb1de44e3c2c24f48ca7d860cafd2771f464b336d400ab6d98384e9320
 DIST oidentd-3.0.0.tar.xz 187088 BLAKE2B ca824119cbb54aee52658c9a167ace88b2ed7f118565d7be043e19534a323772d18a043d803cd553c7408a525e3c717ffb990fb8794b4af4e8ac6c1efe4571c0 SHA512 92e733272979c08bba012f33aa6e0eadc15e18e03c24258b0333f74c201df87cc619012e2d8da69aac10c15684691464f59551c9b9d83e690b3902e47f649c68
-EBUILD oidentd-2.5.0.ebuild 1254 BLAKE2B 928c432bef758266ecd842a3aaea3a4fe55468598a4867d1502eec42a73e540b62591f277f96f4874f38c1e9069f3ccdc6a32a8390c0fc619aa8d9a643511bb6 SHA512 0ea39fead9d40f11229831e53551430788baf885b25efa476b7695057a182279b187b142b50113530a3b2177f577ec5a1f0b60dd88346e23fa807b90055b36f8
+DIST oidentd-3.1.0.tar.xz 183596 BLAKE2B ed648b525153437659b9437612eb8023465d6e45a401ba64bda86e82948c588a2da4da877b371a6bb2b6f0e6f29f1a5ec844009bb2bfcf4eb0d830254da03bcd SHA512 03ce6c64a4351cecdc9177e5a035860d433689de4c86d344eab5af9810b03caedface983c4c4fb2e7ae31b7d868bfcbdd15a094a3f79f43c400258c4902a5972
 EBUILD oidentd-3.0.0-r1.ebuild 1278 BLAKE2B 898693a5fb9f881dab4f4e5a8c4cf658058707d74796cb61b5bef8fffa11e0f7acba577386a3ed9c7008d9c170b975b59a9bd67289c061e73f6a029895e25b13 SHA512 960e4631d8c8f67ba582254b17055db710d6c2cb5d36f9df101692624a6ded343120d268681ed35c0ce9f5abfadab4ac65e2ce8e4139391ba3a1d37cbbfd3cac
+EBUILD oidentd-3.1.0.ebuild 1219 BLAKE2B f244d133ed3cbd067aeb50b8d6124230aa379a5a9ebd98988c4c384869b3171eae759056f41361d79054dd22c1ba2aec4afe15b1ad3883dd92e874a4d9318fc9 SHA512 d7d1f875fe328cfde85539e5ae94d02c65727f8dfdcd5d78980499a851accb5b07e0e1da3f90563eaff1514e15242d07865e5b3a37710846639aeb4d83f276b7
 MISC metadata.xml 570 BLAKE2B 13988eee6eb154328c20cc58e0a7fceed6a6cf38811cb33456d154b646ccd2f638c7d9ffcae17552eb2c907a03ef4ca48a01dcaa9ca082bcd86f01f8b8efb811 SHA512 7474d2c67d8aeb05d48a71517b622706906de74d13d42c6e486fee4103470d72da0523d39084e2d304ada98e228c49d14d0befda63fc50102909eb1dcfda611e
diff --git a/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch b/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
deleted file mode 100644
index 156b136f7755..000000000000
--- a/net-misc/oidentd/files/oidentd-2.5.0-respect-ar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b458d11..b163128 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -32,6 +32,7 @@ AC_PROG_LEX
- AC_PROG_RANLIB
- AC_PROG_INSTALL
- AC_PATH_PROG(sedpath, sed)
-+AM_PROG_AR
- 
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
diff --git a/net-misc/oidentd/oidentd-2.5.0.ebuild b/net-misc/oidentd/oidentd-3.1.0.ebuild
index fd799d2a1495..9b2726b4bcbd 100644
--- a/net-misc/oidentd/oidentd-2.5.0.ebuild
+++ b/net-misc/oidentd/oidentd-3.1.0.ebuild
@@ -1,43 +1,45 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools systemd
+inherit systemd
 
 DESCRIPTION="Another (RFC1413 compliant) ident daemon"
 HOMEPAGE="https://oidentd.janikrabe.com/"
 SRC_URI="https://files.janikrabe.com/pub/${PN}/releases/${PV}/${P}.tar.xz"
 
-LICENSE="BSD-2 GPL-2 LGPL-2+ MIT"
+LICENSE="BSD-2 GPL-2 LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug ipv6 masquerade selinux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="debug masquerade selinux"
 
 DEPEND="masquerade? ( net-libs/libnetfilter_conntrack )"
 
 RDEPEND="
+	${DEPEND}
 	acct-user/oidentd
 	acct-group/oidentd
 	selinux? ( sec-policy/selinux-oident )
-	${DEPEND}"
+"
 
-PATCHES=( "${FILESDIR}/${P}-respect-ar.patch" )
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
 
 src_prepare() {
 	sed -i '/ExecStart/ s|$| -u oidentd -g oidentd|' contrib/systemd/*.service || die
 
 	default
-
-	eautoreconf
 }
 
 src_configure() {
 	local myconf=(
 		$(use_enable debug)
-		$(use_enable ipv6)
 		$(use_enable masquerade libnfct)
 		$(use_enable masquerade nat)
+		--enable-ipv6
 		--enable-xdgbdir
 	)
 	econf "${myconf[@]}"