Moving sidplay-libs here under SLOT=2. Added ~amd64. Version bump.

10 files changed, 154 insertions, 15 deletions

diff --git a/media-libs/libsidplay/ChangeLog b/media-libs/libsidplay/ChangeLog
index ee89c696abc5..6b33a1b99210 100644
--- a/media-libs/libsidplay/ChangeLog
+++ b/media-libs/libsidplay/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-libs/libsidplay
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.14 2004/07/03 07:17:00 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.15 2004/07/03 08:23:29 eradicator Exp $
+
+*libsidplay-2.1.0-r1 (03 Jul 2004)
+*libsidplay-2.1.1 (03 Jul 2004)
+
+  03 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> +metadata.xml,
+  files/libsidplay-gcc34.patch, +files/libsidplay2-gcc34.patch,
+  +libsidplay-2.1.0-r1.ebuild, +libsidplay-2.1.1.ebuild:
+  Moving sidplay-libs here under SLOT=2.  Added ~amd64.  Version bump.
+
+  03 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libsidplay-1.36.57.ebuild:
+  ~amd64.
 
   03 Jul 2004; Jon Hood <squinky86@gentoo.org> +files/libsidplay-gcc34.patch,
   libsidplay-1.36.57.ebuild:
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 710d5ae2f82c..f9279cd43a9e 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -1,6 +1,13 @@
-MD5 cfb6f7d1cda6ced34bbbe0ff41e2038e libsidplay-1.36.57.ebuild 729
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 MD5 143425b5322a9cbe9625a081f13c0cd3 libsidplay-1.36.54.ebuild 696
-MD5 4c621fd43ff54f534a61e66718b50420 ChangeLog 1755
-MD5 b9ebd672165b7c4552a7f9cc90236c49 files/libsidplay-gcc34.patch 1143
+MD5 dd9a8276210b1d613218fdde4830d950 libsidplay-1.36.57.ebuild 736
+MD5 179f3dc9e637549bc0da52ac6bab5e91 ChangeLog 1852
+MD5 1d071a2f026f74380107e89d3cdda5d6 libsidplay-2.1.1.ebuild 972
+MD5 d26dfa0c56de9134ba7492d840a2ccaa libsidplay-2.1.0-r1.ebuild 971
 MD5 fdd6f8c52d3a1c27f89ca988e013a116 files/digest-libsidplay-1.36.54 67
 MD5 4e2a41563a14e632e37d162203ef4d45 files/digest-libsidplay-1.36.57 67
+MD5 58d9cec13cbd5be46ae7a38497e141f6 files/libsidplay-gcc34.patch 907
+MD5 8e6d42fd52a00be55bfda2932cab402e files/digest-libsidplay-2.1.0 71
+MD5 8f2488b49345cd06d6271c657ea79666 files/libsidplay2-gcc34.patch 874
+MD5 c22ab29986ab10f688530269ab08efc3 files/digest-libsidplay-2.1.1 71
+MD5 8e6d42fd52a00be55bfda2932cab402e files/digest-libsidplay-2.1.0-r1 71
diff --git a/media-libs/libsidplay/files/digest-libsidplay-2.1.0-r1 b/media-libs/libsidplay/files/digest-libsidplay-2.1.0-r1
new file mode 100644
index 000000000000..b8169e4358bf
--- /dev/null
+++ b/media-libs/libsidplay/files/digest-libsidplay-2.1.0-r1
@@ -0,0 +1 @@
+MD5 40e61c8edbce16e1a8d0e31169869d99 sidplay-libs-2.1.0.tar.gz 1135771
diff --git a/media-libs/libsidplay/files/digest-libsidplay-2.1.1 b/media-libs/libsidplay/files/digest-libsidplay-2.1.1
new file mode 100644
index 000000000000..d4a95776aa1d
--- /dev/null
+++ b/media-libs/libsidplay/files/digest-libsidplay-2.1.1
@@ -0,0 +1 @@
+MD5 7ea0ba5dc1da4604d15eaae001f7d2a7 sidplay-libs-2.1.1.tar.gz 1900252
diff --git a/media-libs/libsidplay/files/libsidplay-gcc34.patch b/media-libs/libsidplay/files/libsidplay-gcc34.patch
index 134b227cac14..858d3a62cb74 100644
--- a/media-libs/libsidplay/files/libsidplay-gcc34.patch
+++ b/media-libs/libsidplay/files/libsidplay-gcc34.patch
@@ -1,15 +1,6 @@
 diff -Naur libsidplay/src/smart.h xmms-fc-0.5.3/src/smart.h
 --- libsidplay.vanilla/src/smart.h	1998-11-30 13:10:00.000000000 -0600
 +++ libsidplay/src/smart.h	2004-07-03 01:49:33.991970368 -0500
