Version bump.

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

3 files changed, 101 insertions, 9 deletions

diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index caf56feebdaa..2e0ce16efe54 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.63 2012/06/13 12:58:54 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.64 2012/06/27 10:09:32 radhermit Exp $
+
+*mixxx-1.10.1 (27 Jun 2012)
+
+  27 Jun 2012; Tim Harder <radhermit@gentoo.org> +mixxx-1.10.1.ebuild:
+  Version bump.
 
   13 Jun 2012; Johannes Huber <johu@gentoo.org> mixxx-1.10.0.ebuild:
   Stable for x86, wrt bug #417127
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 78d33296e896..c73061d00e74 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -7,17 +7,19 @@ AUX mixxx-1.10.0-libmp4v2_r479_compat.patch 934 RMD160 766ad0f3124a3713711a67c35
 AUX mixxx-1.10.0-no-bzr.patch 1503 RMD160 e4438b5ecd9a4175ebfce7d564ee927fc32ed611 SHA1 7579e8c7a9ed3c62f05484c7f424d7874f7c77f3 SHA256 7584acf4623f2dbbb70b675675242fe528729bf9d39c3eadff4fff87650f157c
 AUX mixxx-1.10.0-system-libs.patch 7152 RMD160 997fc54491efa54d9aec7f77e0fba40b1ce21f5e SHA1 2d3bf891ce824b1dede101ab9512639c7947929d SHA256 c3809896e75c6c4e5e714e75527ec5a970edca5e75124fa06bbe02fb9b08b0a1
 DIST mixxx-1.10.0-src.tar.gz 15852338 RMD160 dde454d7ff6200e33c401e87313ad399ff751d53 SHA1 b01ab69c0eeca99fa6b1da472cfede01bda71328 SHA256 9135f814262bf42eb05bf5d56c760ab462329c06785271d570be6a9d14ab1e97
+DIST mixxx-1.10.1-src.tar.gz 15948956 RMD160 36d2530516bd20ab533b825fbd699fc99021fdbb SHA1 8ad1b879237a2f276c6a71ea811499670078c64a SHA256 eab49a95336dacee9a9e4c2ad22a0436e9c0b341930e9a03e3b46619d7a9f365
 EBUILD mixxx-1.10.0.ebuild 2238 RMD160 f8f97c900fda861d6865b549d97df07086271875 SHA1 db06c50adcd34abf1d99e9057e886f12ad4af78c SHA256 ab4d97e44887f3ef589a229a03a0ce7d49818abfa84ee78206fc7b507f512437
-MISC ChangeLog 1493 RMD160 76a8d7101240fc6441eb5b2a56460e7643585813 SHA1 2eed036168f838dab4899a98bb70efba2c94e7df SHA256 7259b3e6500e7cdda948f750637992e4907d3085347a6777389a7e404af122fc
+EBUILD mixxx-1.10.1.ebuild 2223 RMD160 de16f037978afa9e5d3c092feb65fa1eebce1de8 SHA1 b43c69615b17fa482e22c28ad4ba95e47087961e SHA256 aa9681c9432ea2a27104cc6a82e17f67a83c6fb051de1bdf3886584bdd110b0a
+MISC ChangeLog 1615 RMD160 efe717d6dbd53777e15ec23d99573527accd1504 SHA1 37153fb461220428de290f29121e99fa2bd5cfe5 SHA256 4b60f8beb7e5711f0addbacdc60da8ff68d30bef3171af5483da26e63eee94df
 MISC metadata.xml 268 RMD160 6b11b58939c65abfda36f44663887e57c390637e SHA1 7ea890d152319f88e23844fe6345c7b0d44e82a9 SHA256 607c4390a6642fd00b7489c1a11be4efa57cf12c80e0418c56c9a6554c0ffade
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP2I6HAAoJEO+t9ga+3I3aAzwIAIJ+30fa5ihlBa9surfNEv1N
-UZ7UY+9d/4bwDcemfB9vxIWg0KLrziesIKSmSF+Yum8KlBb9g0uIIBH9Pe/W/ybo
-f+g5xOjZ3gsXuemcO663dPHCBv5/90MEaKs2izUH7GxqKK1oroAAEHFHRLCX//os
-BdH/TIpX/MLHyfkkF0Qy9rYXK+kaeOoD5xhYpNJgGr1lLOmM3TgHhFohiOGd6N6X
-aKY8U7qajsUqUaJeKacCSca0Gb4JBQ4+JyLD8DO76ksbmPo7BUjYdeU0hGtdzs/d
-WZ2bQv9ZNZhS5wTwJ2/SM0Iz/gfsI8vM3zNwScgB8XOC9OxqN8HRLWJR4HInGTw=
-=p0tJ
+iQEcBAEBCgAGBQJP6tviAAoJEEqz6FtPBkyjcvwIAK5VaTozU77zuU43/vyeqzAo
+t2c8MoZz1ybEN89KxjHu35zXaMJ1Ir9FROsCxC/l+OZOJPm2LM4hpEDMybHKfaat
+Waxw2/OAioxlQ0GTXzENO1P531kneXBCzA9HoGx0g+JI/4jKGVXTHEjgLoBz5OYi
+56ESoh2MQTty58vsxaOfGBeF2CldfE6AGDcdWYKoml5S9yHGSNI8v+strbHAVQmj
+5lXTxLUUegU4SkfNogTKDYaigB1KqZAX33CfcZDfxl+qob/ldcCnS+U3T/GomTeL
+JrWUhNwCmoTWlGakuVaQ1Xk7AxX+QSd56drAbZBRuJZGfz9B2U50dr70YsAW7cQ=
+=Q7Zg
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mixxx/mixxx-1.10.1.ebuild b/media-sound/mixxx/mixxx-1.10.1.ebuild
new file mode 100644
index 000000000000..13b397a194ea
--- /dev/null
+++ b/media-sound/mixxx/mixxx-1.10.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.10.1.ebuild,v 1.1 2012/06/27 10:09:32 radhermit Exp $
+
+EAPI=4
+
+inherit eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="A Qt based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net"
+SRC_URI="http://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac debug doc mp3 pulseaudio shout wavpack"
+
+RDEPEND="media-libs/fidlib
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/taglib
+	virtual/glu
+	virtual/opengl
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-sql:4
+	x11-libs/qt-svg:4
+	x11-libs/qt-webkit:4
+	x11-libs/qt-xmlpatterns:4
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	mp3? ( media-libs/libmad )
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.10.0-system-libs.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-cflags.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-docs.patch
+	epatch "${FILESDIR}"/${PN}-1.10.0-no-bzr.patch
+
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	# alter startup command when pulseaudio support is disabled
+	if ! use pulseaudio ; then
+		sed -i -e 's:pasuspender ::' src/mixxx.desktop || die
+	fi
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="/usr/$(get_libdir)" escons \
+		prefix=/usr \
+		qtdir=/usr/$(get_libdir)/qt4 \
+		hifieq=1 \
+		vinylcontrol=1 \
+		optimize=0 \
+		$(use_scons aac faad) \
+		$(use_scons debug qdebug) \
+		$(use_scons mp3 mad) \
+		$(use_scons shout shoutcast) \
+		$(use_scons wavpack wv)
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="/usr/$(get_libdir)" escons install \
+		prefix=/usr \
+		qtdir=/usr/$(get_libdir)/qt4 \
+		install_root="${D}"/usr
+
+	dodoc README Mixxx-Manual.pdf
+}