Restore EAPI=1 version of media-sound/mixxx because we need this in stable, and EAPI=2 should have never been used until a portage supporting it is in stable.

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27.7 i686

3 files changed, 88 insertions, 2 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index f5d54fab8f8a..1bab8fbe76eb 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.44 2008/12/02 06:17:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.45 2008/12/04 05:09:48 ssuominen Exp $
+
+  04 Dec 2008; <ssuominen@gentoo.org> +mixxx-1.6.0.ebuild:
+  Restore EAPI=1 version of media-sound/mixxx because we need this in
+  stable, and EAPI=2 should have never been used until a portage supporting
+  it is in stable.
 
   02 Dec 2008; <ssuominen@gentoo.org> mixxx-1.6.0-r1.ebuild:
   Remove call for local from src_configure because otherwise myconf doesn't
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 09142c0b6917..885635980c0a 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -3,5 +3,6 @@ DIST mixxx-1.4.2.tar.gz 3839230 RMD160 64e7233239b8dad486cbde9a05f24d069ee277b0
 DIST mixxx-1.6.0-src.tar.gz 7285308 RMD160 d0046d8e98b1530f15821eb2d11ee4af82f87e44 SHA1 268d5ed18f4a21185a5496abe0acac12d06242ae SHA256 b57d999f82ab508291692c28ced5190f0391bcab3f85f98a8211a643c82335cb
 EBUILD mixxx-1.4.2.ebuild 1386 RMD160 33405581f9b7ea25a0241352b87f10e6d6c1430e SHA1 d1f4e6c5c9621ba349f1efa1d5b2db5cf0e31817 SHA256 aa8dfe0cbde71e0ccf69352aaf1ef0f2d0afaacef62e78ffd5cb73346af5b3e4
 EBUILD mixxx-1.6.0-r1.ebuild 2051 RMD160 fca75b428ca341d1f910946055acb1526683a9bc SHA1 a2a4588ae62adf0dd82f5b24a5890ff8d0ab20e0 SHA256 049b04d707b6cfcadf50094c88cb34220c7b6f1f7ef081df0a772e290e3be83a
-MISC ChangeLog 6210 RMD160 d45a45017eea6c3193184c6fc6dd7b5ab6616ec1 SHA1 c35c4f7fa25e0262239a8adf8491e4062f22053e SHA256 01fd0eb4d03c34f3450880cb530c4782056d93cab1034dfee3ea688e814d67bc
+EBUILD mixxx-1.6.0.ebuild 2203 RMD160 25ef0493c1f0d2419d5e62b5d487b258da87ca47 SHA1 d252a25119a9dd91ce49b83c637f126947594a95 SHA256 ed93cdfd6e41988eade5f79cc14c053b391f89de546eca2311da34d27d31c1aa
+MISC ChangeLog 6435 RMD160 1aa05ba90018a2b7f3e50bfe274803cf73adbef4 SHA1 dc2610435687ad648d8628d784b431d455a5869d SHA256 498f353f3a11887d880c6f11548ce209e222762d44d9433b28c8889243f2ed3f
 MISC metadata.xml 556 RMD160 31002be47033f8390e02338def17124473f586b8 SHA1 9d056c326c53f6492db0af18ace55761af62dd91 SHA256 fcd00b5c328445c09809b938e0faff9bb9862242ef12edb90a291294b19fbd95
diff --git a/media-sound/mixxx/mixxx-1.6.0.ebuild b/media-sound/mixxx/mixxx-1.6.0.ebuild
new file mode 100644
index 000000000000..9e62f24e1372
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.6.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0.ebuild,v 1.3 2008/12/04 05:09:48 ssuominen Exp $
+
+EAPI=1
+
+inherit eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="a QT based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net"
+SRC_URI="http://downloads.mixxx.org/${MY_P}/${MY_P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug djconsole hifieq ladspa recording shout +vinylcontrol"
+
+RDEPEND="media-libs/mesa
+	media-libs/libmad
+	media-libs/libid3tag
+	media-libs/libvorbis
+	media-libs/libsndfile
+	>=media-libs/portaudio-19_pre
+	djconsole? ( media-libs/libdjconsole )
+	shout? ( media-libs/libshout )
+	ladspa? ( media-libs/ladspa-sdk )
+	virtual/glu
+	|| ( ( x11-libs/qt-core
+		x11-libs/qt-gui
+		x11-libs/qt-opengl )
+		=x11-libs/qt-4.3*:4 )"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${P/_/\~}
+
+pkg_setup() {
+	if ! has_version x11-libs/qt-opengl && ! built_with_use -a =x11-libs/qt-4* opengl qt3support; then
+		die "Re-emerge x11-libs/qt with USE flags opengl and qt3support."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:-O3::g' lib/cmetrics/SConscript || die "sed failed."
+}
+
+src_compile() {
+	local myconf="optimize=0 ffmpeg=0 script=0 prefix=/usr"
+
+	use djconsole && myconf+=" djconsole=1" || myconf+=" djconsole=0"
+	use hifieq && myconf+=" hifieq=1" || myconf+=" hifieq=0"
+	use debug && myconf+=" cmetrics=1" || myconf+=" cmetrics=0"
+	use shout && myconf+=" shoutcast=1" || myconf+=" shoutcast=0"
+	use ladspa && myconf+=" ladspa=1" || myconf+=" ladspa=0"
+	use recording && myconf+=" experimentalrecord=1" || myconf+=" experimentalrecord=0"
+	use vinylcontrol && myconf+=" vinylcontrol=1" || myconf+=" vinylcontrol=0"
+
+	$(type -P scons) ${myconf} -c . || die "scons -c . failed."
+	$(type -P scons) ${myconf} || die "scons failed."
+}
+
+src_install() {
+	dobin mixxx || die "dobin failed."
+
+	insinto /usr/share/mixxx
+	doins -r src/{skins,midi,keyboard} || die "doins failed."
+
+	doicon src/mixxx-icon.png
+	domenu src/mixxx.desktop
+
+	dodoc HERCULES.txt README*
+
+	insinto /usr/share/doc/${PF}
+	doins Mixxx-Manual.pdf
+}