Remove old ebuild, fix libprojectm dependency

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

4 files changed, 9 insertions, 90 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index 0092d6ed3ca7..df4dc6899ec3 100644
--- a/media-sound/qmmp/ChangeLog
+++ b/media-sound/qmmp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qmmp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.26 2010/01/18 17:19:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.27 2010/01/18 17:22:07 hwoarang Exp $
+
+  18 Jan 2010; <hwoarang@gentoo.org> -qmmp-0.3.2.ebuild,
+  qmmp-0.3.2-r1.ebuild:
+  Remove old ebuild, fix libprojectm dependency
 
 *qmmp-0.3.2-r1 (18 Jan 2010)
 
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index b826a555b93a..9723f37e16ef 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -4,8 +4,7 @@ DIST qmmp-0.3.1.tar.bz2 490423 RMD160 ffce4cb387015db1ff6c1ff2b83fdf3c1f849984 S
 DIST qmmp-0.3.2.tar.bz2 491479 RMD160 a51f2ac118ed999f85e6e4d77f3ccc132f5b9a0e SHA1 84f66a0ab85ab257a3e8b02e12871ceebe30c4fc SHA256 3bfbc954591ad261459344182d8885c3a05683ea6f440504c17c5ecfdbb8be78
 EBUILD qmmp-0.3.0-r1.ebuild 2453 RMD160 24fd7e92a8037c38f40ff2f31d90541171717fc6 SHA1 22fa76e615dce1c43867aab631782fb72f12f6a0 SHA256 fcd8636379af69be42a2d9bf7ec42d8ea71535b0d35ca89ac3e7146250e21b11
 EBUILD qmmp-0.3.1.ebuild 2454 RMD160 0709115e951b88f1ca2dfa6b1de3114344487c33 SHA1 976cde537f269c525e899f20f21220b0c7dd3383 SHA256 74e8a0b5f25cba68c0e9555bfc36c5d106c81c48ad8225c703adce2dc139956b
-EBUILD qmmp-0.3.2-r1.ebuild 2514 RMD160 03b6ac72923c10b1d3c5feadaee0ef0d2e9ba821 SHA1 659db7cc6a2d00d85630e7fa009f45c9d3d58dbd SHA256 80b3d8359d25a5dbe7ebbf5b164ad758b6963a212e7ea733833ad52bf4c639ba
-EBUILD qmmp-0.3.2.ebuild 2454 RMD160 c90b6b0ed620e5ed3e489124262cb5aa7b54c2d2 SHA1 31b0383c56e4255f386ce758a139abeacc009f2c SHA256 2a402a0f091436a8c798338be15749e84881db3bf9f98eb5cf0480b4925df6eb
+EBUILD qmmp-0.3.2-r1.ebuild 2506 RMD160 3f5489f39a2d79a6f87cac57bb11cfd149bacd9a SHA1 c6668d65407eedd8bd5f02b9b70db5505c54bda2 SHA256 a5030891960745a0e1b51fbb205db1bc482bdd167faa150dd44f0ab1d685cdf4
 EBUILD qmmp-9999.ebuild 2441 RMD160 3e7c8d277050050f3a36a87c0a218677a402def5 SHA1 f0b82ba85cf4c542d1ee9626dcf7753e940228a6 SHA256 b54406bc9c189fff2c695d45cb6a4acfd74acf0ff24f09c90c64b4ff883fd438
-MISC ChangeLog 3813 RMD160 bf797a76e775b870a0f173661404cd5b6619868b SHA1 457da74c41a1248c0b401da17897c47f2c1b0e81 SHA256 543737adb7c1ee75f9dd1d3ca0342305595628a7b67e37eee71c08a3348219c4
+MISC ChangeLog 3943 RMD160 be54ad0dd021aed75ed8f4046efc3541cb18c444 SHA1 dde9a50906165db9f508404e9536f14e1ddd923b SHA256 316c8116892afc71d856c6ee3a8630d49694b8158ac4931d102e102a7306fe97
 MISC metadata.xml 409 RMD160 1b1111c050fd665ca2eb3662e104fc051d0d817a SHA1 4d17839362ce6cda9f2dd7153e457d2d0a042798 SHA256 de8224b3db3607762ad766e5afa3ec0e4971bc3dfbb4ddaed1ee973761a13bac
