Version bump and cleanup. Added to ~sparc.

12 files changed, 165 insertions, 152 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index 911dd210bde8..5fda5d669f0e 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.21 2004/07/01 07:53:57 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.22 2004/10/08 07:17:26 eradicator Exp $
+
+*mixxx-1.3.2 (08 Oct 2004)
+
+  08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/mixxx-1.3.2-gentoo.patch, -files/mixxx-fixINSTALL.patch,
+  -mixxx-0.9.2.ebuild, -mixxx-1.1-r1.ebuild, -mixxx-1.1.ebuild,
+  +mixxx-1.3.2.ebuild:
+  Version bump and cleanup.  Added to ~sparc.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> mixxx-0.9.2.ebuild,
   mixxx-1.1-r1.ebuild, mixxx-1.1.ebuild, mixxx-1.2.1.ebuild:
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 42e9368758b2..4bfd739c296b 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -4,9 +4,11 @@ MD5 f0226c6e66a9c4315e81fe451b0f4487 mixxx-0.9.2.ebuild 744
 MD5 96a19b5d4fedbaf2867f670bf00428f7 mixxx-1.1-r1.ebuild 1202
 MD5 43af054435252a1f4e1e2b998d4a258a mixxx-1.1.ebuild 1148
 MD5 56663f1bbadbe0cc8bba404dfe7c64c1 mixxx-1.2.1.ebuild 1486
+MD5 bc13cb24b6f2b833d5adb6e5d6b87547 mixxx-1.3.2.ebuild 1265
 MD5 940b03d92d814ef3ab091d118fe837d6 files/digest-mixxx-0.9.2 63
 MD5 fe687b7ed7c86c8b9274ecfef35bb107 files/digest-mixxx-1.1 62
 MD5 fe687b7ed7c86c8b9274ecfef35bb107 files/digest-mixxx-1.1-r1 62
 MD5 f3543ce61c9d39860076bad6d555d3bb files/digest-mixxx-1.2.1 64
 MD5 a2c0c330054a4491d56149b7a6ab3b02 files/mixxx-fixINSTALL.patch 466
 MD5 e7c3a488b82537d2e1912239a42453c0 files/mixxx.pro 13666
