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
commitbad129829e7a8554b32992425d255a903ed85557 (patch)
tree8b6b75fc1f4aa51dff43c5e52ae33cd6553c5e48 /media-libs/liblastfm
parentVersion bump wrt #313187 by Ooblick. (diff)
downloadhistorical-bad129829e7a8554b32992425d255a903ed85557.tar.gz
historical-bad129829e7a8554b32992425d255a903ed85557.tar.bz2
historical-bad129829e7a8554b32992425d255a903ed85557.zip
Fixed, bug 287906 - support for ruby-1.9
Package-Manager: portage-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/Manifest4
-rw-r--r--media-libs/liblastfm/liblastfm-0.3.0.ebuild12
3 files changed, 16 insertions, 6 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/Manifest b/media-libs/liblastfm/Manifest
index 269941b95f63..083369c0bbfb 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,4 +1,4 @@
DIST liblastfm-0.3.0.tar.bz2 92957 RMD160 39098fe55f88c3831ab5b1380c1e978c2ef55aac SHA1 1dabd8d67f4a36aebad29608c6f89b895472c25a SHA256 dd7297fbfe114b2eb29b491d56c6df9b83f16f576c70466d39a95a5ff19af76d
-EBUILD liblastfm-0.3.0.ebuild 1159 RMD160 b905ff5ad8cb5d4c89b533097313c7bc790b477b SHA1 b22dfc52155524179a87f1bfe3d9af1ae0ef85f1 SHA256 169d3cc2f5184b3c7ffde1d9822c727356a106c876d904c2661e89658777de6e
-MISC ChangeLog 1285 RMD160 a68593a0360e458efeaae4d1cd46b3b3b39b4e6b SHA1 cf5b6ec1730602cf24f540ad5113fbfaa391e0d6 SHA256 62a279983372aabfbe3b133ee10a98b3c78efb804e4c9305e13b8812c5350e9b
+EBUILD liblastfm-0.3.0.ebuild 1255 RMD160 a75d2f868daf67cc2cf68a71e0f70e973ae14c20 SHA1 e322b794eac76eb3d5f78a02dd93ef59a8356874 SHA256 53f1d12f62559164a880d3e52372102fd7ecbd439330c2e2d0781a85a0553ef7
+MISC ChangeLog 1409 RMD160 84a0a876ad0b22ed661bc3dba7cb80523befe63f SHA1 7a7cea639da0d6c3e65a7a268924de7742d0d3bf SHA256 e66633178856613de0fdcad5896c374619d0b8e42a2c1f4ef4d719e13f82ecac
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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"
}