Version bump. See bug #38548. minor ebuild changes. repoman fixes.

8 files changed, 405 insertions, 11 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index f2cd36cb904d..fa8b31cbcb9f 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.14 2003/12/29 16:39:07 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.15 2004/01/28 04:30:19 raker Exp $
+
+*mixxx-1.2.1 (27 Jan 2004)
+
+  27 Jan 2004; Nick Hadaway <raker@gentoo.org> mixxx-1.2.1.ebuild:
+  Version bump.  Some ebuild changes contributed by Mike Verdone on bug
+  #28548.  Added some of my own changes as well.
 
 *mixxx-1.1-r1 (29 Dec 2003)
 
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index b537bee6034b..22be0766b5f0 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,9 +1,12 @@
 MD5 a78cde189ba8827cb094b56d959292d5 mixxx-1.1-r1.ebuild 1197
-MD5 fe687b7ed7c86c8b9274ecfef35bb107 files/digest-mixxx-1.1-r1 62
-MD5 a2c0c330054a4491d56149b7a6ab3b02 files/mixxx-fixINSTALL.patch 466
-MD5 940b03d92d814ef3ab091d118fe837d6 files/digest-mixxx-0.9.2 63
-MD5 fe687b7ed7c86c8b9274ecfef35bb107 files/digest-mixxx-1.1 62
+MD5 5237a80b7085cf3d3a1f70e265003c0e mixxx-1.2.1.ebuild 1527
 MD5 3ff8303398e2fa03124de05aae28939a mixxx-0.9.2.ebuild 738
 MD5 d6d16ad4db9ac8e00ae035d6c74b23d3 mixxx-1.1.ebuild 1142
 MD5 56b1cf1b25626f143ac417bbaf1be4a2 ChangeLog 1742
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
+MD5 e7c3a488b82537d2e1912239a42453c0 files/mixxx.pro 13666
+MD5 fe687b7ed7c86c8b9274ecfef35bb107 files/digest-mixxx-1.1-r1 62
+MD5 a2c0c330054a4491d56149b7a6ab3b02 files/mixxx-fixINSTALL.patch 466
+MD5 940b03d92d814ef3ab091d118fe837d6 files/digest-mixxx-0.9.2 63
+MD5 f3543ce61c9d39860076bad6d555d3bb files/digest-mixxx-1.2.1 64
+MD5 fe687b7ed7c86c8b9274ecfef35bb107 files/digest-mixxx-1.1 62
diff --git a/media-sound/mixxx/files/digest-mixxx-1.2.1 b/media-sound/mixxx/files/digest-mixxx-1.2.1
new file mode 100644
index 000000000000..226c0e2fd01c
--- /dev/null
+++ b/media-sound/mixxx/files/digest-mixxx-1.2.1
@@ -0,0 +1 @@
+MD5 2862d8c27cdb376ba90adb945071f8ba mixxx-1.2.1.tar.gz 3029353
diff --git a/media-sound/mixxx/files/mixxx.pro b/media-sound/mixxx/files/mixxx.pro
new file mode 100644
index 000000000000..66ffae2b00d3
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx.pro
@@ -0,0 +1,327 @@
+#
+# Qmake file for Mixxx.
+#
+# (C) 2002-2003 Tue Haste Andersen <haste@diku.dk>
+#
+# Unix dependency code and configure script by Gianluca Romanin. See included
+# files for copyright details.
+#
+
+
+
+#
+# Options, and path to libraries
+#
+
+# On Windows, select between WMME, DIRECTSOUND and ASIO.
+# If ASIO is used, ensure that the path to the ASIO SDK 2 is set correctly below
+WINPA = DIRECTSOUND
+
+# Use this definition on Linux if Mixxx should be statically linked with libmad,
+# libid3tag, fftw, ogg, vorbis and audiofile
+#unix:LINLIBPATH = ../../mixxx-linlib
+
+# Include for unix dependencies. (19/12/2003, J_Zar)
+include( mixxx.depend )
+
+# Path to Macintosh libraries
+macx:MACLIBPATH = ../../mixxx-maclib
+
+# Path to Windows libraries
+win32:WINLIBPATH = ../../mixxx-winlib
+
+# Path to ASIO SDK
+ASIOSDK_DIR   = $$WINLIBPATH/asiosdk2
+
+#
+# End of options
+#
+
+# PortAudio
+DEFINES += __PORTAUDIO__
+SOURCES += playerportaudio.cpp
+HEADERS += playerportaudio.h
+PORTAUDIO_DIR = ../lib/portaudio-v18
+SOURCES += $$PORTAUDIO_DIR/pa_common/pa_lib.c $$PORTAUDIO_DIR/pa_common/pa_convert.c
+HEADERS += $$PORTAUDIO_DIR/pa_common/portaudio.h $$PORTAUDIO_DIR/pa_common/pa_host.h
+INCLUDEPATH += $$PORTAUDIO_DIR/pa_common
+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 {
+    contains(WINPA, DIRECTSOUND) {
+        message("Compiling Mixxx using DirectSound drivers")
+        SOURCES += $$PORTAUDIO_DIR/pa_win_ds/dsound_wrapper.c $$PORTAUDIO_DIR/pa_win_ds/pa_dsound.c
+        LIBS += dsound.lib
+        INCLUDEPATH += $$PORTAUDIO_DIR/pa_win_ds
+    }
+    contains(WINPA, ASIO) {
+        message("Compiling Mixxx using ASIO drivers. Not tested.")
+        SOURCES += $$PORTAUDIO_DIR/pa_asio/pa_asio.cpp $$ASIOSDK_DIR/common/asio.cpp $$ASIOSDK_DIR/host/asiodrivers.cpp $$ASIOSDK_DIR/host/pc/asiolist.cpp
+        HEADERS += $$ASIOSDK_DIR/common/asio.h $$ASIOSDK_DIR/host/asiodrivers.h $$ASIOSDK_DIR/host/pc/asiolist.h
+        INCLUDEPATH += $$PORTAUDIO_DIR/pa_asio $$ASIOSDK_DIR/common $$ASIOSDK_DIR/host $$ASIOSDK_DIR/host/pc
+        LIBS += winmm.lib
+    }
+    contains(WINPA, WMME) {
+        error("TO use WMME drivers add appropriate files to the mixxx.pro file first")
+    }
+}
+
+# DEPRECATED!     ( 19/12/2003, J_Zar)
+# unix {
+#     # Check if we can link against libjack:
+#     system(ld -ljack 2> /dev/null):HAS_JACK=FALSE
+#     count(HAS_JACK,1) {
+#         DEFINES += __JACK__
+#         SOURCES += playerjack.cpp
+#         HEADERS += playerjack.h
+#         LIBS += -ljack
+#         message("Compiling with Jack support")
+#     }
+#     isEmpty(HAS_JACK) {
+#         message("Did not find Jack libraries.")
+#     }
+# }
+
+# OSS Midi (Working good, Linux specific)
+unix:!macx:SOURCES += midiobjectoss.cpp
+unix:!macx:HEADERS += midiobjectoss.h
+unix:!macx:DEFINES += __OSSMIDI__
+
+# Windows MIDI
+win32:SOURCES += midiobjectwin.cpp
+win32:HEADERS += midiobjectwin.h
+win32:DEFINES += __WINMIDI__
+
+# CoreMidi (Mac OS X)
+macx:SOURCES += midiobjectcoremidi.cpp
+macx:HEADERS += midiobjectcoremidi.h
+macx:DEFINES += __COREMIDI__
+macx:LIBS    += -framework CoreMIDI -framework CoreFoundation
+
+# ALSA PCM (Not currently working, Linux specific)
+#SOURCES += playeralsa.cpp
+#HEADERS += playeralsa.h
+#DEFINES += __ALSA__
+#unix:LIBS += -lasound
+
+# ALSA MIDI (Not currently working, Linux specific)
+#SOURCES += midiobjectalsa.cpp
+#HEADERS += midiobjectalsa.h
+#DEFINES  += __ALSAMIDI__
+
+# Visuals
+SOURCES += wvisualsimple.cpp wvisualwaveform.cpp visual/visualbackplane.cpp visual/texture.cpp visual/visualbox.cpp visual/visualbuffer.cpp visual/visualbuffersignal.cpp visual/visualbuffermarks.cpp visual/visualchannel.cpp visual/visualcontroller.cpp visual/visualdisplay.cpp visual/visualdisplaybuffer.cpp visual/light.cpp visual/material.cpp visual/picking.cpp visual/pickable.cpp visual/visualobject.cpp
+HEADERS += wvisualsimple.h wvisualwaveform.h visual/visualbackplane.h  visual/texture.h visual/visualbox.h visual/visualbuffer.h visual/visualbuffersignal.h visual/visualbuffermarks.h visual/visualchannel.h visual/visualcontroller.h visual/visualdisplay.h visual/visualdisplaybuffer.h visual/light.h visual/material.h visual/picking.h visual/pickable.h visual/visualobject.h
+CONFIG += opengl
+
+# MP3
+count(LINLIBPATH, 1) {
+    unix:!macx:LIBS += $$LINLIBPATH/libs/libmad.a $$LINLIBPATH/libs/libid3tag.a
+# DEPRECATED!     ( 19/12/2003, J_Zar)
+# } else {
+#     unix:!macx:LIBS += -lmad -lid3tag
+}
+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
+SOURCES += ../lib/vbrheadersdk/dxhead.c
+HEADERS += ../lib/vbrheadersdk/dxhead.h
+
+# Wave files
+unix:SOURCES += soundsourceaudiofile.cpp
+unix:HEADERS += soundsourceaudiofile.h
+count(LINLIBPATH, 1) {
+    unix:!macx:LIBS += $$LINLIBPATH/libs/libaudiofile.a
+# DEPRECATED!     ( 19/12/2003, J_Zar)
+# } else {
+#     unix:!macx:LIBS += -laudiofile
+}
+win32:SOURCES += soundsourcesndfile.cpp
+win32:HEADERS += soundsourcesndfile.h
+win32:LIBS += libsndfile.lib
+macx:LIBS += $$MACLIBPATH/lib/libaudiofile.a
+
+
+# Ogg Vorbis
+count(LINLIBPATH, 1) {
+    unix:!macx:LIBS += $$LINLIBPATH/libs/libvorbisfile.a $$LINLIBPATH/libs/libvorbis.a $$LINLIBPATH/libs/libogg.a
+# DEPRECATED!     ( 19/12/2003, J_Zar)
+# } else {
+#     unix:!macx:LIBS += -lvorbisfile -lvorbis -logg
+}
+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
+
+# PowerMate
+SOURCES += powermate.cpp
+HEADERS += powermate.h
+unix:!macx:SOURCES += powermatelinux.cpp
+unix:!macx:HEADERS += powermatelinux.h
+win32:SOURCES += powermatewin.cpp
+win32:HEADERS += powermatewin.h
+win32:LIBS += setupapi.lib
+
+# Joystick
+SOURCES += joystick.cpp
+HEADERS += joystick.h
+unix:!macx:SOURCES += joysticklinux.cpp
+unix:!macx:HEADERS += joysticklinux.h
+
+
+# FFT
+ count(LINLIBPATH, 1) {
+     unix:!macx:LIBS += $$LINLIBPATH/libs/libsrfftw.a $$LINLIBPATH/libs/libsfftw.a
+# DEPRECATED!     ( 19/12/2003, J_Zar)
+#  } else {
+#     unix:!macx:LIBS += -lsrfftw -lsfftw
+}
+win32:LIBS += rfftw2st-release.lib fftw2st-release.lib
+macx:LIBS += $$MACLIBPATH/lib/librfftw.a $$MACLIBPATH/lib/libfftw.a
+
+# 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
+
+# Debug plotting through gplot API
+#unix:DEFINES += __GNUPLOT__
+#unix:INCLUDEPATH += ../lib/gplot
+#unix:SOURCES += ../lib/gplot/gplot3.c
+#unix:HEADERS += ../lib/gplot/gplot.h
+
+unix:!macx {
+  # If Intel compiler is used, set icc optimization flags
+  COMPILER = $$system(echo $QMAKESPEC)
+  contains(COMPILER, linux-icc) {
+    message("Using Intel compiler")
+    QMAKE_CXXFLAGS += -rcd -tpp6 -xiMK # icc pentium III
+#    QMAKE_CXXFLAGS += -rcd -tpp7 -xiMKW # icc pentium IV
+#    QMAKE_CXXFLAGS += -prof_gen # generete profiling
+#    QMAKE_CXXFLAGS += -prof_use # use profiling
+    QMAKE_CXXFLAGS += -w1 #-Wall
+    # icc Profiling
+#    QMAKE_CXXFLAGS_DEBUG += -qp -g
+#    QMAKE_LFLAGS_DEBUG += -qp -g
+  }
+
+  # if PREFIX is defined by the user, we use it! ( 19/12/2003, J_Zar)
+  !isEmpty( PREFIX ) {
+     UNIX_SHARE_PATH = $${PREFIX}/mixxx
+  } else {
+     UNIX_SHARE_PATH = /usr/share/mixxx
+  }
+  DEFINES += UNIX_SHARE_PATH=\"$$UNIX_SHARE_PATH\"
+
+  SETTINGS_FILE = \".mixxx.cfg\"
+  TRACK_FILE = \".mixxxtrack.xml\"
+  DEFINES += __LINUX__
+}
+
+unix {
+  DEFINES += __UNIX__
+  INCLUDEPATH += .
+  UI_DIR = .ui
+  MOC_DIR = .moc
+  OBJECTS_DIR = .obj
+
+# Libs needed for static linking on Linux
+count(LINLIBPATH,1) {
+    unix:message("Using static linking")
+#    unix:LIBS += -ldl -lm -lXrender -lSM /usr/lib/libfontconfig.a -lXft
+}
+
+# GCC Compiler optimization flags
+#  QMAKE_CXXFLAGS += -march=pentium3 -O3 -pipe
+#  QMAKE_CFLAGS   += -march=pentium3 -O3 -pipe
+
+# gcc Profiling
+#  QMAKE_CXXFLAGS_DEBUG += -pg
+#  QMAKE_LFLAGS_DEBUG += -pg
+}
+
+win32 {
+  DEFINES += __WIN__
+  INCLUDEPATH += $$WINLIBPATH ../lib .
+  QMAKE_CXXFLAGS += -GX
+  QMAKE_LFLAGS += /VERBOSE:LIB /libpath:$$WINLIBPATH /NODEFAULTLIB:library /NODEFAULTLIB:libcd /NODEFAULTLIB:libcmt /NODEFAULTLIB:libc
+  SETTINGS_FILE = \"mixxx.cfg\"
+  TRACK_FILE = \"mixxxtrack.xml\"
+  RC_FILE = mixxx.rc
+}
+
+macx {
+  DEFINES += __MACX__
+  INCLUDEPATH += $$MACLIBPATH/include
+  LIBS += -lz -framework Carbon -framework QuickTime
+  SETTINGS_FILE = \"mixxx.cfg\"
+  TRACK_FILE = \"mixxxtrack.xml\"
+  RC_FILE = icon.icns
+  QMAKE_CXXFLAGS += -O3 -faltivec -mtune=G4 -mcpu=G4 -mdynamic-no-pic -funroll-loops -ffast-math -fstrict-aliasing
+  QMAKE_CFLAGS += -O3 -faltivec -mtune=G4 -mcpu=G4 -mdynamic-no-pic -funroll-loops -ffast-math -fstrict-aliasing
+  QMAKE_LFLAGS += -O3 -faltivec -mtune=G4 -mcpu=G4 -mdynamic-no-pic -funroll-loops -ffast-math -fstrict-aliasing
+}
+
+# Install-phase for a traditional 'make install'
+unix {
+
+    # skins... (copy all)
+#   skins.path = $${UNIX_SHARE_PATH}/skins
+
+   skinoutline.path = $${UNIX_SHARE_PATH}/skins/outline
+   skinoutline.files = skins/outline/*
+
+   skinoutlineclose.path = $${UNIX_SHARE_PATH}/skins/outlineClose
+   skinoutlineclose.files = skins/outlineClose/*
+
+   skintrad.path = $${UNIX_SHARE_PATH}/skins/traditional
+   skintrad.files = skins/traditional/*
+
+    # midi conf... (copy all)
+   midi.path = $${UNIX_SHARE_PATH}/midi
+   midi.files = midi/*
+
+    # keyboard conf... (copy all)
+   keyb.path = $${UNIX_SHARE_PATH}/keyboard
+   keyb.files = keyboard/*
+
+    # doc files...
+   readme.path = /usr/share/doc/mixxx-1.1
+   readme.files = ../README
+   licence.path = /usr/share/doc/mixxx-1.1
+   licence.files = ../LICENCE
+   copying.path = /usr/share/doc/mixxx-1.1
+   copying.files = ../COPYING
+
+    # binary...
+   TARGET = mixxx
+   target.path = /usr/bin
+
+    # finally adding what we wanna install...
+   INSTALLS += skinoutline skinoutlineclose skintrad midi keyb readme licence copying target
+}
+
+
+FORMS	= dlgprefsounddlg.ui dlgprefmididlg.ui dlgprefplaylistdlg.ui dlgprefcontrolsdlg.ui
+
+SOURCES += mixxxkeyboard.cpp configobject.cpp fakemonitor.cpp controlengine.cpp controleventengine.cpp controleventmidi.cpp controllogpotmeter.cpp controlobject.cpp controlnull.cpp controlpotmeter.cpp controlpushbutton.cpp controlttrotary.cpp controlbeat.cpp dlgpreferences.cpp dlgprefsound.cpp dlgprefmidi.cpp dlgprefplaylist.cpp dlgprefcontrols.cpp enginebuffer.cpp enginebufferscale.cpp enginebufferscalelinear.cpp engineclipping.cpp enginefilterblock.cpp enginefilteriir.cpp engineobject.cpp enginepregain.cpp enginevolume.cpp main.cpp midiobject.cpp midiobjectnull.cpp mixxx.cpp mixxxview.cpp player.cpp playerproxy.cpp soundsource.cpp soundsourcemp3.cpp soundsourceoggvorbis.cpp monitor.cpp enginechannel.cpp enginemaster.cpp wwidget.cpp wpixmapstore.cpp wnumber.cpp wnumberpos.cpp wnumberrate.cpp wnumberbpm.cpp wknob.cpp wdisplay.cpp wvumeter.cpp wpushbutton.cpp wslidercomposed.cpp wslider.cpp wtracktable.cpp wtracktableitem.cpp enginedelay.cpp engineflanger.cpp enginespectralfwd.cpp enginespectralback.cpp mathstuff.cpp readerextract.cpp readerextractwave.cpp readerextractfft.cpp readerextracthfc.cpp readerextractbeat.cpp readerevent.cpp rtthread.cpp windowkaiser.cpp probabilityvector.cpp reader.cpp trackinfoobject.cpp enginevumeter.cpp peaklist.cpp
+HEADERS += mixxxkeyboard.h configobject.h fakemonitor.h controlengine.h controleventengine.h controleventmidi.h controllogpotmeter.h controlobject.h controlnull.h controlpotmeter.h controlpushbutton.h controlttrotary.h controlbeat.h defs.h dlgpreferences.h dlgprefsound.h dlgprefmidi.h dlgprefplaylist.h dlgprefcontrols.h enginebuffer.h enginebufferscale.h enginebufferscalelinear.h engineclipping.h enginefilterblock.h enginefilteriir.h engineobject.h enginepregain.h enginevolume.h midiobject.h midiobjectnull.h mixxx.h mixxxview.h player.h playerproxy.h soundsource.h soundsourcemp3.h soundsourceoggvorbis.h monitor.h enginechannel.h enginemaster.h wwidget.h wpixmapstore.h wnumber.h wnumberpos.h wnumberrate.h wnumberbpm.h wknob.h wdisplay.h wvumeter.h wpushbutton.h wslidercomposed.h wslider.h wtracktable.h wtracktableitem.h enginedelay.h engineflanger.h enginespectralfwd.h enginespectralback.h mathstuff.h readerextract.h readerextractwave.h readerextractfft.h readerextracthfc.h readerextractbeat.h readerevent.h rtthread.h windowkaiser.h probabilityvector.h reader.h trackinfoobject.h enginevumeter.h peaklist.h
+
+# New track code:
+SOURCES += track.cpp trackcollection.cpp trackplaylist.cpp xmlparse.cpp wtreeview.cpp wtreeitem.cpp wtreeitemfile.cpp wtreeitemdir.cpp wtreeitemplaylist.cpp
+HEADERS += track.h trackcollection.h trackplaylist.h xmlparse.h wtreeview.h wtreeitem.h wtreeitemfile.h wtreeitemdir.h wtreeitemplaylist.h
+
+IMAGES += icon.png
+DEFINES += SETTINGS_FILE=$$SETTINGS_FILE TRACK_FILE=$$TRACK_FILE
+unix:TEMPLATE = app
+win32:TEMPLATE = vcapp
+CONFIG += qt thread warn_off release
+DEFINES += QT_NO_CHECK
+#CONFIG += qt thread warn_on debug
+DBFILE = mixxx.db
+LANGUAGE = C++
diff --git a/media-sound/mixxx/mixxx-0.9.2.ebuild b/media-sound/mixxx/mixxx-0.9.2.ebuild
index a31d6041e232..f4aa86264526 100644
--- a/media-sound/mixxx/mixxx-0.9.2.ebuild
+++ b/media-sound/mixxx/mixxx-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.4 2003/12/18 21:38:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-0.9.2.ebuild,v 1.5 2004/01/28 04:30:19 raker Exp $
 
 DESCRIPTION="Digital DJ tool using QT 3.x"
 HOMEPAGE="http://mixxx.sourceforge.net"
diff --git a/media-sound/mixxx/mixxx-1.1-r1.ebuild b/media-sound/mixxx/mixxx-1.1-r1.ebuild
index 0624eb78b129..35fcb3d49a24 100644
--- a/media-sound/mixxx/mixxx-1.1-r1.ebuild
+++ b/media-sound/mixxx/mixxx-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.1 2003/12/29 16:39:07 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.1-r1.ebuild,v 1.2 2004/01/28 04:30:19 raker Exp $
 
 DESCRIPTION="Digital DJ tool using QT 3.x"
 HOMEPAGE="http://mixxx.sourceforge.net"
diff --git a/media-sound/mixxx/mixxx-1.1.ebuild b/media-sound/mixxx/mixxx-1.1.ebuild
index d7446faebe41..3a448d5c114f 100644
--- a/media-sound/mixxx/mixxx-1.1.ebuild
+++ b/media-sound/mixxx/mixxx-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.3 2003/12/19 18:58:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.1.ebuild,v 1.4 2004/01/28 04:30:19 raker Exp $
 
 DESCRIPTION="Digital DJ tool using QT 3.x"
 HOMEPAGE="http://mixxx.sourceforge.net"
diff --git a/media-sound/mixxx/mixxx-1.2.1.ebuild b/media-sound/mixxx/mixxx-1.2.1.ebuild
new file mode 100644
index 000000000000..9682b601f103
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.2.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.2.1.ebuild,v 1.1 2004/01/28 04:30:19 raker Exp $
+
+IUSE="jack"
+
+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/glibc
+	>=x11-libs/qt-3.1.0
+	media-sound/mad
+	=dev-libs/fftw-2*
+	media-libs/libogg
+	media-libs/libvorbis
+	dev-lang/perl
+	media-libs/audiofile
+	jack? ( virtual/jack )"
+
+src_compile() {
+	cd ${S}/src
+	cp ${FILESDIR}/mixxx.pro .
+	./configure
+	sed -i -e "s/CFLAGS *= -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" Makefile
+	sed -i -e "s/CXXFLAGS *= -pipe -w -O2/CXXFLAGS   = ${CXXFLAGS} -w/" Makefile
+	sed -i -e "s/-DUNIX_SHARE_PATH=.*\\\" -D__LIN/-DUNIX_SHARE_PATH=\\\\\"\/usr\/share\/mixxx\\\\\" -D__LIN/" Makefile
+	sed -i -e "42i \
+INSTALL_ROOT=${D}
+" Makefile
+	sed -i -e 's/COPY_FILE= \$\(COPY\) -p/COPY_FILE= $(COPY) -pr/' Makefile
+
+	addpredict  /usr/qt/3/etc/settings
+
+	make || die
+}
+
+src_install() {
+	cd ${S}/src
+
+	make install || 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/*
+}