fix bug #61212

(Portage version: 2.0.51.22-r2)

7 files changed, 56 insertions, 31 deletions

diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index 88dec450a93d..0c6a278da3e2 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/ncmpc
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.10 2005/05/22 17:25:49 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.11 2005/09/08 14:29:13 axxo Exp $
+
+*ncmpc-0.11.1-r1 (08 Sep 2005)
+
+  08 Sep 2005; Thomas Matthijs <axxo@gentoo.org> -ncmpc-0.10.1.ebuild,
+  ncmpc-0.11.1.ebuild, +ncmpc-0.11.1-r1.ebuild:
+  fix bug #61212
 
   22 May 2005; Guy Martin <gmsoft@gentoo.org> ncmpc-0.11.1.ebuild:
   Stable on hppa.
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 6aa7fc360d57..dd94fb224ff7 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,8 +1,10 @@
-MD5 2f6f51d425abe6e29365416439161a71 ChangeLog 1320
-MD5 d0d7a22ea15c7bc5927bf6f24149d4f8 metadata.xml 218
 MD5 c1a2abea06fef22c4a68d1fac60ff044 ncmpc-0.10.1.ebuild 660
+MD5 e4df093e12c0666b00b94c59e9471abe ncmpc-0.11.1.ebuild 717
+MD5 44e8c79bd3038fd096745bb083b1219d ncmpc-0.11.1-r1.ebuild 1213
 MD5 cf38d881dcdcc6e98cf3bdf2a48e6060 ncmpc-0.11.0.ebuild 659
-MD5 06bb7af48d1524a2f18b8c08d40c7ab4 ncmpc-0.11.1.ebuild 718
+MD5 2f6f51d425abe6e29365416439161a71 ChangeLog 1320
+MD5 d0d7a22ea15c7bc5927bf6f24149d4f8 metadata.xml 218
 MD5 981af082baec0896a3afa3f9c79df043 files/digest-ncmpc-0.10.1 64
 MD5 15d947021147e010e4721bd8acb0cbd2 files/digest-ncmpc-0.11.0 64
 MD5 f618389275480629891a25befac11a7f files/digest-ncmpc-0.11.1 64
+MD5 f618389275480629891a25befac11a7f files/digest-ncmpc-0.11.1-r1 64
diff --git a/media-sound/ncmpc/files/digest-ncmpc-0.10.1 b/media-sound/ncmpc/files/digest-ncmpc-0.10.1
deleted file mode 100644
index 3cc20b0f938c..000000000000
--- a/media-sound/ncmpc/files/digest-ncmpc-0.10.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56466acb87371b7420d26401bc7e821e ncmpc-0.10.1.tar.gz 173483
diff --git a/media-sound/ncmpc/files/digest-ncmpc-0.11.1-r1 b/media-sound/ncmpc/files/digest-ncmpc-0.11.1-r1
new file mode 100644
index 000000000000..75b005dde193
--- /dev/null
+++ b/media-sound/ncmpc/files/digest-ncmpc-0.11.1-r1
@@ -0,0 +1 @@
+MD5 c90668b12f3676c73913a863482ec405 ncmpc-0.11.1.tar.gz 273489
diff --git a/media-sound/ncmpc/ncmpc-0.10.1.ebuild b/media-sound/ncmpc/ncmpc-0.10.1.ebuild
deleted file mode 100644
index e9ca728adf36..000000000000
--- a/media-sound/ncmpc/ncmpc-0.10.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.10.1.ebuild,v 1.6 2005/02/10 23:49:25 axxo Exp $
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="http://www.musicpd.org/?page=ncmpc"
-SRC_URI="mirror://sourceforge/musicpd/${P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="ppc x86 ~sparc ~amd64"
-
-RDEPEND="virtual/libc
-	sys-libs/ncurses
-	dev-libs/popt
-	>=dev-libs/glib-2.0"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	make install DESTDIR=${D} docdir=/usr/share/doc/${PF} \
-		|| die "install failed"
-	prepalldocs
-}
diff --git a/media-sound/ncmpc/ncmpc-0.11.1-r1.ebuild b/media-sound/ncmpc/ncmpc-0.11.1-r1.ebuild
new file mode 100644
index 000000000000..202d918184f7
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.11.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1-r1.ebuild,v 1.1 2005/09/08 14:29:13 axxo Exp $
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://www.musicpd.org/?page=ncmpc"
+SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz mirror://sourceforge/musicpd/${P}.tar.gz"
+LICENSE="GPL-2"
+IUSE="clock-screen mouse search-screen key-screen raw-mode nls debug"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+RDEPEND="virtual/libc
+	sys-libs/ncurses
+	dev-libs/popt
+	>=dev-libs/glib-2.4"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use search-screen && einfo "Please note that the search-screen is experimental"
+}
+
+src_compile() {
+	econf $(use_enable clock-screen) \
+		  $(use_enable debug) \
+		  $(use_enable mouse) \
+		  $(use_enable key-screen) \
+		  $(use_enable search-screen) \
+		  $(use_with nls) \
+		  $(use_with raw-mode)
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} docdir=/usr/share/doc/${PF} \
+		|| die "install failed"
+
+	prepalldocs
+}
diff --git a/media-sound/ncmpc/ncmpc-0.11.1.ebuild b/media-sound/ncmpc/ncmpc-0.11.1.ebuild
index 6c9b9c03b1c1..82d89bbd90e7 100644
--- a/media-sound/ncmpc/ncmpc-0.11.1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1.ebuild,v 1.2 2005/05/22 17:25:49 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.11.1.ebuild,v 1.3 2005/09/08 14:29:13 axxo Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://mercury.chem.pitt.edu/~shank/${P}.tar.gz mirror://sourceforge/mu
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~sparc ~amd64 hppa"
+KEYWORDS="~amd64 hppa ~ppc ~sparc x86"
 
 RDEPEND="virtual/libc
 	sys-libs/ncurses