Version bump to new bugfix release and remove old.

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

7 files changed, 28 insertions, 120 deletions

diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index ef8535ede669..1d0045a367e9 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,14 @@
 # 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.54 2010/08/06 12:15:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.55 2010/10/11 16:34:19 radhermit Exp $
+
+*ncmpc-0.18 (11 Oct 2010)
+
+  11 Oct 2010; Tim Harder <radhermit@gentoo.org> -ncmpc-0.16.1-r1.ebuild,
+  -files/ncmpc-0.16.1-asneeded.patch,
+  -files/ncmpc-0.16.1-lyrics-backtrace.patch, -ncmpc-0.17.ebuild,
+  -files/ncmpc-0.17-fix-segfault-on-help-screen.patch, +ncmpc-0.18.ebuild:
+  Version bump to new bugfix release and remove old.
 
 *ncmpc-0.17 (06 Aug 2010)
 
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 052a1174bcaf..8a852f7f9825 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,11 +1,20 @@
-AUX ncmpc-0.16.1-asneeded.patch 326 RMD160 87d8015a1e1e8929ec9334485f5ee16c222e3779 SHA1 a64509fd134ff87fe4b2834337765acf19eadf38 SHA256 4cbf856bdc07d0dc2acd21427fc4979d855fc6e226ea789454d27df6d58c682c
-AUX ncmpc-0.16.1-lyrics-backtrace.patch 633 RMD160 18c2062f1ccd82755505c635dc87d0b813167378 SHA1 442f9e2e0955836d212d9d810197c7a786f61ab7 SHA256 8895bd42ba0a4a06eaf4702470497a71127e42b89ce5b7018da36e6224ec5504
-AUX ncmpc-0.17-fix-segfault-on-help-screen.patch 308 RMD160 2e2bf47983298840cb8c8f5a6e9922e86ccce4b2 SHA1 d7bfc1c0ea572e28c8cd95c3929ffa6ff9599be9 SHA256 adf445002a512b5ccdde0725dc2c00d130937be195d8e54a873a45b6730461ca
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
-DIST ncmpc-0.17.tar.bz2 254701 RMD160 370148a52475ac58343886640522b45e1c104336 SHA1 aa5cd5aa71a259db3899bc064b1d848f0b8d14a7 SHA256 f978ccb260c33c7fd42383a93a0f8fc8b42a27d1f2a43a3526753688add30472
+DIST ncmpc-0.18.tar.bz2 258718 RMD160 e5e0f738006e9443b9be4e2120cfb59d48c2508f SHA1 2e3ed1beb80821655f00578ffed1828efb6f3445 SHA256 1e4eb3af8197d81651adbb7e93df257922703406100e3a52debb6c1885cb5aca
 EBUILD ncmpc-0.14.ebuild 1461 RMD160 c36fc34e8a0286207f2d9a6baa066005c7ffafae SHA1 35447b9dabea06e3b26e43636faf112a4fd8c662 SHA256 e596b27b2a23cd096becbf2f369f5648ac33a86291b486713ee359265d001512
-EBUILD ncmpc-0.16.1-r1.ebuild 1663 RMD160 1a91418e92e269852d38a5f296eb75cc07fcc59a SHA1 e7d2eb485555a0840d3051f62227c9e94c88eaa8 SHA256 3d6182f21533364eaf4ddad422ff4edceeea14821eb402b0bf644cdac08e0920
-EBUILD ncmpc-0.17.ebuild 1824 RMD160 15b8e17a40ab791e1c209fac948c37f2186201d0 SHA1 7cdbf3f769e6faa0c50b0578151d31a42fc7c41f SHA256 9ba22bcca5fd163afd982e46aae6ecd8c6a38710b20ef2ea4e88f5096d47f6b3
-MISC ChangeLog 7060 RMD160 001dc684f0ef66e3b79d9ef7f274ca341eb81e3a SHA1 78a7784a2c992afb50817409c388f012c2182dc2 SHA256 ebb1499db4173b8a594f8f54583003ac5b1c8acce8e5ade958907f426d8c40e4
+EBUILD ncmpc-0.18.ebuild 1614 RMD160 ae67abd8f1485282b1836f108a913de495404b7d SHA1 1f20814deecb8bdd691c17858e9a749250cb0a67 SHA256 6775bed93b3acbb7316e65de9e625f69f342644379f4eb53e830fad0538d9516
+MISC ChangeLog 7394 RMD160 e13d423d24754c07dc7b60eb114234bd06427bfc SHA1 6ef803237d272bd9d79ea7c2691ced1c011038ce SHA256 442ba94505b54348e2b9bd1ce7b1e5c28a7d537c66fd13521c53f61a3bfdd380
 MISC metadata.xml 725 RMD160 40f1ac0d9737e5a38cfd9e4ea77f84327fccf244 SHA1 cc8018bf439e02a861a6fad7127a8318831087f5 SHA256 a9eca18e559d647f099cbb39f05f5c983bf8df7feb7c7f7f0c718d17c923e7f0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMszyUAAoJEEqz6FtPBkyjq/IH/AxjQB0TsQjg8pIQOrJiHnQ5
