More cleanups

10 files changed, 40 insertions, 48 deletions

diff --git a/app-misc/open-plc-utils/Manifest b/app-misc/open-plc-utils/Manifest
index e405af1..fea2221 100644
--- a/app-misc/open-plc-utils/Manifest
+++ b/app-misc/open-plc-utils/Manifest
@@ -1 +1 @@
-EBUILD open-plc-utils-9999.ebuild 779 BLAKE2B c1a0de1e58ac640d6bdaa84160592478f73e71428dcd424cdede7920a39634865b04ff23224077009a07b56b4324241da53bba9d7f08472a91c139bea20a8a89 SHA512 b9d3bc2a411578281b5a4b99e6114edb36edd55534113498763af76a9e5be0975daa7bdf9bf1043323857ee2454fd63d82c5f6fb118fb3d805341cbac7bf81b9
+EBUILD open-plc-utils-9999.ebuild 760 BLAKE2B 6ddd50043f62f22a9756d61907a4d6ac4457bc5964f4e5b49645ae7dbd31854582d2a91eec1cb60be2f5aecab1179154faf0127fef5fe88ccc1647ecfb4203a7 SHA512 abd8bb9dae61ed9cb0ce2afbb04efe20accf83930bb3f4d8bea65567d4d00c299a2986844f5d3d8a0162790a1fff02ca11f02760027b8e5db75641d742ebd78b
diff --git a/app-misc/open-plc-utils/open-plc-utils-9999.ebuild b/app-misc/open-plc-utils/open-plc-utils-9999.ebuild
index 58a83a7..6a5c618 100644
--- a/app-misc/open-plc-utils/open-plc-utils-9999.ebuild
+++ b/app-misc/open-plc-utils/open-plc-utils-9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI=5
+EAPI=7
 
 if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
@@ -25,7 +24,7 @@ RDEPEND=""
 DEPEND="${RDEPEND}"
 
 src_install() {
-    emake ROOTFS="${D}" install || die "emake install failed"
-    emake ROOTFS="${D}" manuals || die "emake manuals failed"
-    use doc && dohtml -r docbook
+	emake ROOTFS="${D}" install || die "emake install failed"
+	emake ROOTFS="${D}" manuals || die "emake manuals failed"
+	use doc && dohtml -r docbook
 }
diff --git a/app-portage/epm/Manifest b/app-portage/epm/Manifest
index b367efc..5d3341a 100644
--- a/app-portage/epm/Manifest
+++ b/app-portage/epm/Manifest
@@ -1,3 +1,3 @@
 AUX epm 30664 BLAKE2B 72988b0b08616761367b98dc3c698e0d352e2c442d0bcc1c77b2bfcd0009cb06bd27572e93d727babeca5bc353a3e7db43a8d7997e316a9e3b41b434e1d93a11 SHA512 75ae3fb03be9508f357f020310fba1e2d89513782ea57cb39f5a524b8cf5ded95c45bc4fbe0bfd195902c25f286119cf54501de64a2f082a69ea0ca55968175a
 AUX epm-1.40-prefix.patch 1293 BLAKE2B 6d835610fce455f6089867b2fd7e959b5dffff07f72a96a9a8a2be3fb4033822967098e32f859b836c25cc8d463b9ae950a7337f65c261ceb538a0dac14a842c SHA512 877204c75356b36df74ace94fe26a09f598448cbf502b7d65fec9d4b142368c4734e16807e5e4706671d8a59bc7db09811166f422d43d74a40fae5ff65e8c256
