Applied patch sent to the amarok-packagers group by Thomas Klausner (copied from KDE overlay)

(Portage version: 2.1.9.25/cvs/Linux i686)

3 files changed, 37 insertions, 2 deletions

diff --git a/media-libs/liblastfm/ChangeLog b/media-libs/liblastfm/ChangeLog
index 897ab69bcdba..5c074ef4f38b 100644
--- a/media-libs/liblastfm/ChangeLog
+++ b/media-libs/liblastfm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.11 2010/09/27 10:12:52 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/ChangeLog,v 1.12 2010/12/14 16:40:25 dilfridge Exp $
+
+  14 Dec 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  liblastfm-0.3.3.ebuild, +files/liblastfm-0.3.3-ruby-1.9-fix.patch:
+  Applied patch sent to the amarok-packagers group by Thomas Klausner
+  <wiz@NetBSD.org>
 
 *liblastfm-0.3.3 (27 Sep 2010)
 
diff --git a/media-libs/liblastfm/files/liblastfm-0.3.3-ruby-1.9-fix.patch b/media-libs/liblastfm/files/liblastfm-0.3.3-ruby-1.9-fix.patch
new file mode 100644
index 000000000000..83f1c23b2204
--- /dev/null
+++ b/media-libs/liblastfm/files/liblastfm-0.3.3-ruby-1.9-fix.patch
@@ -0,0 +1,28 @@
+$NetBSD: patch-aa,v 1.1 2010/09/25 10:16:46 wiz Exp $
+
+ruby-1.9 doesn't have "." in default search path.
+
+--- admin/qpp.orig	2010-09-11 14:16:54.000000000 +0000
++++ admin/qpp
+@@ -3,6 +3,7 @@
+ # RESOURCES under each argument to ARGV as directories
+ 
+ cwd=File.dirname __FILE__
++$:.push(".")
+ require 'find'
+ require "#{cwd}/findsrc"
+ 
+$NetBSD: patch-ab,v 1.1 2010/09/25 10:16:46 wiz Exp $
+
+ruby-1.9 doesn't have "." in default search path.
+
+--- admin/Makefile.rb.orig	2010-09-25 10:12:30.000000000 +0000
++++ admin/Makefile.rb
+@@ -5,6 +5,7 @@
+ # class names in there which #include the file that contains the class
+ 
+ cwd = File.dirname( __FILE__ )
++$:.push(".")
+ require 'find'
+ require "#{cwd}/platform.rb"
+ 
diff --git a/media-libs/liblastfm/liblastfm-0.3.3.ebuild b/media-libs/liblastfm/liblastfm-0.3.3.ebuild
index 53d9de3f6893..ac5c1154da68 100644
--- a/media-libs/liblastfm/liblastfm-0.3.3.ebuild
+++ b/media-libs/liblastfm/liblastfm-0.3.3.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.3.ebuild,v 1.1 2010/09/27 10:12:52 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblastfm/liblastfm-0.3.3.ebuild,v 1.2 2010/12/14 16:40:25 dilfridge Exp $
 
 EAPI="2"
 
@@ -41,6 +41,8 @@ src_prepare() {
 		1.8.*) ;;
 		*) sed -e "s/require 'ftools'//g" -i admin/* || die ;;
 	esac
+
+	epatch "${FILESDIR}/${P}-ruby-1.9-fix.patch" || die "Failed to apply patch to fix compilation with ruby-1.9"
 }
 
 src_configure() {