Stable on amd64 wrt bug #347709. Remove old ebuild

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

4 files changed, 19 insertions, 102 deletions

diff --git a/media-sound/qmmp/ChangeLog b/media-sound/qmmp/ChangeLog
index 7001801c9c94..e26501b6e6ea 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.57 2010/12/04 20:35:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/ChangeLog,v 1.58 2010/12/04 20:51:05 hwoarang Exp $
+
+  04 Dec 2010; Markos Chandras <hwoarang@gentoo.org> -qmmp-0.4.2.ebuild,
+  qmmp-0.4.3.ebuild:
+  Stable on amd64 wrt bug #347709. Remove old ebuild
 
   04 Dec 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> qmmp-0.4.3.ebuild:
   x86 stable wrt bug #347709
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 01b687b2e0d4..4e724677de6b 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,7 +1,15 @@
-DIST qmmp-0.4.2.tar.bz2 647225 RMD160 1b38118b2ef3a91c3dd56909810c991c81abffe4 SHA1 7a4e482f2f439bb855c7fc20547cb154520b00f0 SHA256 f9c331ee9922b04a27d25a09d6a16d94bf38154dcdb8935ff5bb5c25250ed8ec
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST qmmp-0.4.3.tar.bz2 647733 RMD160 cd59f5347189e3f7dc74c85a7bdddcd8b9e197f9 SHA1 3aecf8783ca3b5c944ff766bfc2ba1d16ffbaceb SHA256 a75c2c676515182ecfbe811cba29ba4ca736912e52fde283db4d03eb116457a4
-EBUILD qmmp-0.4.2.ebuild 2917 RMD160 35f422ecfa1b1c8560ff67e77fe26889a36296a4 SHA1 ad150432e9980451f2762b89c85071aceb18785a SHA256 44497a8dde9307fa9f562b4ce25a14eba1f0f7d9c03098a9f89a4924e33bd84f
-EBUILD qmmp-0.4.3.ebuild 2920 RMD160 d5913a9e680f77617524effd1a53b2bb636b73ab SHA1 ceb75c9f7bc90f17407c352f8befff3d74ec4df9 SHA256 458d60f8931f2fa33752691fd73feae86cce6c7c232488e7bca9f1d4f5d3bbd9
+EBUILD qmmp-0.4.3.ebuild 2917 RMD160 ee01fc20b10bf449ee8741bc39ec1a42dca784ab SHA1 0368d3b80a4a77fa391d4c8188faf6f4ec4b75e9 SHA256 7f6e4851553dba8223fd27bf18ef321279332d4fe0dacd31d6c548d3c6229c71
 EBUILD qmmp-9999.ebuild 2985 RMD160 838d3d88d8897b368d8f0c989ed6bbfdaab21549 SHA1 3e34a988a00da6df02fd100e91f2b1a3fc581e45 SHA256 7d2c4f3374a4e928e7763bb34338d062769c4f2f9812139902a93cca0d38d440
-MISC ChangeLog 7851 RMD160 cb349fa8ed6876ac50315404cbd1b95a31ec8e43 SHA1 3f17f8fa57b5f07eea7d3c5f89543247abe635b0 SHA256 ebdb04c753521701635db57a0578793bf890fbc1cc6337f43a52d0c1ffd53727
+MISC ChangeLog 7997 RMD160 7d746a1fcf837680f2d9d1ba0e4cb0435b6495b4 SHA1 0b5c3c2ab41b2b0168ca84ea992d0c83abf3e7ca SHA256 1724a2519b4c2ecb0344c4797777969cbe11d51818e6a94cd8bb00319f813767
 MISC metadata.xml 1009 RMD160 9e6c380881f87afc17619d694e44422495ecf08d SHA1 d325a376a387dbde03ed6a39c842ebd105ed129b SHA256 352e00808008b4f37649e1868d40ffab1aebb266dc47016179791f22456496e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz6qbQACgkQ9/cejkQaxBCerQCeMmG55dt5LdXLgjFS4/uZngIp
+NdYAn0ICt79njP72SPNO4AlkKKvAEn9S
+=yalp
+-----END PGP SIGNATURE-----
diff --git a/media-sound/qmmp/qmmp-0.4.2.ebuild b/media-sound/qmmp/qmmp-0.4.2.ebuild
deleted file mode 100644
index 8c8cc839b052..000000000000
--- a/media-sound/qmmp/qmmp-0.4.2.ebuild
+++ /dev/null
@@ -1,95 +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.2.ebuild,v 1.5 2010/11/03 22:01:25 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=""
-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-qt3support:4
-	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
-		x11-libs/qt-opengl:4 )
-	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"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_use alsa)
-		$(cmake-utils_use_use aac)
-		$(cmake-utils_use_use bs2b)
-		$(cmake-utils_use_use cover)
-		$(cmake-utils_use_use cdda CDA)
-		$(cmake-utils_use_use dbus)
-		$(cmake-utils_use_use enca)
-		$(cmake-utils_use_use ffmpeg)
-		$(cmake-utils_use_use flac)
-		$(cmake-utils_use_use hal)
-		$(cmake-utils_use_use jack)
-		$(cmake-utils_use_use kde KDENOTIFY)
-		$(cmake-utils_use_use ladspa)
-		$(cmake-utils_use_use lyrics)
-		$(cmake-utils_use_use mad)
-		$(cmake-utils_use_use mplayer)
-		$(cmake-utils_use_use mms)
-		$(cmake-utils_use_use modplug)
-		$(cmake-utils_use_use mpris)
-		$(cmake-utils_use_use musepack MPC)
-		$(cmake-utils_use_use notifier)
-		$(cmake-utils_use_use oss)
-		$(cmake-utils_use_use projectm)
-		$(cmake-utils_use_use pulseaudio PULSE)
-		$(cmake-utils_use_use scrobbler)
-		$(cmake-utils_use_use sndfile)
-		$(cmake-utils_use_use tray STATICON)
-		$(cmake-utils_use_use libsamplerate SRC)
-		$(cmake-utils_use_use vorbis)
-		$(cmake-utils_use_use wavpack)"
-
-	cmake-utils_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-0.4.3.ebuild b/media-sound/qmmp/qmmp-0.4.3.ebuild
index a0312740798f..13cea49c6a33 100644
--- a/media-sound/qmmp/qmmp-0.4.3.ebuild
+++ b/media-sound/qmmp/qmmp-0.4.3.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.3.ebuild,v 1.3 2010/12/04 20:35:54 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmmp/qmmp-0.4.3.ebuild,v 1.4 2010/12/04 20:51:05 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/"