More cleanups

4 files changed, 27 insertions, 32 deletions

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
 }