3 files changed, 93 insertions, 8 deletions
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index b47fad549d85..f64299e528b4 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -5,5 +5,6 @@ AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8
 AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c
 AUX expect-5.45.4-examples.patch 935 BLAKE2B df87d211f6693b836e2e8ca2b63c56a9dd073a8e2ab3f71b38523d4797da0c54411d51bd38e5568c0b850b30ce89d7c984945e704486eb61ca5077709de514fc SHA512 0cad9007f82d2e9fb1994e7b8a84858603cca471f34dbbaddadc30b4594c5cb31cb29749629bcea47b1da4abe3526ddc1c5ea36fb816571bc9c6ffadc120667c
 DIST expect5.45.4.tar.gz 632363 BLAKE2B a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d SHA512 a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
-EBUILD expect-5.45.4.ebuild 2297 BLAKE2B 04a0490d261b03a7111fad9e6b966a7001b3b12f32c162ee34d46572837a9761b5595b793c9553f2a545676271ac49feb26c39a42c207268b463d40cffb4a7ea SHA512 4c5385876bd58e1361eeae690263958977a181f6559a896c2a6de4d4f97efb996ff3f8250755182b7e77a316a2ba050ed0f4588562b75a258d4fd1e24635a01c
+EBUILD expect-5.45.4-r1.ebuild 2298 BLAKE2B c5105d17c343b7c457939c73c28e1f7ddc8a0e9b838d3cba132a4a510cb33b7ac12fea546f41fa13fd9329a05c6fd81bf41a2f24d4e88dfc97bedb8c0340e439 SHA512 be596daf8f0ec9567ffb43544f7d1d21fc8686543be5228cbf66a83341b0e53369d3b9932ba3ae6ee6275888a58f200ed708ba1a99af925c80a8a662d068abea
+EBUILD expect-5.45.4.ebuild 2290 BLAKE2B 8b626bcfdec7e853d4cbcad97e201a09c06b2f17c004671df109f879aece4f6bd10d78570b53721b898b73d2e952945351138d571b40cc29c5c88d6edfb0c0d4 SHA512 112562260068e3c64ca47cfe6c1122f02d3aaf6454bc0b54e0d12330686eb6011e40c9ce4c0d1979f4b49e1681f87f82cac7f78b0dac90c280b744c933191e87
 MISC metadata.xml 330 BLAKE2B 4e561b8ea0a607e2fde49595d4808e51b2df54c2d8f3d65c47a4e592e7d7897db71a6677b0330c7c32a8e5773b9571de0e4c8d33c4f8a5c3f0e0f7192082b177 SHA512 fec72aa15126bbe40bc5277bb743acf07203a6153ee52e69f1e828dfc53757b3d11a8e09175397a06bdb4f2c5e683db1ec74de254a6b36926192e5868f2e5ec6
diff --git a/dev-tcltk/expect/expect-5.45.4-r1.ebuild b/dev-tcltk/expect/expect-5.45.4-r1.ebuild
new file mode 100644
index 000000000000..fa02fd421cbb
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.45.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${PN}${PV}"
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="https://core.tcl-lang.org/expect/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="debug doc threads"
+
+# We need dejagnu for src_test, but dejagnu needs expect
+# to compile/run, so we cant add dejagnu to DEPEND :/
+DEPEND=">=dev-lang/tcl-8.2:0[threads?]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-examples.patch )
+
+src_prepare() {
+	default
+	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
+
+	eapply "${FILESDIR}"/${PN}-5.45-gfbsd.patch
+	eapply "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
+	eapply "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+	eapply "${FILESDIR}"/${PN}-5.45-format-security.patch
+	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
+
+	# fix install_name on darwin
+	[[ ${CHOST} == *-darwin* ]] && \
+		eapply "${FILESDIR}"/${P}-darwin-install_name.patch
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+}
+
+src_configure() {
+	# the 64bit flag is useless ... it only adds 64bit compiler flags
+	# (like -m64) which the target toolchain should already handle
+	econf \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--disable-64bit \
+		--enable-shared \
+		$(use_enable threads) \
+		$(use_enable debug symbols mem)
+}
+
+src_test() {
+	# we need dejagnu to do tests ... but dejagnu needs
+	# expect ... so don't do tests unless we have dejagnu
+	type -p runtest || return 0
+	emake test
+}
+
+expect_make_var() {
+	touch pkgIndex.tcl-hand
+	printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
+	rm -f pkgIndex.tcl-hand || die
+}
+
+src_install() {
+	default
+
+	if use doc ; then
+		docinto examples
+		echo dodoc \
+			example/README \
+			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
+		dodoc \
+			example/README \
+			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
+			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
+	fi
+}
diff --git a/dev-tcltk/expect/expect-5.45.4.ebuild b/dev-tcltk/expect/expect-5.45.4.ebuild
index efb1f5f4cae6..6062b7449ecb 100644
--- a/dev-tcltk/expect/expect-5.45.4.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools epatch
+inherit autotools
 
 MY_P="${PN}${PV}"
 DESCRIPTION="tool for automating interactive applications"
@@ -28,15 +28,15 @@ src_prepare() {
 	default
 	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
 
-	epatch "${FILESDIR}"/${PN}-5.45-gfbsd.patch
-	epatch "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-5.45-headers.patch #337943
-	epatch "${FILESDIR}"/${PN}-5.45-format-security.patch
+	eapply "${FILESDIR}"/${PN}-5.45-gfbsd.patch
+	eapply "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
+	eapply "${FILESDIR}"/${PN}-5.45-headers.patch #337943
+	eapply "${FILESDIR}"/${PN}-5.45-format-security.patch
 	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
 
 	# fix install_name on darwin
 	[[ ${CHOST} == *-darwin* ]] && \
-		epatch "${FILESDIR}"/${P}-darwin-install_name.patch
+		eapply "${FILESDIR}"/${P}-darwin-install_name.patch
 
 	mv configure.{in,ac} || die