gentoo auto-resync : 11:06:2023 - 14:17:09

3 files changed, 48 insertions, 4 deletions

diff --git a/net-vpn/vtun/Manifest b/net-vpn/vtun/Manifest
index feee741de18d..d44b7701cb5a 100644
--- a/net-vpn/vtun/Manifest
+++ b/net-vpn/vtun/Manifest
@@ -2,9 +2,10 @@ AUX vtun-3.0.4-autoconf-fork-not-working.patch 300 BLAKE2B 12db3576c0575af1ff619
 AUX vtun-3.0.4-includes.patch 1577 BLAKE2B 7f5eceeb032eb0c9150376f3fe9e2d5adbf36eba5fe113d899b12130e6050a698fff71695781b1df355d53642d60c6a8231382b4c09c69ee47a9d87651dc7e8a SHA512 f576f0ba6ed6302aacf8a3af6d261ce67af5dd484f1d4f1eaf062f89fb56a68db1a66ca543710aae856c4d256601f8e93fe4e3d48065aa304b5f4e8724697e43
 AUX vtun-3.0.4-libssl-ctx.patch 8088 BLAKE2B 5cbc357cc445b189885cb062b85dbc86a24d2418c0a378daff72813d6b1c63d573a831d9d362f57cd541e30f49d6ee42951fc9702b8c2eb2848665c4a6bf785c SHA512 f67105188b0e757904cea480b22778b26a20bba650a27674f1312c58bafe95383a9f14df74004fd5f119ce9ed3df189ae64e1ca051ac73b713c4c03088326be1
 AUX vtun-3.0.4-naughty-inlines.patch 688 BLAKE2B e0ea216161f6c6f106109382cdfdebecc69ebdbd11ea2997ecf05fea04564c0f7a37b76302a01a3507d80fcaf09e3b503a49e1df4cd94871a3532cffd237e463 SHA512 36be4de6b507d5737e2c5757ee004f081dcda63e59d37aa1404b6bbbcd6ca62fd9856799dcec751a51f1027c1ed0f8221e0407f00853de960b78753be2aff8ed
+AUX vtun-3.0.4-use-bison-for-yacc.patch 1079 BLAKE2B 0e7bb4006c94db1b270a44ddcf5f27f83a56904fcfca418ec92bd8126a33195c04b130243dc456412b368779b8cab3767338fa13441b467cd3c3932c3cf85ea7 SHA512 733a9a75ac0ec73555dfb4d03d8559ec1ec4ab974cd15b6c4d405c210850d05a3d65f4df27bb36b8e9681a9ed2b3c612309345527b10dd8b80fe3a916f19e7ee
 AUX vtun.rc 824 BLAKE2B 162ee1c636a63fe1b2ef498a35610c99e4ce35866f1e01d0c46c5ccb4f15cbdc60c02a4ab867c18c3b1c829eb652dbff79597b1748d55fdde3fd73535dfa3675 SHA512 a6dc86f3b86ed6481273ec31a9f62dc199ec86fb698dfc0818464d5b5c1ded17a9eebe67a4d7bce5bb98edeb4d98db16888863d37e4ff784542968f26288f8a7
 AUX vtund-start.conf 1174 BLAKE2B 3bce3aa808286c554accb71876314bbe8ecbd5e02b16b804f911201a0fbfd8fae25f9f6a702d2de4ef5254d50661d9d1c578f5d6b7e9dcec5b92ebe8b4724007 SHA512 7ec2a8f64380483b8e311bbefb78675a457e27088888e654f8c5fee5f14a77a72f1319b9c7e2dd38763c86728e4f44d6eb87c286103e547e19f329f1550e6710
 DIST vtun-3.0.4.tar.gz 132691 BLAKE2B 040c3c66074a1ebdd8a2f32c988b7f4d9423d248ad1259456cd8cdbe0b9adbbaca4cd1e1a4e8c4e6a936a221a9443c099d5d8a219f830925f220bc09e5e7feae SHA512 b1bb7294bd745c2ca888704e2b0f8e05447b5e01bec0f921648afe363d61a19508dea9e26663993cd69c506aa92621e76f36045bddf7c3723d13a72741ca6781
-EBUILD vtun-3.0.4-r2.ebuild 1367 BLAKE2B ae6bdb45a44eb65b0d4c5693961823ca627a7d8c2e0ea743f9a3718a8d8d866cc788ef3e674ad3593f407df49a97682ce70a581fa88f7bcd1187da3a8cdfbbf6 SHA512 b6321a6c7bbe6bcddef4f19acedc8c1596d7ed15d1d42ca7ffaaeeeb3a2512fd69a310ce46d0ef42b80a74849c57f26b252c03e5d73573c1ac4630a36ab89817
 EBUILD vtun-3.0.4-r3.ebuild 1390 BLAKE2B 09ca0540d4abd65a3e7837caccb6d3225da40e31aa1429f30ed9a24f498f37b1ad01e9a9bd902f034febd24145389406f40199ccfb189a6a5f72a4d1ecefa090 SHA512 5013d6cb4313afd8abfc88ed93c845dee41c29718c1dafebc4f06d8178075218d6a70a65b5038cc571681b6a5413b3fe0b16aadbbaac7d65ee06dfee0f989011
