| 1 |
flameeyes 10/04/26 14:09:07 |
| 2 |
|
| 3 |
Modified: ChangeLog eventmachine-0.12.10-r2.ebuild |
| 4 |
Log: |
| 5 |
Add a patch to fix a few more problems in eventmachine, such as bug #317281. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.11 dev-ruby/eventmachine/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/eventmachine/ChangeLog?rev=1.11&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/eventmachine/ChangeLog?rev=1.11&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/eventmachine/ChangeLog?r1=1.10&r2=1.11 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v |
| 18 |
retrieving revision 1.10 |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -r1.10 -r1.11 |
| 21 |
--- ChangeLog 19 Apr 2010 11:48:28 -0000 1.10 |
| 22 |
+++ ChangeLog 26 Apr 2010 14:09:07 -0000 1.11 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for dev-ruby/eventmachine |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v 1.10 2010/04/19 11:48:28 flameeyes Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/ChangeLog,v 1.11 2010/04/26 14:09:07 flameeyes Exp $ |
| 28 |
+ |
| 29 |
+ 26 Apr 2010; Diego E. Pettenò <flameeyes@g.o> |
| 30 |
+ eventmachine-0.12.10-r2.ebuild, +files/eventmachine-0.12.10-gentoo.patch: |
| 31 |
+ Add a patch to fix a few more problems in eventmachine, such as bug |
| 32 |
+ #317281. |
| 33 |
|
| 34 |
*eventmachine-0.12.10-r2 (19 Apr 2010) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: eventmachine-0.12.10-r2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- eventmachine-0.12.10-r2.ebuild 19 Apr 2010 11:48:28 -0000 1.1 |
| 52 |
+++ eventmachine-0.12.10-r2.ebuild 26 Apr 2010 14:09:07 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild,v 1.1 2010/04/19 11:48:28 flameeyes Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/eventmachine/eventmachine-0.12.10-r2.ebuild,v 1.2 2010/04/26 14:09:07 flameeyes Exp $ |
| 58 |
|
| 59 |
EAPI="2" |
| 60 |
# jruby → has shims for Java handling but tests fail badly, remaining |
| 61 |
@@ -20,29 +20,35 @@ |
| 62 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 63 |
IUSE="" |
| 64 |
|
| 65 |
-ruby_add_bdepend 'dev-ruby/rake' |
| 66 |
- |
| 67 |
DEPEND="${DEPEND} |
| 68 |
dev-libs/openssl" |
| 69 |
RDEPEND="${RDEPEND} |
| 70 |
dev-libs/openssl" |
| 71 |
|
| 72 |
all_ruby_prepare() { |
| 73 |
- # This test only works on BSD, and error handling fails on 1.8 |
| 74 |
- rm tests/test_process_watch.rb || die "rm failed" |
| 75 |
- |
| 76 |
- cat - > "${T}"/submake <<EOF |
| 77 |
-#!/bin/sh |
| 78 |
- |
| 79 |
-myrealmake=${MAKE} |
| 80 |
-MAKE=\$myrealmake emake "\$@" |
| 81 |
+ # fix building with RDoc 2.5.x (bug #317281) — upstream b12663e475514b02a28b60d4427a48be7d75faac |
| 82 |
+ # fix tests with Ruby 1.9 — sent upstream |
| 83 |
+ # fix tests on non-FreeBSD (where kqueue is missing) — sent upstream |
| 84 |
+ # fix building when git is not available — sent upstream |
| 85 |
+ epatch "${FILESDIR}/${P}-gentoo.patch" |
| 86 |
+} |
| 87 |
|
| 88 |
-EOF |
| 89 |
- chmod +x "${T}"/submake || die |
| 90 |
+each_ruby_configure() { |
| 91 |
+ for extdir in ext ext/fastfilereader; do |
| 92 |
+ pushd $extdir |
| 93 |
+ ${RUBY} extconf.rb || die "extconf.rb failed for ${extdir}" |
| 94 |
+ popd |
| 95 |
+ done |
| 96 |
} |
| 97 |
|
| 98 |
each_ruby_compile() { |
| 99 |
- MAKE="${T}"/submake ${RUBY} -S rake build || die "rake build failed" |
| 100 |
+ for extdir in ext ext/fastfilereader; do |
| 101 |
+ pushd $extdir |
| 102 |
+ # both extensions use C++, so use the CXXFLAGS not the CFLAGS |
| 103 |
+ emake CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed for ${extdir}" |
| 104 |
+ popd |
| 105 |
+ cp $extdir/*.so lib/ || die "Unable to copy extensions for ${extdir}" |
| 106 |
+ done |
| 107 |
} |
| 108 |
|
| 109 |
all_ruby_install() { |
Archives