Updated to latest cvs upstream and dropped many gentoo patches that were incorporated upstream from the patchset and recreated others to apply against the new version. This release is currently missing cjk support, and will be in package.mask atleast until cjk support is readded. Simplified patching to use the epatch directory support. Added README.patches to replace comments in ebuild.

4 files changed, 140 insertions, 11 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 87d459053012..47adc57e70c9 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,6 +1,17 @@
 # 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.142 2004/10/08 21:55:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.143 2004/10/13 08:55:30 eradicator Exp $
+
+*xmms-1.2.10-r8 (13 Oct 2004)
+
+  13 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +xmms-1.2.10-r8.ebuild:
+  Updated to latest cvs upstream and dropped many gentoo patches that were
+  incorporated upstream from the patchset and recreated others to apply
+  against the new version. This release is currently missing cjk support, and
+  will be in package.mask atleast until cjk support is readded. Simplified
+  patching to use the epatch directory support. Added README.patches to
+  replace comments in ebuild.
 
 *xmms-1.2.10-r7 (08 Oct 2004)
 
diff --git a/media-sound/xmms/Manifest b/media-sound/xmms/Manifest
index 6e18e09e86af..0b23d7e9f8b3 100644
--- a/media-sound/xmms/Manifest
+++ b/media-sound/xmms/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5a8290e44006ccff0dff3094555d6366 metadata.xml 257
 MD5 52cbe75e5b183d35d547a2b82570c959 ChangeLog 25952
 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 b15d8e335d75bb3b7036b623db227abd xmms-1.2.10-r8.ebuild 3275
 MD5 ca3b76022df666be460464f500138ff8 files/digest-xmms-1.2.10-r7 219
+MD5 06fa838f92f1de70661cb51b380ec74e files/digest-xmms-1.2.10-r8 219
 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)
-
-iD8DBQFBZwznArHZZzCEUG0RAhZAAJ9RHSEfDE0tbaFCTEVj4jpbDa/QTQCeItEC
-Aj4rV2T72ouyhjqbOwYsMvk=
-=RodO
------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
new file mode 100644
index 000000000000..53da3daba5a4
--- /dev/null
+++ b/media-sound/xmms/files/digest-xmms-1.2.10-r8
@@ -0,0 +1,3 @@
+MD5 03a85cfc5e1877a2e1f7be4fa1d3f63c xmms-1.2.10.tar.bz2 2418265
+MD5 41eababfa8bad11e9e34e467cdfb86be gentoo_ice-xmms-0.2.tar.bz2 51839
+MD5 03d6dfdcb6696bcd88f87c380dff2a45 xmms-1.2.10-gentoo-patches-2.0.tar.bz2 336778
diff --git a/media-sound/xmms/xmms-1.2.10-r8.ebuild b/media-sound/xmms/xmms-1.2.10-r8.ebuild
new file mode 100644
index 000000000000..eb58ee860ede
--- /dev/null
+++ b/media-sound/xmms/xmms-1.2.10-r8.ebuild
@@ -0,0 +1,123 @@
+# 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 $
+
+IUSE="xml nls esd opengl mmx oggvorbis 3dnow mikmod directfb ipv6 alsa oss arts jack sndfile lirc flac"
+
+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
+	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
+	http://dev.gentoo.org/~eradicator/xmms/${P}-gentoo-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Notice to arch maintainers:
+# Please test out the plugins listed below in PDEPEND.  They should
+# work on most of your archs, but haven't been marked yet.
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+
+DEPEND="=x11-libs/gtk+-1.2*
+	mikmod? ( >=media-libs/libmikmod-3.1.10 )
+	esd? ( >=media-sound/esound-0.2.22 )
+	xml? ( >=dev-libs/libxml-1.8.15 )
+	opengl? ( virtual/opengl )
+	alsa? ( >=media-libs/alsa-lib-0.9.0 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 )"
+
+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 )"
+
+# USE flags pull in xmms plugins
+PDEPEND="!alpha? ( !hppa? ( !ia64? ( !mips? ( !ppc64? ( jack? ( media-plugins/xmms-jack ) ) ) ) ) )
+	 !alpha? ( !ia64? ( !ppc64? ( lirc? ( media-plugins/xmms-lirc ) ) ) )
+	 !ia64? ( !ppc64? ( arts? ( media-plugins/xmms-arts ) ) )
+	 !alpha? ( !hppa? ( !ia64? ( !mips? ( !ppc64? ( sndfile? ( media-plugins/xmms-sndfile ) ) ) ) ) )
+	 flac? ( media-libs/flac )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	EPATCH_SUFFIX="patch"
+	epatch ${PATCHDIR}
+
+	elibtoolize
+	gnuconfig_update
+}
+
+src_compile() {
+	filter-flags -fforce-addr -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+
+	local myconf=""
+
+	if use amd64; then
+		myconf="${myconf} --disable-simd"
+	else
+	  	if use 3dnow || use mmx; then
+			myconf="${myconf} --enable-simd"
+		else
+			myconf="${myconf} --disable-simd"
+		fi
+	fi
+
+	use xml || myconf="${myconf} --disable-cdindex"
+
+	econf \
+		--with-dev-dsp=/dev/sound/dsp \
+		--with-dev-mixer=/dev/sound/mixer \
+		`use_enable oggvorbis vorbis` \
+		`use_enable esd` \
+		`use_enable mikmod` \
+		`use_with mikmod libmikmod` \
+		`use_enable opengl` \
+		`use_enable nls` \
+		`use_enable ipv6` \
+		`use_enable oss oss` \
+		${myconf} \
+		|| die
+
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog FAQ NEWS README TODO
+	newdoc ${PATCHDIR}/README README.patches
+
+	keepdir /usr/share/xmms/Skins
+	insinto /usr/share/pixmaps/
+	donewins xmms/xmms_logo.xpm xmms.xpm
+	doins xmms/xmms_logo.xpm
+	insinto /usr/share/pixmaps/mini
+	doins xmms/xmms_mini.xpm
+
+	insinto /etc/X11/wmconfig
+	donewins xmms/xmms.wmconfig xmms
+
+	insinto /usr/share/applnk/Multimedia
+	doins ${FILESDIR}/xmms.desktop
+	insinto /usr/share/applications
+	doins ${FILESDIR}/xmms.desktop
+
+	# Add the sexy Gentoo Ice skin
+	insinto /usr/share/xmms/Skins/gentoo_ice
+	doins ${WORKDIR}/gentoo_ice/*
+	docinto gentoo_ice
+	dodoc ${WORKDIR}/README
+}