Add examples USE flag and clean up

(Portage version: 2.1.2.7)

4 files changed, 10 insertions, 84 deletions

diff --git a/media-sound/cmus/ChangeLog b/media-sound/cmus/ChangeLog
index a8c584a3e14d..cd7d676e10af 100644
--- a/media-sound/cmus/ChangeLog
+++ b/media-sound/cmus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/cmus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.10 2007/05/31 19:49:24 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/ChangeLog,v 1.11 2007/06/01 06:10:35 opfer Exp $
+
+  01 Jun 2007; Christian Faulhammer <opfer@gentoo.org> -cmus-2.1.0.ebuild,
+  cmus-2.1.0-r1.ebuild:
+  Add examples USE flag and clean up
 
   31 May 2007; Daniel Gryniewicz <dang@gentoo.org> cmus-2.1.0-r1.ebuild:
   Marked stable on amd64 for bug #180295
diff --git a/media-sound/cmus/cmus-2.1.0-r1.ebuild b/media-sound/cmus/cmus-2.1.0-r1.ebuild
index 11d2c2aa737a..a60474cba8d6 100644
--- a/media-sound/cmus/cmus-2.1.0-r1.ebuild
+++ b/media-sound/cmus/cmus-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.1.0-r1.ebuild,v 1.4 2007/05/31 19:49:24 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.1.0-r1.ebuild,v 1.5 2007/06/01 06:10:35 opfer Exp $
 
 inherit eutils multilib
 
@@ -11,7 +11,7 @@ SRC_URI="http://onion.dynserv.net/~timo/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="aac alsa ao arts debug flac mad mikmod modplug mp3 mp4 musepack oss vorbis"
+IUSE="aac alsa ao arts debug examples flac mad mikmod modplug mp3 mp4 musepack oss vorbis"
 
 DEPEND="sys-libs/ncurses
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
@@ -51,7 +51,9 @@ pkg_setup() {
 src_unpack(){
 	unpack ${A}
 	cd "${S}"
+	# Port to older faad, will be included in next release
 	epatch "${FILESDIR}/${P}-faad-2.0.patch"
+	# Will have a configurable path in next release, now it would install in the wrong directory
 	sed -i -e "s~\(/doc/cmus\)~\1-${PVR}~" "${S}/Makefile" || die "sed failed"
 }
 
@@ -84,4 +86,5 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS README
+	use examples || rm -rf "${D}/usr/share/doc/${PF}/examples/"
 }
diff --git a/media-sound/cmus/cmus-2.1.0.ebuild b/media-sound/cmus/cmus-2.1.0.ebuild
deleted file mode 100644
index f51439c8f3d3..000000000000
--- a/media-sound/cmus/cmus-2.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cmus/cmus-2.1.0.ebuild,v 1.3 2007/01/25 14:42:09 beandog Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="A ncurses based music player with plugin support for many formats"
-HOMEPAGE="http://onion.dynserv.net/~timo/cmus.html"
-SRC_URI="http://onion.dynserv.net/~timo/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa ao arts debug flac mad mikmod modplug mp3 musepack oss vorbis"
-
-DEPEND="sys-libs/ncurses
-	alsa? ( >=media-libs/alsa-lib-1.0.11 )
-	ao? (  media-libs/libao )
-	arts? ( kde-base/arts )
-	flac? ( media-libs/flac )
-	mad? ( >=media-libs/libmad-0.14 )
-	mikmod? ( media-libs/libmikmod )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	mp3? ( >=media-libs/libmad-0.14 )
-	musepack? ( >=media-libs/libmpcdec-1.2 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )"
-#	aac? ( >=media-libs/faad-2.5 ) # after licensing issues have been settled
-#	mp4? ( media-libs/libmp4v2
-#		>=media-libs/faad-2.5 )
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! built_with_use sys-libs/ncurses unicode
-	then
-		ewarn
-		ewarn "\t sys-libs/ncurses compiled without the unicode USE flag."
-		ewarn "\t Please recompile sys-libs/ncurses with USE=unicode and emerge"
-		ewarn "\t cmus again if you experience any problems with UTF-8 or"
-		ewarn "\t wide characters."
-		ewarn
-		epause
-	fi
-}
-
-my_config() {
-	local value
-	use ${1} && value=y || value=n
-	myconf="${myconf} ${2}=${value}"
-}
-
-src_compile() {
-	local debuglevel myconf
-
-	use debug && debuglevel=2 || debuglevel=1
-
-	myconf="CONFIG_SUN=n CONFIG_AAC=n CONFIG_MP4=n"
-	my_config ao CONFIG_AO
-	my_config alsa CONFIG_ALSA
-	my_config arts CONFIG_ARTS
-	my_config flac CONFIG_FLAC
-	my_config mad CONFIG_MAD
-	my_config mikmod CONFIG_MIKMOD
-	my_config mp3 CONFIG_MAD
-	my_config modplug CONFIG_MODPLUG
-	my_config musepack CONFIG_MPC
-	my_config oss CONFIG_OSS
-	my_config vorbis CONFIG_VORBIS
-
-	# econf doesn't work, because configure wants "prefix" (and similar) without dashes
-	./configure prefix=/usr ${myconf} libdir=/usr/$(get_libdir) DEBUG=$debuglevel || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README
-}
diff --git a/media-sound/cmus/files/digest-cmus-2.1.0 b/media-sound/cmus/files/digest-cmus-2.1.0
deleted file mode 100644
index 98c2b516ef2b..000000000000
--- a/media-sound/cmus/files/digest-cmus-2.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 11ca53a05442ee073b6e790e957b1433 cmus-2.1.0.tar.bz2 146956
-RMD160 f359c8929dd616855aedbe2c4d1d2e252a8946ca cmus-2.1.0.tar.bz2 146956
-SHA256 fe47e258918526b9e1b2cd7081d73654af8c326f0f3b0fabe450b805b78423c0 cmus-2.1.0.tar.bz2 146956