Add ruby support

Package-Manager: portage-2.0.53_rc5

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index a9ad1c5a331ce3ae74e1fa788a94837a465da89d..55481d608def1d7e454aefb8c414ab39cabf0db7 100644 (file)
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.189 2005/10/17 11:24:34 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.190 2005/10/24 10:04:44 pauldv Exp $
+
+  21 Oct 2005; <pauldv@gentoo.org> subversion-1.2.3-r3.ebuild:
+  Add support for ruby bindings. Courtessy of Tom Payne <twp@gentoo.org> 
+  in bug #102543.
 
 *subversion-1.2.3-r3 (17 Oct 2005)
 

diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index f05f7d44a152c81a1c07368b8242750e9fe813ea..f608710e3a67709ca52b56edb602d669aab1e0e8 100644 (file)
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,4 +1,4 @@
-MD5 32c7c04320bbe628b311c9dec6364df8 ChangeLog 32140
+MD5 b4fea785094fff779d72e0dc3185da9f ChangeLog 32296
 MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
 MD5 1c207179f5bf0b148528312cbc37632d files/digest-subversion-1.1.3 70
 MD5 4cdbf1f8636cd0a207ae87228b6f412b files/digest-subversion-1.2.3 70
@@ -8,6 +8,7 @@ MD5 4cdbf1f8636cd0a207ae87228b6f412b files/digest-subversion-1.2.3-r3 70
 MD5 b8146e2661f55257aef6d41e79897b63 files/subversion-1.1.1-perl-vendor.patch 713
 MD5 ce6f3698724b55cf49e647727207cca5 files/subversion-db4.patch 563
 MD5 82c218472a786250947746b8bc8294dd files/subversion-hotbackup-config.patch 629
+MD5 10d20fe76ce2f39d1eb45089ce3471a5 files/subversion-swig.m4-ruby.patch 698
 MD5 8de1f6e76dcb072171a09aaba2fd3b2b files/svnserve.confd 323
 MD5 7d95a67c28ea2a5c204628d5104c1427 files/svnserve.initd 817
 MD5 196636ccd0b2c9a8903c7d6a0a356153 files/svnserve.xinetd 329
@@ -16,5 +17,5 @@ MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 MD5 f01c7eaf4fdafaa346051868f66c0148 subversion-1.1.3.ebuild 11430
 MD5 873d9543dfdaea49b33f4934cf1f54b9 subversion-1.2.3-r1.ebuild 10875
 MD5 ca08bcb93390917e84341cea8a590ac9 subversion-1.2.3-r2.ebuild 10907
-MD5 480f7db03603ceb20b69df52d9e8acde subversion-1.2.3-r3.ebuild 11362
+MD5 acb12c13032b119196f65207b6b1db98 subversion-1.2.3-r3.ebuild 11672
 MD5 82dabd375ad894884925f0c7c40fcbe3 subversion-1.2.3.ebuild 11793

diff --git a/dev-util/subversion/files/subversion-swig.m4-ruby.patch b/dev-util/subversion/files/subversion-swig.m4-ruby.patch
new file mode 100644 (file)
index 0000000..de911b8
--- /dev/null
+++ b/dev-util/subversion/files/subversion-swig.m4-ruby.patch
@@ -0,0 +1,11 @@
+--- build/ac-macros/swig.m4.old        2005-10-21 14:31:22.000000000 +0200
++++ build/ac-macros/swig.m4    2005-10-21 14:31:47.000000000 +0200
+@@ -216,7 +216,7 @@
+       SWIG_RB_COMPILE="$svn_cv_ruby_compile"
+ 
+       AC_CACHE_CHECK([how to link Ruby extensions], [svn_cv_ruby_link],[
+-        svn_cv_ruby_link="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(LDSHARED)).sub(/^\w+/, Config::CONFIG.fetch(%q(CC)) + %q( -shrext .) + Config::CONFIG.fetch(%q(DLEXT)))'`"
++        svn_cv_ruby_link="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(LDSHARED)).sub(/^\S+/, Config::CONFIG.fetch(%q(CC)) + %q( -shrext .) + Config::CONFIG.fetch(%q(DLEXT)))'`"
+       ])
+       SWIG_RB_LINK="$svn_cv_ruby_link"
+ 

diff --git a/dev-util/subversion/subversion-1.2.3-r3.ebuild b/dev-util/subversion/subversion-1.2.3-r3.ebuild
index c96f9be902684444a5f5a7fb25f2a73db8f5176c..ac9a96d2d642e3b082a96484514a1e052ab8ebf3 100644 (file)
--- a/dev-util/subversion/subversion-1.2.3-r3.ebuild
+++ b/dev-util/subversion/subversion-1.2.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3-r3.ebuild,v 1.1 2005/10/17 11:24:34 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3-r3.ebuild,v 1.2 2005/10/24 10:04:44 pauldv Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module
 
@@ -11,7 +11,7 @@ SRC_URI="http://subversion.tigris.org/tarballs/${P/_rc/-rc}.tar.bz2"
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-IUSE="apache2 berkdb python emacs perl java nls nowebdav zlib"
+IUSE="apache2 berkdb python emacs perl java nls nowebdav zlib ruby"
 RESTRICT="test"
 
 # Presently subversion doesn't build with swig-1.3.22, bug 65424
@@ -21,6 +21,8 @@ RDEPEND="apache2? ( ${APACHE2_DEPEND} )
        perl? ( >=dev-lang/swig-1.3.21
                >=dev-lang/perl-5.8.6-r6
                !=dev-lang/perl-5.8.7 )
+       ruby? ( >=dev-lang/swig-1.3.21
+               dev-lang/ruby )
        !nowebdav? ( ~net-misc/neon-0.24.7 )
        berkdb? ( =sys-libs/db-4* )
        zlib? ( sys-libs/zlib )
@@ -61,6 +63,7 @@ src_unpack() {
        epatch ${FILESDIR}/subversion-db4.patch
        epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
        epatch ${FILESDIR}/subversion-hotbackup-config.patch
+       epatch ${FILESDIR}/subversion-swig.m4-ruby.patch
 
        export WANT_AUTOCONF=2.5
        elibtoolize
@@ -83,7 +86,7 @@ src_compile() {
 #      use java && myconf="${myconf} $(use_with jikes)"
        use java && myconf="${myconf} --without-jikes"
 
-       if use python || use perl; then
+       if use python || use perl || use ruby; then
                myconf="${myconf} --with-swig"
        else
                myconf="${myconf} --without-swig"
@@ -124,6 +127,10 @@ src_compile() {
                make swig-pl || die "Perl library building failed"
        fi
 
+       if use ruby; then
+               make swig-rb || die "Ruby library building failed"
+       fi
+
        if use java; then
                # ensure that the destination dir exists, else some compilation fails
                mkdir -p ${S}/subversion/bindings/java/javahl/classes
@@ -173,6 +180,9 @@ src_install () {
                make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
                fixlocalpod
        fi
+       if use ruby; then
+               make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed"
+       fi
        if use java; then
                make DESTDIR="${D}" install-javahl || die "installation failed"
        fi