Fix backtrace that happens when trying to use the leoslyrics plugin (bug 316397)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 35 insertions, 8 deletions

diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index 4a7c90d77af6..3d509f0e30b8 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ncmpc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.51 2010/06/03 15:56:52 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.52 2010/06/03 19:09:26 angelos Exp $
+
+*ncmpc-0.16.1-r1 (03 Jun 2010)
+
+  03 Jun 2010; Christoph Mende <angelos@gentoo.org> -ncmpc-0.16.1.ebuild,
+  +ncmpc-0.16.1-r1.ebuild, +files/ncmpc-0.16.1-lyrics-backtrace.patch:
+  Fix backtrace that happens when trying to use the leoslyrics plugin (bug
+  316397)
 
 *ncmpc-0.16.1 (03 Jun 2010)
 
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index d885ec1a4773..aa3fb9ea2a74 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ncmpc-0.16.1-lyrics-backtrace.patch 633 RMD160 18c2062f1ccd82755505c635dc87d0b813167378 SHA1 442f9e2e0955836d212d9d810197c7a786f61ab7 SHA256 8895bd42ba0a4a06eaf4702470497a71127e42b89ce5b7018da36e6224ec5504
 DIST ncmpc-0.13.tar.bz2 209561 RMD160 535e643d89615d4dddbd5ab56a9ef5c11bc1ceb4 SHA1 b7a16751612bcec57f134848a4630352f2fc1cfe SHA256 0aab2394039277c19447ea7f9b767e4f670a31b99d5ea3095e8b29d12b44f346
 DIST ncmpc-0.14.tar.bz2 247783 RMD160 cf687b30bfe8c36c597289c359a8b0ce14923575 SHA1 0a2ea890129cf9cc2929ab93554d4892f7f19e7f SHA256 d04d4798df1c857e9cdbefe146f8827995bf7fe4357fd8cf0421299f7a0cdc87
 DIST ncmpc-0.16.1.tar.bz2 248796 RMD160 288f41723240aa27081cc9af599b609462cd2c02 SHA1 1728d4a3a880d08c356354d2ebaf2a18fdc56016 SHA256 936481e146f90a248c092ad82f166b40af82db6eec56537a64abac75d75ef922
 EBUILD ncmpc-0.13.ebuild 1383 RMD160 625f627a00fa2ffb8f712c1722b2815f2502e442 SHA1 de5967f0dafdbe803065de7dd9c902279d11bec8 SHA256 f270c8b15108f890f80fe7bb40a7189cd1440fbebba7f0851ae6d76993376062
 EBUILD ncmpc-0.14.ebuild 1461 RMD160 c36fc34e8a0286207f2d9a6baa066005c7ffafae SHA1 35447b9dabea06e3b26e43636faf112a4fd8c662 SHA256 e596b27b2a23cd096becbf2f369f5648ac33a86291b486713ee359265d001512
-EBUILD ncmpc-0.16.1.ebuild 1512 RMD160 6a57c61d6317bc850474947cce684aaeebf4745d SHA1 373b7303c7464f0594707409589815ac6c57f427 SHA256 6e7b0483387cd68e8568911269beddf0231e7ff8150f7a69becf106a6e06f752
-MISC ChangeLog 6279 RMD160 0f55bf9c75658b951c17adac40d4141aa5d089a1 SHA1 ee9aaf052d1e83435483364856fa13b02df8b7c4 SHA256 e01f7d53a8c5c8670cc246dabefdf89067a2c11f21f6a953d66956125677effd
+EBUILD ncmpc-0.16.1-r1.ebuild 1575 RMD160 9ebe67719ace1128a8c192f2aa04bc3fca5fd54c SHA1 8d096efb005aebcb445ac6cc4db79f63b617d4ea SHA256 253171fc4fa9f68c191668426fededcc0d163cdbd594d0c3d2926eacd7601e6b
+MISC ChangeLog 6542 RMD160 4ed2a9ea1060f8a181ef21897cef488fa9f23470 SHA1 6d00261a7f5bc5479ff9a22a4cca83cc4fd482d3 SHA256 daa1b551a43d22bc65893113228f42bc9f11a953c48228220e7a63e9a8e1c67e
 MISC metadata.xml 725 RMD160 40f1ac0d9737e5a38cfd9e4ea77f84327fccf244 SHA1 cc8018bf439e02a861a6fad7127a8318831087f5 SHA256 a9eca18e559d647f099cbb39f05f5c983bf8df7feb7c7f7f0c718d17c923e7f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwH0NgACgkQmWq1bYTyC0NhNgD/UzEWXQ9QdeDhUsBLpSbWW6OR
-ccKDGA0III6l19Do2qYA/1jXiZcOmcc0FszpW5s8k7tBzOnJmQ1UFkKF4BaHADvm
-=6IYn
+iF4EAREIAAYFAkwH/fkACgkQmWq1bYTyC0MLpQEApOvdTYL+k/CUyNYS4kvdhRao
+GfsVt6DdeYmo0vNBg6QBAIU18kbBAF1XZK0fabIETXSMSIiXpPDtdnP1av1urHUf
+=wVu4
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ncmpc/files/ncmpc-0.16.1-lyrics-backtrace.patch b/media-sound/ncmpc/files/ncmpc-0.16.1-lyrics-backtrace.patch
new file mode 100644
index 000000000000..7a6c1fdd3f60
--- /dev/null
+++ b/media-sound/ncmpc/files/ncmpc-0.16.1-lyrics-backtrace.patch
@@ -0,0 +1,17 @@
+diff --git a/lyrics/30-leoslyrics.py b/lyrics/30-leoslyrics.py
+index 2a40f37..639a303 100755
+--- a/lyrics/30-leoslyrics.py
++++ b/lyrics/30-leoslyrics.py
+@@ -43,7 +43,11 @@ def search(artist, title):
+                        'artist': artist,
+                        'songtitle': title})
+     url = "http://api.leoslyrics.com/api_search.php?" + query
+-    f = urlopen(url)
++    try:
++        f = urlopen(url)
++    except IOError:
++        stderr.write("Failed to connect to http://api.leoslyrics.com, it seems down!\n")
++	exit(1)
+     handler = SearchContentHandler()
+     parser = make_parser()
+     parser.setContentHandler(handler)
diff --git a/media-sound/ncmpc/ncmpc-0.16.1.ebuild b/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild
index b0ffe5e7656f..df02cae38542 100644
--- a/media-sound/ncmpc/ncmpc-0.16.1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.16.1.ebuild,v 1.1 2010/06/03 15:56:52 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild,v 1.1 2010/06/03 19:09:26 angelos Exp $
 
 EAPI=2
-inherit multilib
+inherit base multilib
 
 DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
 HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc"
@@ -23,6 +23,8 @@ RDEPEND=">=dev-libs/glib-2.12:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-lyrics-backtrace.patch" )
+
 src_configure() {
 	# The use_with lyrics-screen is for multilib
 	# USE lirc is broken wrt #250015