+3b8aQdISBfDt26zUVumSfSPSKsXsXCTQ5eqXLpmvUiLwFE8JPzQuLh6ZVgzIkhJu
+5yf4Zw1qxbF4fwQsFv6x95WwEDIW1XbG7CWTeyvUas5c38PSmv1qQoGFhWk9n0Cv
+q/hVQAv+dALEfyZKgWAi35u5ogDKdL7Pab8NAIZ1Cufhz1aDvP6sZfw2Ryz5Ugxp
+VnE9TzqoL1n93MIGtAyZxsfslGikmSUP9EHGXi2VR+q/4QWESauDjQFqYr5SQgez
+UjwjEytiWf/860Tz6Lhbk6/TV6T0Dxka97b+pCVEmEKuZUD/hh5YpK8XcexZoLM=
+=oPDc
+-----END PGP SIGNATURE-----
diff --git a/media-sound/ncmpc/files/ncmpc-0.16.1-asneeded.patch b/media-sound/ncmpc/files/ncmpc-0.16.1-asneeded.patch
deleted file mode 100644
index f472a2ec238f..000000000000
--- a/media-sound/ncmpc/files/ncmpc-0.16.1-asneeded.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.am
-+++ Makefile.am
-@@ -168,7 +168,8 @@
- 
- test_run_hscroll_SOURCES = test/run_hscroll.c src/hscroll.c src/charset.c
- test_run_hscroll_CPPFLAGS = -I$(srcdir)/src $(AM_CPPFLAGS)
--test_run_hscroll_LDFLAGS = $(GLIB_LIBS)
-+test_run_hscroll_CFLAGS = $(GLIB_CFLAGS)
-+test_run_hscroll_LDADD = $(GLIB_LIBS)
- 
- #
- # sparse
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
deleted file mode 100644
index 7a6c1fdd3f60..000000000000
--- a/media-sound/ncmpc/files/ncmpc-0.16.1-lyrics-backtrace.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/files/ncmpc-0.17-fix-segfault-on-help-screen.patch b/media-sound/ncmpc/files/ncmpc-0.17-fix-segfault-on-help-screen.patch
deleted file mode 100644
index 0cdf767b1400..000000000000
--- a/media-sound/ncmpc/files/ncmpc-0.17-fix-segfault-on-help-screen.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/328519
-
---- src/screen_help.c
-+++ src/screen_help.c
-@@ -105,7 +105,9 @@
- 	{ 0, CMD_LIST_JUMP, NULL },
- 	{ 0, CMD_TOGGLE_FIND_WRAP, NULL },
- 	{ 0, CMD_LOCATE, NULL },
-+#ifdef ENABLE_SONG_SCREEN
- 	{ 0, CMD_SCREEN_SONG, NULL },
-+#endif
- 	{ 0, CMD_NONE, NULL },
- 	{ 0, CMD_QUIT, NULL },
- 
diff --git a/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild b/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild
deleted file mode 100644
index 3c5549b2947d..000000000000
--- a/media-sound/ncmpc/ncmpc-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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-r1.ebuild,v 1.2 2010/07/13 19:02:44 xarthisius Exp $
-
-EAPI=2
-inherit autotools base multilib
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc"
-SRC_URI="http://downloads.sourceforge.net/musicpd/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="artist-screen colors debug +help-screen key-screen lyrics-screen
-mouse nls search-screen song-screen"
-#lirc
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	dev-libs/popt
-	media-libs/libmpdclient"
-#	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-lyrics-backtrace.patch"
-	"${FILESDIR}/${P}-asneeded.patch" )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# The use_with lyrics-screen is for multilib
-	# USE lirc is broken wrt #250015
-	# $(use_enable lirc) \
-	econf \
-		--docdir=${EPREFIX}/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		$(use_enable artist-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lyrics-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics) \
-		$(use_enable mouse) \
-		$(use_enable nls) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README doc/config.sample doc/keys.sample
-}
diff --git a/media-sound/ncmpc/ncmpc-0.17.ebuild b/media-sound/ncmpc/ncmpc-0.18.ebuild
index c7f2043d3978..e09c24db4906 100644
--- a/media-sound/ncmpc/ncmpc-0.17.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.18.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.17.ebuild,v 1.3 2010/08/06 12:20:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.18.ebuild,v 1.1 2010/10/11 16:34:19 radhermit Exp $
 
 EAPI=2
-inherit autotools eutils multilib
+inherit multilib
 
 DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
 HOMEPAGE="http://mpd.wikia.com/wiki/Client:Ncmpc"
@@ -21,13 +21,6 @@ RDEPEND=">=dev-libs/glib-2.12:2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.16.1-asneeded.patch \
-		"${FILESDIR}"/${PN}-0.16.1-lyrics-backtrace.patch \
-		"${FILESDIR}"/${P}-fix-segfault-on-help-screen.patch
-	eautoreconf
-}
-
 src_configure() {
 	# upstream lirc doesn't have pkg-config file wrt #250015
 	if use lirc; then