-EBUILD epm-1.40.ebuild 675 BLAKE2B 6bacf694e05b2334e72b2686c5340675ab8434102a818c33e252b7bd82c9a8db8f25224f88b8009954ef7cc55ec969db6ee44a880fd95f92baedb5f5d1e5c40c SHA512 f22ddc4e4a5719684e55406970adef1d1bbdbf2a28017465eb7f6d6c37fa1c392b9a56621afc9c3b6dc56daa2e842ecf10cab0c734fc4a569ec83f5994e945ca
+EBUILD epm-1.40.ebuild 667 BLAKE2B c94ce19ccab266b56079ab7c5b7220af2fc47988d12731f22760418225c65e3f4bbd4d552dcd5731aa667d4ab82c67ee341da3514de51fcd3e2aef975ad77411 SHA512 d115f1cbea2103922c906092e6b8404c04a25eab885eca6b60d2bc3c95b876c093f981829768d5397438e6a9f146da9fe68bbcdf168da134d28acdc6661ef8d9
diff --git a/app-portage/epm/epm-1.40.ebuild b/app-portage/epm/epm-1.40.ebuild
index f03c083..1d75273 100644
--- a/app-portage/epm/epm-1.40.ebuild
+++ b/app-portage/epm/epm-1.40.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="7"
 
@@ -23,8 +22,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	cp "${FILESDIR}"/epm ${S}/epm
-	epatch "${FILESDIR}"/${P}-prefix.patch
+	cp "${FILESDIR}"/epm "${S}"/epm
+	epatch "${FILESDIR}/${P}"-prefix.patch
 	eprefixify epm
 }
 
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index db48589..1571243 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1 +1 @@
-EBUILD luajit-2.1.9999.ebuild 1208 BLAKE2B fe2159983909b6177d38ee0643d67ddd61ee9cd8abd9b9aef62c4df76ef6017e328921cb8b8ca30b4b2c57f77651df0153b36f41f3c36f5053c9cdd5325d7731 SHA512 24ba23d3c2cbfc13b0f7c2bdf7894add1d13307e9e17ae594c08e0895681188ca49528b09af087c794f42d0c7e33c633e38bb77a91e3550f3c31323461cb547b
+EBUILD luajit-2.1.9999.ebuild 1176 BLAKE2B d32e9f050c2a00f118d150a586c21736faa62b27d0e5382d1dce3d4f2f87c1c241955119b7ac7f41a47a4a8fd8ba2f726115f0cc84627ac1204c1b2ce8e679a9 SHA512 fdf55a2b12da42953f3b13f8bff7b577852fd527a7e8713ce7048e0eddb2c013a7e10da714f306dd66234c45990f8f50366fbee8bdd3532f3eb5607cb7cdf92d
diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild
index c0cb360..5993d07 100644
--- a/dev-lang/luajit/luajit-2.1.9999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit pax-utils toolchain-funcs versionator git-r3
+inherit pax-utils toolchain-funcs git-r3
 
-#MY_PV="$(get_version_component_range 1-4)"
+#MY_PV="$(ver_cut 1-4)"
 #MY_PV="${MY_PV/_beta/-beta}"
 MY_PV="2.1.0-beta3"
 
diff --git a/dev-lang/squeakvm/Manifest b/dev-lang/squeakvm/Manifest
index 0478227..bac05e0 100644
--- a/dev-lang/squeakvm/Manifest
+++ b/dev-lang/squeakvm/Manifest
@@ -1,2 +1,2 @@
 DIST Squeak-4.10.2.2614-src.tar.gz 3297314 BLAKE2B 03c89ea96ed005f1d7a25e6b1016f39bec2dbd7e2282a12c1b02ab57859477d87e3098426c55411fc06e250207830b7e50a23e6330ca64fd967613f2af86e180 SHA512 b823fb97f7826dbbae5feeb15ffc3ab7e11cf27c5a3cc3f2cf2f8c39b56af5f9d0078d020a4b8f72b997198d296be6d85ec10e0bca10d5214bf586e1e0587f07
