summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-04-05 11:35:20 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-04-05 11:35:20 +0000
commit52ca4623f8a0816e11d7e866fedbea3316779388 (patch)
tree1a7ef72f93f45f9a9c79a7ce8f4725cda0f7b702 /media-libs/liblastfm
parentVersion bump wrt #313187 by Ooblick. (diff)
downloadgentoo-2-52ca4623f8a0816e11d7e866fedbea3316779388.tar.gz
gentoo-2-52ca4623f8a0816e11d7e866fedbea3316779388.tar.bz2
gentoo-2-52ca4623f8a0816e11d7e866fedbea3316779388.zip
Fixed, bug 287906 - support for ruby-1.9
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/liblastfm')
-rw-r--r--media-libs/liblastfm/ChangeLog6
-rw-r--r--media-libs/liblastfm/liblastfm-0.3.0.ebuild12
2 files changed, 14 insertions, 4 deletions
diff --git a/media-libs/liblastfm/ChangeLog b/media-libs/liblastfm/ChangeLog
index 383f7ef888e9..57ad8882590c 100644
--- a/media-libs/liblastfm/ChangeLog
+++ b/media-libs/liblastfm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/liblastfm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.8 2010/04/05 07:03:54 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.9 2010/04/05 11:35:20 reavertm Exp $
+
+ 05 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org>
+ liblastfm-0.3.0.ebuild:
+ Fixed, bug 287906 - support for ruby-1.9
05 Apr 2010; Maciej Mrozowski <reavertm@gentoo.org>
liblastfm-0.3.0.ebuild:
diff --git a/media-libs/liblastfm/liblastfm-0.3.0.ebuild b/media-libs/liblastfm/liblastfm-0.3.0.ebuild
index 5137fcd4a548..8dfd46a241be 100644
--- a/media-libs/liblastfm/liblastfm-0.3.0.ebuild
+++ b/media-libs/liblastfm/liblastfm-0.3.0.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/media-libs/liblastfm/liblastfm-0.3.0.ebuild,v 1.9 2010/04/05 07:03:54 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-0.3.0.ebuild,v 1.10 2010/04/05 11:35:20 reavertm Exp $
EAPI="2"
@@ -21,9 +21,8 @@ COMMON_DEPEND="
>=x11-libs/qt-core-4.5:4
>=x11-libs/qt-sql-4.5:4
"
-# Unrestrict Ruby depend for next release!
DEPEND="${COMMON_DEPEND}
- =dev-lang/ruby-1.8*
+ dev-lang/ruby
>=x11-libs/qt-test-4.5:4
"
RDEPEND="${COMMON_DEPEND}
@@ -34,6 +33,12 @@ src_prepare() {
# Fix multilib paths
find . -name *.pro -exec sed -i -e "/target.path/s/lib/$(get_libdir)/g" {} + \
|| die "failed to fix multilib paths"
+
+ # >=1.9 ruby compatibility
+ case `ruby -e 'puts RUBY_VERSION'` in
+ 1.8.*) ;;
+ *) sed -e "s/require 'ftools'//g" -i admin/* || die ;;
+ esac
}
src_configure() {
@@ -42,5 +47,6 @@ src_configure() {
src_install() {
emake DESTDIR="${D}${ROOT}" install || die "emake install failed"
+
dodoc README || die "dodoc failed"
}