Stable on amd64 334881. Remove old ebuild

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

4 files changed, 19 insertions, 110 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index 2b4967bf6f98..e980db32cb21 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.50 2010/09/14 01:43:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.51 2010/09/14 08:54:26 hwoarang Exp $
+
+  14 Sep 2010; Markos Chandras <hwoarang@gentoo.org> -qmmp-0.4.0.ebuild,
+  qmmp-0.4.1.ebuild:
+  Stable on amd64 334881. Remove old ebuild
 
   14 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> qmmp-0.4.1.ebuild:
   x86 stable wrt bug #334881
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index e2a0ecf8b705..d0368f3f4784 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,9 +1,17 @@
-DIST qmmp-0.4.0.tar.bz2 613749 RMD160 7749e86d8e7b3877afe6b140c08c8eca3a79a7a8 SHA1 741ad3d362c5889ca8dcbdfd8d48163f7dcce6df SHA256 20270813a59d973fb0b7dcd870d9f3d0d4d1eeed00e1a40b5b2fb9e95681e689
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST qmmp-0.4.1.tar.bz2 625899 RMD160 ef456de0e2504e5366deb21283ae3d90b57f4269 SHA1 055ddebff4074bcc18c41af6fe7728d11844bb3c SHA256 f79b3184169c7f6249768b0bf052002bcbed7753550790e87296fca718989812
 DIST qmmp-0.4.2.tar.bz2 647225 RMD160 1b38118b2ef3a91c3dd56909810c991c81abffe4 SHA1 7a4e482f2f439bb855c7fc20547cb154520b00f0 SHA256 f9c331ee9922b04a27d25a09d6a16d94bf38154dcdb8935ff5bb5c25250ed8ec
-EBUILD qmmp-0.4.0.ebuild 3088 RMD160 3043deddb5a64e59f1c893b9620939844b9239e6 SHA1 761aa7cb4c0a74936f36ff17f7622da5da07a773 SHA256 52a8e43a7a8cf950852891db2a2bac774e90b59107d778fe8854dc39b2886690
-EBUILD qmmp-0.4.1.ebuild 2925 RMD160 7bd1c01207e10c8d2551447e814be02733a0895d SHA1 5b816a36b823b18ee0c6b069778511dad3f9f648 SHA256 29549a9030b859359cbd05057cc158e3d9da15ec6d754ee7b1cd1c6000f44043
+EBUILD qmmp-0.4.1.ebuild 2922 RMD160 4fa4e99f2244ecfee34d6ea8482a667f6c3566b6 SHA1 5d562504ba3d6878e4bfd3b7e18608ccbe60076c SHA256 6295fab04a63e1760dfd40694662f823e58b413a102ff169fae289e3a06583be
 EBUILD qmmp-0.4.2.ebuild 2924 RMD160 2c538abd5a213c33d2664d71d15a784815bbe00c SHA1 8978a699a77081d395438345dbc0cbff735579ac SHA256 4f23d8c6cb45c5f37cb0c17ed97c369617a1b768653ae2489d70ca9fb29fa228
 EBUILD qmmp-9999.ebuild 2990 RMD160 a3975d0ea3c9fc2b41da2bc5b322fc235b958823 SHA1 4810d2afff32ad654eaa31a56773e6622bfe3c80 SHA256 edfd52f3d6d25d82e9cf2a5bb055899992aaaf49faad65a697c8c49cdfdf3e8b