-EBUILD squeakvm-4.10.2.2614.ebuild 3921 BLAKE2B dc33239856722575aa2d2ec0d60f9a0b5f0b95ff125bc8d2826785fe3e9aca299325f81919a4f97b8fb3358adfb50fa440692091d7593560c2d5895846e29ae9 SHA512 c63d2f2880fde6fc3f76a3e11b4fcaf03c36aba8ad048d786271911268409047f514f2333a327ecb6b26ca3022b57bd62e8f296b6f0d3e3efa32bfa89461e4c1
+EBUILD squeakvm-4.10.2.2614.ebuild 3873 BLAKE2B 2be33c6ca4b011557ad37855b1bcd1e4985e6da7c871a6c7be44bdac282af37c387914bbb1ca4243d411e3dda5291f8c7b982e50154def30c81a4d1e4d3b1109 SHA512 7d5ed1b91f1bd639026336c13bd0681f9e78c6419bf3dbe7ae4f8eb97dcc4a502c3a6831d9bd159e6b97dc707d0a20b1bb1a137dcf353dcf3387774ee35c362b
diff --git a/dev-lang/squeakvm/squeakvm-4.10.2.2614.ebuild b/dev-lang/squeakvm/squeakvm-4.10.2.2614.ebuild
index 8071784..baa6678 100644
--- a/dev-lang/squeakvm/squeakvm-4.10.2.2614.ebuild
+++ b/dev-lang/squeakvm/squeakvm-4.10.2.2614.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit versionator fixheadtails
+
+EAPI=7
+inherit fixheadtails
 DESCRIPTION="Highly-portable Smalltalk-80 implementation"
 HOMEPAGE="http://www.squeak.org/"
 SRC_URI="http://squeakvm.org/unix/release/Squeak-${PV}-src.tar.gz"
@@ -10,7 +11,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+X +mmx +threads +iconv +opengl image64 alsa oss pulseaudio nas +v4l fbcon dbus +scratch examples"
 
-
 DEPEND="X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
 	dev-util/cmake
 	media-libs/freetype
@@ -23,7 +23,7 @@ DEPEND="X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXt )
 	opengl? ( virtual/opengl )
 	v4l? ( >=media-libs/libv4l-0.5.8 )
 	alsa? ( media-libs/alsa-lib )
-	oss? ( || ( media-libs/alsa-oss  media-sound/oss ) )
+	oss? ( media-libs/alsa-oss )
 	pulseaudio? ( media-sound/pulseaudio )
 	nas? ( media-libs/nas )
 	dbus? ( sys-apps/dbus )"
