From fb6f81ecd656bc7ab2499c04f4076e4005c4574f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 17 Nov 2011 17:15:10 +0100
Subject: [PATCH] ruby: update to 1.9.3p0.

---
 srcpkgs/ruby/ruby-devel.template | 19 +++++-------------
 srcpkgs/ruby/ruby-gems.template  |  9 ++-------
 srcpkgs/ruby/ruby.rshlibs        |  3 ++-
 srcpkgs/ruby/template            | 34 +++++++++++++++++++++-----------
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/srcpkgs/ruby/ruby-devel.template b/srcpkgs/ruby/ruby-devel.template
index 3c1a0651801..8a5e6017a63 100644
--- a/srcpkgs/ruby/ruby-devel.template
+++ b/srcpkgs/ruby/ruby-devel.template
@@ -5,22 +5,13 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
-Add_dependency run db-devel
-Add_dependency run gdbm-devel
-Add_dependency run openssl-devel
-Add_dependency run zlib-devel
-Add_dependency run readline-devel
-Add_dependency run ncurses-devel
 Add_dependency run ruby
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/{lib,share} ${DESTDIR}/usr/lib/ruby/1.9.1
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/ruby/1.9.1/mkmf.rb \
-		${DESTDIR}/usr/lib/ruby/1.9.1
-	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/lib/ruby/1.9.1/mkmf.rb usr/lib/ruby/1.9.1
+	vmove usr/share/doc usr/share
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/ruby/ruby-gems.template b/srcpkgs/ruby/ruby-gems.template
index b4b0d295235..10d14d20692 100644
--- a/srcpkgs/ruby/ruby-gems.template
+++ b/srcpkgs/ruby/ruby-gems.template
@@ -20,11 +20,6 @@ Add_dependency run ruby
 
 do_install()
 {
-	local libdir=/usr/lib/ruby/1.9.1
-
-	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/${libdir}
-
-	mv ${SRCPKGDESTDIR}/usr/bin/gem ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/${libdir}/ubygems.rb ${DESTDIR}/${libdir}
-	mv ${SRCPKGDESTDIR}/${libdir}/rubygems ${DESTDIR}/${libdir}
+	vmove usr/bin/gem usr/bin
+	vmove usr/lib/ruby/gems usr/lib/ruby
 }
diff --git a/srcpkgs/ruby/ruby.rshlibs b/srcpkgs/ruby/ruby.rshlibs
index 3dd48a78df5..f22d299b5cb 100644
--- a/srcpkgs/ruby/ruby.rshlibs
+++ b/srcpkgs/ruby/ruby.rshlibs
@@ -9,7 +9,8 @@ libncursesw.so.6
 libdb-4.8.so
 libcrypto.so.1
 libffi.so.5
-libgdbm.so.3
 libssl.so.1
 libreadline.so.6
 libz.so.1
+libgdbm.so.4
+libyaml-0.so.2
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 5c195bead67..241faa130d3 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,17 +1,17 @@
 # Template build file for 'ruby'.
 pkgname=ruby
-_ruby_ver="1.9.2"
-_ruby_distpatchver="p180"
+_ruby_ver="1.9.3"
+_ruby_distpatchver="p0"
 _ruby_distver="${_ruby_ver}-${_ruby_distpatchver}"
-revision=2
 version=${_ruby_ver}${_ruby_distpatchver}
 wrksrc="${pkgname}-${_ruby_distver}"
-distfiles="ftp://ftp.ruby-lang.org/pub/ruby/1.9/$pkgname-${_ruby_distver}.tar.gz"
+distfiles="ftp://ftp.ruby-lang.org/pub/ruby/1.9/$pkgname-${_ruby_distver}.tar.bz2"
 build_style=gnu-configure
-configure_args="--enable-shared --disable-rpath"
+configure_args="--enable-shared --disable-rpath
+DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
 short_desc="Ruby programming language"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=9027a5abaaadc2af85005ed74aeb628ce2326441874bf3d4f1a842663cde04f4
+checksum=ca8ba4e564fc5f98b210a5784e43dfffef9471222849e46f8e848b37e9f38acf
 long_desc="
  Ruby is the interpreted scripting language for quick and easy object
  oriented programming. It has many features to process text files and to
@@ -20,15 +20,25 @@ long_desc="
 
 subpackages="ruby-devel ruby-gems ruby-irb ruby-rdoc ruby-ri"
 
-
+Add_dependency build pkg-config
 Add_dependency build coreutils
 Add_dependency build bison
 Add_dependency build groff
 Add_dependency build doxygen
+Add_dependency build graphviz
+Add_dependency build zlib-devel
+Add_dependency build ncurses-devel
+Add_dependency build readline-devel
+Add_dependency build libffi-devel
+Add_dependency build openssl-devel
 Add_dependency build db-devel
 Add_dependency build gdbm-devel
-Add_dependency build openssl-devel
-Add_dependency build zlib-devel
-Add_dependency build readline-devel
-Add_dependency build ncurses-devel
-Add_dependency build libffi-devel
+Add_dependency build libyaml-devel
+Add_dependency build pango-devel
+
+pre_build() {
+	# Execute manually the pango trigger for doc graphs.
+	cd / && ${FAKEROOT_CMD} ${FAKEROOT_CMD_ARGS} \
+		${XBPS_TRIGGERSDIR}/pango-modules run post-install && \
+		cd ${wrksrc}
+}