diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-25 11:19:42 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-25 11:19:42 +0000 |
commit | 2d8590065d5de09752e600bb2a8180d915c30fe4 (patch) | |
tree | 9b8c279801a75692f0e575ab0910a9bae25be54d | |
parent | Initial commit wrt #311287. (diff) | |
download | gentoo-2-2d8590065d5de09752e600bb2a8180d915c30fe4.tar.gz gentoo-2-2d8590065d5de09752e600bb2a8180d915c30fe4.tar.bz2 gentoo-2-2d8590065d5de09752e600bb2a8180d915c30fe4.zip |
Change exists to self.exists in compat18.rb by Alex Legler.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
-rw-r--r-- | xfce-extra/eatmonkey/ChangeLog | 6 | ||||
-rw-r--r-- | xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild | 8 | ||||
-rw-r--r-- | xfce-extra/eatmonkey/files/eatmonkey-0.1.4-syntax.patch | 13 |
3 files changed, 20 insertions, 7 deletions
diff --git a/xfce-extra/eatmonkey/ChangeLog b/xfce-extra/eatmonkey/ChangeLog index 1df71157c827..6a0ba64c8798 100644 --- a/xfce-extra/eatmonkey/ChangeLog +++ b/xfce-extra/eatmonkey/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-extra/eatmonkey # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/eatmonkey/ChangeLog,v 1.1 2010/03/25 11:09:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/eatmonkey/ChangeLog,v 1.2 2010/03/25 11:19:42 ssuominen Exp $ + + 25 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + eatmonkey-0.1.4.ebuild, +files/eatmonkey-0.1.4-syntax.patch: + Change exists to self.exists in compat18.rb by Alex Legler. *eatmonkey-0.1.4 (25 Mar 2010) diff --git a/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild b/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild index bdd22e9c79f4..724e43d3432e 100644 --- a/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild +++ b/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild,v 1.1 2010/03/25 11:09:09 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild,v 1.2 2010/03/25 11:19:42 ssuominen Exp $ EAPI=2 inherit xfconf @@ -31,6 +31,7 @@ DEPEND="${COMMON_DEPEND} pkg_setup() { DOCS="AUTHORS ChangeLog NEWS README" XFCONF="--disable-dependency-tracking" + PATCHES=( "${FILESDIR}/${P}-syntax.patch" ) } src_prepare() { @@ -38,10 +39,5 @@ src_prepare() { -e 's:/usr/local:/usr:' \ src/eat{monkey,manager.rb} || die - # compat18.rb has class to handle this, but it's not working for some reason - sed -i \ - -e 's:Dir.exists:File.directory:' \ - src/eatsettings.rb || die - xfconf_src_prepare } diff --git a/xfce-extra/eatmonkey/files/eatmonkey-0.1.4-syntax.patch b/xfce-extra/eatmonkey/files/eatmonkey-0.1.4-syntax.patch new file mode 100644 index 000000000000..bacd69778e56 --- /dev/null +++ b/xfce-extra/eatmonkey/files/eatmonkey-0.1.4-syntax.patch @@ -0,0 +1,13 @@ +Fix compability with Ruby 1.8 by Alex Legler <a3li@gentoo.org>. It helps to actually mark the method static. + +--- src/compat18.rb ++++ src/compat18.rb +@@ -12,7 +12,7 @@ + end + + class Dir +- def exists?(path) ++ def self.exists?(path) + File.directory?(path) + end + end |