@@ -42,93 +42,88 @@ src_prepare() {
 
 src_configure() {
 	local myconf=""
-	if use X; then	
+	if use X; then
 		myconf="${myconf} --with-x"
 	else
 	    myconf="${myconf} --without-x"
 	fi
-	if use threads; then	
+	if use threads; then
 		myconf="${myconf} --enable-mpg-pthread"
 	else
 	    myconf="${myconf} --disable-mpg-pthread"
 	fi
-	if use iconv; then	
+	if use iconv; then
 		myconf="${myconf} --enable-iconv"
 	else
 	    myconf="${myconf} --disable-iconv"
 	fi
 
-	if use opengl; then	
+	if use opengl; then
 		myconf="${myconf} --with-gl"
 	else
 	    myconf="${myconf} --without-gl"
 	fi
 
-	if use alsa; then	
+	if use alsa; then
 		myconf="${myconf} --with-alsa"
 	else
 	    myconf="${myconf} --without-alsa"
 	fi
 
-	if use oss; then	
+	if use oss; then
 		myconf="${myconf} --with-oss"
 	else
 	    myconf="${myconf} --without-oss"
 	fi
 
-	if use pulseaudio; then	
+	if use pulseaudio; then
 		myconf="${myconf} --with-pulse"
 	else
 	    myconf="${myconf} --without-pulse"
 	fi
 
-	if use nas; then	
+	if use nas; then
 		myconf="${myconf} --with-NAS"
 	else
 	    myconf="${myconf} --without-NAS"
 	fi
 
-	if use v4l; then	
+	if use v4l; then
 		myconf="${myconf} --with-CameraPlugin"
 	else
 	    myconf="${myconf} --without-CameraPlugin"
 	fi
 
-	if use fbcon; then	
+	if use fbcon; then
 		myconf="${myconf} --with-fbdev"
 	else
 	    myconf="${myconf} --without-fbdev"
 	fi
 
-	if use dbus; then	
+	if use dbus; then
 		myconf="${myconf} --with-DBusPlugin"
 	else
 	    myconf="${myconf} --without-DBusPlugin"
 	fi
 
-	if use scratch; then	
+	if use scratch; then
 		myconf="${myconf} --with-ScratchPlugin"
 	else
 	    myconf="${myconf} --without-ScratchPlugin"
 	fi
 
-
-	if use X; then	
+	if use X; then
 		myconf="${myconf} --with-x"
 	else
 	    myconf="${myconf} --without-x"
 	fi
 
-
-	if use X; then	
+	if use X; then
 		myconf="${myconf} --with-x"
 	else
 	    myconf="${myconf} --without-x"
 	fi
 
-
-
-
 	#use mmx 		&& myconf="${myconf} --enable-mpg-mmx"
 	#use threads 	&& myconf="${myconf} --enable-mpg-pthread"
 	#use iconv 		|| myconf="${myconf} --disable-iconv"
@@ -143,7 +138,7 @@ src_configure() {
 	#use dbus		|| myconf="${myconf} --without-DBusPlugin"
 	#use scratch		|| myconf="${myconf} --without-ScratchPlugin"
 
-	cd ${S}
+	cd "${S}"
 	touch unix/npsqueak/CMakeLists.txt
 	mkdir build
 	cd build
@@ -164,8 +159,8 @@ src_configure() {
 
 src_install() {
 	dodoc README unix/ChangeLog
-	cd ${S}/build
-	emake DESTDIR=${D} ROOT=${D} docdir=/usr/share/doc/${PF} install || die
+	cd "${S}"/build
+	emake DESTDIR="${D}" ROOT="${D}" docdir=/usr/share/doc/"${PF}" install || die
 	exeinto /usr/lib/squeak
 	exeinto /usr/lib/ckformat
 }
diff --git a/dev-perl/Unicode-CaseFold/Manifest b/dev-perl/Unicode-CaseFold/Manifest
index 7677d1e..8e0ae76 100644
--- a/dev-perl/Unicode-CaseFold/Manifest
+++ b/dev-perl/Unicode-CaseFold/Manifest
@@ -1,2 +1,2 @@
 DIST Unicode-CaseFold-1.00.tar.gz 65145 BLAKE2B 7b16031ee06d6f1c6bcde184941c13f64b3f65c4888e59354adf8e9090d28138f08b9534fbf529dca8dab8f6cbe2588b3ff4878a5fd48246ebfe3636dcb760fa SHA512 e947129b05759f1f0d3efa7b8793f47dd0ed4e3c8f105523badecc58d8e9a7c4d79984c172bd4114fe6462adb45500fbebffb1e4ecbf0427a54d535cfb55874d
-EBUILD Unicode-CaseFold-1.00.ebuild 589 BLAKE2B e433b72b4b9243fff32361332c8f2e37bdf22a3165b38bdcec422838ebefed061c3c6ca0e719f4b653607348b60804f5ed69a09246a854def71971d8c5bb28b2 SHA512 56480eed97d63bf90b6ce1e284aef0490b938b8638fac21ffe6916fa56920bf66e5aa1e971674b02d89d93baca8c5b6faac3a435d3a4d5fbbaeeca4bc9411af7
+EBUILD Unicode-CaseFold-1.00.ebuild 573 BLAKE2B 9d266657fcd05600d584f15d5dd91f01f60c85821233ee8035942d5c17f795c7dac47733441acd41091628d46ad7e50147d7411349b46d0f800b14fe5174abb1 SHA512 bedaff829d3ced178145f5d6fe70ccfa6f7a4357e9d924b77c0d863c9b768b004fdab0cacdc5997110ff0b93680151dea09c72cfb353fc1271c07548db8d8a52
diff --git a/dev-perl/Unicode-CaseFold/Unicode-CaseFold-1.00.ebuild b/dev-perl/Unicode-CaseFold/Unicode-CaseFold-1.00.ebuild
index 1b81510..6e712d6 100644
--- a/dev-perl/Unicode-CaseFold/Unicode-CaseFold-1.00.ebuild
+++ b/dev-perl/Unicode-CaseFold/Unicode-CaseFold-1.00.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=5
+EAPI=7
 
 inherit perl-module