gentoo auto-resync : 13:07:2024 - 12:26:41

3 files changed, 9 insertions, 92 deletions

diff --git a/app-emulation/hercules-sdl/Manifest b/app-emulation/hercules-sdl/Manifest
index db987967acdb..9adbfddfa650 100644
--- a/app-emulation/hercules-sdl/Manifest
+++ b/app-emulation/hercules-sdl/Manifest
@@ -2,6 +2,5 @@ AUX gen_hashes.sh 706 BLAKE2B 85e0f867ea7012a9859f75cf8802ce85b50b23c2a7b48a1179
 AUX hercules-sdl-4.4.1-htmldir.patch 774 BLAKE2B 3cf3c50c60059ae0bd042333c2220669f87aa37cf632d1bc2cec738e02ca5f74a2a4302e484a73b6e9df32edb8c4bf2c0a2198c32e1242cab970e4a819c254c1 SHA512 bae45addb0c4f339b93d9709119b7df5d330978e60b982349244b98a72b157f86180454fa82ff9918a082f705a06a379ff3212f59bd5c1777090bb0cf03b9795
 AUX hercules-sdl-4.7.0-backport-pr658.patch 1591 BLAKE2B 4959d5d1f59c370d505156f0aec543af11a96e5b4513eb634f9c79aa69e537f854efd5870a710b50d8e2fd882bb33b34d2f7f5b15dab0c71fa503825f4c5b31c SHA512 3d3dcb3b1cb0cf580dff9f720c58a28597dc9ea926b6b3384cbaa88726515a0a25efbcde5a763488fcca0603d951f42702e416abe974c5f981befc3360733ed2
 DIST hercules-sdl-4.7.tar.gz 25439384 BLAKE2B 78a8d2df947c80e23d0e956a25a4f009dd32b09f2834cc06373f685badf9f1e657bf0f4e4408c7085371c46085718998076f3a6063caf80c9161b1fa7caa91eb SHA512 9d7060c4e2687358b9547b59b47362d642cbf2bf009085fdd41e485170d0f81029ee3d04d12b905a3a266cd26a9087e92c231c3f4600c32a8535a6140656b7b0
-EBUILD hercules-sdl-4.7.0-r1.ebuild 2678 BLAKE2B 99fc2187abb2729f3749da3d38419d5254bc9574001ef13676a447eb3ffaa8673b9d3c7c052bf541994a562e3326259cd9825e3e7c887d6e99246c21d04c2a7a SHA512 a71847afbd15b79165e2f6dc89effa2fb9dc28fae5d24e3db4cabafeab1aee56e86d46a9b5c9b5c52748738186755b3c93887f54c37e61b02f32a0a659e034b9
-EBUILD hercules-sdl-4.7.0.ebuild 2604 BLAKE2B 916d399a2d0a53ade95495d1788399543ebe41000cb480307af7425c78cfe2adeaa53a753f9e66eedb3786a9d875794f1f44ef15a80653718bc02a8ed01add2d SHA512 1c4242b251e4b4d0ecf84b7e796a242ded35adeb686726bfe4833c0c4c1c69b0705f3216e6a31f24e9876a39b6315d228d65d149d8ca66a08cc77755f27abf47
+EBUILD hercules-sdl-4.7.0-r1.ebuild 2730 BLAKE2B 378e8c9cf94019b4ab0aa8bba8a136563e2a9e8282d863ee7c1be2169504b1dfefd11349c9c413b7dea20b833c0ac82f3bcff3266a8966a2293667a0d3ccd323 SHA512 8d6dd1399542cef2147ba963e92e49ac85ece4d95a1f1a2e34ccd1729d2205a938a18dff7c07068b3aca9f4c00f39a61165d41243eead22ee220347df21f0c41
 MISC metadata.xml 1141 BLAKE2B b630c058fe32f2410985e53779d387fc007759f2bd36ad8240a2b6a2157b6c5921cfb4aa14ed3b513e0f787d9838bab46a6ceadd031d33daa2a3190d2ca64095 SHA512 fe090b27c7d46e6a9fee40a9d948f4124814d134cb64ff7f7d7b2d341f1db9313f5d071e5c34a312a3dacbe643c8083ba98a3b0058fa3886b9d024d6ecb17575
diff --git a/app-emulation/hercules-sdl/hercules-sdl-4.7.0-r1.ebuild b/app-emulation/hercules-sdl/hercules-sdl-4.7.0-r1.ebuild
index 2067dddd725d..773fa8bde935 100644
--- a/app-emulation/hercules-sdl/hercules-sdl-4.7.0-r1.ebuild
+++ b/app-emulation/hercules-sdl/hercules-sdl-4.7.0-r1.ebuild
@@ -25,23 +25,26 @@ FILECAPS=(
 	-M 755 cap_net_admin+ep usr/bin/hercifc
 )
 
