Add examples USE flag and clean up

Package-Manager: portage-2.1.2.7

5 files changed, 22 insertions, 103 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/Manifest b/media-sound/cmus/Manifest
index b57c9ba656e6..69a08abffd4b 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -6,32 +6,25 @@ MD5 a4eb9a6a20e5d0a9ece11fd802e14cb3 files/cmus-2.1.0-faad-2.0.patch 9319
 RMD160 04e836ec3ae74d7d233aa9bf96bd5313a67ad4fa files/cmus-2.1.0-faad-2.0.patch 9319
 SHA256 74e70a7c6430f3d210a27a4ed272f70d4ab7be12b665d6b9eb30d4f9ae4d71be files/cmus-2.1.0-faad-2.0.patch 9319
 DIST cmus-2.1.0.tar.bz2 146956 RMD160 f359c8929dd616855aedbe2c4d1d2e252a8946ca SHA1 961d4bd1446c9499aeaac5a280761e5d98ca514f SHA256 fe47e258918526b9e1b2cd7081d73654af8c326f0f3b0fabe450b805b78423c0
-EBUILD cmus-2.1.0-r1.ebuild 2431 RMD160 7784a3d91376f18f2720ff6ce38e8416aabe4232 SHA1 a271641d236a454659677ff37c1a097dc1c1451a SHA256 1636590b68ed7d0af77877b8aa2363cfab82039ba0b106b32fde741b61152ce6
-MD5 1f0fdd51251fd35b117d9a6ee5518728 cmus-2.1.0-r1.ebuild 2431
-RMD160 7784a3d91376f18f2720ff6ce38e8416aabe4232 cmus-2.1.0-r1.ebuild 2431
-SHA256 1636590b68ed7d0af77877b8aa2363cfab82039ba0b106b32fde741b61152ce6 cmus-2.1.0-r1.ebuild 2431
-EBUILD cmus-2.1.0.ebuild 2296 RMD160 f9548391af2222c8f0b4f542812f11e9c0aee3b0 SHA1 7a5780b97801cdcf37992f9675060e2c52e0d98b SHA256 b14bf8b70c488aba1446b34875c826dc224d396e6e206125674b14ec2254f897
-MD5 7891a424e0ba704bbb0c8f847b83b1d1 cmus-2.1.0.ebuild 2296
-RMD160 f9548391af2222c8f0b4f542812f11e9c0aee3b0 cmus-2.1.0.ebuild 2296
-SHA256 b14bf8b70c488aba1446b34875c826dc224d396e6e206125674b14ec2254f897 cmus-2.1.0.ebuild 2296
-MISC ChangeLog 1798 RMD160 a60b29440a510de803faf9d53f15f23f04e8a9be SHA1 4c0b60e327ec142f0421ee4f64d5fcb29cbf0c1a SHA256 a74ace103645a5df25d4e1de20e4ac403037c64689311699382fefb5d683d78e
-MD5 29c0d15bc2f9b7db1f5745a084ed5a54 ChangeLog 1798
-RMD160 a60b29440a510de803faf9d53f15f23f04e8a9be ChangeLog 1798
-SHA256 a74ace103645a5df25d4e1de20e4ac403037c64689311699382fefb5d683d78e ChangeLog 1798
+EBUILD cmus-2.1.0-r1.ebuild 2652 RMD160 88000d9ff0c7118c99a92b8b8d9aea25f1f69e20 SHA1 fe2da553d2dd9cc591a352637badb4e8cd4dd36a SHA256 3967b3f4eb066b134beb61ed4be250c12c10860a14bce6ccb031d671f1bbf515
+MD5 ba554ff16ca89e916d0a358254b508d8 cmus-2.1.0-r1.ebuild 2652
+RMD160 88000d9ff0c7118c99a92b8b8d9aea25f1f69e20 cmus-2.1.0-r1.ebuild 2652
+SHA256 3967b3f4eb066b134beb61ed4be250c12c10860a14bce6ccb031d671f1bbf515 cmus-2.1.0-r1.ebuild 2652
+MISC ChangeLog 1936 RMD160 923f4eff8870c11015351632e33cbec3573a0c8c SHA1 7d6d70b0fb75bd35a0edb26652e3f572e4227021 SHA256 c0bb7bb143e5dcb19d2b21b0c585f3f8a20660d095a78e6f4a37604f0449dfd7
+MD5 6f4faa68d07103ad1471aa7de2f72902 ChangeLog 1936
+RMD160 923f4eff8870c11015351632e33cbec3573a0c8c ChangeLog 1936
+SHA256 c0bb7bb143e5dcb19d2b21b0c585f3f8a20660d095a78e6f4a37604f0449dfd7 ChangeLog 1936
 MISC metadata.xml 266 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 SHA1 2eb26e89e18770b3cc373ab290938a2aea6bce97 SHA256 2d1e8e22e242d00cd34f662e4d04d2e7d488951bd1e84fe3132d2b1ebd1b71d2
 MD5 f2e99271e391d686f969c3d65ac24562 metadata.xml 266
 RMD160 ec474d4b2edebeccd738705e8717ecdb4aaca347 metadata.xml 266
 SHA256 2d1e8e22e242d00cd34f662e4d04d2e7d488951bd1e84fe3132d2b1ebd1b71d2 metadata.xml 266
-MD5 09c6a71861ec01bf051528e96b76651b files/digest-cmus-2.1.0 235
-RMD160 a55cde314c80603ebb98468fbd26542662ba5203 files/digest-cmus-2.1.0 235
-SHA256 c40feb869833f7706be4e6c528e121c6b18fddeb0d275c0ad9695d8714f8a3a2 files/digest-cmus-2.1.0 235
 MD5 09c6a71861ec01bf051528e96b76651b files/digest-cmus-2.1.0-r1 235
 RMD160 a55cde314c80603ebb98468fbd26542662ba5203 files/digest-cmus-2.1.0-r1 235
 SHA256 c40feb869833f7706be4e6c528e121c6b18fddeb0d275c0ad9695d8714f8a3a2 files/digest-cmus-2.1.0-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGXybaomPajV0RnrERAk1EAJ9aVTIwFLGW2eL1Fv5rX6xotU2wCQCeM29k
-XHBwGEMBTa5bbzpcVamd/yY=
-=bFjF
+iD8DBQFGX7hqNQqtfCuFneMRAp4DAJwLtSvq6MuYHfzh9HIiiKdrUxciJQCfZwL/
+EBPDQCaxlpdx4hNpXiQRvyE=
+=rNiC
 -----END PGP SIGNATURE-----
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