Merge git://dev.alpinelinux.org/aports

8 files changed, 2 insertions, 247 deletions

diff --git a/testing/linux-vanilla/APKBUILD b/testing/linux-vanilla/APKBUILD
index 728eaff32..0bb966baa 100644
--- a/testing/linux-vanilla/APKBUILD
+++ b/testing/linux-vanilla/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vanilla
 pkgname=linux-${_flavor}
-pkgver=3.6.3
+pkgver=3.6.4
 _kernver=3.6
 pkgrel=0
 pkgdesc="Linux kernel with grsecurity"
@@ -136,6 +136,6 @@ dev() {
 }
 
 md5sums="1a1760420eac802c541a20ab51a093d1  linux-3.6.tar.xz
-96701113d37ef4f9b785206ab8bcc71e  patch-3.6.3.xz
+d7efab4da2682c44662b684026b059f7  patch-3.6.4.xz
 ea6b7a5af95a50107565c31cf505bf1e  kernelconfig.x86
 26cbb12158bb32e599363033581e3f3d  kernelconfig.x86_64"
diff --git a/testing/ruby-coderay/APKBUILD b/testing/ruby-coderay/APKBUILD
deleted file mode 100644
index a255a5839..000000000
--- a/testing/ruby-coderay/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-_gemname=coderay
-pkgname=ruby-coderay
-pkgver=1.0.8
-pkgrel=0	
-pkgdesc="Fast and easy syntax highlighting"
-url="http://coderay.rubychan.de"
-arch="noarch"
-license="MIT"
-depends="ruby"
-depends_dev=
-makedepends="$depends_dev ruby-gems"
-install=""
-subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
-
-_builddir="$srcdir"/$_realname-$pkgver
-build() {
-	return 0
-}
-
-package() {
-	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
-	rm -rf "$pkgdir"/$_gemdir/cache \
-		"$pkgdir"/$_geminstdir/ext \
-		"$pkgdir"/$_geminstdir/.require_paths
-}
-
-md5sums="d646068de8d976d8af431dd8e80a9f60  coderay-1.0.8.gem"
diff --git a/testing/ruby-fastercsv/APKBUILD b/testing/ruby-fastercsv/APKBUILD
deleted file mode 100644
index e432171c3..000000000
--- a/testing/ruby-fastercsv/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-_gemname=fastercsv
-pkgname=ruby-fastercsv
-pkgver=1.5.5
-pkgrel=0	
-pkgdesc="Replacement to Rubys standard CSV library"
-url="http://fastercsv.rubyforge.org"
-arch="noarch"
-license="MIT"
-depends="ruby"
-depends_dev=
-makedepends="$depends_dev ruby-gems"
-install=""
-subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
-
-_builddir="$srcdir"/$_realname-$pkgver
-build() {
-	return 0
-}
-
-package() {
-	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
-	rm -rf "$pkgdir"/$_gemdir/cache \
-		"$pkgdir"/$_geminstdir/ext \
-		"$pkgdir"/$_geminstdir/.require_paths
-}
-
-md5sums="b42d4fc751bdea1c2bd832e11942aa7f  fastercsv-1.5.5.gem"
diff --git a/testing/ruby-kgio/APKBUILD b/testing/ruby-kgio/APKBUILD
deleted file mode 100644
index 2f9ef9245..000000000
--- a/testing/ruby-kgio/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-_gemname=kgio
-pkgname=ruby-kgio
-pkgver=2.7.4
-pkgrel=0	
-pkgdesc="Provides non-blocking I/O methods for Ruby"
-url="http://bogomips.org/kgio"
-arch="all"
-license="MIT"
-depends="ruby"
-depends_dev="ruby-dev"
-makedepends="$depends_dev ruby-gems"
-install=""
-subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
-
-_builddir="$srcdir"/$_realname-$pkgver
-build() {
-	return 0
-}
-
-package() {
-	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
-	rm -rf "$pkgdir"/$_gemdir/cache \
-		"$pkgdir"/$_geminstdir/ext \
-		"$pkgdir"/$_geminstdir/.require_paths
-}
-
-md5sums="7e885db4af8c6c9e776d2c1ab7c373ce  kgio-2.7.4.gem"
diff --git a/testing/ruby-net-ldap/APKBUILD b/testing/ruby-net-ldap/APKBUILD
deleted file mode 100644
index 6275aab46..000000000
--- a/testing/ruby-net-ldap/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-_gemname=net-ldap
-pkgname=ruby-net-ldap
-pkgver=0.3.1
-pkgrel=0	
-pkgdesc="Ruby ldap client"
-url="http://rubyldap.com/"
-arch="noarch"
-license="MIT"
-depends="ruby"
-depends_dev=
-makedepends="$depends_dev ruby-gems"
-install=""
-subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
-
-_builddir="$srcdir"/$_realname-$pkgver
-build() {
-	return 0
-}
-
-package() {
-	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
-	rm -rf "$pkgdir"/$_gemdir/cache \
-		"$pkgdir"/$_geminstdir/ext \
-		"$pkgdir"/$_geminstdir/.require_paths
-}
-
-md5sums="96c39c91619446256936b3c81b554c93  net-ldap-0.3.1.gem"
diff --git a/testing/ruby-rack-openid/APKBUILD b/testing/ruby-rack-openid/APKBUILD
deleted file mode 100644
index 4a99ec15b..000000000
--- a/testing/ruby-rack-openid/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-_gemname=rack-openid
-pkgname=ruby-rack-openid
-pkgver=1.3.1
-pkgrel=0	
-pkgdesc="Provides a more HTTPish API around the ruby-openid library"
-url="https://github.com/josh/rack-openid"
-arch="noarch"
-license="MIT"
-depends="ruby ruby-rack"
-depends_dev=
-makedepends="$depends_dev ruby-gems"
-install=""
-subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
-
-_builddir="$srcdir"/$_realname-$pkgver
-build() {
-	return 0
-}
-
-package() {
-	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
-	rm -rf "$pkgdir"/$_gemdir/cache \
-		"$pkgdir"/$_geminstdir/ext \
-		"$pkgdir"/$_geminstdir/.require_paths
-}
-
-md5sums="e452612b2ecc2546841f873a6ee3a9d3  rack-openid-1.3.1.gem"
diff --git a/testing/ruby-raindrops/APKBUILD b/testing/ruby-raindrops/APKBUILD
deleted file mode 100644
index 02a2c9501..000000000
--- a/testing/ruby-raindrops/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-_gemname=raindrops
-pkgname=ruby-raindrops
-pkgver=0.10.0
-pkgrel=0	
-pkgdesc="A real-time stats toolkit to show statistics for Rack HTTP servers"
-url="http://raindrops.bogomips.org"
-arch="all"
-license="MIT"
-depends="ruby"
-depends_dev="ruby-dev"
-makedepends="$depends_dev ruby-gems"
-install=""
-subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
-
-_builddir="$srcdir"/$_realname-$pkgver
-build() {
-	return 0
-}
-
-package() {
-	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
-	rm -rf "$pkgdir"/$_gemdir/cache \
-		"$pkgdir"/$_geminstdir/ext \
-		"$pkgdir"/$_geminstdir/.require_paths
-}
-
-md5sums="eddab07f2cedce119659b10f5b9c4211  raindrops-0.10.0.gem"
diff --git a/testing/ruby-unicorn/APKBUILD b/testing/ruby-unicorn/APKBUILD
deleted file mode 100644
index d31901693..000000000
--- a/testing/ruby-unicorn/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-_gemname=unicorn
-pkgname=ruby-unicorn
-pkgver=4.4.0
-pkgrel=1	
-pkgdesc="Unicorn is an HTTP server for Rack applications"
-url="http://unicorn.bogomips.org"
-arch="all"
-license="MIT"
-depends="ruby ruby-kgio ruby-rack ruby-raindrops"
-depends_dev="ruby-dev"
-makedepends="$depends_dev ruby-gems"
-install=""
-subpackages=""
-source="http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem"
-
-_builddir="$srcdir"/$_realname-$pkgver
-build() {
-	return 0
-}
-
-package() {
-	local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-	local _geminstdir=$_gemdir/gems/$_gemname-$pkgver
-	mkdir -p "$pkgdir" || return 1
-
-	gem install --local --install-dir "$pkgdir"/$_gemdir \
-		--ignore-dependencies --verbose --no-rdoc --no-ri \
-		"$srcdir"/$_gemname-$pkgver.gem || return 1
-	rm -rf "$pkgdir"/$_gemdir/cache \
-		"$pkgdir"/$_geminstdir/ext \
-		"$pkgdir"/$_geminstdir/.require_paths
-}
-
-md5sums="00f52cd67c3ed7a7e0672104c6df9d7a  unicorn-4.4.0.gem"