Version bump. ~sparc -amd64.

7 files changed, 92 insertions, 6 deletions

diff --git a/media-sound/madman/ChangeLog b/media-sound/madman/ChangeLog
index 1fa2fb3ef376..c5bdb4d8cc31 100644
--- a/media-sound/madman/ChangeLog
+++ b/media-sound/madman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/madman
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/madman/ChangeLog,v 1.5 2004/06/25 00:09:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madman/ChangeLog,v 1.6 2004/07/12 19:43:15 eradicator Exp $
+
+*madman-0.93 (12 Jul 2004)
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> madman-0.93.ebuild:
+  Version bump.  ~sparc -amd64.
 
   25 Apr 2004; Aron Griffis <agriffis@gentoo.org> madman-0.91.1.ebuild:
   Add die following econf for bug 48950
diff --git a/media-sound/madman/Manifest b/media-sound/madman/Manifest
index bd12746bf2ab..dd4836446d26 100644
--- a/media-sound/madman/Manifest
+++ b/media-sound/madman/Manifest
@@ -1,4 +1,7 @@
-MD5 e4cfc746be65a99f7a4703dfcd90094f madman-0.91.1.ebuild 726
-MD5 e01696f8a77fb70a6874490c8f8bec29 ChangeLog 705
+MD5 3f8149d70beafaf80e2d54de35e55943 madman-0.91.1.ebuild 735
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 42929b295e24d7a756544b1aba1a7813 ChangeLog 845
+MD5 5ea31811acac3605934bd930b665dab4 madman-0.93.ebuild 1762
 MD5 cf5b2760fca097c0c04b4566fad931ce files/digest-madman-0.91.1 65
+MD5 552d34016df5811e777e48617ac62c35 files/digest-madman-0.93 63
+MD5 619eaa44f6cc47b3f9c27a0f4f7fb0f8 files/madman-0.93-gcc34.patch 408
diff --git a/media-sound/madman/files/digest-madman-0.93 b/media-sound/madman/files/digest-madman-0.93
new file mode 100644
index 000000000000..322102fef718
--- /dev/null
+++ b/media-sound/madman/files/digest-madman-0.93
@@ -0,0 +1 @@
+MD5 a9aeef95248ecd55e0479a6b8dec43f2 madman-0.93.tar.gz 548497
diff --git a/media-sound/madman/files/madman-0.93-gcc34.patch b/media-sound/madman/files/madman-0.93-gcc34.patch
new file mode 100644
index 000000000000..98992e9ca95c
--- /dev/null
+++ b/media-sound/madman/files/madman-0.93-gcc34.patch
@@ -0,0 +1,12 @@
+diff -Naur madman-0.93.orig/utility/refcnt_ptr.h madman-0.93/utility/refcnt_ptr.h
+--- madman-0.93.orig/utility/refcnt_ptr.h	2004-05-20 07:03:13.000000000 -0700
++++ madman-0.93/utility/refcnt_ptr.h	2004-07-12 12:09:48.000000000 -0700
+@@ -109,7 +109,7 @@
+     refcnt_ptr(const refcnt_ptr<T2>& rhs) throw()
+ 	{
+ 	object = rhs.object;
+-	refcnt = rhs.refCnt;
++	this->refcnt = rhs.refCnt;
+ 	increaseCount();
+ 	}
+ 
diff --git a/media-sound/madman/madman-0.91.1.ebuild b/media-sound/madman/madman-0.91.1.ebuild
index 4dad984de407..a0abfdf90fc9 100644
--- a/media-sound/madman/madman-0.91.1.ebuild
+++ b/media-sound/madman/madman-0.91.1.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/madman/madman-0.91.1.ebuild,v 1.7 2004/06/25 00:09:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madman/madman-0.91.1.ebuild,v 1.8 2004/07/12 19:43:15 eradicator Exp $
 
 DESCRIPTION="MP3 organizer/ID3 tag-editor extrodinaire"
 HOMEPAGE="http://madman.sf.net"
@@ -20,7 +20,7 @@ DEPEND=">=x11-libs/qt-3.1.0-r3
 src_compile() {
 	addwrite "${QTDIR}/etc/settings"
 	econf --prefix=/usr --libdir=/usr/lib || die "econf failed"
-	emake
+	emake || die
 }
 
 src_install() {
diff --git a/media-sound/madman/madman-0.93.ebuild b/media-sound/madman/madman-0.93.ebuild
new file mode 100644
index 000000000000..92429f6102df
--- /dev/null
+++ b/media-sound/madman/madman-0.93.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/madman/madman-0.93.ebuild,v 1.1 2004/07/12 19:43:15 eradicator Exp $
+
+IUSE=""
+
+inherit eutils
+
+DESCRIPTION="MP3 organizer/ID3 tag-editor extrodinaire"
+HOMEPAGE="http://madman.sf.net"
+SRC_URI="mirror://sourceforge/madman/${P}.tar.gz"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+#-amd64: 0.93: see bug #56821
+KEYWORDS="~x86 -amd64 ~sparc"
+
+DEPEND=">=x11-libs/qt-3.1.0-r3
+	>=media-libs/libvorbis-1.0
+	>=media-sound/xmms-1.2.7-r20
+	>=media-libs/id3lib-3.8.3"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+addpredict_from_config() {
+	# This is a hack to be able to dynamically determine which directories
+	# scons will try to create .scons* files in.
+	for i in `$1 --libs --cflags | tr ' ' '\n' |
+				grep -E -- '-L|-I' | cut -c 3-`; do
+		addpredict $i
+	done;
+}
+
+src_compile() {
+	# Since I have found no way to prevent scons from trying to create
+	# .scons$PID and .sconsign files, I have instead just added the
+	# directiories where it tries to create them to the predict path.
+	addpredict "${QTDIR}/include"
+	addpredict "${QTDIR}/lib"
+	addpredict_from_config glib-config
+	addpredict_from_config xmms-config
+
+	tar xzf scons-local-0.95.tar.gz
+
+	./scons.py ${MAKEOPTS} prefix=/usr || die
+}
+
+src_install() {
+	# Since I cannot make scons install the files in a different directory than
+	# prefix is set to (without recompiling everyting), I opted to install
+	# madman "by hand".
+	dobin main/madman
+	dodoc README
+	dodoc COPYING
+	newdoc plugins/README README.plugins
+	dodir /usr/lib/${PN}/plugins
+	exeinto /usr/lib/${PN}/plugins
+	doexe `find plugins -perm -100 -a -type f`
+}
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index e1959805598f..fcdb14e6c559 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -1,4 +1,4 @@
-MD5 2cad2443cb7655e6ae20f12eafaa3807 ChangeLog 2642
+MD5 dac560d2d2c28c8a20377be3a7850eba ChangeLog 2642
 MD5 3d519658795b6efec48a545560a380e6 madplay-0.15.0b-r1.ebuild 1178
 MD5 b150ca1001af1df3caadd520e2b0d646 madplay-0.15.0b.ebuild 1271
 MD5 011f1b696d87a745fa8285ec03c1996c madplay-0.15.1b.ebuild 1178