7 files changed, 29 insertions, 29 deletions
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 9c23e794225b..2f7f6e2a041b 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/calcoo/Manifest b/sci-calculators/calcoo/Manifest
index bc0aaf2f0ff1..40d0eefbd6c3 100644
--- a/sci-calculators/calcoo/Manifest
+++ b/sci-calculators/calcoo/Manifest
@@ -1,4 +1,4 @@
 AUX calcoo-1.3.18-gold.patch 357 BLAKE2B 05d3f353a59ac317da28ab2ea96a5fe31f9a5f46799e0c03ff2c49eba955ecd8cb46eb09916ee6375db59822cd35c0b26ca01fdaab5625992489a2586914442f SHA512 5dde7e02ca567965cb1eadc6d181af49d20d5a45c4af6f93dfd406c207a4520827f99eed65f3dd4cc13d8e95d01377b9bf308d5cff885aa53fc96d8f39caf0b6
 DIST calcoo-1.3.18.tar.gz 133605 BLAKE2B 4a753143dce8311c10bf6906bd6723f6109cede03bfc89051dd4d952e90becba473046654808381d7636b35c627ebc1522b24e488a59532ea3e656508ca72334 SHA512 e03fd61abb1e5500a1e4eb91e732ced1c963770ddb85824430511cc5c14d1f5af1095e2fdc7b8b483afba94e3ac8381a001e0a42dccaa182c1a888e90afd14a7
-EBUILD calcoo-1.3.18-r1.ebuild 747 BLAKE2B 427de99726b596ed6d8f9213cae37644e9de54274935c6bd416c5aa770206a3b136343f144832172e58a5eb0bd4e88d28469fd2a1df7ff8c1c1391b66b4b592a SHA512 3a2bcaf3a82c6efdc952edaee6d42af9d5d7311da2d333f8fe7a48f6b4e370ecedd4ae69069b2348a2d1b6f835077afac31ae449a6f4b4380cc66a8b3c4ba57e
+EBUILD calcoo-1.3.18-r2.ebuild 720 BLAKE2B 7bcaa1c6156d781c2192f56c36897991c3b7a9ddc4c92b76528c02fc17811706ed95515552cf2a652bab4b4210418560f4929d45e389694f0d30a0791c047fab SHA512 99578fcc7b3315f49b2fd961227f44c77cbdb7dba7fe2a66707e3b92d7e5896defb3646bcf2455d6dc94c6746275e0bcbd267932b0879f2c6293a8231bd002e2
 MISC metadata.xml 340 BLAKE2B 4c4c3b7410b06d8ff004993d17abe9ed397cb17387a2f191807055344f3a7375dcd784c95d44398d896ac837e1d7ab81332ccda9661102b380658a3eb3e1b43c SHA512 1a018c4df5563e9d8ea3a157517562d6a03ba43fc5df3a3e5ac5867e5b7e577ac14f20bcacd460be3f18c28a2580946d6ef0cbf3c82d0e8f8a853dee48d0c8b0
diff --git a/sci-calculators/calcoo/calcoo-1.3.18-r1.ebuild b/sci-calculators/calcoo/calcoo-1.3.18-r2.ebuild
index ed6619f18b9e..2f1eeab77801 100644
--- a/sci-calculators/calcoo/calcoo-1.3.18-r1.ebuild
+++ b/sci-calculators/calcoo/calcoo-1.3.18-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools desktop
 
@@ -12,17 +12,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=( "${FILESDIR}"/${P}-gold.patch )
 
 src_prepare() {
 	default
-	mv configure.{in,ac} || die
 	eautoreconf
 }
 