-RDEPEND="
-	!app-emulation/hercules
+COMMON_DEPEND="
 	dev-libs/libltdl
 	net-libs/libnsl:0
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
 	object-rexx? ( dev-lang/oorexx )
 	regina-rexx? ( dev-lang/regina-rexx )"
-DEPEND="${RDEPEND}
+RDEPEND="
+	!app-emulation/hercules
+	!app-arch/tapeutils
+	${COMMON_DEPEND}"
+DEPEND="
+	${COMMON_DEPEND}
 	~app-emulation/hercules-sdl-crypto-${PV}
 	~app-emulation/hercules-sdl-decnumber-${PV}
 	~app-emulation/hercules-sdl-softfloat-${PV}
 	~app-emulation/hercules-sdl-telnet-${PV}"
 # Neither package support needs to be compiled-in for tests,
 # but the "rexx" command needs to be available
-BDEPEND="${RDEPEND}
-	test? ( || ( dev-lang/regina-rexx dev-lang/oorexx ) )"
+BDEPEND="test? ( || ( dev-lang/regina-rexx dev-lang/oorexx ) )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.1-htmldir.patch"
diff --git a/app-emulation/hercules-sdl/hercules-sdl-4.7.0.ebuild b/app-emulation/hercules-sdl/hercules-sdl-4.7.0.ebuild
deleted file mode 100644
index 336396af8692..000000000000
--- a/app-emulation/hercules-sdl/hercules-sdl-4.7.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools fcaps
-
-DESCRIPTION="The SoftDevLabs (SDL) version of the Hercules 4.x Hyperion Emulator"
-HOMEPAGE="https://sdl-hercules-390.github.io/html/"
-SRC_URI="https://github.com/SDL-Hercules-390/hyperion/archive/refs/tags/Release_${PV/.0/}.tar.gz -> ${P/.0/}.tar.gz"
-
-S="${WORKDIR}/hyperion-Release_${PV/.0/}"
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-# In theory USE=object-rexx and USE=regina-rexx are not mutually-exclusive.
-# In practice they functionally are as the Gentoo packages conflict, and
-# additionally Hercules only supports calling out to one of them at runtime,
-# controlled by the HREXX_PACKAGE environment variable.
-IUSE="bzip2 debug object-rexx regina-rexx test"
-RESTRICT="!test? ( test )"
-FILECAPS=(
-	-M 755 cap_sys_nice\=eip usr/bin/hercules --
-	-M 755 cap_sys_nice\=eip usr/bin/herclin --
-	-M 755 cap_net_admin+ep usr/bin/hercifc
-)
-
-RDEPEND="
-	dev-libs/libltdl
-	net-libs/libnsl:0
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	object-rexx? ( dev-lang/oorexx )
-	regina-rexx? ( dev-lang/regina-rexx )"
-DEPEND="${RDEPEND}
-	~app-emulation/hercules-sdl-crypto-${PV}
-	~app-emulation/hercules-sdl-decnumber-${PV}
-	~app-emulation/hercules-sdl-softfloat-${PV}
-	~app-emulation/hercules-sdl-telnet-${PV}"
-# Neither package support needs to be compiled-in for tests,
-# but the "rexx" command needs to be available
-BDEPEND="${RDEPEND}
-	test? ( || ( dev-lang/regina-rexx dev-lang/oorexx ) )"
-
-PATCHES=( "${FILESDIR}/${PN}-4.4.1-htmldir.patch" )
-
-src_prepare() {
-	rm -rf crypto decNumber SoftFloat telnet || die
-	sed -i 's#/lib${hc_cv_pkg_lib_subdir}#/lib#g' configure.ac || die
-	sed -i 's#_pkgname}${hc_cv_pkg_lib_suffix}#_pkgname}#g' configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local -x ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=$(usex bzip2)
-	econf \
-		$(use_enable bzip2 cckd-bzip2) \
-		$(use_enable bzip2 het-bzip2) \
-		$(use_enable object-rexx) \
-		$(use_enable regina-rexx) \
-		$(use_enable debug) \
-		--enable-custom="Gentoo ${PF}.ebuild" \
-		--disable-optimization \
-		--disable-setuid-hercifc \
-		--disable-capabilities \
-		--enable-ipv6 \
-		--enable-enhanced-configincludes \
-		--disable-fthreads \
-		--enable-shared \
-		--enable-automatic-operator \
-		--enable-extpkgs="${SYSROOT}/usr/$(get_libdir)/${PN}"
-}
-
-src_install() {
-	default
-	dodoc RELEASE.NOTES
-
-	insinto /usr/share/hercules
-	doins hercules.cnf
-
-	# No static archives.  Have to leave .la files for modules. #720342
-	find "${ED}/usr/$(get_libdir)" -name "*.la" -delete || die
-}