Using old xmms icon for desktop menu entries. Fixed gettext being in RDEPEND instead of DEPEND. General cleanup.

4 files changed, 15 insertions, 21 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 47adc57e70c9..766b52360bc7 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.143 2004/10/13 08:55:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.144 2004/10/14 16:54:50 eradicator Exp $
+
+  14 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Using old xmms icon for desktop menu entries. Fixed gettext being in RDEPEND
+  instead of DEPEND. General cleanup.
 
 *xmms-1.2.10-r8 (13 Oct 2004)
 
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index aa9f9cb64eb1..f9e4d23725be 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
 MD5 ac2bb853682c589f2d8d9be47e10d507 ChangeLog 26469
 MD5 33180edc5b30f54debff69322fae465a xmms-1.2.8-r4.ebuild 5271
 MD5 2007d20f67e563a3289ef2f5853f84be xmms-1.2.10-r7.ebuild 6560
 MD5 e8f74b9f98c9a742f9d9e7559227ef84 xmms-1.2.10-r5.ebuild 5386
-MD5 a5f564c23b56a372b30a7fa9558aa4d3 xmms-1.2.10-r8.ebuild 3275
+MD5 5ac8d967a2e5cad03bd4416713b3bf86 xmms-1.2.10-r8.ebuild 3285
 MD5 ca3b76022df666be460464f500138ff8 files/digest-xmms-1.2.10-r7 219
-MD5 1cb7f59a4210ff270e427e51e75d6efc files/digest-xmms-1.2.10-r8 219
+MD5 1225ae30d08c086a46f95efe2843cf96 files/digest-xmms-1.2.10-r8 275
 MD5 f52f09b25da87c876de70b6177292f2e files/digest-xmms-1.2.8-r4 216
 MD5 7d2f3807ebbff435b909ecf0539cbf4f files/xmms.desktop 722
 MD5 aa46b23a1cf0655c7f09adbdd623d49f files/digest-xmms-1.2.10-r5 219
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBbPrsArHZZzCEUG0RAliPAJ9QWDpAJ8XRI9E2MxmQM4hxuwsTawCcCsy7
-3ycAJNXj+TOuViN0CRV2tlo=
-=r8+T
------END PGP SIGNATURE-----
diff --git a/media-sound/xmms/files/digest-xmms-1.2.10-r8 b/media-sound/xmms/files/digest-xmms-1.2.10-r8
index 001dfc089c1d..6d98de939a79 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.10-r8
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r8
@@ -1,3 +1,4 @@
 MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
 MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
 MD5 27d260df61192835afa56e9ac1c1c229 xmms-1.2.10-gentoo-patches-2.0.tar.bz2 336850
+MD5 fe54f2ec779bc995176e63e3e77cca11 gnomexmms.xpm 7979
diff --git a/media-sound/xmms/xmms-1.2.10-r8.ebuild b/media-sound/xmms/xmms-1.2.10-r8.ebuild
index eb58ee860ede..3912d9946a71 100644
--- a/media-sound/xmms/xmms-1.2.10-r8.ebuild
+++ b/media-sound/xmms/xmms-1.2.10-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r8.ebuild,v 1.1 2004/10/13 08:55:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.10-r8.ebuild,v 1.2 2004/10/14 16:54:50 eradicator Exp $
 
 IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 alsa oss arts jack sndfile lirc flac"
 
@@ -8,15 +8,14 @@ inherit flag-o-matic eutils libtool gnuconfig
 
 PATCHVER="2.0"
 
-MY_P="${P/_pre/-pre}"
-S="${WORKDIR}/${MY_P}"
 PATCHDIR="${WORKDIR}/patches"
 
 DESCRIPTION="X MultiMedia System"
 HOMEPAGE="http://www.xmms.org/"
-SRC_URI="http://www.xmms.org/files/1.2.x/${MY_P}.tar.bz2
+SRC_URI="http://www.xmms.org/files/1.2.x/${P}.tar.bz2
 	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
-	http://dev.gentoo.org/~eradicator/xmms/${P}-gentoo-patches-${PATCHVER}.tar.bz2"
+	http://dev.gentoo.org/~eradicator/xmms/${P}-gentoo-patches-${PATCHVER}.tar.bz2
+	http://dev.gentoo.org/~eradicator/xmms/gnomexmms.xpm"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -35,12 +34,12 @@ DEPEND="=x11-libs/gtk+-1.2*
 
 RDEPEND="${DEPEND}
 	directfb? ( dev-libs/DirectFB )
-	sys-devel/gettext
 	app-arch/unzip"
 
 #We want these things in DEPEND only
 DEPEND="${DEPEND}
-	nls? ( dev-util/intltool )"
+	nls? ( dev-util/intltool 
+	       sys-devel/gettext )"
 
 # USE flags pull in xmms plugins
 PDEPEND="!alpha? ( !hppa? ( !ia64? ( !mips? ( !ppc64? ( jack? ( media-plugins/xmms-jack ) ) ) ) ) )
@@ -102,7 +101,7 @@ src_install() {
 
 	keepdir /usr/share/xmms/Skins
 	insinto /usr/share/pixmaps/
-	donewins xmms/xmms_logo.xpm xmms.xpm
+	newins ${DISTDIR}/gnomexmms.xpm xmms.xpm
 	doins xmms/xmms_logo.xpm
 	insinto /usr/share/pixmaps/mini
 	doins xmms/xmms_mini.xpm