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

Package-Manager: portage-2.1.9.25/cvs/Linux i686

4 files changed, 40 insertions, 4 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/Manifest b/media-libs/liblastfm/Manifest
index 0aa8d65644ec..c026e07e503b 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,6 +1,7 @@
+AUX liblastfm-0.3.3-ruby-1.9-fix.patch 709 RMD160 33292019d7794b1d41c93405eb0dc026d8ae8c52 SHA1 1d6ba47a986d56630e0840f951691bfa4158cf45 SHA256 2b48625cf97aef626fa1b00e6e233d40ca567e0715613a572d0570900c9cae3d
 DIST liblastfm-0.3.0.tar.bz2 92957 RMD160 39098fe55f88c3831ab5b1380c1e978c2ef55aac SHA1 1dabd8d67f4a36aebad29608c6f89b895472c25a SHA256 dd7297fbfe114b2eb29b491d56c6df9b83f16f576c70466d39a95a5ff19af76d
 DIST liblastfm-0.3.3.tar.gz 111700 RMD160 690931075f38fda78c69015ca5088c166f6e1013 SHA1 f2e9705c9c2cbeaa14f46da9bd35ab36fe710392 SHA256 2607ba6c1495bae8c0f93df1e6271ba5c4503ee53e5657d815fdd584e4df636c
 EBUILD liblastfm-0.3.0.ebuild 1263 RMD160 8c00e8189bd017faf049d7f0051087013cef274c SHA1 9ca91501aeba434f0aa145599ad399e7ae5299d8 SHA256 2fe69d64c69ed1ced1f0de7f81b0b66776caa442d93f9f8363092489acbb0b41
-EBUILD liblastfm-0.3.3.ebuild 1334 RMD160 80bdb235640147330be9dc41720c579843363e9b SHA1 e0a77c9f4fbad1938db7f120491510e0d91a9cd0 SHA256 f06926d585aa6a8de02124b34e6bdf5d26639e2d9716485f0476e8da61b88f05
-MISC ChangeLog 1720 RMD160 e8394dee982c000cbece9d18bbc9efe528f3859c SHA1 929e090ddb0230127ec5a34f64d79643a41dcd8e SHA256 bfded1e1ea4b87a3363fe44333ac7bc5fcf677978aa3e1a330c6d2ee14900476
+EBUILD liblastfm-0.3.3.ebuild 1443 RMD160 88462131bd8b89d62576ac6a61c6a23465965c8e SHA1 026107ebecbf14db46627a6e6bf44d923c1d1f19 SHA256 2765cde0dbf883f697c8f3ae47c25276db6cea2dd67717a4c8609fee2b8222e5
+MISC ChangeLog 1934 RMD160 6f1a6509c04f03015cb3d3840dc0b5089e1fad61 SHA1 104adaa14c3cd3dfffd53df04a24653882d870cd SHA256 0c8ca2361a7d37c4b7c65ef3f2251814f8e8bbda9298cfdf7483a8abf1f37318
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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() {