Merge branch 'bump.djt.20190417' into 'master'

djt package bumps for 2019-05-03



See merge request !227

21 files changed, 445 insertions, 134 deletions

diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD
index 45583d16a..5c9e06bd5 100644
--- a/user/nano/APKBUILD
+++ b/user/nano/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=nano
-pkgver=3.1
+pkgver=4.2
 pkgrel=0
 pkgdesc="Enhanced clone of the Pico text editor"
 url="https://www.nano-editor.org"
@@ -44,4 +44,4 @@ package() {
 	rm -rf "$pkgdir"/usr/lib/charset.alias
 }
 
-sha512sums="dc50381a129fec32d85982d8129324268e3e27a28c5b958fb7bcfca690646bd0a3b995dc456971355b91952c0ac3ea3e0a873b228010238a76e8dbb0ddaf1143  nano-3.1.tar.xz"
+sha512sums="280c986ebbc83875270da659232910568bcade962b75ddf9ddc2af6e0fb9aab2b0d029a80d632b5c67fc385958ef4d724aafeeb10299c9e2bc281e737a11845c  nano-4.2.tar.xz"
diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD
index a0c2d1533..312916128 100644
--- a/user/postfix/APKBUILD
+++ b/user/postfix/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=postfix
-pkgver=3.3.2
-pkgrel=2
+pkgver=3.4.5
+pkgrel=0
 pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside"
 url="http://www.postfix.org/"
 arch="all"
@@ -91,6 +91,6 @@ sqlite() {
 	_database "sqlite" "SQLite 3"
 }
 
-sha512sums="df67eb978751900d357597def16f744dae990f5cc4e48af8dca57f84b0140e05416712727c1760b8f557ed3564cd593620756561b0a6f31db4b54d928e15293f  postfix-3.3.2.tar.gz
+sha512sums="af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94  postfix-3.4.5.tar.gz
 63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc  honour-config-directory.patch
 2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592  postfix.initd"
diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD
index f8ff737a6..ea147080d 100644
--- a/user/protobuf/APKBUILD
+++ b/user/protobuf/APKBUILD
@@ -1,10 +1,9 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
-# TODO: Build Python module, and clean up Ruby build process
 pkgname=protobuf
 _gemname=google-protobuf
-pkgver=3.6.1
+pkgver=3.7.1
 _tstver=1.8.0
 pkgrel=0
 pkgdesc="Library for extensible, efficient structure packing"
@@ -12,13 +11,12 @@ url="https://github.com/google/protobuf"
 arch="all"
 license="BSD-3-Clause"
 depends_dev="zlib-dev"
-makedepends="$depends_dev autoconf automake libtool ruby ruby-dev ruby-rake"
-subpackages="ruby-$_gemname:_ruby $pkgname-dev $pkgname-vim::noarch"
+makedepends="$depends_dev autoconf automake libtool ruby ruby-dev ruby-rake
+	ruby-rake-compiler python3 python3-dev"
+checkdepends="ruby-json ruby-test-unit"
+subpackages="ruby-$_gemname:_ruby py3-$pkgname:_python $pkgname-dev $pkgname-vim::noarch"
 source="$pkgname-$pkgver.tar.gz::https://github.com/google/$pkgname/archive/v$pkgver.tar.gz
