Remove old versions, fix repoman warnings, clean up..

(Portage version: 2.1.5)

4 files changed, 19 insertions, 147 deletions

diff --git a/media-sound/mixxx/mixxx-1.2.1.ebuild b/media-sound/mixxx/mixxx-1.2.1.ebuild
deleted file mode 100644
index 097a31fc8efb..000000000000
--- a/media-sound/mixxx/mixxx-1.2.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# 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.12 2007/07/02 15:15:21 peper Exp $
-
-inherit qt3
-
-IUSE="jack"
-
-DESCRIPTION="Digital DJ tool using QT 3.x"
-HOMEPAGE="http://mixxx.sourceforge.net"
-SRC_URI="mirror://sourceforge/mixxx/${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-
-RDEPEND="$(qt_min_version 3.1)
-	media-sound/madplay
-	=sci-libs/fftw-2*
-	media-libs/libogg
-	media-libs/libvorbis
-	dev-lang/perl
-	media-libs/audiofile
-	jack? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-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  ${QTDIR}/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/*
-}
diff --git a/media-sound/mixxx/mixxx-1.4.1.ebuild b/media-sound/mixxx/mixxx-1.4.1.ebuild
deleted file mode 100644
index 002d87b48af6..000000000000
--- a/media-sound/mixxx/mixxx-1.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.4.1.ebuild,v 1.3 2006/10/29 22:23:28 flameeyes Exp $
-
-IUSE="alsa jack"
-
-inherit eutils qt3
-
-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"
-# -amd64: 1.4.1 - static noise comes out of speakers at startup - eradicator
-KEYWORDS="-amd64 ~sparc ~x86"
-
-DEPEND="$(qt_min_version 3.1)
-	media-sound/madplay
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/audiofile
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	media-libs/portaudio
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )"
-
-RDEPEND="${DEPEND}
-	 dev-lang/perl"
-
-DEPEND="${DEPEND}
-	dev-util/pkgconfig
-	sys-apps/sed"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.3.2-gentoo.patch
-}
-
-src_compile() {
-	./configure `use_enable alsa Alsa` `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 ../README.ALSA ../Mixxx-Manual.pdf
-}
diff --git a/media-sound/mixxx/mixxx-1.4.2.ebuild b/media-sound/mixxx/mixxx-1.4.2.ebuild
index 96dfd7dd9478..032020eebb89 100644
--- a/media-sound/mixxx/mixxx-1.4.2.ebuild
+++ b/media-sound/mixxx/mixxx-1.4.2.ebuild
@@ -1,23 +1,19 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.4.2.ebuild,v 1.7 2006/11/05 21:59:07 aballier Exp $
-
-IUSE="alsa jack"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.4.2.ebuild,v 1.8 2008/05/21 00:03:36 drac Exp $
 
 inherit eutils qt3
 
-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"
-# -amd64: 1.4.2 - static noise comes out of speakers at startup - eradicator
-KEYWORDS="-amd64 sparc x86 ~ppc"
+KEYWORDS="sparc ~ppc x86"
+IUSE="alsa jack"
 
-DEPEND="$(qt_min_version 3.1)
+RDEPEND="$(qt_min_version 3.1)
 	media-sound/madplay
 	media-libs/libogg
 	media-libs/libvorbis
@@ -27,38 +23,34 @@ DEPEND="$(qt_min_version 3.1)
 	media-libs/portaudio
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )"
-
-RDEPEND="${DEPEND}
-	 dev-lang/perl"
-
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
+	dev-lang/perl
 	dev-util/pkgconfig
 	sys-apps/sed"
 
+S=${WORKDIR}/${P}/src
+
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.3.2-gentoo.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.3.2-gentoo.patch
 }
 
 src_compile() {
-	./configure `use_enable alsa` `use_enable jack` || die "configure failed"
+	./configure `use_enable alsa` `use_enable 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"
+	addpredict ${QTDIR}/etc/settings
+	emake || die "emake failed."
 }
 
 src_install() {
 	insinto /usr/share/mixxx
-	doins -r skins midi keyboard
+	doins -r skins midi keyboard || die "doins failed."
 
-	insopts -m0755
-	insinto /usr/bin
-	doins mixxx
+	dobin mixxx || die "dobin failed."
 
-	dodoc ../README ../README.ALSA ../Mixxx-Manual.pdf
+	dodoc ../{README,README.ALSA,Mixxx-Manual.pdf}
 }
diff --git a/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild b/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild
index 764d257a5647..a6ca840238f4 100644
--- a/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild
+++ b/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # 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_beta2.ebuild,v 1.1 2008/05/20 23:54:27 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.6.0_beta2.ebuild,v 1.2 2008/05/21 00:03:36 drac Exp $
 
 EAPI=1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mixxx/${MY_P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug djconsole hifieq ladspa recording shout +vinylcontrol"
 
 # TODO. It bundles libs, like samplerate, why?