Version Bump and added a patch to fix seek subsongs without subsong length database thanks to Heikki Orsila <heikki.orsila@iki.fi> on bug #113733. Removing unneeded versions.

Package-Manager: portage-2.0.53_rc7

9 files changed, 77 insertions, 60 deletions

diff --git a/media-plugins/xmms-sid/ChangeLog b/media-plugins/xmms-sid/ChangeLog
index e4ac1722445d..28829d8052ad 100644
--- a/media-plugins/xmms-sid/ChangeLog
+++ b/media-plugins/xmms-sid/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/xmms-sid
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-sid/ChangeLog,v 1.15 2005/09/04 10:31:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-sid/ChangeLog,v 1.16 2005/11/28 03:39:28 metalgod Exp $
+
+*xmms-sid-0.8.0_beta15 (28 Nov 2005)
+
+  28 Nov 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/xmms-sid-0.8.0_beta15-seek-popup-fix.patch, -xmms-sid-0.7.3.ebuild,
+  -xmms-sid-0.8.0_beta8.ebuild, +xmms-sid-0.8.0_beta15.ebuild:
+  Version Bump and added a patch to fix seek subsongs without subsong length
+  database thanks to Heikki Orsila <heikki.orsila@iki.fi> on bug #113733.
+  Removing unneeded versions.
 
   04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xmms-sid-0.7.3.ebuild,
   xmms-sid-0.7.4.ebuild, xmms-sid-0.8.0_beta8.ebuild,
diff --git a/media-plugins/xmms-sid/Manifest b/media-plugins/xmms-sid/Manifest
index 315eb8755521..6ddfb1600b8e 100644
--- a/media-plugins/xmms-sid/Manifest
+++ b/media-plugins/xmms-sid/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b07e305e133bc74c449b92e152c394dd ChangeLog 2956
-MD5 20bf94c44c11afe7ee453342a832d119 xmms-sid-0.7.3.ebuild 593
-MD5 09fbe7bf4631a8d5a9d1c430321097bb xmms-sid-0.8.0_beta8.ebuild 667
-MD5 634000ccaa6ac00e811ac51fa3e06af2 xmms-sid-0.8.0_beta10.ebuild 1050
-MD5 533d95ea5d9040752a1c5fad47d2380e xmms-sid-0.7.4.ebuild 592
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 9d2c73cc740feebe60e4d8c64a9bf20c files/digest-xmms-sid-0.7.3 67
-MD5 d1e03d2763331e5973e88b05d52cc3eb files/digest-xmms-sid-0.8.0_beta10 72
-MD5 073e30620c46661936b6205498f10267 files/digest-xmms-sid-0.8.0_beta8 71
+MD5 a0a03b1d78c97642dd16eece88ba8b53 ChangeLog 3365
 MD5 9f2a9e14baa6d0132bc640fd61208aff files/digest-xmms-sid-0.7.4 67
