From 83e4ddc711b08f5e0456d1b6087224145cefe9ac Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 18 Aug 2017 04:23:44 +0000
Subject: main/ruby: modernise, move 'make test' to check phase

---
 main/ruby/APKBUILD | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'main/ruby')

diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 0e94aa353a..d4b7c96f98 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=ruby
 pkgver=2.4.1
 _abiver="${pkgver%.*}.0"
-pkgrel=4
+pkgrel=5
 pkgdesc="An object-oriented language for quick and easy programming"
 url="http://www.ruby-lang.org/en/"
 arch="all"
@@ -44,7 +44,7 @@ case "$CARCH" in
 esac
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	cd "$builddir"
 	autoconf
@@ -78,19 +78,22 @@ build() {
 		--enable-pthread \
 		--disable-rpath \
 		--enable-shared \
-		--with-mantype=man \
-		|| return 1
-	make || return 1
-	make test || return 1
+		--with-mantype=man
+	make
+}
+
+check() {
+	cd "$builddir"
+	make test
 }
 
 package() {
 	cd "$builddir"
 
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 
 	install -m 644 -D COPYING \
-		"$pkgdir"/usr/share/licenses/$pkgname/COPYING || return 1
+		"$pkgdir"/usr/share/licenses/$pkgname/COPYING
 
 	rm -R "$pkgdir"$_gemdir/cache/*
 
-- 
cgit v1.2.3