-	googletest-$_tstver.tar.gz::https://github.com/google/googletest/archive/release-$_tstver.tar.gz
-	musl-fix.patch
-	trim-rakefile.patch"
-builddir="$srcdir/$pkgname-$pkgver"
+	googletest-$_tstver.tar.gz::https://github.com/google/googletest/archive/release-$_tstver.tar.gz"
 
 prepare() {
 	default_prepare
@@ -33,8 +31,8 @@ prepare() {
 }
 
 build() {
+	# Build Protobuf
 	cd "$builddir"
-
 	CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" LDFLAGS="$LDFLAGS -latomic" \
 		./configure --prefix=/usr \
 			--sysconfdir=/etc \
@@ -43,11 +41,10 @@ build() {
 			--localstatedir=/var
 	make
 
+	# Build for Ruby
 	cd "$builddir"/ruby
-
 	# Generate proto files for built-in protocols.
 	rake genproto
-
 	gem build $_gemname.gemspec
 	gem install --local \
 		--install-dir dist \
@@ -56,7 +53,12 @@ build() {
 		--verbose \
 		$_gemname
 
-	# build test-suite
+	# Build for Python 3
+	cd "$builddir"/python
+	export LD_LIBRARY_PATH=${builddir}/src/.libs
+	python3 setup.py build --cpp_implementation
+
+	# Build test-suite
 	local test; for test in googletest googlemock; do
 		cd "$builddir/third_party/googletest/$test"
 		autoreconf -vfi
@@ -65,10 +67,13 @@ build() {
 	done
 }
 
-# TODO: Run tests for ruby gem.
 check() {
 	cd "$builddir"
 	make check
+	cd "$builddir"/ruby
+	rake test
+	cd "$builddir"/python
+	python3 setup.py test --cpp_implementation
 }
 
 package() {
@@ -93,6 +98,14 @@ _ruby() {
 	rm -r ext/ tests/
 }
 
+_python() {
+	pkgdesc="Python bindings to Google's data interchange format"
+
+	cd "$builddir"/python
+	python3 setup.py install --prefix=/usr --root="$subpkgdir" \
+		--cpp_implementation
+}
+
 vim() {
 	pkgdesc="Vim syntax for $pkgname"
 	depends=""
@@ -102,7 +115,5 @@ vim() {
 		"$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim
 }
 
-sha512sums="1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839  protobuf-3.6.1.tar.gz
-1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d  googletest-1.8.0.tar.gz
-875592bc5dc5efe9087ea1b340673f54c984ecd5aa3b110a2da136bdc28009af7ce1a9c57f4747ff809fc02eb6c39a0209c277177172af467a54172d9700188a  musl-fix.patch
-d1d11fe76d2a1ae92f47f9eb1e0d94c67b7192a9dc4a382b6c0835f4fe4dbc2f98ca1b3c5095ad5b4e368581072330f943209c0decea02ebb47938588543fdb1  trim-rakefile.patch"
+sha512sums="7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f  protobuf-3.7.1.tar.gz
+1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d  googletest-1.8.0.tar.gz"
diff --git a/user/protobuf/musl-fix.patch b/user/protobuf/musl-fix.patch
deleted file mode 100644
index 442ca20ed..000000000
--- a/user/protobuf/musl-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-seems like both musl libc and android has byteswap.h
-
---- a/src/google/protobuf/stubs/port.h
-+++ b/src/google/protobuf/stubs/port.h
-@@ -94,7 +94,7 @@
- #include <intrin.h>
- #elif defined(__APPLE__)
- #include <libkern/OSByteOrder.h>
--#elif defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__)
-+#elif defined(__linux__) || defined(__BIONIC__) || defined(__CYGWIN__)
- #include <byteswap.h>  // IWYU pragma: export
- #endif
- 
-@@ -380,7 +380,7 @@ inline void GOOGLE_UNALIGNED_STORE64(voi
- #define bswap_32(x) OSSwapInt32(x)
- #define bswap_64(x) OSSwapInt64(x)
- 
--#elif !defined(__GLIBC__) && !defined(__BIONIC__) && !defined(__CYGWIN__)
-+#elif !defined(__linux__) && !defined(__BIONIC__) && !defined(__CYGWIN__)
- 
- static inline uint16 bswap_16(uint16 x) {
-   return static_cast<uint16>(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8));
diff --git a/user/protobuf/trim-rakefile.patch b/user/protobuf/trim-rakefile.patch
deleted file mode 100644
index 7f53d7099..000000000
--- a/user/protobuf/trim-rakefile.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Remove code that we don't use to avoid installing additional dependencies.
---- a/ruby/Rakefile
-+++ b/ruby/Rakefile
-@@ -1,6 +1,4 @@
- require "rubygems"
--require "rubygems/package_task"
--require "rake/extensiontask" unless RUBY_PLATFORM == "java"
- require "rake/testtask"
- 
- spec = Gem::Specification.load("google-protobuf.gemspec")
-@@ -39,51 +37,6 @@
-   end
- end
- 
--if RUBY_PLATFORM == "java"
--  if `which mvn` == ''
--    raise ArgumentError, "maven needs to be installed"
--  end
--  task :clean do
--    system("mvn --batch-mode clean")
--  end
--
--  task :compile do
--    system("mvn --batch-mode package")
--  end
--else
--  Rake::ExtensionTask.new("protobuf_c", spec) do |ext|
--    unless RUBY_PLATFORM =~ /darwin/
--      # TODO: also set "no_native to true" for mac if possible. As is,
--      # "no_native" can only be set if the RUBY_PLATFORM doing
--      # cross-compilation is contained in the "ext.cross_platform" array.
--      ext.no_native = true
--    end
--    ext.ext_dir = "ext/google/protobuf_c"
--    ext.lib_dir = "lib/google"
--    ext.cross_compile = true
--    ext.cross_platform = [
--      'x86-mingw32', 'x64-mingw32',
--      'x86_64-linux', 'x86-linux',
--      'universal-darwin'
--    ]
--  end
--
--  task 'gem:windows' do
--    require 'rake_compiler_dock'
--    RakeCompilerDock.sh "bundle && IN_DOCKER=true rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0"
--  end
--
--  if RUBY_PLATFORM =~ /darwin/
--    task 'gem:native' do
--      system "rake genproto"
--      system "rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0"
--    end
--  else
--    task 'gem:native' => [:genproto, 'gem:windows']
--  end
--end
--
--
- # Proto for tests.
- genproto_output << "tests/generated_code.rb"
- genproto_output << "tests/test_import.rb"
-@@ -104,9 +57,6 @@
- 
- task :clean do
-   sh "rm -f #{genproto_output.join(' ')}"
--end
--
--Gem::PackageTask.new(spec) do |pkg|
- end
- 
- Rake::TestTask.new(:test => :build) do |t|
diff --git a/user/ruby-diff-lcs/APKBUILD b/user/ruby-diff-lcs/APKBUILD
new file mode 100644
index 000000000..c6f163ada
--- /dev/null
+++ b/user/ruby-diff-lcs/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=ruby-diff-lcs
+_gemname=${pkgname#ruby-}
+pkgver=1.3
+pkgrel=1
+pkgdesc="Generate difference sets between Ruby sequences"
+url="http://halostatue.github.io/diff-lcs/"
+arch="noarch"
+options="!check"  # to avoid cyclic dependency with rspec
+license="MIT"
+depends="ruby"
+subpackages="$pkgname-tools"
+source="$pkgname-$pkgver.tar.gz::https://github.com/halostatue/$_gemname/archive/v$pkgver.tar.gz"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	cd "$builddir"
+	gem build $_gemname.gemspec
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+	local geminstdir="$gemdir/gems/$_gemname-$pkgver"
+
+	cd "$builddir"
+	gem install --local \
+		--install-dir "$gemdir" \
+		--bindir "$pkgdir/usr/bin" \
+		--ignore-dependencies \
+		--no-document \
+		--verbose \
+		$_gemname
+
+	# Remove unnecessary files.
+	cd "$gemdir"
+	rm -r cache/ build_info/ doc/
+	cd "$geminstdir"
+	rm -r autotest/ docs/ spec/ Rakefile *.md *.rdoc *.txt
+}
+
+tools() {
+	pkgdesc="$pkgdesc (CLI tools)"
+	depends="$pkgname=$pkgver-r$pkgrel"
+
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/* "$subpkgdir"/usr/bin/
+}
+
+sha512sums="b455f86ab006cbb823c2f8ed7fcde16c432e3783b6408ec305e57b7f4d0cf98bad586786947414ec3dc27e885b1485e534d26df19eaa9972874d78a8829b501e  ruby-diff-lcs-1.3.tar.gz"
diff --git a/user/ruby-diff-lcs/gemspec.patch b/user/ruby-diff-lcs/gemspec.patch
new file mode 100644
index 000000000..9c0b69ecd
--- /dev/null
+++ b/user/ruby-diff-lcs/gemspec.patch
@@ -0,0 +1,16 @@
+--- a/rspec-core.gemspec
++++ b/rspec-core.gemspec
+@@ -13,11 +13,10 @@
+   s.summary     = "rspec-core-#{RSpec::Core::Version::STRING}"
+   s.description = "BDD for Ruby. RSpec runner and example groups."
+ 
+-  s.files            = `git ls-files -- lib/*`.split("\n")
+-  s.files           += %w[README.md LICENSE.md Changelog.md .yardopts .document]
++  s.files            = Dir['lib/**/*']
+   s.test_files       = []
+   s.bindir           = 'exe'
+-  s.executables      = `git ls-files -- exe/*`.split("\n").map{ |f| File.basename(f) }
++  s.executables      = Dir['exe/*'].map{ |f| File.basename(f) }
+   s.rdoc_options     = ["--charset=UTF-8"]
+   s.require_path     = "lib"
+ 
diff --git a/user/ruby-rake-compiler/APKBUILD b/user/ruby-rake-compiler/APKBUILD
new file mode 100644
index 000000000..a2254eea9
--- /dev/null
+++ b/user/ruby-rake-compiler/APKBUILD
@@ -0,0 +1,46 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=ruby-rake-compiler
+_gemname=${pkgname#ruby-}
+pkgver=1.0.7
+pkgrel=0
+pkgdesc="Provide a standard and simplified way to build and package Ruby extensions"
+url="https://github.com/rake-compiler/rake-compiler"
+arch="noarch"
+license="MIT"
+depends="ruby ruby-rake"
+checkdepends="ruby-rspec"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rake-compiler/$_gemname/archive/v$pkgver.tar.gz
+	gemfile-remove-unwanted-files.patch"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	cd "$builddir"
+	gem build $_gemname.gemspec
+}
+
+check() {
+	cd "$builddir"
+	rspec spec
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	cd "$builddir"
+
+	gem install --local \
+		--install-dir "$gemdir" \
+		--bindir "$pkgdir/usr/bin" \
+		--ignore-dependencies \
+		--no-document \
+		--verbose \
+		$_gemname
+
+	# Remove unnecessary files and empty directories.
+	cd "$gemdir"
+	rm -r cache build_info doc
+}
+
+sha512sums="fa901f5cc48891f07bd8d9a27cf4e745e87d5a667dbee0c9f4b43f9564fdfe3067b9c658f10ea8bcacd32ea7320a542ef0fca9373147057472f5572a4a4c5268  ruby-rake-compiler-1.0.7.tar.gz
+e68672541d62898bc72fb7e40f16bc75ed1d46eabedd18da60a6f0673d67bf63d990e191fb41d6034e3f6361662807030cbd8f0c817223a5d03c46a3a664f855  gemfile-remove-unwanted-files.patch"
diff --git a/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch b/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch
new file mode 100644
index 000000000..3424cd912
--- /dev/null
+++ b/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch
@@ -0,0 +1,26 @@
+--- a/rake-compiler.gemspec
++++ b/rake-compiler.gemspec
+@@ -22,14 +22,8 @@
+   s.add_development_dependency 'cucumber', '~> 1.1.4'
+ 
+   # components, files and paths
+-  s.files = Dir.glob("features/**/*.{feature,rb}")
+   s.files += ["bin/rake-compiler"]
+   s.files += Dir.glob("lib/**/*.rb")
+-  s.files += ["spec/spec.opts"]
+-  s.files += Dir.glob("spec/**/*.rb")
+-  s.files += Dir.glob("tasks/**/*.rake")
+-  s.files += ["Rakefile", "Gemfile"]
+-  s.files += Dir.glob("*.{rdoc,txt,yml}")
+ 
+   s.bindir      = 'bin'
+   s.executables = ['rake-compiler']
+@@ -38,8 +32,6 @@
+ 
+   # documentation
+   s.rdoc_options << '--main'  << 'README.rdoc' << '--title' << 'rake-compiler -- Documentation'
+-
+-  s.extra_rdoc_files = %w(README.rdoc LICENSE.txt History.txt)
+ 
+   # project information
+   s.homepage          = 'https://github.com/rake-compiler/rake-compiler'
diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD
new file mode 100644
index 000000000..34deeb73d
--- /dev/null
+++ b/user/ruby-rspec-core/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=ruby-rspec-core
+_gemname=${pkgname#ruby-}
+pkgver=3.8.0
+pkgrel=0
+pkgdesc="RSpec runner and formatters"
+url="https://relishapp.com/rspec/rspec-core/"
+arch="noarch"
+options="!check"  # rspec's tests are written in rspec
+license="MIT"
+depends="ruby ruby-rspec-support~=${pkgver%.*}"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
+	gemspec.patch"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	cd "$builddir"
+	gem build $_gemname.gemspec
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	cd "$builddir"
+	gem install --local \
+		--install-dir "$gemdir" \
+		--bindir "$pkgdir/usr/bin" \
+		--ignore-dependencies \
+		--no-document \
+		--verbose \
+		$_gemname
+
+	# Clean-up...
+	rm -r "$gemdir"/cache \
+		"$gemdir"/build_info \
+		"$gemdir"/doc
+}
+
+sha512sums="6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6  ruby-rspec-core-3.8.0.tar.gz
+e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2  gemspec.patch"
diff --git a/user/ruby-rspec-core/gemspec.patch b/user/ruby-rspec-core/gemspec.patch
new file mode 100644
index 000000000..0a6cad0d0
--- /dev/null
+++ b/user/ruby-rspec-core/gemspec.patch
@@ -0,0 +1,16 @@
+--- a/rspec-core.gemspec
++++ b/rspec-core.gemspec
+@@ -13,11 +13,10 @@
+   s.summary     = "rspec-core-#{RSpec::Core::Version::STRING}"
+   s.description = "BDD for Ruby. RSpec runner and example groups."
+ 
+-  s.files            = `git ls-files -- lib/*`.split("\n")
+-  s.files           += %w[README.md LICENSE.md Changelog.md .yardopts .document]
++  s.files            = Dir["lib/**/*"]
+   s.test_files       = []
+   s.bindir           = 'exe'
+-  s.executables      = `git ls-files -- exe/*`.split("\n").map{ |f| File.basename(f) }
++  s.executables      = Dir["exe/*"].map{ |f| File.basename(f) }
+   s.rdoc_options     = ["--charset=UTF-8"]
+   s.require_path     = "lib"
+ 
diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD
new file mode 100644
index 000000000..1cf7cf5cc
--- /dev/null
+++ b/user/ruby-rspec-expectations/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=ruby-rspec-expectations
+_gemname=${pkgname#ruby-}
+pkgver=3.8.3
+pkgrel=0
+pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec"
+url="https://relishapp.com/rspec/rspec-expectations/"
+arch="noarch"
+options="!check"  # rspec's tests are written in rspec
+license="MIT"
+depends="ruby ruby-diff-lcs ruby-rspec-support~=${pkgver%.*}"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
+	gemspec.patch"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	cd "$builddir"
+	gem build $_gemname.gemspec
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	cd "$builddir"
+	gem install --local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--no-document \
+		--verbose \
+		$_gemname
+
+	# Clean-up...
+	rm -r "$gemdir"/cache \
+		"$gemdir"/build_info \
+		"$gemdir"/doc
+}
+
+sha512sums="328b3403e7ac2864ed6ad1a196ca24df6693797e35525559f2082c7e1c161d60da7776ca1a68a82364a7ea55115ac2c12ebf6af8486ef88757a4818a9683ae80  ruby-rspec-expectations-3.8.3.tar.gz
+1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346  gemspec.patch"
diff --git a/user/ruby-rspec-expectations/gemspec.patch b/user/ruby-rspec-expectations/gemspec.patch
new file mode 100644
index 000000000..644aad1ad
--- /dev/null
+++ b/user/ruby-rspec-expectations/gemspec.patch
@@ -0,0 +1,12 @@
+--- a/rspec-expectations.gemspec
++++ b/rspec-expectations.gemspec
+@@ -13,8 +13,7 @@
+   s.summary     = "rspec-expectations-#{RSpec::Expectations::Version::STRING}"
+   s.description = "rspec-expectations provides a simple, readable API to express expected outcomes of a code example."
+ 
+-  s.files            = `git ls-files -- lib/*`.split("\n")
+-  s.files           += %w[README.md LICENSE.md Changelog.md .yardopts .document]
++  s.files            = Dir["lib/**/*"]
+   s.test_files       = []
+   s.rdoc_options     = ["--charset=UTF-8"]
+   s.require_path     = "lib"
diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD
new file mode 100644
index 000000000..70a6b801c
--- /dev/null
+++ b/user/ruby-rspec-mocks/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=ruby-rspec-mocks
+_gemname=${pkgname#ruby-}
+pkgver=3.8.0
+pkgrel=0
+pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking"
+url="https://relishapp.com/rspec/rspec-mocks/"
+arch="noarch"
+options="!check"  # rspec's tests are written in rspec
+license="MIT"
+depends="ruby ruby-diff-lcs ruby-rspec-support~=${pkgver%.*}"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
+	gemspec.patch"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	cd "$builddir"
+	gem build $_gemname.gemspec
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	cd "$builddir"
+	gem install --local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--no-document \
+		--verbose \
+		$_gemname
+
+	# Clean-up...
+	rm -r "$gemdir"/cache \
+		"$gemdir"/build_info \
+		"$gemdir"/doc
+}
+
+sha512sums="0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba  ruby-rspec-mocks-3.8.0.tar.gz
+6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d  gemspec.patch"
diff --git a/user/ruby-rspec-mocks/gemspec.patch b/user/ruby-rspec-mocks/gemspec.patch
new file mode 100644
index 000000000..5d4f6e775
--- /dev/null
+++ b/user/ruby-rspec-mocks/gemspec.patch
@@ -0,0 +1,12 @@
+--- a/rspec-mocks.gemspec
++++ b/rspec-mocks.gemspec
+@@ -13,8 +13,7 @@
+   s.summary     = "rspec-mocks-#{RSpec::Mocks::Version::STRING}"
+   s.description = "RSpec's 'test double' framework, with support for stubbing and mocking"
+ 
+-  s.files            = `git ls-files -- lib/*`.split("\n")
+-  s.files           += %w[README.md LICENSE.md Changelog.md .yardopts .document]
++  s.files            = Dir["lib/**/*"]
+   s.test_files       = []
+   s.rdoc_options     = ["--charset=UTF-8"]
+   s.require_path     = "lib"
diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD
new file mode 100644
index 000000000..ba2389e72
--- /dev/null
+++ b/user/ruby-rspec-support/APKBUILD
@@ -0,0 +1,40 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=ruby-rspec-support
+_gemname=${pkgname#ruby-}
+pkgver=3.8.0
+pkgrel=0
+pkgdesc="Support utilities for RSpec gems"
+url="https://relishapp.com/rspec/rspec-support/"
+arch="noarch"
+options="!check"  # rspec's tests are written in rspec
+license="MIT"
+depends="ruby"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
+	gemspec.patch"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	cd "$builddir"
+	gem build $_gemname.gemspec
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	cd "$builddir"
+	gem install --local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--no-document \
+		--verbose \
+		$_gemname
+
+	# Clean-up...
+	rm -r "$gemdir"/cache \
+		"$gemdir"/build_info \
+		"$gemdir"/doc
+}
+
+sha512sums="e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693  ruby-rspec-support-3.8.0.tar.gz
+e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731  gemspec.patch"
diff --git a/user/ruby-rspec-support/gemspec.patch b/user/ruby-rspec-support/gemspec.patch
new file mode 100644
index 000000000..069c93729
--- /dev/null
+++ b/user/ruby-rspec-support/gemspec.patch
@@ -0,0 +1,12 @@
+--- a/rspec-support.gemspec
++++ b/rspec-support.gemspec
+@@ -13,8 +13,7 @@
+   spec.description   = "Support utilities for RSpec gems"
+   spec.license       = "MIT"
+ 
+-  spec.files         = `git ls-files -- lib/*`.split("\n")
+-  spec.files         += %w[README.md LICENSE.md Changelog.md]
++  spec.files         = Dir["lib/**/*"]
+   spec.test_files    = []
+   spec.rdoc_options  = ["--charset=UTF-8"]
+   spec.require_paths = ["lib"]
diff --git a/user/ruby-rspec/APKBUILD b/user/ruby-rspec/APKBUILD
new file mode 100644
index 000000000..7c6f5ef10
--- /dev/null
+++ b/user/ruby-rspec/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
+# Maintainer: Dan Theisen <djt@hxx.in>
+pkgname=ruby-rspec
+_gemname=${pkgname#ruby-}
+pkgver=3.8.0
+pkgrel=0
+pkgdesc="Behaviour Driven Development for Ruby"
+url="http://rspec.info/"
+arch="noarch"
+options="!check"  # no tests provided
+license="MIT"
+depends="ruby
+	ruby-rspec-core~=${pkgver%.*}
+	ruby-rspec-expectations~=${pkgver%.*}
+	ruby-rspec-mocks~=${pkgver%.*}"
+source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
+	gemspec.patch"
+builddir="$srcdir/$_gemname-$pkgver"
+
+build() {
+	cd "$builddir"
+	gem build $_gemname.gemspec
+}
+
+package() {
+	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
+
+	cd "$builddir"
+	gem install --local \
+		--install-dir "$gemdir" \
+		--ignore-dependencies \
+		--no-document \
+		--verbose \
+		$_gemname
+
+	# Clean-up...
+	rm -r "$gemdir"/cache \
+		"$gemdir"/build_info \
+		"$gemdir"/doc
+}
+
+sha512sums="0468bfab40de2acb622c772101aef7cc71364c3414344848e90a91376106ae7597d0abcdacebe3a9fad6140780008619d9450bc0842b6e5c9e95bafb9fccae9b  ruby-rspec-3.8.0.tar.gz
+f554eef881574e68532dd6c9edeb6b8ad172ac707f7518134378e1099a40ada959c6c770514aab13a6345343113594208be0e42044803c0c2cde3adde00c5520  gemspec.patch"
diff --git a/user/ruby-rspec/gemspec.patch b/user/ruby-rspec/gemspec.patch
new file mode 100644
index 000000000..1bd3937c3
--- /dev/null
+++ b/user/ruby-rspec/gemspec.patch
@@ -0,0 +1,14 @@
+--- a/rspec.gemspec
++++ b/rspec.gemspec
+@@ -14,10 +14,7 @@
+   s.summary     = "rspec-#{RSpec::Version::STRING}"
+   s.description = "BDD for Ruby"
+ 
+-  s.files            = `git ls-files -- lib/*`.split("\n")
+-  s.files           += ["LICENSE.md"]
+-  s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
+-  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
++  s.files            = Dir["lib/**/*"]
+   s.extra_rdoc_files = [ "README.md" ]
+   s.rdoc_options     = ["--charset=UTF-8"]
+   s.require_path     = "lib"
diff --git a/user/smartmontools/APKBUILD b/user/smartmontools/APKBUILD
index 25b6de93e..9125db241 100644
--- a/user/smartmontools/APKBUILD
+++ b/user/smartmontools/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=smartmontools
-pkgver=6.6
-pkgrel=1
+pkgver=7.0
+pkgrel=0
 pkgdesc="Control and monitor S.M.A.R.T. enabled hard drives"
 url="https://www.smartmontools.org/"
 arch="all"
@@ -12,7 +12,6 @@ subpackages="$pkgname-doc $pkgname-openrc"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
 	smartd.initd
 	smartd.confd
-	musl-canonicalize_file_name.patch
 	"
 
 build() {
@@ -41,7 +40,6 @@ package() {
 	install -Dm644 "$srcdir"/smartd.confd "$pkgdir"/etc/conf.d/smartd
 }
 
-sha512sums="64bb533dac29f62ddd662a16a12c97df1af9cbac9ac526ce7af0b3bff9da49cf265a2030d91a7160452b56a67e80d7f34c9b4e45bbb320114f55695e2cb5cfaf  smartmontools-6.6.tar.gz
+sha512sums="96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512  smartmontools-7.0.tar.gz
 61cae548fc9f3a9fbea20d684502d3816e7b0b60fcf533ae4e1ab850725c208eb6ba5012ae154a46f0b7bb7285a9e63cbdecafed8db7fd63fda0ba59081260cc  smartd.initd
-ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437  smartd.confd
-eff9a1ca8e10be5b05a4be609973065d6f02f12c9d511d3a7c87fa172934d3739594f00e5a61ed2d6dc65de5fd1ff23ec049b21078d5b1620c5dbafa56d78bbe  musl-canonicalize_file_name.patch"
+ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437  smartd.confd"
diff --git a/user/smartmontools/musl-canonicalize_file_name.patch b/user/smartmontools/musl-canonicalize_file_name.patch
deleted file mode 100644
index bdc7cc6f1..000000000
--- a/user/smartmontools/musl-canonicalize_file_name.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# Ticket: https://smartmontools.org/ticket/921#ticket
---- a/os_linux.cpp
-+++ b/os_linux.cpp
-@@ -3176,7 +3176,7 @@
- {
-   char path[128];
-   snprintf(path, sizeof(path), "/sys/block/%s/device", name);
--  char * syshostpath = canonicalize_file_name(path);
-+  char * syshostpath = realpath(path, NULL);
-   if (!syshostpath)
-     return false;
-