media-sound/ncmpc: Rewrite certain parts and general cleanup.

svn path=/sunrise/; revision=4227

3 files changed, 36 insertions, 32 deletions

diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index 18d65da92..a4baf2392 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jul 2007; David Shakaryan <omp@gentoo.org> ncmpc-9999.ebuild:
+  Rewrite certain parts and general cleanup.
+
   11 Jul 2007; Jakub Moc <jakub@gentoo.org> ncmpc-9999.ebuild:
   Fix broken dependencies
 
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index a50447ff7..80fe211ca 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,3 @@
-EBUILD ncmpc-9999.ebuild 1629 RMD160 b2ac7d7cd6476d739977a971c3cc05977784d522 SHA1 66e7b2b9fb3c1a57c3e6d49450f42db67bc887d8 SHA256 dff88106948757c1db3eea4d696726362ecea1fc2fc4cb3fdf393ed03fc13549
-MISC ChangeLog 483 RMD160 2a3f1cf9b9b456a79526616fa18693a02b6f7bce SHA1 88125b51463f99d0516a52d645d60f2911f1f756 SHA256 368506185009fd48c5ce8df5e48b7bbf1593193d05d5500e53d0f88fbf6efcc1
+EBUILD ncmpc-9999.ebuild 1557 RMD160 3b79dba26c116772cd9e2bdfe89497d76d1ce0ca SHA1 dae7fa6ffc21d05c168652a3207e88017d310cad SHA256 beb0dc3de6a6db658b1259eca51ac06a0389a9f2f154e0ac46f5bbc60fbcce33
+MISC ChangeLog 596 RMD160 745e24525b0de151bad7a52f0f30bf28f7f7e88b SHA1 5932fc984e23cfbb1ed89eea2196fed58253ea94 SHA256 981b5a17f7dea2db4d70264b63fdf10f2cc1a2eb64206ca95017e40ab8e46b36
 MISC metadata.xml 453 RMD160 fbafd84fe6ebffbe011ed0606a9c44acb060c35a SHA1 2d3fbef542650b819baf2d0299c626c103d593f7 SHA256 21910cceb3b9bebc2f72c4a04ac2342402138fb34c8aee5c230dc6a049884663
diff --git a/media-sound/ncmpc/ncmpc-9999.ebuild b/media-sound/ncmpc/ncmpc-9999.ebuild
index eda0a38f3..005999294 100644
--- a/media-sound/ncmpc/ncmpc-9999.ebuild
+++ b/media-sound/ncmpc/ncmpc-9999.ebuild
@@ -4,58 +4,59 @@
 
 inherit subversion
 
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="http://www.musicpd.org/?page=ncmpc"
 ESVN_REPO_URI="https://svn.musicpd.org/ncmpc/branches/tradiaz"
-ESVN_PROJECT="ncmpc-svn"
 ESVN_BOOTSTRAP="autogen.sh"
-LICENSE="GPL-2"
-IUSE="artist-screen clock-screen debug key-screen lyrics-screen mouse nls raw-mode search-screen"
 
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="http://www.musicpd.org/?page=ncmpc"
+
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="artist-screen clock-screen debug key-screen lyrics-screen mouse nls raw-mode search-screen"
 
-RDEPEND="sys-libs/ncurses
+RDEPEND="dev-libs/expat
 	>=dev-libs/glib-2.4
 	net-misc/curl
-	dev-libs/expat"
+	sys-libs/ncurses"
 
 	# FIXME: curl and expat are only needed for lyrics-screen
 	# Unfortunately, they are linked to whenever found
-	# lyrics-screen? ( net-misc/curl dev-libs/expat )"
+	# lyrics-screen? ( dev-libs/expat net-misc/curl )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
-	subversion_fetch     || die "${ESVN}: unknown problem occurred in subversion_fetch."
+	subversion_fetch
 
-	# clean some crappy submitted files
-	cd ${S}
-	sed -i -e '$D' autogen.sh || die "patching of autogen.sh failed."
-	sed -i -e 's:po/Makefile:po/Makefile.in:' configure.ac
-	rm po/Makefile.in
+	cd "${S}"
 
-	subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
+	# No need to configure during boostrap.
+	sed -i -e '/.\/configure/d' autogen.sh || die "sed failed"
+
+	# Do not enter po directory.
+	sed -i -e 's/ po\/Makefile//' configure.ac || die "sed failed"
+	sed -i -e '/\\$/{N;s/\\\n  po//}' Makefile.am || die "sed failed"
+
+	subversion_bootstrap
 }
 
 src_compile() {
-	econf $(use_enable artist-screen)	\
-			$(use_enable clock-screen)	\
-			$(use_enable debug)			\
-			$(use_enable key-screen)	\
-			$(use_enable lyrics-screen)	\
-			$(use_enable mouse)			\
-			$(use_enable nls)			\
-			$(use_enable raw-mode)		\
-			$(use_enable search-screen)
-
-	emake || die "make failed"
+	econf $(use_enable artist-screen) \
+		$(use_enable clock-screen) \
+		$(use_enable debug) \
+		$(use_enable key-screen) \
+		$(use_enable lyrics-screen) \
+		$(use_enable mouse) \
+		$(use_enable nls) \
+		$(use_enable raw-mode) \
+		$(use_enable search-screen) || die "econf failed"
+
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR="${D}" docdir=/usr/share/doc/${PF} \
-		|| die "install failed"
-
-	prepalldocs
+	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install \
+		|| die "emake install failed"
 }