[arch-commits] Commit in ruby/repos (10 files)
Thomas Dziedzic
td123 at nymeria.archlinux.org
Sat Aug 10 18:29:16 UTC 2013
Date: Saturday, August 10, 2013 @ 20:29:16
Author: td123
Revision: 192406
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
ruby/repos/staging-i686/
ruby/repos/staging-i686/0001-remove-db-support.patch
(from rev 192405, ruby/trunk/0001-remove-db-support.patch)
ruby/repos/staging-i686/PKGBUILD
(from rev 192405, ruby/trunk/PKGBUILD)
ruby/repos/staging-i686/gemrc
(from rev 192405, ruby/trunk/gemrc)
ruby/repos/staging-i686/ruby.install
(from rev 192405, ruby/trunk/ruby.install)
ruby/repos/staging-x86_64/
ruby/repos/staging-x86_64/0001-remove-db-support.patch
(from rev 192405, ruby/trunk/0001-remove-db-support.patch)
ruby/repos/staging-x86_64/PKGBUILD
(from rev 192405, ruby/trunk/PKGBUILD)
ruby/repos/staging-x86_64/gemrc
(from rev 192405, ruby/trunk/gemrc)
ruby/repos/staging-x86_64/ruby.install
(from rev 192405, ruby/trunk/ruby.install)
---------------------------------------------+
staging-i686/0001-remove-db-support.patch | 35 ++++++++++++
staging-i686/PKGBUILD | 72 ++++++++++++++++++++++++++
staging-i686/gemrc | 5 +
staging-i686/ruby.install | 22 +++++++
staging-x86_64/0001-remove-db-support.patch | 35 ++++++++++++
staging-x86_64/PKGBUILD | 72 ++++++++++++++++++++++++++
staging-x86_64/gemrc | 5 +
staging-x86_64/ruby.install | 22 +++++++
8 files changed, 268 insertions(+)
Copied: ruby/repos/staging-i686/0001-remove-db-support.patch (from rev 192405, ruby/trunk/0001-remove-db-support.patch)
===================================================================
--- staging-i686/0001-remove-db-support.patch (rev 0)
+++ staging-i686/0001-remove-db-support.patch 2013-08-10 18:29:16 UTC (rev 192406)
@@ -0,0 +1,35 @@
+From b653d6ffe9ec25c203fc0cbbbdd72e9b42546283 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at gmail.com>
+Date: Sat, 10 Aug 2013 10:50:16 -0700
+Subject: [PATCH] remove db support
+
+---
+ ext/dbm/extconf.rb | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
+index 32a9446..2412404 100644
+--- a/ext/dbm/extconf.rb
++++ b/ext/dbm/extconf.rb
+@@ -5,17 +5,11 @@ dir_config("dbm")
+ if dblib = with_config("dbm-type", nil)
+ dblib = dblib.split(/[ ,]+/)
+ else
+- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm)
++ dblib = %w(libc gdbm_compat gdbm qdbm)
+ end
+
+ headers = {
+ "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc.
+- "db" => ["db.h"],
+- "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
+- "db2" => ["db2/db.h", "db2.h", "db.h"],
+- "db3" => ["db3/db.h", "db3.h", "db.h"],
+- "db4" => ["db4/db.h", "db4.h", "db.h"],
+- "db5" => ["db5/db.h", "db5.h", "db.h"],
+ "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
+ "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
+ "qdbm" => ["qdbm/relic.h", "relic.h"],
+--
+1.8.3.4
+
Copied: ruby/repos/staging-i686/PKGBUILD (from rev 192405, ruby/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-08-10 18:29:16 UTC (rev 192406)
@@ -0,0 +1,72 @@
+# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: Jeramy Rutley <jrutley at gmail.com>
+
+pkgname=('ruby' 'ruby-docs')
+pkgver=2.0.0_p247
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://www.ruby-lang.org/en/'
+license=('BSD' 'custom')
+makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+options=('!emptydirs' '!makeflags')
+source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
+ 'gemrc'
+ '0001-remove-db-support.patch')
+md5sums=('60913f3eec0c4071f44df42600be2604'
+ '6fb8e7a09955e0f64be3158fb4a27e7a'
+ 'b93ff50214a3da26525244cf37b71a8f')
+
+build() {
+ cd ruby-${pkgver//_/-}
+
+ # use gdbm because db v6 changed the license to AGPL
+ patch -Np1 -i ${srcdir}/0001-remove-db-support.patch
+
+ PKG_CONFIG=/usr/bin/pkg-config ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-shared \
+ --enable-pthread \
+ --disable-rpath
+
+ make
+}
+
+check() {
+ cd ruby-${pkgver//_/-}
+
+ make test
+}
+
+package_ruby() {
+ pkgdesc='An object-oriented language for quick and easy programming'
+ depends=('gdbm' 'openssl' 'libffi' 'libyaml')
+ optdepends=('tk: for Ruby/TK'
+ 'ruby-docs: Ruby documentation')
+ provides=('rubygems' 'rake')
+ conflicts=('rake')
+ backup=('etc/gemrc')
+ install='ruby.install'
+
+ cd ruby-${pkgver//_/-}
+
+ make DESTDIR="${pkgdir}" install-nodoc
+
+ install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
+}
+
+package_ruby-docs() {
+ pkgdesc='Documentation files for ruby'
+
+ cd ruby-${pkgver//_/-}
+
+ make DESTDIR="${pkgdir}" install-doc install-capi
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
+}
Copied: ruby/repos/staging-i686/gemrc (from rev 192405, ruby/trunk/gemrc)
===================================================================
--- staging-i686/gemrc (rev 0)
+++ staging-i686/gemrc 2013-08-10 18:29:16 UTC (rev 192406)
@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+# pacman installed gems and gem installed gems
+gem: --user-install
Copied: ruby/repos/staging-i686/ruby.install (from rev 192405, ruby/trunk/ruby.install)
===================================================================
--- staging-i686/ruby.install (rev 0)
+++ staging-i686/ruby.install 2013-08-10 18:29:16 UTC (rev 192406)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+print_gem_default_target() {
+ echo 'The default location of gem installs is $HOME/.gem/ruby'
+ echo 'Add the following line to your PATH if you plan to install using gem'
+ echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+ echo 'If you want to install to the system wide location, you must either:'
+ echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+}
+
+# arg 1: the new package version
+post_install() {
+ print_gem_default_target
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
+ print_gem_default_target
+ fi
+}
Copied: ruby/repos/staging-x86_64/0001-remove-db-support.patch (from rev 192405, ruby/trunk/0001-remove-db-support.patch)
===================================================================
--- staging-x86_64/0001-remove-db-support.patch (rev 0)
+++ staging-x86_64/0001-remove-db-support.patch 2013-08-10 18:29:16 UTC (rev 192406)
@@ -0,0 +1,35 @@
+From b653d6ffe9ec25c203fc0cbbbdd72e9b42546283 Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc at gmail.com>
+Date: Sat, 10 Aug 2013 10:50:16 -0700
+Subject: [PATCH] remove db support
+
+---
+ ext/dbm/extconf.rb | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
+index 32a9446..2412404 100644
+--- a/ext/dbm/extconf.rb
++++ b/ext/dbm/extconf.rb
+@@ -5,17 +5,11 @@ dir_config("dbm")
+ if dblib = with_config("dbm-type", nil)
+ dblib = dblib.split(/[ ,]+/)
+ else
+- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm)
++ dblib = %w(libc gdbm_compat gdbm qdbm)
+ end
+
+ headers = {
+ "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc.
+- "db" => ["db.h"],
+- "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
+- "db2" => ["db2/db.h", "db2.h", "db.h"],
+- "db3" => ["db3/db.h", "db3.h", "db.h"],
+- "db4" => ["db4/db.h", "db4.h", "db.h"],
+- "db5" => ["db5/db.h", "db5.h", "db.h"],
+ "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
+ "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
+ "qdbm" => ["qdbm/relic.h", "relic.h"],
+--
+1.8.3.4
+
Copied: ruby/repos/staging-x86_64/PKGBUILD (from rev 192405, ruby/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-08-10 18:29:16 UTC (rev 192406)
@@ -0,0 +1,72 @@
+# Maintainer: Thomas Dziedzic <gostrc at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+# Contributor: Jeramy Rutley <jrutley at gmail.com>
+
+pkgname=('ruby' 'ruby-docs')
+pkgver=2.0.0_p247
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://www.ruby-lang.org/en/'
+license=('BSD' 'custom')
+makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
+options=('!emptydirs' '!makeflags')
+source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
+ 'gemrc'
+ '0001-remove-db-support.patch')
+md5sums=('60913f3eec0c4071f44df42600be2604'
+ '6fb8e7a09955e0f64be3158fb4a27e7a'
+ 'b93ff50214a3da26525244cf37b71a8f')
+
+build() {
+ cd ruby-${pkgver//_/-}
+
+ # use gdbm because db v6 changed the license to AGPL
+ patch -Np1 -i ${srcdir}/0001-remove-db-support.patch
+
+ PKG_CONFIG=/usr/bin/pkg-config ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-shared \
+ --enable-pthread \
+ --disable-rpath
+
+ make
+}
+
+check() {
+ cd ruby-${pkgver//_/-}
+
+ make test
+}
+
+package_ruby() {
+ pkgdesc='An object-oriented language for quick and easy programming'
+ depends=('gdbm' 'openssl' 'libffi' 'libyaml')
+ optdepends=('tk: for Ruby/TK'
+ 'ruby-docs: Ruby documentation')
+ provides=('rubygems' 'rake')
+ conflicts=('rake')
+ backup=('etc/gemrc')
+ install='ruby.install'
+
+ cd ruby-${pkgver//_/-}
+
+ make DESTDIR="${pkgdir}" install-nodoc
+
+ install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
+}
+
+package_ruby-docs() {
+ pkgdesc='Documentation files for ruby'
+
+ cd ruby-${pkgver//_/-}
+
+ make DESTDIR="${pkgdir}" install-doc install-capi
+
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
+}
Copied: ruby/repos/staging-x86_64/gemrc (from rev 192405, ruby/trunk/gemrc)
===================================================================
--- staging-x86_64/gemrc (rev 0)
+++ staging-x86_64/gemrc 2013-08-10 18:29:16 UTC (rev 192406)
@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+# pacman installed gems and gem installed gems
+gem: --user-install
Copied: ruby/repos/staging-x86_64/ruby.install (from rev 192405, ruby/trunk/ruby.install)
===================================================================
--- staging-x86_64/ruby.install (rev 0)
+++ staging-x86_64/ruby.install 2013-08-10 18:29:16 UTC (rev 192406)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+print_gem_default_target() {
+ echo 'The default location of gem installs is $HOME/.gem/ruby'
+ echo 'Add the following line to your PATH if you plan to install using gem'
+ echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+ echo 'If you want to install to the system wide location, you must either:'
+ echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
+}
+
+# arg 1: the new package version
+post_install() {
+ print_gem_default_target
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
+ print_gem_default_target
+ fi
+}
More information about the arch-commits
mailing list