diff --git a/media-sound/qmmp/qmmp-0.3.2-r1.ebuild b/media-sound/qmmp/qmmp-0.3.2-r1.ebuild
index ee71119bff39..c2df5f013605 100644
--- a/media-sound/qmmp/qmmp-0.3.2-r1.ebuild
+++ b/media-sound/qmmp/qmmp-0.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.3.2-r1.ebuild,v 1.1 2010/01/18 17:19:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.3.2-r1.ebuild,v 1.2 2010/01/18 17:22:07 hwoarang Exp $
 
 EAPI="2"
 
@@ -39,7 +39,7 @@ RDEPEND="x11-libs/qt-gui:4
 	jack? ( media-sound/jack-audio-connection-kit
 		media-libs/libsamplerate )
 	ffmpeg? ( media-video/ffmpeg )
-	projectm? ( >=media-libs/libprojectm-2.0.1 )
+	projectm? ( media-libs/libprojectm )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
 	wavpack? ( media-sound/wavpack )
 	scrobbler? ( net-misc/curl )
diff --git a/media-sound/qmmp/qmmp-0.3.2.ebuild b/media-sound/qmmp/qmmp-0.3.2.ebuild
deleted file mode 100644
index 902d619d817b..000000000000
--- a/media-sound/qmmp/qmmp-0.3.2.ebuild
+++ /dev/null
@@ -1,84 +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/qmmp/qmmp-0.3.2.ebuild,v 1.1 2010/01/13 17:56:55 hwoarang Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-[ "$PV" == "9999" ] && inherit subversion
-
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com/index_en.php"
-if [ "$PV" != "9999" ]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	SRC_URI=""
-	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b ffmpeg flac jack libsamplerate +mad modplug musepack oss projectm pulseaudio scrobbler sndfile +vorbis wavpack"
-
-RDEPEND="x11-libs/qt-gui:4
-	media-libs/taglib
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	flac? ( media-libs/flac )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	vorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	jack? ( media-sound/jack-audio-connection-kit
-		media-libs/libsamplerate )
-	ffmpeg? ( media-video/ffmpeg )
-	projectm? ( >=media-libs/libprojectm-2.0.1 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	wavpack? ( media-sound/wavpack )
-	scrobbler? ( net-misc/curl )
-	sndfile? ( media-libs/libsndfile )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog README"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-qmmp_use_enable() {
-	# uses completely non standard cmake options...
-	if use ${1}; then
-		echo "-DUSE_${2}:BOOL=TRUE"
-	else
-		echo "-DUSE_${2}:BOOL=FALSE"
-	fi
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(qmmp_use_enable alsa ALSA)
-		$(qmmp_use_enable aac AAC)
-		$(qmmp_use_enable bs2b BS2B)
-		$(qmmp_use_enable dbus DBUS)
-		$(qmmp_use_enable ffmpeg FFMPEG)
-		$(qmmp_use_enable flac FLAC)
-		$(qmmp_use_enable jack JACK)
-		$(qmmp_use_enable mad MAD)
-		$(qmmp_use_enable modplug MODPLUG)
-		$(qmmp_use_enable musepack MPC)
-		$(qmmp_use_enable oss OSS)
-		$(qmmp_use_enable projectm PROJECTM)
-		$(qmmp_use_enable pulseaudio PULSE)
-		$(qmmp_use_enable scrobbler SCROBBLER)
-		$(qmmp_use_enable sndfile SNDFILE)
-		$(qmmp_use_enable libsamplerate SRC)
-		$(qmmp_use_enable vorbis VORBIS)
-		$(qmmp_use_enable wavpack WAVPACK)"
-
-	cmake-utils_src_configure
-}