@@ -32,6 +30,7 @@ src_configure() {
 
 src_install() {
 	default
+
 	newicon src/pixmaps/main.xpm ${PN}.xpm
 	make_desktop_entry ${PN} Calcoo ${PN} "Education;Math"
 }
diff --git a/sci-calculators/tiemu/Manifest b/sci-calculators/tiemu/Manifest
index 6bf871537a43..f4b702b53eaf 100644
--- a/sci-calculators/tiemu/Manifest
+++ b/sci-calculators/tiemu/Manifest
@@ -2,5 +2,5 @@ AUX tiemu-3.03-fix-ftbfs-with-customized-abort-function.patch 417 BLAKE2B 8e0ba1
 AUX tiemu-3.03-r2820.patch 797 BLAKE2B a333d890ab0aed23ebec5ddaa41c728d7e92acb0b28ac8fea65cec92537d724b32ba00b26b2aba5714ff978c6bdd8aee8e8060d144d1d739b40cb1da3b7e886d SHA512 303b2c070131127fec872b1e53ad8a25dd26ab9e85bc6812351b26e7c0c3fcec7ce50d68d7964b47f3f1f68092e0ebc5b9fe499c811981aed28a1aeb702f4a4e
 AUX tiemu-3.03-remove_depreciated_gtk_calls.patch 5232 BLAKE2B 15c2016b9d73da648b8a8b62204a9901798a7c2129517c8bd1281f386f02e30c4e5eee885543eaff73d7041430b135048c34cd936ce10d08c310cb7f594d2f0a SHA512 7c5f254312086f1b1841c0abd2c6529f52fbfbbfb32c4621363fe58d6f0cfbaaeca610c7136e4d27a0393e88fadd098781db81ca144fb94c5c44d0d7744d53a3
 DIST tiemu_3.03.orig.tar.gz 27343892 BLAKE2B 3fd5a14deb47ad0753f97f7707e1c3fa78477a6afa9a7afa99953fa77cb4d79d5ff8160dce87d24622e0fd2a95b3f35789ba1711e0eb94ce664ac329ce9fb16c SHA512 417f57b14ff603bc35ec1dcd7e6a884c28dc9decddcf775318cac1db383907a59d24dcef3c96324703a896672bd54caa51220126edd9e6c1642d87c4e75e127a
-EBUILD tiemu-3.03-r1.ebuild 1560 BLAKE2B f19ee0cee4ef2460f687da697074e5d5e96e76ae2ff8060617ef0b8836a29b366a4c12858cfa0abf870488d060ef0497e838fa0a7fcb34bbf4bde17546096764 SHA512 67d6efb06c4563bf9571e7f70e181001b14ce400e9053cbde1aa70174e43a73b7f73119a361aae53b3f16689b0b63b53dc9db447c96222b84bb16324c268afb6
+EBUILD tiemu-3.03-r2.ebuild 1572 BLAKE2B 5351d927f9e0723884812f0df4a078005411e86700d800b9bdc073b84b7dd3920432732b5b3341d4a0528eda6d98e48eb393076abd6bd64ecbc7e398fae8ac6e SHA512 a356829afbad46538d55a4ead7a619755fd7e3f87158c2c0743d2194dfdae9215763885644bc59d9594f6e9093dbc1a97ebfb44ed30d78283e4983ba6b798e2b
 MISC metadata.xml 676 BLAKE2B e6dbb65c2f08850353d6058208445a9bf319367a3eb5f5feb64cc033d86e95f935f32c19d043568a5935f51370e4f53f7136961c836a00eed68914a7b5d6750d SHA512 183c4ad404e44ff9c217d6ed86031719f9fdb8e60d6cfc95825f2c3cb9dd97a021ef5b7130bf4eda671a8c5fbc2ddb5c7584bdca2e5a17cc9ddc0d59aedd181c
diff --git a/sci-calculators/tiemu/tiemu-3.03-r1.ebuild b/sci-calculators/tiemu/tiemu-3.03-r2.ebuild
index 62b0cee3d4f5..ef5c95e0d072 100644
--- a/sci-calculators/tiemu/tiemu-3.03-r1.ebuild
+++ b/sci-calculators/tiemu/tiemu-3.03-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit desktop
 
 DESCRIPTION="Texas Instruments hand-helds emulator"
@@ -13,21 +14,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="dbus nls sdl threads xinerama"
 
-RDEPEND="sci-libs/libticables2
+RDEPEND="
+	gnome-base/libglade:2.0
+	sci-libs/libticables2
 	sci-libs/libticalcs2
 	sci-libs/libtifiles2
 	sci-libs/libticonv
-	gnome-base/libglade:2.0
 	x11-libs/gtk+:2
 	dbus? ( >=dev-libs/dbus-glib-0.60 )
 	nls? ( virtual/libintl )
 	sdl? ( media-libs/libsdl )
 	xinerama? ( x11-libs/libXinerama )"
-
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
 	xinerama? ( x11-base/xorg-proto )"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-remove_depreciated_gtk_calls.patch
@@ -57,7 +59,8 @@ src_configure() {
 
 src_install() {
 	default
-	rm -f "${ED%/}"/usr/share/tiemu/{Manpage.txt,COPYING,RELEASE,AUTHORS,LICENSES} || die
+
+	rm -f "${ED}"/usr/share/tiemu/{Manpage.txt,COPYING,RELEASE,AUTHORS,LICENSES} || die
 	make_desktop_entry tiemu "TiEmu Calculator" \
 		"${EPREFIX}"/usr/share/tiemu/pixmaps/icon.xpm
 }
diff --git a/sci-calculators/tilp2/Manifest b/sci-calculators/tilp2/Manifest
index dc578cffddce..133e2a66a8ae 100644
--- a/sci-calculators/tilp2/Manifest
+++ b/sci-calculators/tilp2/Manifest
@@ -1,4 +1,4 @@
 AUX tilp2-1.18-nonbash.patch 434 BLAKE2B 6ad5ddeef2c3df0bf782ecd5db84eb4562de839e18105ed092e3e69d18887324cacd6df7a1d3324eff4d11add30e4183d41b887e7a4c32491b1546081781891c SHA512 e3b7313a25ef18de243c8c1c0950f3e3c9811aeda77f811f8a717d683e03309f3d84bdc34ca8699cf8625ec927e8bffad2213409cec7f8d1cc8e1620b0e2d4b3
 DIST tilp2-1.18.tar.bz2 536744 BLAKE2B 819e34954a917b2fb100a6b74cf3c95ba32dd0d2824f4fc27960b275ad48d9a32393671f134b87296723a9f0b67c8d40b835355a2648be8fe81a89a4bc82e17d SHA512 8e46337e1ac7de85d88d4cb677910a099cdb6d3f473cdf8ca751a45dd66410b11751cd4555116c9249aa53bd23105957b4b2af2247968ec840da68aeed105f5f
-EBUILD tilp2-1.18.ebuild 1304 BLAKE2B 9acf150350892ed4a56cca27684600999d3001ee32790a0c9f6ead909f52453afbbcd1a34201512dfb38f6f52d550bb52310ff59a855db6ff3ba309b5ecb1054 SHA512 78c5ae2676557fa7053e5cdb4b25e8329ae4bdc309c767b57fa0cf81cfdfcda1c43639364aac525cc29d79ab4db37769ae7dfb0b84fe085257682e857df9e92d
+EBUILD tilp2-1.18-r1.ebuild 1282 BLAKE2B 58bdb470beb94a94fb07c543ae64e083380a8c923cb1973921dae3fc9628b9485d17dec4d574cde4ae39fb4efaf12610442d9b0665398c67736b6dbeb609eb3c SHA512 eeaf662e94683fa44dd4cacd56bc8dcc3464e06cfd5ff8867fb72c53ab6ab3c3a32a31a5e6793db013a7dd06d0a535117776c80086a201901446d40a0663e287
 MISC metadata.xml 587 BLAKE2B 6009280493400b5ca1bf63023227ef0da35b3c2e9930a57c9b86ffd493e8594dd303e8bcffae7994a9f15d67f68790d7e90d8dd5a88ce072d15dfe7f850155b5 SHA512 77301234f5ba674d1f9935213a66db6779a1fc630e793e28d292043f44e52c4c5dfa33bf70153ad54bfb874f200d69c02c0bf811e78df0ee74b9596349d30c11
diff --git a/sci-calculators/tilp2/tilp2-1.18.ebuild b/sci-calculators/tilp2/tilp2-1.18-r1.ebuild
index 5cad6f355541..ff566c357e29 100644
--- a/sci-calculators/tilp2/tilp2-1.18.ebuild
+++ b/sci-calculators/tilp2/tilp2-1.18-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools xdg
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls static-libs"
+IUSE="nls"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -22,32 +22,30 @@ RDEPEND="
 	>=sci-libs/libtifiles2-1.1.7
 	>=sci-libs/libticonv-1.1.5
 	x11-libs/gtk+:2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18-nonbash.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-1.18-nonbash.patch )
 
 src_prepare() {
 	default
 	# The ac macro AC_PATH_KDE was provided by "acinclude.m4" in 1.17.
 	# This file is missing in the current version which will cause an autoconf error.
 	# But since we don't build with kde support, we may safely remove all its reverse dependencies.
-	sed -i -e '/AC_PATH_KDE/d' configure.ac
+	sed -i -e '/AC_PATH_KDE/d' configure.ac || die
 	sed -i \
 		-e 's/@[^@]*\(KDE\|QT\|KIO\)[^@]*@//g' \
 		-e 's/@X_LDFLAGS@//g' \
-		src/Makefile.am
+		src/Makefile.am || die
 	eautoreconf
 }
 
 src_configure() {
 	# kde seems to be kde3 only
-	econf --without-kde \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
+	econf \
+		--without-kde \
+		$(use_enable nls)
 }