+MD5 d1e03d2763331e5973e88b05d52cc3eb files/digest-xmms-sid-0.8.0_beta10 72
+MD5 67500eff54a569f111dd5ae1d51d6e20 files/digest-xmms-sid-0.8.0_beta15 72
+MD5 06abf13332370f9f4dc2cc3cc4b77090 files/xmms-sid-0.8.0_beta15-seek-popup-fix.patch 785
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 533d95ea5d9040752a1c5fad47d2380e xmms-sid-0.7.4.ebuild 592
+MD5 634000ccaa6ac00e811ac51fa3e06af2 xmms-sid-0.8.0_beta10.ebuild 1050
+MD5 84738733473da8e032c6219f6c786622 xmms-sid-0.8.0_beta15.ebuild 1007
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDGs0Aj5H05b2HAEkRApxpAJ9SnuC3kvDNc5rxcTVFODvKsHuG3QCdE1ew
-SOE+KefMwSrwSk1oOkFld6Y=
-=0Qwn
+iD8DBQFDinu0wUpWvClEHQoRAqGVAJ0ecZreA7MGvZ9sFpXQ8lf3XGxi8wCfZV22
+lx9GVCFu4HIDQaBJJnjnWKM=
+=6wO9
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/xmms-sid/files/digest-xmms-sid-0.7.3 b/media-plugins/xmms-sid/files/digest-xmms-sid-0.7.3
deleted file mode 100644
index e113974c78ef..000000000000
--- a/media-plugins/xmms-sid/files/digest-xmms-sid-0.7.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0aef1d224da37ebba9b02eef1c7954ba xmms-sid-0.7.3.tar.bz2 163594
diff --git a/media-plugins/xmms-sid/files/digest-xmms-sid-0.8.0_beta15 b/media-plugins/xmms-sid/files/digest-xmms-sid-0.8.0_beta15
new file mode 100644
index 000000000000..f96b403157cf
--- /dev/null
+++ b/media-plugins/xmms-sid/files/digest-xmms-sid-0.8.0_beta15
@@ -0,0 +1 @@
+MD5 36503ef4b2dfb3a16c6c67b27e5b9ccd xmms-sid-0.8.0beta15.tar.gz 441824
diff --git a/media-plugins/xmms-sid/files/digest-xmms-sid-0.8.0_beta8 b/media-plugins/xmms-sid/files/digest-xmms-sid-0.8.0_beta8
deleted file mode 100644
index 046cf38bfa5e..000000000000
--- a/media-plugins/xmms-sid/files/digest-xmms-sid-0.8.0_beta8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 764e05e33bae112f6e26cc3212d855df xmms-sid-0.8.0beta8.tar.gz 394119
diff --git a/media-plugins/xmms-sid/files/xmms-sid-0.8.0_beta15-seek-popup-fix.patch b/media-plugins/xmms-sid/files/xmms-sid-0.8.0_beta15-seek-popup-fix.patch
new file mode 100644
index 000000000000..7af130c8ba2a
--- /dev/null
+++ b/media-plugins/xmms-sid/files/xmms-sid-0.8.0_beta15-seek-popup-fix.patch
@@ -0,0 +1,16 @@
+Index: src/xmms-sid.c
+===================================================================
+RCS file: /cvs/xmms-sid/src/xmms-sid.c,v
+retrieving revision 1.61
+diff -u -p -r1.61 xmms-sid.c
+--- src/xmms-sid.c	8 Nov 2005 09:33:26 -0000	1.61
++++ src/xmms-sid.c	27 Nov 2005 18:54:53 -0000
+@@ -418,7 +418,7 @@ void *xs_playthread(void *argPointer)
+ 
+ 		/* Set song information for current subtune */
+ 		xs_plugin_ip.set_info(myTune->subTunes[myStatus.currSong - 1].tuneTitle,
+-				      (songLength > 0) ? (songLength * 1000) : -1,
++				      (songLength > 0) ? (songLength * 1000) : 0,
+ 				      (myTune->subTunes[myStatus.currSong - 1].tuneSpeed >
+ 				       0) ? (myTune->subTunes[myStatus.currSong - 1].tuneSpeed * 1000) : -1,
+ 				      myStatus.audioFrequency, myStatus.audioChannels);
diff --git a/media-plugins/xmms-sid/xmms-sid-0.7.3.ebuild b/media-plugins/xmms-sid/xmms-sid-0.7.3.ebuild
deleted file mode 100644
index f88da0997e53..000000000000
--- a/media-plugins/xmms-sid/xmms-sid-0.7.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-sid/xmms-sid-0.7.3.ebuild,v 1.9 2005/09/04 10:31:05 flameeyes Exp $
-
-DESCRIPTION="C64 SID plugin for XMMS"
-HOMEPAGE="http://www.tnsp.org/xmms-sid.php"
-SRC_URI="http://www.tnsp.org/xs-files/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~alpha ~hppa"
-
-IUSE=""
-
-DEPEND="media-sound/xmms
-	=media-libs/libsidplay-1.36*"
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ChangeLog README* NEWS TODO
-}
diff --git a/media-plugins/xmms-sid/xmms-sid-0.8.0_beta15.ebuild b/media-plugins/xmms-sid/xmms-sid-0.8.0_beta15.ebuild
new file mode 100644
index 000000000000..f5ee148c1940
--- /dev/null
+++ b/media-plugins/xmms-sid/xmms-sid-0.8.0_beta15.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-sid/xmms-sid-0.8.0_beta15.ebuild,v 1.1 2005/11/28 03:39:28 metalgod Exp $
+
+inherit eutils autotools libtool
+
+MY_PV=${PV/_beta/beta}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="C64 SID plugin for XMMS"
+HOMEPAGE="http://www.tnsp.org/xmms-sid.php"
+SRC_URI="http://tnsp.org/xs-files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+# This really NEEDs one of the libsidplays, but unfortunately we need to RDEPEND on both for
+# GRP to work right.
+RDEPEND="media-sound/xmms
+	=media-libs/libsidplay-1*
+	=media-libs/libsidplay-2*"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-seek-popup-fix.patch
+	eautoreconf
+	elibtoolize
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS ChangeLog README* NEWS TODO
+}
diff --git a/media-plugins/xmms-sid/xmms-sid-0.8.0_beta8.ebuild b/media-plugins/xmms-sid/xmms-sid-0.8.0_beta8.ebuild
deleted file mode 100644
index bdf44ad32fc7..000000000000
--- a/media-plugins/xmms-sid/xmms-sid-0.8.0_beta8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-sid/xmms-sid-0.8.0_beta8.ebuild,v 1.7 2005/09/04 10:31:05 flameeyes Exp $
-
-MY_PV=${PV/_beta/beta}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="C64 SID plugin for XMMS"
-HOMEPAGE="http://www.tnsp.org/xmms-sid.php"
-SRC_URI="http://tnsp.org/xs-files/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~hppa ~ppc"
-
-IUSE=""
-
-DEPEND="media-sound/xmms
-	=media-libs/libsidplay-1.36*"
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ChangeLog README* NEWS TODO
-}