+MD5 064add22fc8473743fee7feedb5256f0 files/digest-mixxx-1.3.2 64
diff --git a/media-sound/mixxx/files/digest-mixxx-0.9.2 b/media-sound/mixxx/files/digest-mixxx-0.9.2
deleted file mode 100644
index 33a2622b80c6..000000000000
--- a/media-sound/mixxx/files/digest-mixxx-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7b5339b16cce6d2aeea2033168bf1fd0 mixxx-0.9.2.tar.gz 643831
diff --git a/media-sound/mixxx/files/digest-mixxx-1.1 b/media-sound/mixxx/files/digest-mixxx-1.1
deleted file mode 100644
index 3031e4c9ef8e..000000000000
--- a/media-sound/mixxx/files/digest-mixxx-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f58b202b4ca8dd22cefab946198a37ad mixxx-1.1.tar.gz 3299737
diff --git a/media-sound/mixxx/files/digest-mixxx-1.1-r1 b/media-sound/mixxx/files/digest-mixxx-1.1-r1
deleted file mode 100644
index 3031e4c9ef8e..000000000000
--- a/media-sound/mixxx/files/digest-mixxx-1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f58b202b4ca8dd22cefab946198a37ad mixxx-1.1.tar.gz 3299737
diff --git a/media-sound/mixxx/files/digest-mixxx-1.3.2 b/media-sound/mixxx/files/digest-mixxx-1.3.2
new file mode 100644
index 000000000000..6d5ef5d49966
--- /dev/null
+++ b/media-sound/mixxx/files/digest-mixxx-1.3.2
@@ -0,0 +1 @@
+MD5 0562b94bbb0ddb53854719f0a0b319fd mixxx-1.3.2.tar.gz 3752254
diff --git a/media-sound/mixxx/files/mixxx-1.3.2-gentoo.patch b/media-sound/mixxx/files/mixxx-1.3.2-gentoo.patch
new file mode 100644
index 000000000000..0cb05c4ef041
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.3.2-gentoo.patch
@@ -0,0 +1,96 @@
+--- mixxx.pro.orig	2004-10-07 23:50:03.207054925 -0700
++++ mixxx.pro	2004-10-07 23:51:45.553399829 -0700
+@@ -31,23 +31,7 @@
+ DEFINES += __PORTAUDIO__
+ SOURCES += playerportaudio.cpp
+ HEADERS += playerportaudio.h
+-PORTAUDIO_DIR = ../lib/portaudio-v18
+-INCLUDEPATH += $$PORTAUDIO_DIR/pa_common
+-HEADERS += $$PORTAUDIO_DIR/pa_common/portaudio.h
+-unix {
+-SOURCES += $$PORTAUDIO_DIR/pa_common/pa_lib.c $$PORTAUDIO_DIR/pa_common/pa_convert.c
+-HEADERS += $$PORTAUDIO_DIR/pa_common/pa_host.h
+-unix:!macx:SOURCES += $$PORTAUDIO_DIR/pablio/ringbuffer.c $$PORTAUDIO_DIR/pa_unix_oss/pa_unix.c $$PORTAUDIO_DIR/pa_unix_oss/pa_unix_oss.c
+-unix:!macx:HEADERS += $$PORTAUDIO_DIR/pablio/ringbuffer.h $$PORTAUDIO_DIR/pa_unix_oss/pa_unix.h
+-unix:!macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_unix_oss
+-macx:SOURCES += $$PORTAUDIO_DIR/pablio/ringbuffer.c $$PORTAUDIO_DIR/pa_mac_core/pa_mac_core.c
+-macx:LIBS += -framework CoreAudio -framework AudioToolbox
+-macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_mac_core $$PORTAUDIO_DIR/pablio 
+-}
+-win32 {
+-    message("Compiling with PortAudio/WMME drivers")
+-    LIBS += winmm.lib PAStaticWMME.lib
+-}
++LIBS += -lportaudio
+ 
+ # RTAudio (Windows DirectSound)
+ win32 {
+@@ -111,8 +95,6 @@
+ CONFIG += opengl
+ 
+ # MP3
+-win32:LIBS += libmad-release.lib libid3tag-release.lib
+-macx:LIBS += $$MACLIBPATH/lib/libmad.a $$MACLIBPATH/lib/libid3tag.a
+ 
+ # MP3 vbrheadersdk from Xing Technology
+ INCLUDEPATH += ../lib/vbrheadersdk
+@@ -128,10 +110,12 @@
+ macx:HEADERS += soundsourceaudiofile.h
+ macx:DEFINES += __AUDIOFILE__
+ macx:LIBS += $$MACLIBPATH/lib/libaudiofile.a
++unix:LIBS += -lsndfile
+ 
+ # Ogg Vorbis
+ win32:LIBS += vorbisfile_static.lib vorbis_static.lib ogg_static.lib
+ macx:LIBS += $$MACLIBPATH/lib/libvorbis.a $$MACLIBPATH/lib/libvorbisfile.a $$MACLIBPATH/lib/libogg.a
++unix:LIBS += -lvorbis
+ 
+ # PowerMate
+ SOURCES += powermate.cpp
+@@ -155,9 +139,9 @@
+ INCLUDEPATH += $$KISSFFT_DIR
+ 
+ # Audio scaling
+-INCLUDEPATH += ../lib/libsamplerate
+-SOURCES += enginebufferscalesrc.cpp ../lib/libsamplerate/samplerate.c ../lib/libsamplerate/src_linear.c ../lib/libsamplerate/src_sinc.c ../lib/libsamplerate/src_zoh.c
+-HEADERS += enginebufferscalesrc.h ../lib/libsamplerate/samplerate.h ../lib/libsamplerate/config.h ../lib/libsamplerate/common.h ../lib/libsamplerate/float_cast.h ../lib/libsamplerate/fastest_coeffs.h ../lib/libsamplerate/high_qual_coeffs.h ../lib/libsamplerate/mid_qual_coeffs.h
++SOURCES += enginebufferscalesrc.cpp
++HEADERS += enginebufferscalesrc.h
++LIBS += -lsamplerate
+ 
+ # Debug plotting through gplot API
+ #unix:DEFINES += __GNUPLOT__
+@@ -184,7 +168,7 @@
+   isEmpty( PREFIX ) {
+     PREFIX = /usr
+   }
+-  UNIX_SHARE_PATH = $${PREFIX}/share/mixxx
++  UNIX_SHARE_PATH = /usr/share/mixxx
+   DEFINES += UNIX_SHARE_PATH=\"$$UNIX_SHARE_PATH\"
+ 
+   SETTINGS_FILE = \".mixxx.cfg\"
+@@ -252,19 +236,19 @@
+    keyb.files = keyboard/*
+ 
+     # doc files...
+-   readme.path = $${PREFIX}/share/doc/mixxx-1.3
++   readme.path = /usr/share/doc/mixxx-1.3
+    readme.files = ../README
+-   licence.path = $${PREFIX}/share/doc/mixxx-1.3
++   licence.path = /usr/share/doc/mixxx-1.3
+    licence.files = ../LICENSE
+-   copying.path = $${PREFIX}/share/doc/mixxx-1.3
++   copying.path = /usr/share/doc/mixxx-1.3
+    copying.files = ../COPYING
+-   manual.path = $${PREFIX}/share/doc/mixxx-1.3
++   manual.path = /usr/share/doc/mixxx-1.3
+    manual.files = ../Mixxx-Manual.pdf
+ 
+ 
+     # binary...
+    TARGET = mixxx
+-   target.path = $${PREFIX}/bin
++   target.path = /usr/bin
+ 
+     # finally adding what we wanna install...
+    INSTALLS += skino skinoc skinos skint midi keyb readme licence copying manual target
diff --git a/media-sound/mixxx/files/mixxx-fixINSTALL.patch b/media-sound/mixxx/files/mixxx-fixINSTALL.patch
deleted file mode 100644
index 1997f3401672..000000000000
--- a/media-sound/mixxx/files/mixxx-fixINSTALL.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- install.pl	2003-08-20 18:20:55.000000000 +0900
-+++ install.pl-gentoo	2003-09-18 16:45:18.000000000 +0900
-@@ -6,7 +6,8 @@
- # August 2003, Tue Haste Andersen <haste@diku.dk>
- #
- 
--$BASE='/usr'; 
-+#$BASE='/usr'; 
-+$BASE='${D}/usr'; 
- 
- # Check if this is running on Linux
- $_ = `uname`;
-@@ -33,6 +34,7 @@
- `install src/midi/* $BASE/share/mixxx/midi`;
- 
- # Copy mixxx binary to $BASE/bin
-+`install -d $BASE/bin`;
- `install src/mixxx $BASE/bin`;
- 
- # Copy doc files
-
diff --git a/media-sound/mixxx/mixxx-0.9.2.ebuild b/media-sound/mixxx/mixxx-0.9.2.ebuild
deleted file mode 100644
index 4293bc97a6ad..000000000000
--- a/media-sound/mixxx/mixxx-0.9.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-0.9.2.ebuild,v 1.9 2004/07/01 07:53:57 eradicator Exp $
-
-IUSE=""
-
-DESCRIPTION="Digital DJ tool using QT 3.x"
-HOMEPAGE="http://mixxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/mixxx/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-
-DEPEND="virtual/libc
-	>=x11-libs/qt-3.0.3
-	media-libs/portaudio
-	media-sound/madplay
-	media-libs/audiofile"
-
-S=${WORKDIR}/${P}/src
-
-src_compile() {
-	qmake mixxx || die
-	make || die
-}
-
-src_install() {
-	dodir /usr/bin
-	cp ./mixxx ${D}/usr/bin || die
-	dodir /usr/share/mixxx
-	cp ./config/* ${D}/usr/share/mixxx/ || die
-}
diff --git a/media-sound/mixxx/mixxx-1.1-r1.ebuild b/media-sound/mixxx/mixxx-1.1-r1.ebuild
deleted file mode 100644
index 8f56f555d2ca..000000000000
--- a/media-sound/mixxx/mixxx-1.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.1-r1.ebuild,v 1.6 2004/07/01 07:53:57 eradicator Exp $
-
-IUSE=""
-
-DESCRIPTION="Digital DJ tool using QT 3.x"
-HOMEPAGE="http://mixxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/mixxx/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND="virtual/libc
-	>=x11-libs/qt-3.1.0
-	media-sound/madplay
-	=dev-libs/fftw-2.1.5
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-lang/perl
-	media-libs/audiofile"
-
-src_compile() {
-	cd ${S}/src
-	qmake mixxx.pro || die
-	sed -i -e "s/CFLAGS *= -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" Makefile
-	sed -i -e "s/CXXFLAGS *= -pipe -w -O2/CXXFLAGS   = ${CXXFLAGS} -w/" Makefile
-	make || die
-}
-
-src_install() {
-	cd ${S}
-	sed -i -e "s#$BASE='/usr';#$BASE='${D}/usr';#" install.pl
-	./install.pl || die
-
-	einfo ""
-	einfo "Fixing permissions..."
-	einfo ""
-
-	chmod 644 ${D}/usr/share/doc/${PF}/*
-	chmod 644 ${D}/usr/share/mixxx/midi/*
-	chmod 644 ${D}/usr/share/mixxx/skins/outline/*
-	chmod 644 ${D}/usr/share/mixxx/skins/outlineClose/*
-	chmod 644 ${D}/usr/share/mixxx/skins/traditional/*
-}
diff --git a/media-sound/mixxx/mixxx-1.1.ebuild b/media-sound/mixxx/mixxx-1.1.ebuild
deleted file mode 100644
index 30669ecd3c85..000000000000
--- a/media-sound/mixxx/mixxx-1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.1.ebuild,v 1.8 2004/07/01 07:53:57 eradicator Exp $
-
-IUSE=""
-
-DESCRIPTION="Digital DJ tool using QT 3.x"
-HOMEPAGE="http://mixxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/mixxx/${P}.tar.gz"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND="virtual/libc
-	>=x11-libs/qt-3.1.0
-	media-sound/madplay
-	=dev-libs/fftw-2.1.5
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-lang/perl
-	media-libs/audiofile"
-
-src_compile() {
-	cd ${S}/src
-	qmake mixxx.pro || die
-	sed -i -e "s/CFLAGS   = -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" Makefile
-	sed -i -e "s/CXXFLAGS   = -pipe -w -O2/CXXFLAGS   = ${CXXFLAGS} -w/" Makefile
-	make || die
-}
-
-src_install() {
-	cd ${S}
-	sed -i -e "s#$BASE='/usr';#$BASE='${D}/usr';#" install.pl
-	./install.pl || die
-
-	einfo ""
-	einfo "Fixing permissions..."
-	einfo ""
-
-	chmod 644 ${D}/usr/share/doc/${PF}/*
-	chmod 644 ${D}/usr/share/mixxx/midi/*
-	chmod 644 ${D}/usr/share/mixxx/skins/outline/*
-	chmod 644 ${D}/usr/share/mixxx/skins/traditional/*
-}
diff --git a/media-sound/mixxx/mixxx-1.3.2.ebuild b/media-sound/mixxx/mixxx-1.3.2.ebuild
new file mode 100644
index 000000000000..3fc35340545b
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.3.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.3.2.ebuild,v 1.1 2004/10/08 07:17:26 eradicator Exp $
+
+IUSE="jack"
+
+inherit eutils
+
+S="${WORKDIR}/${P}/src"
+
+DESCRIPTION="Digital DJ tool using QT 3.x"
+HOMEPAGE="http://mixxx.sourceforge.net"
+SRC_URI="mirror://sourceforge/mixxx/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~sparc ~x86"
+
+DEPEND=">=x11-libs/qt-3.1.0
+	media-sound/madplay
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/audiofile
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	media-libs/portaudio
+	jack? ( media-sound/jack-audio-connection-kit )"
+
+RDEPEND="${DEPEND}
+	 dev-lang/perl"
+
+DEPEND="${DEPEND}
+	sys-apps/sed"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+}
+
+src_compile() {
+	./configure `use_enable jack Jack` || die "configure failed"
+	
+        sed -i -e "s/CFLAGS *= -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" \
+               -e "s/CXXFLAGS *= -pipe -w -O2/CXXFLAGS   = ${CXXFLAGS} -w/" Makefile
+
+	addpredict  ${QTDIR}/etc/settings
+	emake || die "make failed"
+}
+
+src_install() {
+	make COPY_FILE="cp -fpr" \
+	     INSTALL_ROOT="${D}" install || die "make install failed"
+
+	dodoc ../README ../Mixxx-Manual.pdf
+}