Date: Monday, October 27, 2014 @ 20:29:41
Author: anatolik
Revision: 225396
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
ruby/repos/testing-i686/
ruby/repos/testing-i686/PKGBUILD
(from rev 225395, ruby/trunk/PKGBUILD)
ruby/repos/testing-i686/disable_sse2_on_i686.patch
(from rev 225395, ruby/trunk/disable_sse2_on_i686.patch)
ruby/repos/testing-i686/gemrc
(from rev 225395, ruby/trunk/gemrc)
ruby/repos/testing-i686/ruby.install
(from rev 225395, ruby/trunk/ruby.install)
ruby/repos/testing-x86_64/
ruby/repos/testing-x86_64/PKGBUILD
(from rev 225395, ruby/trunk/PKGBUILD)
ruby/repos/testing-x86_64/disable_sse2_on_i686.patch
(from rev 225395, ruby/trunk/disable_sse2_on_i686.patch)
ruby/repos/testing-x86_64/gemrc
(from rev 225395, ruby/trunk/gemrc)
ruby/repos/testing-x86_64/ruby.install
(from rev 225395, ruby/trunk/ruby.install)
-------------------------------------------+
testing-i686/PKGBUILD | 82 ++++++++++++++++++++++++++++
testing-i686/disable_sse2_on_i686.patch | 27 +++++++++
testing-i686/gemrc | 5 +
testing-i686/ruby.install | 22 +++++++
testing-x86_64/PKGBUILD | 82 ++++++++++++++++++++++++++++
testing-x86_64/disable_sse2_on_i686.patch | 27 +++++++++
testing-x86_64/gemrc | 5 +
testing-x86_64/ruby.install | 22 +++++++
8 files changed, 272 insertions(+)
Copied: ruby/repos/testing-i686/PKGBUILD (from rev 225395, ruby/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-10-27 19:29:41 UTC (rev 225396)
@@ -0,0 +1,82 @@
+# Maintainer: Thomas Dziedzic <gos...@gmail.com>
+# Contributor: Allan McRae <al...@archlinux.org>
+# Contributor: John Proctor <jproc...@prium.net>
+# Contributor: Jeramy Rutley <jrut...@gmail.com>
+
+pkgname=('ruby' 'ruby-docs')
+pkgver=2.1.4
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.ruby-lang.org/en/'
+license=('BSD' 'custom')
+# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk'
+# https://bugs.ruby-lang.org/issues/8000
+# wait for upstream to start supporting tk 8.6
+makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml'
'ttf-dejavu') # 'tk'
+options=('!emptydirs' '!makeflags' 'staticlibs')
+source=("http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz";
+ 'gemrc'
+ 'disable_sse2_on_i686.patch')
+sha1sums=('ce83142e829b1172ded4dfa46d4abd1fce2dd6d6'
+ 'de4b760b7e2cd9af88ca67536ce37b950f1ee514'
+ '6e919c4892ef1f02d99e5620c6aac1251fc4597c')
+
+
+prepare() {
+ cd ruby-${pkgver}
+
+ # FS#39470
+ patch -Np1 -i ${srcdir}/disable_sse2_on_i686.patch
+}
+
+build() {
+ cd ruby-${pkgver}
+
+ PKG_CONFIG=/usr/bin/pkg-config ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sharedstatedir=/var/lib \
+ --libexecdir=/usr/lib/ruby \
+ --enable-shared \
+ --disable-rpath \
+ --with-dbm-type=gdbm_compat
+
+ make
+}
+
+check() {
+ cd ruby-${pkgver}
+
+ make test
+}
+
+package_ruby() {
+ pkgdesc='An object-oriented language for quick and easy programming'
+ depends=('gdbm' 'openssl' 'libffi' 'libyaml' 'gmp' 'zlib')
+ optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK'
+ 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/testing-i686/disable_sse2_on_i686.patch (from rev 225395,
ruby/trunk/disable_sse2_on_i686.patch)
===================================================================
--- testing-i686/disable_sse2_on_i686.patch (rev 0)
+++ testing-i686/disable_sse2_on_i686.patch 2014-10-27 19:29:41 UTC (rev
225396)
@@ -0,0 +1,27 @@
+diff --git a/configure.in b/configure.in
+index fc01f3b..bd9f950 100644
+--- a/configure.in
++++ b/configure.in
+@@ -858,22 +858,6 @@ if test "$GCC" = yes; then
+ for oflag in -fno-fast-math; do
+ RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
+ done
+- AS_CASE(["$target"],
+- [*-darwin*], [
+- # doesn't seem necessary on Mac OS X
+- ],
+- [[i[4-6]86*|i386*mingw*]], [
+- RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [
+- RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse)
+- ])
+- AS_CASE(["$XCFLAGS"],
+- [[*-msse2*]], [
+- RUBY_TRY_CFLAGS(-mstackrealign, [
+- RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign)
+- ])
+- ])
+- ]
+- )
+ fi
+
+ AC_ARG_WITH(opt-dir,
Copied: ruby/repos/testing-i686/gemrc (from rev 225395, ruby/trunk/gemrc)
===================================================================
--- testing-i686/gemrc (rev 0)
+++ testing-i686/gemrc 2014-10-27 19:29:41 UTC (rev 225396)
@@ -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/testing-i686/ruby.install (from rev 225395,
ruby/trunk/ruby.install)
===================================================================
--- testing-i686/ruby.install (rev 0)
+++ testing-i686/ruby.install 2014-10-27 19:29:41 UTC (rev 225396)
@@ -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/testing-x86_64/PKGBUILD (from rev 225395,
ruby/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-10-27 19:29:41 UTC (rev 225396)
@@ -0,0 +1,82 @@
+# Maintainer: Thomas Dziedzic <gos...@gmail.com>
+# Contributor: Allan McRae <al...@archlinux.org>
+# Contributor: John Proctor <jproc...@prium.net>
+# Contributor: Jeramy Rutley <jrut...@gmail.com>
+
+pkgname=('ruby' 'ruby-docs')
+pkgver=2.1.4
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.ruby-lang.org/en/'
+license=('BSD' 'custom')
+# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk'
+# https://bugs.ruby-lang.org/issues/8000
+# wait for upstream to start supporting tk 8.6
+makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml'
'ttf-dejavu') # 'tk'
+options=('!emptydirs' '!makeflags' 'staticlibs')
+source=("http://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz";
+ 'gemrc'
+ 'disable_sse2_on_i686.patch')
+sha1sums=('ce83142e829b1172ded4dfa46d4abd1fce2dd6d6'
+ 'de4b760b7e2cd9af88ca67536ce37b950f1ee514'
+ '6e919c4892ef1f02d99e5620c6aac1251fc4597c')
+
+
+prepare() {
+ cd ruby-${pkgver}
+
+ # FS#39470
+ patch -Np1 -i ${srcdir}/disable_sse2_on_i686.patch
+}
+
+build() {
+ cd ruby-${pkgver}
+
+ PKG_CONFIG=/usr/bin/pkg-config ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sharedstatedir=/var/lib \
+ --libexecdir=/usr/lib/ruby \
+ --enable-shared \
+ --disable-rpath \
+ --with-dbm-type=gdbm_compat
+
+ make
+}
+
+check() {
+ cd ruby-${pkgver}
+
+ make test
+}
+
+package_ruby() {
+ pkgdesc='An object-oriented language for quick and easy programming'
+ depends=('gdbm' 'openssl' 'libffi' 'libyaml' 'gmp' 'zlib')
+ optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK'
+ 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/testing-x86_64/disable_sse2_on_i686.patch (from rev 225395,
ruby/trunk/disable_sse2_on_i686.patch)
===================================================================
--- testing-x86_64/disable_sse2_on_i686.patch (rev 0)
+++ testing-x86_64/disable_sse2_on_i686.patch 2014-10-27 19:29:41 UTC (rev
225396)
@@ -0,0 +1,27 @@
+diff --git a/configure.in b/configure.in
+index fc01f3b..bd9f950 100644
+--- a/configure.in
++++ b/configure.in
+@@ -858,22 +858,6 @@ if test "$GCC" = yes; then
+ for oflag in -fno-fast-math; do
+ RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
+ done
+- AS_CASE(["$target"],
+- [*-darwin*], [
+- # doesn't seem necessary on Mac OS X
+- ],
+- [[i[4-6]86*|i386*mingw*]], [
+- RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [
+- RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse)
+- ])
+- AS_CASE(["$XCFLAGS"],
+- [[*-msse2*]], [
+- RUBY_TRY_CFLAGS(-mstackrealign, [
+- RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign)
+- ])
+- ])
+- ]
+- )
+ fi
+
+ AC_ARG_WITH(opt-dir,
Copied: ruby/repos/testing-x86_64/gemrc (from rev 225395, ruby/trunk/gemrc)
===================================================================
--- testing-x86_64/gemrc (rev 0)
+++ testing-x86_64/gemrc 2014-10-27 19:29:41 UTC (rev 225396)
@@ -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/testing-x86_64/ruby.install (from rev 225395,
ruby/trunk/ruby.install)
===================================================================
--- testing-x86_64/ruby.install (rev 0)
+++ testing-x86_64/ruby.install 2014-10-27 19:29:41 UTC (rev 225396)
@@ -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
+}