-MISC ChangeLog 7028 RMD160 7e690ab71b058e39c9e9c944808bddd8e1d74ab2 SHA1 79d38723f75fbcd0d729bfe533ac6d9387d3b58a SHA256 a8bcbe84695d2afa317b78bd6fa0e8ec00b04c79b99de086eeaa1c83639ff105
+MISC ChangeLog 7165 RMD160 a6c330229e5e1380f31f8a34cad1728be60531f4 SHA1 cacf05a0313d9f05217cf23f223ac4073e1531d3 SHA256 edacaa640ff69933b9c5054b67be62580e80841927c15f727db424bfad849e9f
 MISC metadata.xml 1009 RMD160 9e6c380881f87afc17619d694e44422495ecf08d SHA1 d325a376a387dbde03ed6a39c842ebd105ed129b SHA256 352e00808008b4f37649e1868d40ffab1aebb266dc47016179791f22456496e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyPOBkACgkQ9/cejkQaxBCNWgCdEDl0Sr8P5hkzrSkB90aTiWqN
+/h8AnRNHhu4L1yKwr1PuhdnxECgDLl7Z
+=594b
+-----END PGP SIGNATURE-----
diff --git a/media-sound/qmmp/qmmp-0.4.0.ebuild b/media-sound/qmmp/qmmp-0.4.0.ebuild
deleted file mode 100644
index dc7d2bb112a6..000000000000
--- a/media-sound/qmmp/qmmp-0.4.0.ebuild
+++ /dev/null
@@ -1,103 +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.4.0.ebuild,v 1.6 2010/07/14 14:03:38 fauli 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=""
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa +dbus bs2b cdda cover enca ffmpeg flac hal jack kde ladspa
-libsamplerate lyrics +mad mms modplug mplayer mpris musepack notifier oss projectm pulseaudio scrobbler sndfile tray +vorbis wavpack"
-
-RDEPEND="x11-libs/qt-gui:4[qt3support]
-	media-libs/taglib
-	alsa? ( media-libs/alsa-lib )
-	bs2b? ( media-libs/libbs2b )
-	cdda? ( dev-libs/libcdio )
-	dbus? ( sys-apps/dbus )
-	aac? ( media-libs/faad2 )
-	enca? ( app-i18n/enca )
-	flac? ( media-libs/flac )
-	hal? ( sys-apps/hal )
-	ladspa? ( media-libs/ladspa-cmt )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	mms? ( media-libs/libmms )
-	mplayer? ( media-video/mplayer )
-	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 )
-	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 cover COVER)
-		$(qmmp_use_enable cdda CDA)
-		$(qmmp_use_enable dbus DBUS)
-		$(qmmp_use_enable enca ENCA)
-		$(qmmp_use_enable ffmpeg FFMPEG)
-		$(qmmp_use_enable flac FLAC)
-		$(qmmp_use_enable hal HAL)
-		$(qmmp_use_enable jack JACK)
-		$(qmmp_use_enable kde KDENOTIFY)
-		$(qmmp_use_enable ladspa LADSPA)
-		$(qmmp_use_enable lyrics LYRICS)
-		$(qmmp_use_enable mad MAD)
-		$(qmmp_use_enable mplayer MPLAYER)
-		$(qmmp_use_enable mms MMS)
-		$(qmmp_use_enable modplug MODPLUG)
-		$(qmmp_use_enable mpris MPRIS)
-		$(qmmp_use_enable musepack MPC)
-		$(qmmp_use_enable notifier NOTIFIER)
-		$(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 tray STATICON)
-		$(qmmp_use_enable libsamplerate SRC)
-		$(qmmp_use_enable vorbis VORBIS)
-		$(qmmp_use_enable wavpack WAVPACK)"
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-0.4.1.ebuild b/media-sound/qmmp/qmmp-0.4.1.ebuild
index 34a78c78ff7b..c9028b6da7b3 100644
--- a/media-sound/qmmp/qmmp-0.4.1.ebuild
+++ b/media-sound/qmmp/qmmp-0.4.1.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.4.1.ebuild,v 1.5 2010/09/14 01:43:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.4.1.ebuild,v 1.6 2010/09/14 08:54:26 hwoarang Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ 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"
+	KEYWORDS="amd64 x86"
 else
 	SRC_URI=""
 	ESVN_REPO_URI="http://qmmp.googlecode.com/svn/trunk/qmmp/"