-@@ -24,7 +24,7 @@
-         }
-         else
-         {
--            pBufCurrent = ( bufBegin = ( bufEnd = 0 ));
-+            T* pBufCurrent = ( bufBegin = ( bufEnd = 0 ));
-             bufLen = 0;
-             status = false;
-         }
 @@ -207,16 +207,16 @@
      {
          if ( bufferLen >= 1 )
diff --git a/media-libs/libsidplay/files/libsidplay2-gcc34.patch b/media-libs/libsidplay/files/libsidplay2-gcc34.patch
new file mode 100644
index 000000000000..a6f450e86b22
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay2-gcc34.patch
@@ -0,0 +1,27 @@
+diff -Naur sidplay-libs-2.1.0.orig/libsidplay/include/sidplay/SmartPtr.h sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h
+--- sidplay-libs-2.1.0.orig/libsidplay/include/sidplay/SmartPtr.h	2002-12-23 12:38:47.000000000 -0800
++++ sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h	2004-07-03 01:04:47.603925633 -0700
+@@ -211,16 +211,16 @@
+ 	{
+ 		if ( bufferLen >= 1 )
+ 		{
+-			pBufCurrent = ( bufBegin = buffer );
+-			bufEnd = bufBegin + bufferLen;
+-			bufLen = bufferLen;
+-			status = true;
++			this->pBufCurrent = ( this->bufBegin = buffer );
++			this->bufEnd = this->bufBegin + bufferLen;
++			this->bufLen = bufferLen;
++			this->status = true;
+ 		}
+ 		else
+ 		{
+-			pBufCurrent = bufBegin = bufEnd = 0;
+-			bufLen = 0;
+-			status = false;
++			this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
++			this->bufLen = 0;
++			this->status = false;
+ 		}
+ 	}
+ };
diff --git a/media-libs/libsidplay/libsidplay-1.36.57.ebuild b/media-libs/libsidplay/libsidplay-1.36.57.ebuild
index fc194fcc20d0..daed5699185b 100644
--- a/media-libs/libsidplay/libsidplay-1.36.57.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.57.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-libs/libsidplay/libsidplay-1.36.57.ebuild,v 1.11 2004/07/03 07:17:00 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.57.ebuild,v 1.12 2004/07/03 08:23:29 eradicator Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/${P}
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="x86 sparc alpha hppa ia64 ~ppc"
+KEYWORDS="x86 sparc alpha hppa ia64 ~ppc ~amd64"
 
 DEPEND="virtual/libc"
 
diff --git a/media-libs/libsidplay/libsidplay-2.1.0-r1.ebuild b/media-libs/libsidplay/libsidplay-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..7594e0b7967b
--- /dev/null
+++ b/media-libs/libsidplay/libsidplay-2.1.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.0-r1.ebuild,v 1.1 2004/07/03 08:23:29 eradicator Exp $
+
+IUSE=""
+
+inherit libtool eutils
+
+MY_PN="sidplay-libs"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="C64 SID player library"
+HOMEPAGE="http://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
+RESTRICT="nomirror"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/libsidplay2-gcc34.patch
+
+	elibtoolize
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+
+	cd ${S}/libsidplay
+	docinto libsidplay
+	dodoc AUTHORS ChangeLog README TODO
+
+	cd ${S}/libsidutils
+	docinto libsidutils
+	dodoc AUTHORS ChangeLog README TODO
+
+	cd ${S}/resid
+	docinto resid
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/media-libs/libsidplay/libsidplay-2.1.1.ebuild b/media-libs/libsidplay/libsidplay-2.1.1.ebuild
new file mode 100644
index 000000000000..8b57f256c71d
--- /dev/null
+++ b/media-libs/libsidplay/libsidplay-2.1.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.1.ebuild,v 1.1 2004/07/03 08:23:29 eradicator Exp $
+
+IUSE=""
+
+inherit libtool eutils
+
+MY_PN="sidplay-libs"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="C64 SID player library"
+HOMEPAGE="http://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
+RESTRICT="nomirror"
+
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/libsidplay2-gcc34.patch
+
+	elibtoolize
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die
+
+	cd ${S}/libsidplay
+	docinto libsidplay
+	dodoc AUTHORS ChangeLog README TODO
+
+	cd ${S}/libsidutils
+	docinto libsidutils
+	dodoc AUTHORS ChangeLog README TODO
+
+	cd ${S}/resid
+	docinto resid
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}
diff --git a/media-libs/libsidplay/metadata.xml b/media-libs/libsidplay/metadata.xml
new file mode 100644
index 000000000000..efa54454de71
--- /dev/null
+++ b/media-libs/libsidplay/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer><email>hanno@gentoo.org</email></maintainer>
+</pkgmetadata>