+EBUILD vtun-3.0.4-r4.ebuild 1432 BLAKE2B 5132217d4a09368d5b98f64cbf7a6a48c646c40b601350e78527c5c26e1d28e542da5d8758c461fa3aeab4ed2eeb7807a2d0e7aa3f9a38330d10a990e4b5328d SHA512 8d0cee8965f24e1f7ce8c66918f89d69aa74699afe342f04b7fabfa7f1012fe8871d60297a0c572d7b041f1f4a03c365404d654c7ac1a59260060a99e46a7a43
 MISC metadata.xml 477 BLAKE2B 83e62f89bae99ff4978da7fbafb82efce91a4bdc0e7f21679498dbac9bd0dde7b9e92c9086e346aa10a7ad30c13a399744d0f2931ef9abef5cb615a36a68cb70 SHA512 7150ee075186afae28979496d4aeec067ca8dec417f2f1098a0f48b11940aa52ed085aaaabeff657cc8d634a967dc54a20b744423417cfe033fe5738cba1b6d4
diff --git a/net-vpn/vtun/files/vtun-3.0.4-use-bison-for-yacc.patch b/net-vpn/vtun/files/vtun-3.0.4-use-bison-for-yacc.patch
new file mode 100644
index 000000000000..70a28befe486
--- /dev/null
+++ b/net-vpn/vtun/files/vtun-3.0.4-use-bison-for-yacc.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/907988
+--- a/configure.in	2016-10-01 23:46:01.000000000 +0200
++++ b/configure.in	2023-06-10 22:44:20.873592074 +0200
+@@ -82,11 +82,14 @@
+ AC_CANONICAL_SYSTEM
+ 
+ dnl Check for programs.
+-AC_PROG_YACC
+ AC_PROG_LEX
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ 
++AC_ARG_VAR([BISON], [bison command for yacc parsing])
++AC_CHECK_PROG([BISON], [bison -y], [bison -y], [no])
++AS_IF([test "x$BISON" = "xno"], [AC_MSG_ERROR([bison not found])])
++
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
+--- a/Makefile.in	2016-10-01 23:46:00.000000000 +0200
++++ b/Makefile.in	2023-06-10 23:00:25.278904190 +0200
+@@ -21,8 +21,8 @@
+ CFLAGS = @CFLAGS@ @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@ @LIBS@
+ 
+-YACC = @YACC@
+-YACCFLAGS = -d
++BISON = @BISON@
++BISONFLAGS = -d
+ 
+ LEX = @LEX@
+ LEXFLAGS = -t 
+@@ -62,7 +62,7 @@
+ 	$(CC) $(CFLAGS) -o vtund $(OBJS) $(LFD_OBJS) $(LDFLAGS)
+ 
+ cfg_file.tab.h:
+-	$(YACC) $(YACCFLAGS) -b cfg_file cfg_file.y
++	$(BISON) $(BISONFLAGS) -b cfg_file cfg_file.y
+ 
+ cfg_file.tab.c: cfg_file.y cfg_kwords.h config.h cfg_file.tab.h
+ 
diff --git a/net-vpn/vtun/vtun-3.0.4-r2.ebuild b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
index 6f2661a261b8..81eaa36bd9e3 100644
--- a/net-vpn/vtun/vtun-3.0.4-r2.ebuild
+++ b/net-vpn/vtun/vtun-3.0.4-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-info
+inherit linux-info autotools
 
 DESCRIPTION="Create tunnels over TCP/IP networks with shaping, encryption, and compression"
 SRC_URI="https://sourceforge.net/projects/vtun/files/${PN}/${PV}/${P}.tar.gz"
@@ -11,7 +11,7 @@ HOMEPAGE="https://vtun.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="lzo socks5 ssl zlib"
 
 RDEPEND="
@@ -23,7 +23,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-alternatives/lex
-	app-alternatives/yacc
+	sys-devel/bison
 "
 
 DOCS=( ChangeLog Credits FAQ README README.Setup README.Shaper TODO )
@@ -34,10 +34,12 @@ PATCHES=(
 	"${FILESDIR}"/${P}-includes.patch
 	"${FILESDIR}"/${P}-naughty-inlines.patch
 	"${FILESDIR}"/${P}-autoconf-fork-not-working.patch
+	"${FILESDIR}"/${P}-use-bison-for-yacc.patch
 )
 
 src_prepare() {
 	default
+	eautoreconf
 	sed -i -e '/^LDFLAGS/s|=|+=|g' Makefile.in || die
 	sed -i 's:$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund::' Makefile.in || die
 }