initial

48 files changed, 5094 insertions, 0 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
new file mode 100644
index 0000000..6a1bf52
--- /dev/null
+++ b/media-sound/amarok/ChangeLog
@@ -0,0 +1,2034 @@
+# ChangeLog for media-sound/amarok
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.434 2012/08/11 20:40:33 scarabeus Exp $
+
+*amarok-2.6.0 (11 Aug 2012)
+
+  11 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> +amarok-2.6.0.ebuild,
+  -amarok-2.5.0-r3.ebuild, -amarok-2.5.90-r1.ebuild, -amarok-2.5.96.ebuild:
+  Add the final release. Remove RCs and overshadowed.
+
+*amarok-2.5.96 (03 Aug 2012)
+
+  03 Aug 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.5.96.ebuild:
+  [media-sound/amarok] Version bump (2.6 RC).
+
+  19 Jul 2012; Michael Palimaka <kensington@gentoo.org> amarok-2.4.3-r1.ebuild,
+  amarok-2.5.0-r3.ebuild, amarok-2.5.0-r4.ebuild, amarok-2.5.90-r1.ebuild:
+  Add missing slot dependencies on Qt.
+
+  14 Jul 2012; Johannes Huber <johu@gentoo.org> amarok-2.5.0-r4.ebuild:
+  Stable for x86, wrt bug #418321
+
+  14 Jul 2012; Agostino Sarubbo <ago@gentoo.org> amarok-2.5.0-r4.ebuild:
+  Stable for amd64, wrt bug #418321
+
+*amarok-2.5.90-r1 (08 Jul 2012)
+*amarok-2.5.0-r4 (08 Jul 2012)
+
+  08 Jul 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.5.0-r4.ebuild, +amarok-2.5.90-r1.ebuild,
+  +files/amarok-2.5.0-fix-context-view-on-startup.patch, amarok-2.5.0-r3.ebuild,
+  metadata.xml:
+  [media-sound/amarok-2.5.0-r3] Fix whitespace. [media-sound/amarok-2.5.0-r4]
+  revision bump to add the patch to fix clipped context view - bug 424261.
+  [media-sound/amarok-2.5.90-r1] Move from the overlay the 2.6.0-beta1 - bug
+  419509.
+
+  08 Jul 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.4.3-r1.ebuild, amarok-2.5.0-r3.ebuild:
+  [media-sound/amarok] Fix media-libs/liblastfm dependency - bug 423391.
+
+  03 Jul 2012; Johannes Huber <johu@gentoo.org> amarok-2.5.0-r3.ebuild:
+  Stable for x86, wrt bug #418321
+
+  22 Jun 2012; Agostino Sarubbo <ago@gentoo.org> amarok-2.5.0-r3.ebuild:
+  Stable for amd64, wrt bug #418321
+
+*amarok-2.5.0-r3 (22 Jun 2012)
+
+  22 Jun 2012; <creffett@gentoo.org> -amarok-2.5.0-r2.ebuild,
+  +amarok-2.5.0-r3.ebuild, +files/amarok-2.5.0-qtdebug.patch:
+  Rev bump, added patch to fix Amarok crashing for bug 395575. Remove old.
+
+  26 May 2012; Alexey Shvetsov <alexxy@gentoo.org> amarok-2.5.0-r2.ebuild,
+  metadata.xml:
+  [media-sound/amarok] Allow installing with KDE SC 4.9
+
+  04 May 2012; Johannes Huber <johu@gentoo.org> -amarok-2.4.0.ebuild,
+  -amarok-2.4.3.ebuild, -amarok-2.5.0-r1.ebuild, -amarok-2.5.0.ebuild,
+  amarok-2.4.3-r1.ebuild, amarok-2.5.0-r2.ebuild:
+  Remove old. Migrate to virtual/pkgconfig.
+
+  17 Apr 2012; Brent Baude <ranger@gentoo.org> amarok-2.4.3-r1.ebuild:
+  Marking amarok-2.4.3-r1 ppc for bug 389997
+
+  16 Apr 2012; Brent Baude <ranger@gentoo.org> amarok-2.4.3.ebuild:
+  Marking amarok-2.4.3 ppc for bug 389997
+
+*amarok-2.5.0-r2 (09 Feb 2012)
+
+  09 Feb 2012; Johannes Huber <johu@gentoo.org> +amarok-2.5.0-r2.ebuild,
+  +files/amarok-2.5.0-kde48.patch:
+  Rev bump, adds upstream patch for gui issues with kde 4.8, fixes bug #402131.
+
+  14 Jan 2012; Thomas Kahle <tomka@gentoo.org> amarok-2.4.3-r1.ebuild:
+  x86 stable per bug 389997
+
+  31 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.5.0-r1.ebuild:
+  [media-sound/amarok-2.5.0-r1] Added missing libofa dependency and configure
+  switch. Thanks to Matěj Laitl again - bug 395369.
+
+  28 Dec 2011; Agostino Sarubbo <ago@gentoo.org> amarok-2.4.3-r1.ebuild:
+  Stable for AMD64, wrt bug #389997
+
+*amarok-2.5.0-r1 (28 Dec 2011)
+*amarok-2.4.3-r1 (28 Dec 2011)
+
+  28 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.4.3-r1.ebuild, +amarok-2.5.0-r1.ebuild, metadata.xml:
+  [media-sound/amarok] Drop the player use flag until upstream allows to
+  disable the player again. Apply Matěj Laitl's patch to amarok-2.5.0.
+
+*amarok-2.5.0 (20 Dec 2011)
+
+  20 Dec 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.4.0.ebuild, amarok-2.4.3.ebuild, +amarok-2.5.0.ebuild:
+  [media-sound/amarok] Bump to the 2.5.0 release.
+  Dropped ~ppc64 keywords as all KDE versions are masked on the ppc64 arch.
+
+  08 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org> amarok-2.4.3.ebuild:
+  No use-deps on strigi, bug 386259
+
+  28 Oct 2011; Jonathan Callen <abcd@gentoo.org> -amarok-2.4.1.ebuild,
+  -amarok-2.3.2-r1.ebuild:
+  remove old
+
+  24 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.4.3.ebuild:
+  [media-sound/amarok] Replace the mysql dependency - bug 388059.
+
+  23 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> amarok-2.4.0.ebuild,
+  amarok-2.4.1.ebuild, amarok-2.4.3.ebuild:
+  Add dependency on kde-base/kdebase-kioslaves, bug 374399
+
+*amarok-2.4.3 (01 Aug 2011)
+
+  01 Aug 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  -amarok-2.4.0.90.ebuild, +amarok-2.4.3.ebuild:
+  Version bump, remove old
+
+  01 Jun 2011; Brent Baude <ranger@gentoo.org> amarok-2.4.0.ebuild:
+  Marking amarok-2.4.0 ppc stable for bug 354033
+
+  09 May 2011; Markos Chandras <hwoarang@gentoo.org> amarok-2.4.0.ebuild:
+  Stable on amd64 wrt bug #354033
+
+  09 May 2011; Thomas Kahle <tomka@gentoo.org> amarok-2.4.0.ebuild:
+  x86 stable per bug 354033
+
+*amarok-2.4.1 (08 May 2011)
+
+  08 May 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.4.0.90.ebuild, +amarok-2.4.1.ebuild,
+  +files/amarok-fix-upnp-dep.patch:
+  Bumped amarok to the 2.4.1 release.
+  Renamed the patch to fix the upnp detection.
+
+  26 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.4.0.90.ebuild:
+  [media-sound/amarok-2.4.0.90] Added keywords back to ebuild.
+
+  20 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.2-r1.ebuild, amarok-2.4.0.ebuild, amarok-2.4.0.90.ebuild:
+  Dropped the dev-db/{mysql,mariadb} dep for use flag embedded and unified it
+  on the virtual/mysql dep.
+  Moved from the dev-db/mysql[minimal] check on pkg_postinst to
+  virtual/mysql[minimal] now that I've added the minimal use flag to the
+  virtual/mysql ebuilds.
+  Added the handbook use flag which should fix bug 354035. Thanks to Andreas
+  Hüttel for the help.
+
+  20 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.4.0.90.ebuild, +files/amarok-2.4.0.90-fix-plugin-detection.patch:
+  Added upstream patch to fix the plugin detection at startup.
+
+  20 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  files/amarok-2.4.0.90-fix-upnp-dep.patch:
+  Updated upnp patch so cmake can find the HUpnp include dir.
+
+*amarok-2.4.0.90 (19 Apr 2011)
+
+  19 Apr 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.2-r1.ebuild, amarok-2.4.0.ebuild, +amarok-2.4.0.90.ebuild,
+  +files/amarok-2.4.0.90-fix-upnp-dep.patch, metadata.xml:
+  Bumped amarok to the 2.4.0.90 release (2.4.1 beta 1).
+  Added a patch to get upnp support - not working yet.
+
+  02 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org> amarok-2.3.2-r1.ebuild,
+  amarok-2.4.0.ebuild:
+  EAPI3, sync with live ebuild about git eclass handling, use add_kdebase_dep
+
+  14 Jan 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.4.0.ebuild:
+  [media-sound/amarok-2.4.0] Fix SRC_URI. Fixes bug 351618 - thanks to
+  ScytheMan (scytheman666 AT gmail DOT com).
+
+*amarok-2.4.0 (12 Jan 2011)
+
+  12 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  -amarok-2.3.1-r2.ebuild, -amarok-2.3.1.90.ebuild,
+  -files/amarok-2.3.1-fix-trayicon.patch, +amarok-2.4.0.ebuild,
+  -files/amarok-fix-accessibility-dep.patch:
+  Version bump, remove old ebuilds and patches
+
+  21 Nov 2010; Thomas Kahle <tomka@gentoo.org> amarok-2.3.2-r1.ebuild:
+  x86 stable per bug 346233
+
+  21 Nov 2010; Markos Chandras <hwoarang@gentoo.org> amarok-2.3.2-r1.ebuild:
+  Stable on amd64 wrt bug #346233
+
+  06 Oct 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.2-r1.ebuild:
+  [media-sound/amarok-2.3.2-r1] If we want to build amarok with embedded
+  support, we have to depend on mysql/maria[embedded].
+
+  06 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  -amarok-2.3.2.ebuild:
+  b0rk3d
+
+  06 Oct 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.2-r1.ebuild:
+  [media-sound/amarok-2.3.2-r1] If we want to build amarok with embedded
+  support, we have to depend on mysql/maria[embedded].
+
+  06 Oct 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.2-r1.ebuild:
+  [media-sound/amarok-2.3.2-r1] Updated the EGIT_REPO_URI as upstream
+  changed the git location.
+
+*amarok-2.3.2-r1 (27 Sep 2010)
+
+  27 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.2-r1.ebuild, +files/amarok-2.3.2-fix-qt-regression.patch:
+  [media-sound/amarok-2.3.2-r1] Now that we finally have working patches for
+  mariadb and mysql 5.1.50,
+  fixed the embedded deps and added embedded to IUSE defaults.
+  Added an upstream patch to fix issues with the collection scanning caused
+  by a QT bug/regression -
+  https://bugs.kde.org/show_bug.cgi?id=251762#c10
+
+  19 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.1.90.ebuild:
+  [media-sound/amarok-2.3.1.90] Revert the unintentional drop of the
+  embedded USE flag dependencies.
+
+*amarok-2.3.2 (19 Sep 2010)
+
+  19 Sep 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.1.90.ebuild, +amarok-2.3.2.ebuild,
+  +files/amarok-2.3.2-flac-fix.patch:
+  [media-sound/amarok-2.3.2] Bumped amarok to the 2.3.2 release - masked
+  until the public release.
+  Applied commit ce57e426 from the git tree to fix a BMP tag bug related to
+  flac files - thanks to Jeff Mitchell <mitchell AT kde DOT org>.
+
+  24 Aug 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.1-r2.ebuild:
+  Fixed amarok-2.3.1-r2 SRC_URI: unstable -> stable.
+
+*amarok-2.3.1.90 (24 Aug 2010)
+
+  24 Aug 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.1.90.ebuild:
+  Added amarok 2.3.1.90 (2.3.2 Beta1).
+
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -amarok-2.2.2-r1.ebuild, -files/amarok-2.2.2-nodebug.patch,
+  -files/amarok-2.2-mysql-libs.patch,
+  -files/amarok-2.3.0-crash_fix_info_applet.patch, -amarok-2.3.1.ebuild,
+  -amarok-2.3.1-r1.ebuild, -files/amarok-qtscriptcheck.patch:
+  Cleanup old stuff.
+
+  30 Jul 2010; Markos Chandras <hwoarang@gentoo.org> amarok-2.3.1-r2.ebuild:
+  Stable on amd64 wrt bug #329853
+
+  27 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
+  amarok-2.3.1-r2.ebuild:
+  stable x86, bug 329853
+
+  11 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.1-r2.ebuild, files/amarok-2.3.1-fix-trayicon.patch:
+  Updated the fix-trayicon patch to include all the 4 commits by Kevin Funk
+  available from http://krf.kollide.net/files/work/amarok/
+
+*amarok-2.3.1-r2 (11 Jul 2010)
+
+  11 Jul 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.1-r2.ebuild, +files/amarok-2.3.1-fix-trayicon.patch:
+  Added missing deps for dev-util/automoc and dev-util/pkgconfig. Thanks to
+  Nikoli <nikoli@lavabit.com> - fixes bug 324883.
+  Added a patch to fix the missing tray icon in non-KDE environments. Thanks
+  to Rex Dieter for the heads up in the amarok-packagers ml and Kevin Funk
+  for the patch - fixes bug 325371.
+  Fixed the available linguas list. Thanks to MarisN <maris.gis@gmail.com> -
+  fixes bug 326147.
+
+  07 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  amarok-2.3.1-r1.ebuild:
+  Keyword ~ppc64 wrt #280552, thanks to Andreas Thalhammer and Jorge Manuel
+  B. S. Vicetto.
+
+  19 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.1-r1.ebuild:
+  [media-sound/amarok-2.3.1-r1] Synced some changes from the live ebuild in
+  the overlay:
+  updated the git repo now that amarok moved from gitorious to kde and
+  dropped a comment.
+
+  13 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  amarok-2.3.1-r1.ebuild:
+  Amarok utils require Qt4, drop implicit Qt dep caused by OPENGL_REQUIRED
+  and replace it by explicit dependency, nepomuk is pulled by
+  kdelibs[semantic-desktop] already
+
+  12 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.1-r1.ebuild:
+  [media-sound/amarok-2.3.1-r1] Moved media-sound/amarok-utils block to
+  RDEPEND.
+
+  12 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -amarok-2.2.0.ebuild, -amarok-2.2.2.ebuild, -amarok-2.2.2.90.ebuild,
+  -amarok-2.3.0.ebuild, -amarok-2.3.0-r1.ebuild, -amarok-2.3.0.90.ebuild:
+  [media-sound/amarok] Dropped old ebuilds.
+
+  12 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.1-r1.ebuild:
+  [media-sound/amarok-2.3.1-r1] Fix cmake call for utils - utilities !=
+  utils.
+
+*amarok-2.3.1-r1 (12 Jun 2010)
+
+  12 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.1-r1.ebuild, +files/amarok-fix-accessibility-dep.patch,
+  metadata.xml:
+  [media-sound/amarok-2.3.1-r1] Merged amarok and amarok-utils. Applied
+  patch to drop the accessibility requirement - should fix bug 319803.
+  Reviewed mysql deps to allow for mariadb - fixes bug 320807. Applied
+  minimal-toc cflag to avoid issues on ppc64 - should fix bug 280552.
+  Testing for this masked version is welcomed.
+
+  09 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.1.ebuild:
+  [media-sound/amarok-2.3.1] Added a hard dep on
+  x11-libs/qt-gui[accessibility] to fix the build issues as some UI dialogs
+  require it. Should fix bug 319803.
+
+*amarok-2.3.1 (28 May 2010)
+
+  28 May 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.1.ebuild:
+  [media-sound/amarok] Bumped to the 2.3.1 release.
+
+  18 May 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.0.90.ebuild:
+  Sort dependency order.
+
+  19 Apr 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.3.0.90.ebuild:
+  [media-sound/amarok-2.3.0.90] Fixing SRC_URI as betas are in the unstable
+  tree - thanks to Torsten (tove).
+
+*amarok-2.3.0.90 (17 Apr 2010)
+
+  17 Apr 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.0.90.ebuild:
+  [media-sound/amarok] Bumped to the 2.3.1 Beta 1 (2.3.0.90) release.
+
+*amarok-2.3.0-r1 (28 Mar 2010)
+
+  28 Mar 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.0-r1.ebuild, +files/amarok-2.3.0-crash_fix_info_applet.patch:
+  Applied upstream patch to fix a crash on startup on the info applet caused
+  by a Qt bug.
+
+*amarok-2.3.0 (15 Mar 2010)
+
+  15 Mar 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.3.0.ebuild:
+  Bumped amarok to the 2.3.0 release.
+
+  01 Mar 2010; Dror Levin <spatz@gentoo.org> amarok-2.2.2-r1.ebuild,
+  amarok-2.2.2.90.ebuild:
+  Fix !use space issue, bug 306681.
+
+  27 Feb 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  amarok-2.2.2.90.ebuild:
+  Disable + from embedded USE flag (it's not the default recommended in
+  2.3pre releases)
+
+  25 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
+  amarok-2.2.2-r1.ebuild:
+  stable x86, bug 305909
+
+  23 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.2.2-r1.ebuild, amarok-2.2.2.90.ebuild:
+  Reviewed mysql deps and added a few postinst warnings.
+
+  23 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.2.2-r1.ebuild, amarok-2.2.2.90.ebuild:
+  Fixed mysql deps and dropped support for mysql-community - fixes bug
+  306155.
+
+  23 Feb 2010; Joseph Jezak <josejx@gentoo.org> amarok-2.2.2-r1.ebuild,
+  amarok-2.2.2.90.ebuild:
+  Marked ~ppc for bug #280552.
+
+  22 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> amarok-2.2.0.ebuild,
+  amarok-2.2.2.ebuild, amarok-2.2.2-r1.ebuild, amarok-2.2.2.90.ebuild:
+  Bug #306155 workaround: Update MySQL dep to prevent MySQL 5.1 from being
+  considered as a dep solution, due to the lack of a functional
+  shared-embedded patch at this time.
+
+  20 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  amarok-2.2.2-r1.ebuild:
+  amd64 stable wrt #305909
+
+  20 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.2.2.90.ebuild:
+  Restricted tests for amarok-2.2.2.90 as we don't have a required dep in
+  the tree ( gmock - http://code.google.com/p/gmock/ ).
+  Fixes bug 305979 - thanks to Ryan for reporting.
+
+*amarok-2.2.2-r1 (19 Feb 2010)
+
+  19 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.2-r1.ebuild:
+  Rev-bumped amarok-2.2.2 to fix the deps and to ask for a quick
+  stabilization.
+  Fixed strigi deps (bug 304883) - thanks to Samuli.
+  Dropped the bindist use flag and added a hard dep on taglib[asf,mp4] (bug
+  299899) - thanks to Jeff Mitchell (jefferai).
+
+  19 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -amarok-2.2.1.ebuild, -amarok-2.2.1-r1.ebuild, -amarok-2.2.1-r2.ebuild,
+  -amarok-2.2.1.90.ebuild:
+  Cleaned old versions.
+
+*amarok-2.2.2.90 (19 Feb 2010)
+
+  19 Feb 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.2.90.ebuild:
+  Bumped amarok to the 2.2.2.90 release (2.3 Beta 1).
+  Fixed strigi deps (bug 304883) - thanks to Samuli.
+  Dropped the bindist use flag and added a hard dep on taglib[asf,mp4] (bug
+  299899) - thanks to Jeff Mitchell (jefferai).
+
+  16 Feb 2010; Jonathan Callen <abcd@gentoo.org>
+  -files/amarok-1.4.9.1-libmtp-0.3.0-API.patch,
+  -files/amarok-1.4.10-gcc-4.3.patch, -files/amarok-1.4.10-gcc44.patch,
+  -files/amarok-libmp4v2.patch:
+  Drop old patches
+
+  10 Jan 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  files/amarok-2.2.2-nodebug.patch:
+  Added updated patch by Jeff Mitchell.
+
+*amarok-2.2.2 (08 Jan 2010)
+
+  08 Jan 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.2.ebuild, +files/amarok-2.2.2-nodebug.patch:
+  Bumped amarok to 2.2.2 (should be out next Monday).
+  Dropped semantic-desktop from IUSE defaults and added Jeff Mitchell patch
+  to fix some scanning issues.
+
+  23 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  -amarok-1.4.10_p20090130-r3.ebuild:
+  Drop 1.4 series amarok.
+
+*amarok-2.2.1.90 (16 Dec 2009)
+
+  16 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  +amarok-2.2.1.90.ebuild:
+  Version bump
+
+*amarok-2.2.1-r2 (01 Dec 2009)
+
+  01 Dec 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.1-r2.ebuild, +files/amarok-2.2-mysql-libs.patch:
+  Updated taglib dependency - fixes bug 293950.
+  Patched mysqlecollection to fix the build with >=binutils-2.20 - fixes bug
+  290662.
+  Should fix bug 277785.
+
+  20 Nov 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.2.1-r1.ebuild:
+  Really added kdemultimedia-kioslaves dep this time.
+
+*amarok-2.2.1-r1 (20 Nov 2009)
+
+  20 Nov 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.1-r1.ebuild:
+  Added missing app-crypt/qca:2 dep. Fixes bug #293509 - thanks to Rafael
+  <rktspm@gmail.com>.
+  Added missing kde-base/kdemultimedia-kioslaves. Fixes bug #292216 - thanks
+  to Hubert Lee <oboe-nerd@hotmail.com>.
+  Bumped revision to avoid dep tree issues.
+
+  14 Nov 2009; Theo Chatzimichos <tampakrap@gentoo.org> amarok-2.2.0.ebuild,
+  amarok-2.2.1.ebuild, +files/amarok-qtscriptcheck.patch:
+  after a long time, fix qtscript check, bug 270923, kde bug 189367
+
+*amarok-2.2.1 (14 Nov 2009)
+
+  14 Nov 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.1.ebuild:
+  Bumped amarok to release 2.2.1.
+  This release like 2.2.0 segfauls on start if built with binutils-2.20
+  (bug 290662).
+
+  09 Nov 2009; Christian Faulhammer <fauli@gentoo.org> amarok-2.2.0.ebuild:
+  stable x86, bug 290483
+
+  07 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  amarok-1.4.10_p20090130-r3.ebuild:
+  Remove kde-base/konqueror:3.5 support.
+
+  26 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> amarok-2.2.0.ebuild:
+  amd64 stable wrt #290483
+
+  10 Oct 2009; Raúl Porcel <armin76@gentoo.org>
+  amarok-1.4.10_p20090130-r3.ebuild:
+  sparc stable wrt #280797
+
+*amarok-2.2.0 (02 Oct 2009)
+
+  02 Oct 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.2.0.ebuild, metadata.xml:
+  Bumped amarok to version 2.2.0.
+
+  27 Sep 2009; Brent Baude <ranger@gentoo.org>
+  amarok-1.4.10_p20090130-r3.ebuild:
+  Marking amarok-1.4.10_p20090130-r3 ppc64 for bug 280797
+
+  29 Aug 2009; nixnut <nixnut@gentoo.org> amarok-1.4.10_p20090130-r3.ebuild:
+  ppc stable #280797
+
+  15 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  amarok-1.4.10_p20090130-r3.ebuild, +files/amarok-libmp4v2-2.patch:
+  Include string.h for strcmp wrt #281217.
+
+  15 Aug 2009; Markus Meier <maekke@gentoo.org>
+  amarok-1.4.10_p20090130-r3.ebuild:
+  amd64/x86 stable, bug #280797
+
+  22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> amarok-2.1.ebuild,
+  amarok-2.1.1.ebuild, metadata.xml:
+  Rename USE cdaudio to USE cdda.
+
+*amarok-1.4.10_p20090130-r3 (10 Jul 2009)
+
+  10 Jul 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/amarok-libmp4v2.patch, +amarok-1.4.10_p20090130-r3.ebuild:
+  Added a patch to amarok-1.4.10_p20090130-r3 to support the new libmp4v2 -
+  thanks to Samuli Suominen <ssuominen@gentoo.org> for the patch.
+
+  04 Jul 2009; Raúl Porcel <armin76@gentoo.org>
+  amarok-1.4.10_p20090130-r2.ebuild:
+  sparc stable wrt #272554
+
+*amarok-2.1.1 (26 Jun 2009)
+
+  26 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -files/2.0.1.1-ipod.patch, -amarok-2.0.2-r2.ebuild,
+  -amarok-2.0.2-r3.ebuild, -files/amarok-2.0.2-lastfm-authentication.patch,
+  +amarok-2.1.1.ebuild, -files/amarok-ipod.patch:
+  Version bump, remove old, bug 275467
+
+  13 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org> amarok-2.1.ebuild:
+  Enable KDE_LINGUAS.
+
+  11 Jun 2009; Markus Meier <maekke@gentoo.org>
+  amarok-1.4.10_p20090130-r2.ebuild:
+  amd64 stable, bug #272554
+
+  10 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
+  amarok-1.4.10_p20090130-r2.ebuild:
+  stable x86, bug 272554
+
+  06 Jun 2009; nixnut <nixnut@gentoo.org> amarok-1.4.10_p20090130-r2.ebuild:
+  ppc stable #272554
+
+*amarok-2.1 (04 Jun 2009)
+
+  04 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  amarok-2.0.2-r2.ebuild, amarok-2.0.2-r3.ebuild, +amarok-2.1.ebuild,
+  +files/disable_bindings_test.patch:
+  Version bump to 2.1, slot change to 4
+
+  04 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  amarok-1.4.10_p20090130-r2.ebuild:
+  Correct path by adding ${KDEDIR}
+
+  25 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  amarok-1.4.10_p20090130-r2.ebuild:
+  Fix typo
+
+  25 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  amarok-1.4.10_p20090130-r2.ebuild:
+  Fix bug 269774
+
+  13 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  amarok-2.0.2-r2.ebuild, amarok-2.0.2-r3.ebuild:
+  remove block for amarok-1.4
+
+*amarok-1.4.10_p20090130-r2 (13 May 2009)
+
+  13 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  +amarok-1.4.10_p20090130-r2.ebuild:
+  Revision bump, EAPI-2'ed, slotted and prefixed
+
+*amarok-2.0.2-r3 (24 Apr 2009)
+
+  24 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/amarok-2.0.2-lastfm-authentication.patch, +amarok-2.0.2-r3.ebuild:
+  Bumped amarok-2.0.2 to include a lastfm patch. Thanks to Gustavo Henrique
+  Nihei for poking me about it.
+
+  23 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -amarok-2.0.1.1.ebuild, -amarok-2.0.2-r1.ebuild:
+  Removed old amarok-2 ebuilds now that 2.0.2-r2 is finally working for
+  everyone. Removing 2.0.1.1 should also prevent the phonon blocks.
+
+*amarok-2.0.2-r2 (22 Apr 2009)
+
+  22 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-2.0.2-r2.ebuild:
+  In order to get amarok-2.0.2 to build, I've appended --as-needed to the
+  ldflags.
+
+  15 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> amarok-2.0.2-r1.ebuild:
+  Fix typo.
+
+  15 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.0.2-r1.ebuild:
+  Adjusted minimum mysql deps.
+
+  15 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  amarok-2.0.2-r1.ebuild:
+  Disabled building the included qtscriptgenerator and added dep to the
+  separate package.
+
+  15 Apr 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/amarok-1.4.10-gcc44.patch, amarok-1.4.10_p20090130-r1.ebuild:
+  Fix building w/ GCC 4.4 for bug #264464.
+
+*amarok-2.0.2-r1 (14 Apr 2009)
+
+  14 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +files/amarok-ipod.patch, metadata.xml, +amarok-2.0.2-r1.ebuild:
+  Added amarok-2.0.2.
+
+*amarok-1.4.10-r3 (14 Apr 2009)
+
+  14 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  metadata.xml, -amarok-1.4.8.ebuild, -amarok-1.4.9.1.ebuild,
+  -amarok-1.4.9.1-r1.ebuild, -amarok-1.4.10.ebuild,
+  -amarok-1.4.10-r1.ebuild, +amarok-1.4.10-r3.ebuild,
+  -amarok-1.4.10_p20090130.ebuild, amarok-1.4.10_p20090130-r1.ebuild,
+  -amarok-1.4.9999-r2.ebuild, amarok-2.0.1.1.ebuild:
+  Removed old versions of amarok-1.4 and the 1.4.9999 version as upstream
+  work on 1.4 has been stopped. Added blockers for other versions of amarok
+  to prevent the merge process from dying for colisions - fixes bug 241134.
+
+  19 Mar 2009; Brent Baude <ranger@gentoo.org> amarok-1.4.10-r2.ebuild:
+  Marking amarok-1.4.10-r2 ppc for bug 254896
+
+  16 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> amarok-2.0.1.1.ebuild:
+  Remove redundant dep. Already handled by kdelibs.
+
+  11 Mar 2009; Brent Baude <ranger@gentoo.org> amarok-1.4.10-r2.ebuild:
+  Marking amarok-1.4.10-r2 ppc64 for bug 254896
+
+  07 Mar 2009; Raúl Porcel <armin76@gentoo.org> amarok-1.4.10-r2.ebuild:
+  sparc stable wrt #254896
+
+  07 Mar 2009; Markus Meier <maekke@gentoo.org> amarok-1.4.10-r2.ebuild:
+  amd64/x86 stable, bug #254896
+
+*amarok-1.4.10-r2 (04 Mar 2009)
+
+  04 Mar 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  +files/amarok-1.4.10-audibletag.patch, +amarok-1.4.10-r2.ebuild:
+  apply audibletag.patch, security bug 254896
+
+  02 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> amarok-2.0.1.1.ebuild:
+  Fix typo
+
+  01 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> amarok-2.0.1.1.ebuild:
+  Adjust deps
+
+  01 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> amarok-2.0.1.1.ebuild:
+  Ajust deps
+
+  28 Feb 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
+  semantic-desktop is a global USE-flag
+
+  10 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/2.0.1.1-ipod.patch, amarok-2.0.1.1.ebuild:
+  Fix ipod issue with amarok 2.0. Per bug #255730.
+
+*amarok-1.4.10_p20090130-r1 (30 Jan 2009)
+*amarok-1.4.10_p20090130 (30 Jan 2009)
+
+  30 Jan 2009; Carsten Lohrke <carlo@gentoo.org>
+  +amarok-1.4.10_p20090130.ebuild, +amarok-1.4.10_p20090130-r1.ebuild:
+  Sync to stable branch, fixing bug #256389. Desktop entry fixes.
+
+  25 Jan 2009; <jokey@gentoo.org> amarok-2.0.1.1.ebuild:
+  Revert keyword per #gentoo-dev talk
+
+  13 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org> amarok-2.0.1.1.ebuild:
+  Add big fat warning about building amarok 2.0.1.1 on amd64.
+
+  13 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org> amarok-2.0.1.1.ebuild:
+  Add block to mysql builded with USE=minimal. That solves bug #254820
+
+  13 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org> -amarok-1.90-r1.ebuild,
+  -amarok-2.0.ebuild:
+  Drop old amarok:2 versions
+
+  13 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org> amarok-2.0.1.1.ebuild:
+  cdaudio support removed from amarok by upstream
+
+*amarok-2.0.1.1 (12 Jan 2009)
+
+  12 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org> +amarok-2.0.1.1.ebuild:
+  Version bump to 2.0.1.1
+
+  14 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org> amarok-2.0.ebuild:
+  Block mysql compiled with minimal useflag. Fixes bug #250702.
+
+  10 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org> amarok-2.0.ebuild:
+  Block amarok:0 correctly (since it was not done before at all i think it
+  does not need revbump).
+
+*amarok-2.0 (10 Dec 2008)
+
+  10 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml, +amarok-2.0.ebuild:
+  Version bump.
+
+  08 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org> amarok-1.90-r1.ebuild:
+  Make amarok optionaly depend on qt-opengl
+
+  01 Nov 2008; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml,
+  -amarok-1.90.ebuild, amarok-1.90-r1.ebuild:
+  Disabling ipod for amarok 1.9 (Bug 245112). Removing gentoofan23 from
+  maintainers.
+
+  13 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org> amarok-1.90.ebuild,
+  amarok-1.90-r1.ebuild:
+  Depend on a more recent libmtp version; Amarok won't compile with
+  <media-libs/libmtp-0.3.3
+
+*amarok-1.90-r1 (11 Oct 2008)
+
+  11 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-1.90-r1.ebuild:
+  Made a revision bump for 1.90 to ensure everyone gets the fixes in
+  kde4-base.eclass that make the pkg install under KDEDIR.
+
+  10 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org> amarok-1.90.ebuild:
+  Amarok needs sqlite[threadsafe], adding it.
+
+*amarok-1.90 (10 Oct 2008)
+
+  10 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +amarok-1.90.ebuild:
+  Bumped amarok to version 1.90. Version 1.92 will remain masked in the
+  ovelay due to the dep in mysql[embedded].
+
+  04 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Remove duplicate flags from metadata. Some were alreay well explained in
+  length before.
+
+  03 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Remove myself as maintainer.
+
+  03 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
+  Add myself as maintainer.
+
+  31 Aug 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/amarok-1.4.10-gcc-4.3.patch, amarok-1.4.10.ebuild,
+  amarok-1.4.10-r1.ebuild:
+  Fix for gcc-4.3. Bug 234784. Thanks to Martin Väth
+  <vaeth@mathematik.uni-wuerzburg.de>.
+
+  19 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  amarok-1.4.10.ebuild:
+  ppc stable, bug #234689
+
+  16 Aug 2008; Markus Rothe <corsair@gentoo.org> amarok-1.4.10.ebuild:
+  Stable on ppc64; bug #234689
+
+  15 Aug 2008; Friedrich Oslage <bluebird@gentoo.org> amarok-1.4.10.ebuild:
+  Stable on sparc, security bug #234689
+
+  15 Aug 2008; Raúl Porcel <armin76@gentoo.org> amarok-1.4.10.ebuild:
+  x86 stable wrt #234689
+
+  15 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org>
+  amarok-1.4.10.ebuild:
+  stable amd64, security bug 234689
+
+*amarok-1.4.10-r1 (14 Aug 2008)
+
+  14 Aug 2008; Carsten Lohrke <carlo@gentoo.org> +amarok-1.4.10-r1.ebuild:
+  Revision with libmtp patch...
+
+  14 Aug 2008; Carsten Lohrke <carlo@gentoo.org> amarok-1.4.10.ebuild:
+  Adjust libmtp dependency.
+
+*amarok-1.4.10 (14 Aug 2008)
+
+  14 Aug 2008; Carsten Lohrke <carlo@gentoo.org> +amarok-1.4.10.ebuild:
+  Version bump.
+
+  17 Jul 2008; Markus Rothe <corsair@gentoo.org> amarok-1.4.9.1.ebuild:
+  Stable on ppc64; bug #231061
+
+  14 Jul 2008; nixnut <nixnut@gentoo.org> amarok-1.4.9.1.ebuild:
+  Stable on ppc wrt bug 231061
+
+  08 Jul 2008; Raúl Porcel <armin76@gentoo.org> amarok-1.4.9.1.ebuild:
+  sparc stable wrt #231061
+
+  08 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
+  amarok-1.4.9.1.ebuild:
+  stable x86, bug 231061
+
+  07 Jul 2008; Dawid Węgliński <cla@gentoo.org> amarok-1.4.9.1.ebuild:
+  Stable on amd64 (bug #231061)
+
+  07 Jul 2008; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.9.1.ebuild,
+  amarok-1.4.9.1-r1.ebuild:
+  Remove old and no more pertinent configure options from myconf.
+
+*amarok-1.4.9.1-r1 (05 Jul 2008)
+
+  05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/amarok-1.4.9.1-libmtp-0.3.0-API.patch, amarok-1.4.9.1.ebuild,
+  +amarok-1.4.9.1-r1.ebuild:
+  Rev bump for libmtp-0.3.0 compat. Bug #230885.
+
+  27 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  files/amarok-1.4.9.1-helix+gcc-4.3.patch:
+  Fix a typo in amarok-1.4.9.1-helix+gcc-4.3.patch, as noted by Rick Harris
+  in bug 223287.
+
+  20 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/amarok-1.4.9.1-helix+gcc-4.3.patch:
+  Fix patch to complete building on GCC 4.3.
+
+  19 May 2008; Tiziano Müller <dev-zero@gentoo.org> amarok-1.4.8.ebuild,
+  amarok-1.4.9.1.ebuild, amarok-1.4.9999-r2.ebuild:
+  Changed dependency for postgresql to virtual/postgresql-base
+
+  15 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.9.1-helix+gcc-4.3.patch, amarok-1.4.9.1.ebuild:
+  Add patch to fix building with GCC 4.3 with the Helix engine enabled.
+  Closes bug #214278.
+
+  15 May 2008; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.9.1.ebuild,
+  amarok-1.4.9999-r2.ebuild:
+  Depend on alsa-lib when using the Helix engine, as ALSA is checked for and
+  build fails without it. As we don't support HelixPlayer itself but just
+  RealPlayer, this is no concern for non-Linux systems.
+
+*amarok-1.4.9.1 (10 Apr 2008)
+
+  10 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4.7-r2.ebuild, amarok-1.4.8.ebuild, +amarok-1.4.9.1.ebuild:
+  Remove old version, disable Amazon support in 1.4.8 version as the
+  protocol is not working anymore, and add a new pre-release ebuild for
+  1.4.9.1 that is yet to be officially released.
+
+  19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> amarok-1.4.7-r2.ebuild,
+  amarok-1.4.8.ebuild, amarok-1.4.9999-r2.ebuild:
+  Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
+
+  08 Jan 2008; Raúl Porcel <armin76@gentoo.org> amarok-1.4.8.ebuild:
+  sparc stable wrt #204046, thanks to Alex Maclean for testing
+
+  05 Jan 2008; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.8.ebuild,
+  amarok-1.4.9999-r2.ebuild:
+  Require at least libgpod 0.5.2, fixes bug #204332.
+
+  04 Jan 2008; Richard Freeman <rich0@gentoo.org> amarok-1.4.8.ebuild:
+  amd64 stable - bug #204046
+
+  02 Jan 2008; Brent Baude <ranger@gentoo.org> amarok-1.4.8.ebuild:
+  Marking amarok-1.4.8 ppc for bug 204046
+
+  02 Jan 2008; Brent Baude <ranger@gentoo.org> amarok-1.4.8.ebuild:
+  Marking amarok-1.4.8 ppc64 for bug 204046
+
+  02 Jan 2008; Brent Baude <ranger@gentoo.org> ChangeLog:
+  Marking amarok-1.4.7-r2 ppc64 for bug 204046
+
+  02 Jan 2008; Brent Baude <ranger@gentoo.org> ChangeLog:
+  Marking amarok-1.4.7-r2 ppc for bug 204046
+
+  02 Jan 2008; Markus Meier <maekke@gentoo.org> amarok-1.4.8.ebuild:
+  x86 stable, bug #204046
+
+  30 Dec 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Clarify that RealPlayer is GPL-incompatible.
+
+*amarok-1.4.8 (17 Dec 2007)
+
+  17 Dec 2007; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.4.8.ebuild:
+  Version bump.
+
+  23 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Add proper documentation of some of the possibly ambiguous USE flags.
+
+*amarok-1.4.9999-r2 (23 Nov 2007)
+
+  23 Nov 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4.7-r1.ebuild, amarok-1.4.7-r2.ebuild,
+  -amarok-1.4.9999-r1.ebuild, +amarok-1.4.9999-r2.ebuild:
+  Remove old version, sync amarok-1.4.9999 to the current amarok release ebuild.
+
+  22 Nov 2007; nixnut <nixnut@gentoo.org> amarok-1.4.7-r2.ebuild:
+  Stable on ppc wrt bug 199547
+
+  22 Nov 2007; Raúl Porcel <armin76@gentoo.org> amarok-1.4.7-r2.ebuild:
+  sparc stable, thanks to Alex Maclean for testing
+
+  19 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  amarok-1.4.7-r2.ebuild:
+  Marked stable on amd64 as per bug 199547.
+
+  18 Nov 2007; Markus Rothe <corsair@gentoo.org> amarok-1.4.7-r2.ebuild:
+  Stable on ppc64; bug #199547
+
+  18 Nov 2007; Dawid Węgliński <cla@gentoo.org> amarok-1.4.7-r2.ebuild:
+  Stable on x86 (bug #199547)
+
+*amarok-1.4.7-r2 (18 Nov 2007)
+
+  18 Nov 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.7-svn148317.patch, -amarok-1.4.6-r1.ebuild,
+  -amarok-1.4.7.ebuild, +amarok-1.4.7-r2.ebuild:
+  Version bump, add the patch of upstream SVN rev. 148317, to fix KDE bug
+  #148317.
+
+  17 Nov 2007; Samuli Suominen <drac@gentoo.org> amarok-1.4.7-r1.ebuild:
+  amd64 stable wrt #198711
+
+  11 Nov 2007; nixnut <nixnut@gentoo.org> amarok-1.4.7-r1.ebuild:
+  Stable on ppc wrt bug 198711
+
+  10 Nov 2007; Markus Rothe <corsair@gentoo.org> amarok-1.4.7-r1.ebuild:
+  Stable on ppc64; bug #198711
+
+  10 Nov 2007; Dawid Węgliński <cla@gentoo.org> amarok-1.4.7-r1.ebuild:
+  Stable on x86 (bug #198711)
+
+  10 Nov 2007; Raúl Porcel <armin76@gentoo.org> amarok-1.4.7-r1.ebuild:
+  sparc stable wrt #192678, thanks to Alex Maclean for testing
+
+*amarok-1.4.7-r1 (10 Nov 2007)
+
+  10 Nov 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4.5-magnatune.patch,
+  +files/amarok-1.4.7+xine-lib-1.1.8-lastfm.patch, -amarok-1.4.5-r1.ebuild,
+  -amarok-1.4.6.ebuild, +amarok-1.4.7-r1.ebuild:
+  Remove old version, revision bump to blacklist xine-lib-1.1.8 direct last.fm
+  playback as it's broken by server change, 1.1.9 will work again.
+
+  04 Nov 2007; Christoph Mende <angelos@gentoo.org> amarok-1.4.7.ebuild:
+  Stable on amd64 wrt bug #192678
+
+  03 Nov 2007; Lars Weiler <pylon@gentoo.org> amarok-1.4.7.ebuild:
+  stable ppc, bug #192678
+
+  30 Oct 2007; Markus Rothe <corsair@gentoo.org> amarok-1.4.7.ebuild:
+  Stable on ppc64; bug #192678
+
+  29 Oct 2007; Dawid Węgliński <cla@gentoo.org> amarok-1.4.7.ebuild:
+  Stable on x86 (bug #192678)
+
+  11 Oct 2007; Samuli Suominen <drac@gentoo.org> amarok-1.4.5-r1.ebuild,
+  amarok-1.4.6.ebuild, amarok-1.4.6-r1.ebuild, amarok-1.4.7.ebuild,
+  amarok-1.4.9999-r1.ebuild:
+  Replace noamazon USE flag with amazon and add it to base/package.use for bug
+  134493.
+
+*amarok-1.4.7 (30 Aug 2007)
+
+  30 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> +amarok-1.4.7.ebuild:
+  Version bump to 1.4.7 as per bug 189236.
+
+  13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  amarok-1.4.6-r1.ebuild:
+  ppc. stable
+
+  31 Jul 2007; Christoph Mende <angelos@gentoo.org> amarok-1.4.6-r1.ebuild:
+  Stable on amd64 wrt bug #186324
+
+  30 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  amarok-1.4.6-r1.ebuild:
+  Stable on sparc wrt #186324
+
+  30 Jul 2007; Markus Rothe <corsair@gentoo.org> amarok-1.4.6-r1.ebuild:
+  Stable on ppc64; bug #186324
+
+  29 Jul 2007; Raúl Porcel <armin76@gentoo.org> amarok-1.4.6-r1.ebuild:
+  x86 stable wrt #186324
+
+*amarok-1.4.6-r1 (23 Jun 2007)
+
+  23 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4.6-r1.ebuild:
+  Disable system sqlite usage again, produces freezes for some people, it's
+  better avoiding it again.
+
+*amarok-1.4.6 (21 Jun 2007)
+
+  21 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4.6_rc2.ebuild, +amarok-1.4.6.ebuild:
+  Bump to 1.4.6 final; same tarball, but the ebuild replaced aac useflag with
+  the more descriptive mp4 useflag.
+
+*amarok-1.4.6_rc2 (17 Jun 2007)
+
+  17 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4.4+libgpod-0.4.0.patch,
+  -files/amarok-1.4.5-lyrc-script.patch, -amarok-1.4.5-r2.ebuild,
+  -amarok-1.4.6_pre20070608.ebuild, -amarok-1.4.6_pre20070608-r1.ebuild,
+  +amarok-1.4.6_rc2.ebuild:
+  Version bump to 1.4.6_rc2 tarball.
+
+*amarok-1.4.9999-r1 (14 Jun 2007)
+*amarok-1.4.6_pre20070608-r1 (14 Jun 2007)
+
+  14 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4.6_pre20070608-r1.ebuild, -amarok-1.4.9999.ebuild,
+  +amarok-1.4.9999-r1.ebuild:
+  Nowadays sqlite3 should be pretty much stable, so use it external again.
+  (both 1.4.6 pre-release snapshot and live svn).
+
+*amarok-1.4.9999 (14 Jun 2007)
+
+  14 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4.9999.ebuild, -amarok-9999-r2.ebuild:
+  Rename amarok-9999-r2 to amarok-1.4.9999 to make explicit that it's a live
+  subversion for the current stable (1.4) branch. Frees up the 9999 slot for
+  2.0 when it will be feasible.
+
+*amarok-9999-r2 (10 Jun 2007)
+
+  10 Jun 2007; Diego Pettenò <flameeyes@gentoo.org> -amarok-9999-r1.ebuild,
+  +amarok-9999-r2.ebuild:
+  Bump the live Subversion ebuild to abide to the changes added in 1.4.5-r2
+  (python useflag).
+
+*amarok-1.4.6_pre20070608 (08 Jun 2007)
+
+  08 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4.6_pre20070608.ebuild:
+  Add a snapshot of amarok from SVN to avoid having to backport all the fixes.
+
+*amarok-1.4.5-r2 (07 Jun 2007)
+
+  07 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.5-lyrc-script.patch, +amarok-1.4.5-r2.ebuild:
+  Revision bump: add patch to fix lyrc script, thanks to Jan Spitalnik in bug
+  #166050 and add a python useflag to depend on PyQT as per bug #179472.
+
+  07 Jun 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml,
+  -amarok-1.4.4-r3.ebuild:
+  Remove old version and take over package again.
+
+  19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove flameeyes from metadata.xml due to retirement.
+
+  24 Feb 2007; Markus Rothe <corsair@gentoo.org> amarok-1.4.5-r1.ebuild:
+  Stable on ppc64; bug #166901
+
+  21 Feb 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  amarok-1.4.5-r1.ebuild:
+  Stable on ppc wrt bug #166901.
+
+  19 Feb 2007; <malc@gentoo.org> amarok-1.4.5-r1.ebuild:
+  Stable on amd64 wrt security bug #166901
+
+  17 Feb 2007; Markus Rothe <corsair@gentoo.org> amarok-1.4.5-r1.ebuild:
+  Added ~ppc64
+
+  15 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  amarok-1.4.5-r1.ebuild:
+  Stable on sparc wrt security #166901
+
+  15 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  amarok-1.4.5-r1.ebuild:
+  stable x86; security bug 166901
+
+  14 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  files/amarok-1.4.5-magnatune.patch:
+  Fix the patch, use the proper one.
+
+*amarok-1.4.5-r1 (14 Feb 2007)
+
+  14 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4.3-playlist-encoding.patch,
+  +files/amarok-1.4.5-magnatune.patch, -amarok-1.4.4-r4.ebuild,
+  -amarok-1.4.5.ebuild, +amarok-1.4.5-r1.ebuild:
+  Version bump, adding a patch to fix a possible security flaw in the
+  magnatune store support (KDE BUG #138499). Also add unzip as runtime
+  dependency as it is used for the magnatune shop.
+
+  06 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.5.ebuild:
+  Fix dependency for amarok 1.4.5, libgpod 0.4.2 is needed at least.
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.5.ebuild:
+  Add ~ppc as requested by lu_zero in bug #164242.
+
+  05 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> amarok-1.4.5.ebuild:
+  Rekeyworded ~sparc wrt #164242
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
+  Update digest.
+
+  05 Feb 2007; Jeroen Roovers <jer@gentoo.org> files/digest-amarok-1.4.5,
+  Manifest:
+  Fix the 1.4.5 digest for mabi.
+
+  04 Feb 2007; Matti Bickel <mabi@gentoo.org> amarok-1.4.4-r4.ebuild:
+  readd ~ppc (bug #164242)
+
+  01 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> amarok-9999-r1.ebuild:
+  Update not to use trunk anymore for Live SVN.
+
+*amarok-1.4.5 (01 Feb 2007)
+
+  01 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.4.5.ebuild,
+  amarok-9999-r1.ebuild:
+  Version bump (pre-release), and update also 9999-r1 to have a daap useflag
+  to disable mongrel dependency.
+
+  31 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  amarok-1.4.4-r4.ebuild:
+  Keyworded ~sparc wrt #164242
+
+*amarok-9999-r1 (28 Jan 2007)
+*amarok-1.4.4-r4 (28 Jan 2007)
+
+  28 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4.3-r1.ebuild, amarok-1.4.4-r3.ebuild, +amarok-1.4.4-r4.ebuild,
+  -amarok-9999.ebuild, +amarok-9999-r1.ebuild:
+  Remove old version; revision bump fo both 1.4.4 release and live Subversion
+  ebuild to depend on mongrel rather than building and installing its own
+  copy. This drops ~ppc ~ppc64 and ~sparc keywords.
+
+  25 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> amarok-9999.ebuild:
+  Replace -* keyword with empty keywords.
+
+  19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.4+libgpod-0.4.0.patch, amarok-1.4.4-r3.ebuild:
+  Add patch to fix building with newer versions of libgpod; closes bug
+  #162725; thanks to Alessio Cassiba for reporting, and Olivier Crete for
+  pointing out the problem.
+
+  31 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-9999.ebuild:
+  As the current SVN version requires a newer libmtp, make the 9999 ebuild
+  require it too, even if it's not in portage.
+
+*amarok-9999 (28 Dec 2006)
+
+  28 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> +amarok-9999.ebuild:
+  Add a live SVN version of Amarok. Although not supported and a bad idea in
+  general, it would save me from supporting people with old and broken
+  unofficial amarok-svn ebuilds that usually waste my time.
+
+  26 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/digest-amarok-1.4.4-r3, Manifest:
+  Fix digest.
+
+  26 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  amarok-1.4.4-r3.ebuild:
+  Stable on sparc wrt #158836
+
+  25 Dec 2006; Andrej Kacian <ticho@gentoo.org> amarok-1.4.4-r3.ebuild:
+  Stable on x86, bug #158836.
+
+  23 Dec 2006; Matti Bickel <mabi@gentoo.org> amarok-1.4.4-r3.ebuild:
+  ppc stable (bug #158836)
+
+  23 Dec 2006; Markus Rothe <corsair@gentoo.org> amarok-1.4.4-r3.ebuild:
+  Stable on ppc64; bug #158836
+
+*amarok-1.4.4-r3 (22 Dec 2006)
+
+  22 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4.4-asneeded.patch,
+  -files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch,
+  -files/amarok-1.4.4-musicbrainz.patch,
+  -files/amarok-1.4.4-podcast-fix.patch, -files/amarok-1.4.4-sparc.patch,
+  amarok-1.4.3-r1.ebuild, -amarok-1.4.4.ebuild, -amarok-1.4.4-r1.ebuild,
+  -amarok-1.4.4-r2.ebuild, +amarok-1.4.4-r3.ebuild:
+  Add patch to fix bug #157752 thanks to Grant McDorman for reporting; correct
+  dependency for postgresql/libpq, thanks to Julien Allanos in bug #158812;
+  remove old version, move patches on their own tarball to reduce size of
+  filesdir.
+
+  01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  amarok-1.4.4-r2.ebuild:
+  Keyworded ~sparc wrt #156599
+
+  01 Dec 2006; Markus Rothe <corsair@gentoo.org> amarok-1.4.4-r2.ebuild:
+  Added ~ppc64; bug #156599
+
+  01 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/digest-amarok-1.4.3-r1, Manifest:
+  Fix digest, see bug #156834.
+
+  30 Nov 2006; Matti Bickel <mabi@gentoo.org> amarok-1.4.4-r2.ebuild:
+  Rekeyworded ~ppc (bug #156599)
+
+*amarok-1.4.4-r2 (30 Nov 2006)
+
+  30 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch, +amarok-1.4.4-r2.ebuild:
+  Add patch to fix Last.FM playback with xine-lib 1.1.3.
+
+*amarok-1.4.4-r1 (29 Nov 2006)
+
+  29 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.4-musicbrainz.patch, +amarok-1.4.4-r1.ebuild:
+  Add patch to fix musicbrainz support, and add the useflag back now that it
+  does work when cancelling.
+
+  23 Nov 2006; Francesco Riosa <vivo@gentoo.org> amarok-1.4.3-r1.ebuild,
+  amarok-1.4.4.ebuild:
+  dev-db/mysql => virtual/mysql
+
+  22 Nov 2006; Joseph Jezak <josejx@gentoo.org> amarok-1.4.4.ebuild:
+  Marked ~ppc for bug #153024.
+
+  19 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.4-asneeded.patch, amarok-1.4.4.ebuild:
+  Add patch to fix building with libgpod and --as-needed (bug #154022). Thanks
+  to Timothy (drizzt) who gave me the patch.
+
+  15 Nov 2006; Markus Rothe <corsair@gentoo.org> amarok-1.4.4.ebuild:
+  Added ~ppc64; bug #153024
+
+  09 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> amarok-1.4.4.ebuild:
+  Rekeywording ~sparc wrt #153024
+
+  08 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.4-sparc.patch, amarok-1.4.4.ebuild:
+  Add patch to allow building on SPARC, see bug #153024. Thanks to Jason Wever
+  for reporting and Jurij Smakov for the patch.
+
+  06 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.3-r1.ebuild,
+  amarok-1.4.4.ebuild:
+  Remove xmms useflag (upstream is going to remove it on their own releases
+  soon anyway).
+
+  02 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.4-podcast-fix.patch, amarok-1.4.4.ebuild:
+  Add micro-fix for podcasts, as reported by jaervosz.
+
+*amarok-1.4.4 (27 Oct 2006)
+
+  27 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4.0a-strict-aliasing.patch, -amarok-1.3.8.ebuild,
+  -amarok-1.4.0a-r1.ebuild, +amarok-1.4.4.ebuild:
+  Remove old versions, and add the new 1.4.4 not released yet.
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.3-r1.ebuild:
+  Allow using libgpod 0.4 with 1.4.3 version.
+
+  20 Oct 2006; Simon Stelling <blubb@gentoo.org> amarok-1.4.3-r1.ebuild:
+  stable on amd64
+
+  18 Oct 2006; Joshua Jackson <tsunam@gentoo.org> amarok-1.4.3-r1.ebuild:
+  Stable x86; bug #150988
+
+  14 Oct 2006; Joseph Jezak <josejx@gentoo.org> amarok-1.4.3-r1.ebuild:
+  Marked ppc stable for bug #150988.
+
+  14 Oct 2006; Markus Rothe <corsair@gentoo.org> amarok-1.4.3-r1.ebuild:
+  Stable on ppc64; bug #150988
+
+  14 Oct 2006; Jason Wever <weeve@gentoo.org> amarok-1.4.3-r1.ebuild:
+  Stable on SPARC wrt bug #150988.
+
+  12 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4.1-libvisual.patch, -files/amarok-1.4.2-20restarts.patch,
+  -files/amarok-1.4.2-audiocd-freeze.patch,
+  -files/amarok-1.4.2-collection-sqlite.patch,
+  -files/amarok-1.4.2-libmtp.patch, amarok-1.4.0a-r1.ebuild,
+  -amarok-1.4.1-r3.ebuild, -amarok-1.4.2-r1.ebuild, -amarok-1.4.3.ebuild,
+  amarok-1.4.3-r1.ebuild:
+  Fix libgpod dependency on 0.3 version as 0.4 is not supported (see bug
+  #150983); remove old versions as the new target stable is 1.4.3-r1.
+
+*amarok-1.4.3-r1 (15 Sep 2006)
+
+  15 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.3-playlist-encoding.patch, +amarok-1.4.3-r1.ebuild:
+  Add patch from upstream to fix playlist encoding problems.
+
+  05 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.3.ebuild:
+  Disable libmtp for now, avoid automagic dependency.
+
+  05 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> amarok-1.4.3.ebuild:
+  Rekeyworded ~sparc
+
+*amarok-1.4.3 (05 Sep 2006)
+
+  05 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.4.3.ebuild:
+  Version bump.
+
+*amarok-1.4.2-r1 (31 Aug 2006)
+
+  31 Aug 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.2-20restarts.patch,
+  +files/amarok-1.4.2-audiocd-freeze.patch,
+  +files/amarok-1.4.2-collection-sqlite.patch,
+  +files/amarok-1.4.2-libmtp.patch, -amarok-1.4.1-r1.ebuild,
+  -amarok-1.4.1-r2.ebuild, -amarok-1.4.2_beta1.ebuild,
+  +amarok-1.4.2-r1.ebuild:
+  Version bump (-r1 as this is not a vanilla version and I want to bump who
+  has already a local 1.4.2 copy for sure). Remove old versions.
+
+  08 Aug 2006; Simon Stelling <blubb@gentoo.org> amarok-1.4.0a-r1.ebuild:
+  stable on amd64
+
+  05 Aug 2006; Jason Wever <weeve@gentoo.org> amarok-1.4.1-r3.ebuild:
+  Re-added ~sparc keyword wrt bug #140243.
+
+*amarok-1.4.2_beta1 (30 Jul 2006)
+
+  30 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4.2_beta1.ebuild:
+  Version bump (beta version).
+
+*amarok-1.4.1-r3 (27 Jul 2006)
+
+  27 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.1-libvisual.patch, +amarok-1.4.1-r3.ebuild:
+  Add patch t fix libvisual 0.4 support, thanks to Ian Monroe for providing
+  the commit diff. Closes bug #140563.
+
+  26 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.1-r2.ebuild:
+  Remove special case for automake 1.9, the ebuild forces that already when
+  needed.
+
+  25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.8.ebuild,
+  amarok-1.4.0a-r1.ebuild, amarok-1.4.1-r1.ebuild, amarok-1.4.1-r2.ebuild:
+  Remove musicbrainz support as per bug #140184.
+
+  20 Jul 2006; Markus Rothe <corsair@gentoo.org> amarok-1.4.1-r2.ebuild:
+  Added ~ppc64; bug #140243
+
+  18 Jul 2006; Joshua Jackson <tsunam@gentoo.org> amarok-1.4.0a-r1.ebuild:
+  Stable x86; bug #139095
+
+*amarok-1.4.1-r2 (13 Jul 2006)
+
+  13 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4.1-r2.ebuild:
+  Add njb useflag to enable device support, as per bug #140240.
+
+  08 Jul 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  amarok-1.4.0a-r1.ebuild:
+  stable on ppc (Bug #139095)
+
+  05 Jul 2006; Joshua Jackson <tsunam@gentoo.org> amarok-1.4.0a-r1.ebuild:
+  Stable x86; bug #139095
+
+  04 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  amarok-1.4.0a-r1.ebuild:
+  Stable on sparc wrt #139095
+
+  04 Jul 2006; Markus Rothe <corsair@gentoo.org> amarok-1.4.0a-r1.ebuild:
+  Stable on ppc64; bug #139095
+
+  03 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.1-r1.ebuild:
+  Remove pl docs, as they were broken on release.
+
+*amarok-1.4.1-r1 (03 Jul 2006)
+
+  03 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> -amarok-1.4.1.ebuild,
+  +amarok-1.4.1-r1.ebuild:
+  Rename lastfm.protocol file to amaroklasfm.protocol to avoid collisions with
+  lastfmplayer. Thanks to Michael Weyershäuser in bug #139032.
+
+*amarok-1.4.1 (03 Jul 2006)
+
+  03 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> -amarok-1.4.0a.ebuild,
+  -amarok-1.4.1_beta1.ebuild, +amarok-1.4.1.ebuild:
+  Bump to latest version and remove old ones.
+
+*amarok-1.4.1_beta1 (18 Jun 2006)
+
+  18 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4.1_beta1.ebuild:
+  Add new version (beta).
+
+*amarok-1.4.0a-r1 (18 Jun 2006)
+
+  18 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.0a-strict-aliasing.patch, +amarok-1.4.0a-r1.ebuild:
+  Add patch to fix strict-aliasing breakage.
+
+  08 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.0a.ebuild:
+  Update description line for 1.4.0a ebuild as now it's Amarok rather than
+  amaroK.
+
+  28 May 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.8.ebuild,
+  amarok-1.4.0a.ebuild:
+  Fix libvisual-plugins dependency on the 0.2 slot.
+
+  25 May 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.0a.ebuild:
+  Remove xx value for translation.
+
+  24 May 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.0a.ebuild:
+  Add ~x86-fbsd keyword.
+
+*amarok-1.4.0a (18 May 2006)
+
+  18 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4.0-audiocd.patch, -files/amarok-1.4.0-collectiondb.patch,
+  -amarok-1.4.0-r2.ebuild, +amarok-1.4.0a.ebuild:
+  New upstream release to fix issues when migrating from 1.3 version, should
+  also fix bug #133647.
+
+*amarok-1.4.0-r2 (16 May 2006)
+
+  16 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.0-collectiondb.patch, -amarok-1.4.0-r1.ebuild,
+  +amarok-1.4.0-r2.ebuild:
+  Add patch to fix leaks on connection db.
+
+*amarok-1.4.0-r1 (15 May 2006)
+
+  15 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4.0-audiocd.patch, -amarok-1.4.0.ebuild,
+  +amarok-1.4.0-r1.ebuild:
+  Add patch from Markus Kaufhold in KDE bug #127388 to fix audiocd playing
+  with xine engine.
+
+  15 May 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.0.ebuild:
+  Force usage of gentoo mirrors.
+
+*amarok-1.4.0 (14 May 2006)
+
+  14 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4_beta3-r2.ebuild, +amarok-1.4.0.ebuild:
+  Update to 1.4.0 release (still not officially announced). This version
+  intentionally drops GStreamer support. It might return in 1.4.1, but please
+  don't bug me about that, talk with upstream.
+
+  08 May 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  amarok-1.4_beta3-r2.ebuild:
+  Added to ~ppc
+
+  05 May 2006; Diego Pettenò <flameeyes@gentoo.org> -amarok-1.3.6.ebuild,
+  -amarok-1.3.9.ebuild:
+  Drop old versions.
+
+  28 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-amarok-1.3.6,
+  files/digest-amarok-1.3.8, Manifest:
+  Fixing SHA256 digest, pass four
+
+  17 Apr 2006; Markus Rothe <corsair@gentoo.org> amarok-1.4_beta3-r2.ebuild:
+  Added ~ppc64; bug #129409
+
+  12 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  amarok-1.4_beta3-r2.ebuild:
+  Drop akode dep (the engine is no more already) and kioslaves support. Thanks
+  to eean for noticing this.
+
+*amarok-1.4_beta3-r2 (11 Apr 2006)
+
+  11 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4_beta3-r1.ebuild, +amarok-1.4_beta3-r2.ebuild:
+  Update to 1.4-beta3c and re-enable helix.
+
+  11 Apr 2006; Jason Wever <weeve@gentoo.org> amarok-1.4_beta3-r1.ebuild:
+  Added ~sparc keyword wrt bug #129409.
+
+  11 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  amarok-1.4_beta3-r1.ebuild:
+  Disable helix engine until the missing include file is fixed.
+
+  10 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
+  Make myself direct maintaner of amarok.
+
+*amarok-1.4_beta3-r1 (10 Apr 2006)
+
+  10 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4_beta3.ebuild, +amarok-1.4_beta3-r1.ebuild:
+  Add 1.4_beta3b (as -r1).
+
+  10 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  amarok-1.4_beta3.ebuild:
+  Make xine the default backend always enabled. gstreamer can be added as extra.
+
+*amarok-1.4_beta3 (10 Apr 2006)
+
+  10 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4_beta2-r1.ebuild, +amarok-1.4_beta3.ebuild:
+  Version bump, dropped ~ppc ~ppc64 and ~sparc keywords because of missing
+  dependencies. This version will go in ~arch.
+
+  27 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.9.ebuild:
+  Restrict mirroring of 1.3.9 release and update digest as the tarball was
+  changed upstream.
+
+  26 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.9.ebuild:
+  Remove Polish doc as it's broken in 1.3.9 package.
+
+*amarok-1.3.9 (26 Mar 2006)
+
+  26 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.9.ebuild:
+  Version bump.
+
+  15 Mar 2006; Luis Medinas <metalgod@gentoo.org> amarok-1.3.8.ebuild:
+  Stable on amd64. Bug #122609.
+
+  15 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  amarok-1.4_beta2-r1.ebuild:
+  Drop --without-ifp line, was an artifact.
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4_beta2.ebuild, amarok-1.4_beta2-r1.ebuild:
+  Add ifp useflag to enable iRiver access; thanks to Gabriel Devenyi in bug
+  #122634.
+
+*amarok-1.4_beta2-r1 (05 Mar 2006)
+
+  05 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4_beta2-r1.ebuild:
+  Add -r1 which installs itself in /usr, finally avoid installing in kde's
+  prefix.
+
+*amarok-1.4_beta2 (05 Mar 2006)
+
+  05 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4_beta1.ebuild, -amarok-1.4_beta1-r1.ebuild,
+  +amarok-1.4_beta2.ebuild:
+  Add amarok 1.4_beta2.
+
+*amarok-1.4_beta1-r1 (03 Mar 2006)
+
+  03 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4_beta1-r1.ebuild:
+  Add new revision using gstreamer 0.10. Test required.
+
+  20 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org> amarok-1.3.8.ebuild:
+  Stable on sparc wrt #122609
+
+  19 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  amarok-1.4_beta1.ebuild:
+  Add optional support for helix engine (only with realplayer at the moment).
+
+  19 Feb 2006; Chris White <chriswhite@gentoo.org> amarok-1.3.8.ebuild:
+  x86 stable per bug #122609.
+
+  17 Feb 2006; Joseph Jezak <josejx@gentoo.org> amarok-1.3.8.ebuild:
+  Marked ppc stable for bug #122609.
+
+  17 Feb 2006; Markus Rothe <corsair@gentoo.org> amarok-1.3.8.ebuild:
+  Stable on ppc64; bug #122609
+
+  13 Feb 2006; Hanno Boeck <hanno@gentoo.org> amarok-1.4_beta1.ebuild:
+  Moodbar / exscalibar support added.
+
+  13 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.4_beta1-parallelmake.patch, amarok-1.4_beta1.ebuild:
+  The patch for parallel make wasn't enough as configure file should be
+  removed to recreate autotools (was already if using $LINGUAS). Instead of
+  using it, uncomment the sed line fixing it.
+
+  12 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.3.7-lyrc.patch, -amarok-1.3.7-r1.ebuild:
+  Drop old 1.3.7-r1 version, foreseeing 1.3.8 as future stable.
+
+*amarok-1.4_beta1 (12 Feb 2006)
+
+  12 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.4_beta1-parallelmake.patch, +amarok-1.4_beta1.ebuild:
+  Add 1.4_beta1 under package.mask, with patch to fix parallel make issues.
+
+  05 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.8.ebuild:
+  Move the $LINGUAS handling to kde eclass.
+
+  31 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.8.ebuild:
+  Make kioslaves an optional dependency on kde useflag, and add a notice about
+  it on postinst.
+
+  30 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.8.ebuild:
+  Add dependency over kdemultimedia or kdemultimedia-kioslaves, for audiocd:/
+  support.
+
+  26 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> -files/amarok-gcc4.gz,
+  -amarok-1.2.4.ebuild:
+  Drop old, unsupported version, and compressed gcc4 patch.
+
+  19 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> amarok-1.3.6.ebuild:
+  Stable on amd64, bug 114493.
+
+*amarok-1.3.8 (15 Jan 2006)
+
+  15 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.8.ebuild:
+  Version bump, add support for honouring LINGUAS, avoid building and
+  installing extraneous data.
+
+  11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> -amarok-1.3.7.ebuild:
+  Drop old version.
+
+  09 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.7-r1.ebuild:
+  Drop kdeenablefinal useflag, it used to work back in 1.2 series but it's not
+  unsupported, and next release line will use unsermake so...
+
+  04 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.7-r1.ebuild:
+  Add kdeenablefinal flag that can be used to actually build amaroK using
+  --enable-final.
+
+*amarok-1.3.7-r1 (25 Dec 2005)
+
+  25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.7-lyrc.patch, +amarok-1.3.7-r1.ebuild:
+  Add patch to fix lyrics display, thanks to Ian Monroe for letting me know.
+
+  24 Dec 2005; Michael Hanselmann <hansmi@gentoo.org> amarok-1.3.6.ebuild:
+  Stable on ppc.
+
+  23 Dec 2005; Markus Rothe <corsair@gentoo.org> amarok-1.3.7.ebuild:
+  Added ~ppc64
+
+  15 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.6.ebuild:
+  Fix dependency on tunepimp to 0.3, as 0.4 breaks API.
+
+  15 Dec 2005; Chris White <chriswhite@gentoo.org> amarok-1.3.6.ebuild:
+  x86 stable for bug #114493.
+
+  13 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.7.ebuild:
+  Append -fno-inline to fix saltuary crashes on -O3 builds.
+
+*amarok-1.3.7 (07 Dec 2005)
+
+  07 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.7.ebuild:
+  Update to latest upstream version.
+
+  05 Dec 2005: Zaheer Merali <zaheerm@gentoo.org> amarok-1.3.6.ebuild,
+  amarok-1.2.4.ebuild:
+  Fix GStreamer dependencies
+  
+  29 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.6.ebuild:
+  Move icons in global prefix to close bug #113886.
+
+  29 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.2.4.ebuild:
+  Change oggvorbis flag into vorbis (#94254).
+
+*amarok-1.3.6 (08 Nov 2005)
+
+  08 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> -amarok-1.3.5.ebuild,
+  +amarok-1.3.6.ebuild:
+  Update to 1.3.6 (and removal of 1.3.5) that seems to fix the crash at startup.
+
+  05 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.3.2-playlist.patch, -amarok-1.2.3.ebuild,
+  -amarok-1.3.2-r1.ebuild, -amarok-1.3.3.ebuild:
+  Remove old versions.
+
+  28 Oct 2005; Jason Wever <weeve@gentoo.org> amarok-1.3.5.ebuild:
+  Changed -sparc keyword to ~sparc.
+
+*amarok-1.3.5 (25 Oct 2005)
+
+  25 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> -amarok-1.3.4.ebuild,
+  +amarok-1.3.5.ebuild:
+  Update to 1.3.5, as 1.3.4 seemed to have problems.
+
+*amarok-1.3.4 (24 Oct 2005)
+
+  24 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.4.ebuild:
+  Bumped to 1.3.4.
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.3.3.ebuild:
+  Do not force arts plugins, avoiding complications due to the fact that
+  kde-base/artsplugins-akode will be providing them in KDE 3.5.
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.3.ebuild:
+  Cleanup configure parameters, make sure musicbrainz is disabled when
+  required, and forcefully disable extra engines.
+
+*amarok-1.3.3 (09 Oct 2005)
+
+  09 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.3.ebuild:
+  Version bump following upstream.
+
+*amarok-1.3.2-r1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/amarok-1.3.1-gst-alsaagain.patch,
+  -files/amarok-1.3.1-gst-onlyoss.patch, -files/amarok-1.3.1-qt-3.3.5.patch,
+  +files/amarok-1.3.2-playlist.patch, -amarok-1.3.ebuild,
+  -amarok-1.3.1-r1.ebuild, -amarok-1.3.1-r2.ebuild, -amarok-1.3.2.ebuild,
+  +amarok-1.3.2-r1.ebuild:
+  Added patch to fix crashes on startup with 1.3 series. Thanks to Mark
+  Kretschmann for the patch. Purged old 1.3 ebuilds as they are not stable
+  enough.
+
+*amarok-1.3.2 (20 Sep 2005)
+
+  20 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.2.ebuild:
+  Version bump.
+
+  18 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.1-qt-3.3.5.patch, amarok-1.3.1-r2.ebuild:
+  Added patch to compile with qt 3.3.5 from amaroK's SVN repository. Closes
+  bug #106366.
+
+*amarok-1.3.1-r2 (11 Sep 2005)
+
+  11 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.1-gst-alsaagain.patch, +amarok-1.3.1-r2.ebuild:
+  Added patch to re-add support for alsasink with gstreamer engine. Thanks to
+  Mark Kretschmann for submitting it.
+
+  08 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.3.1-r1.ebuild:
+  Don't force using gst-plugins-oss, let the uesrs select what they want.
+  Close #105298. The sed for libpq-fe is no more needed. Make musicbrainz
+  optional with musicbrainz useflag. Close #105298.
+
+*amarok-1.3.1-r1 (08 Sep 2005)
+
+  08 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/amarok-1.3.1-gst-onlyoss.patch, -amarok-1.3.1.ebuild,
+  +amarok-1.3.1-r1.ebuild:
+  Added patch to avoid using autodetection with gstreamer (crashes when using
+  alsa). Added a note for gstreamer users and a dependency over oss plugin.
+  Consider using xine backend if you want alsa output.
+
+*amarok-1.3.1 (06 Sep 2005)
+
+  06 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.1.ebuild:
+  Added amarok 1.3.1, masked due to problems with gstreamer and alsa.
+
+*amarok-1.3 (15 Aug 2005)
+
+  15 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.3_beta3.ebuild, +amarok-1.3.ebuild:
+  Updated to amarok-1.3 final.
+
+  08 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.2.3.ebuild,
+  amarok-1.2.4.ebuild, amarok-1.3_beta3.ebuild:
+  Raise dependency on mysql for bug #101717.
+
+  07 Aug 2005; Carsten Lohrke <carlo@gentoo.org> amarok-1.3_beta3.ebuild:
+  fix build with postgres
+
+*amarok-1.3_beta3 (01 Aug 2005)
+
+  01 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.3_beta3.ebuild:
+  New upstream version. Closes #101001. Still in package.mask being a beta.
+
+  31 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.2.3.ebuild,
+  amarok-1.2.4.ebuild, amarok-1.3_beta1.ebuild, amarok-1.3_beta2.ebuild:
+  Use ${KDEDIR} instead of kde-config to set PREFIX as it's not in path during
+  src_compile().
+
+  30 Jul 2005; Simon Stelling <blubb@gentoo.org> amarok-1.2.4.ebuild:
+  stable on amd64
+
+  10 Jul 2005; Joseph Jezak <josejx@gentoo.org> amarok-1.2.4.ebuild:
+  Marked ppc stable.
+
+  08 Jul 2005; Carsten Lohrke <carlo@gentoo.org> amarok-1.2.4.ebuild:
+  stable on x86
+
+  09 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.3_beta2.ebuild:
+  Move amarok.desktop in /usr/share/applications (#77515).
+
+*amarok-1.3_beta2 (27 Jun 2005)
+
+  27 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.3_beta2.ebuild:
+  New upstream beta.
+
+  22 Jun 2005; Hanno Boeck <hanno@gentoo.org> +files/amarok-gcc4.gz,
+  amarok-1.2.4.ebuild:
+  Fix for gcc4.
+
+  17 Jun 2005; Joseph Jezak <josejx@gentoo.org> amarok-1.2.3.ebuild:
+  Marked ppc stable.
+
+  16 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  amarok-1.3_beta1.ebuild:
+  Amarok 1.3 depends on kde 3.3 not 3.4.
+
+  08 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.3_beta1.ebuild:
+  Change flag 'oggvorbis' into 'vorbis' (#89592). Change 'mad' into 'mp3'. Add
+  missing configure switches.
+
+*amarok-1.3_beta1 (06 Jun 2005)
+
+  06 Jun 2005; Heinrich Wendel <lanius@gentoo.org> +amarok-1.3_beta1.ebuild:
+  version bump
+
+*amarok-1.2.4 (21 May 2005)
+
+  21 May 2005; Heinrich Wendel <lanius@gentoo.org> -amarok-1.2.ebuild,
+  -amarok-1.2.1.ebuild, -amarok-1.2.2.ebuild, amarok-1.2.3.ebuild,
+  +amarok-1.2.4.ebuild:
+  version bump, cleanups
+
+  14 May 2005; Heinrich Wendel <lanius@gentoo.org> amarok-1.2.3.ebuild:
+  stable on amd64 and x86
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> amarok-1.2.1.ebuild:
+  stable on amd64
+
+*amarok-1.2.3 (29 Mar 2005)
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> +amarok-1.2.3.ebuild:
+  new upstream version, thanks to Diego Pettenò <dgp85@users.sourceforge.net>
+
+  21 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> amarok-1.2.1.ebuild:
+  Stable on x86.
+
+*amarok-1.2.2 (18 Mar 2005)
+
+  18 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/amarok-1.2.2-contextbrowser-cpu-fix.patch, +amarok-1.2.2.ebuild:
+  New version (#85284). Correct gstreamer dependencies (#84663). Add support for
+  visualization plugins through libvisual (#82165). Warn that aRts support is
+  deprecated (as requested in bug #85542). Add patch to fix kde bug 101524.
+
+*amarok-1.2.1 (01 Mar 2005)
+
+  01 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +amarok-1.2.1.ebuild:
+  version bump
+
+*amarok-1.2 (13 Feb 2005)
+
+  13 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +amarok-1.2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> -files/amarok-1.0-cjk.diff,
+  amarok-1.2_beta4.ebuild:
+  Removed cjk patch, it does not apply anymore.
+
+*amarok-1.2_beta4 (01 Feb 2005)
+
+  01 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> -amarok-1.2_beta2.ebuild,
+  -amarok-1.2_beta3.ebuild, +amarok-1.2_beta4.ebuild:
+  Version bump.
+
+  30 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> amarok-1.1.1.ebuild:
+  added missing libsdl dependency. fixes #72395
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> amarok-1.0.2.ebuild,
+  amarok-1.1.1.ebuild, amarok-1.2_beta2.ebuild, amarok-1.2_beta3.ebuild:
+  Changed deps on kdebase, kdemultimedia to accept kdebase-meta and
+  kdemultimedia-meta, the split 'meta' packages. This dep will be narrowed
+  down in the future to the precise split packages required.
+
+*amarok-1.2_beta3 (11 Jan 2005)
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.2_beta3.ebuild:
+  Version bump closes bug #77185.
+
+  04 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild, amarok-1.2_beta2.ebuild:
+  Updating version on xine dependency per bug #70260.
+
+  13 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -amarok-1.2_beta1.ebuild, amarok-1.2_beta2.ebuild:
+  Added mysql support.
+
+*amarok-1.2_beta2 (12 Dec 2004)
+
+  12 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.2_beta2.ebuild:
+  Version bump.
+
+  04 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild, amarok-1.2_beta1.ebuild:
+  Relaxing the arts dependency.  Closes bug #72869.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> amarok-1.1.1.ebuild,
+  amarok-1.2_beta1.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+*amarok-1.2_beta1 (29 Nov 2004)
+
+  29 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild, +amarok-1.2_beta1.ebuild:
+  Version bump (package.mask'd beta) and fix missing depend on
+  media-sound/kdemultimedia for CD playback.
+
+  22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  -sparc
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> -amarok-0.9.ebuild,
+  amarok-1.1.1.ebuild:
+  Cleanup.
+
+  07 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  Readded gstreamer support forcing the mad plugin to be installed for
+  gstreamer support as the ffmpeg plugin won't work (see bug #66902).
+
+  05 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  Removing gstreamer support as it is horribly broken and uses 100% CPU under
+  some circumstances... see bug #65434 comment #3.
+
+  26 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1.1.ebuild:
+  Changing dep to =libvisual-0.1.6 to close bug #68731.
+
+*amarok-1.1.1 (09 Oct 2004)
+
+  09 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.1.1.ebuild, -amarok-1.1.ebuild:
+  Version bump for bug #66902.
+
+  30 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> amarok-1.1.ebuild:
+  Removed noamazon support as it is broken in this version. Fixed upstream for
+  next release.
+
+  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> amarok-1.1.ebuild:
+  Added noamazon USE flag to turn off support for downloading covers from
+  amazon.com
+
+*amarok-1.0.1 (27 Sep 2004)
+
+  27 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> -amarok-1.0.1.ebuild,
+  -amarok-1.0.ebuild, -amarok-1.1_beta2.ebuild:
+  Version bump and cleanup.
+
+  22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.1_beta2.ebuild:
+  Added arts to IUSE.
+
+*amarok-1.1_beta2 (15 Sep 2004)
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +amarok-1.1_beta2.ebuild:
+  Version bump closes bug #61723.
+
+  03 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -amarok-1.0_beta3.ebuild, -amarok-1.0_beta4.ebuild:
+  1.0.2 stable amd64, x86.  Removing old ebuilds.
+
+*amarok-1.0.2 (09 Aug 2004)
+
+  09 Aug 2004; Patrick Dawson <pkdawson@gentoo.org> amarok-1.0.2.ebuild:
+  Version bump, closes bug #59600. Added a xine USE flag.
+  Thanks to Andrew Cooks <andrew@expertron.co.za>
+
+  06 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> :
+  Version bump, closes bug #55898.
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> amarok-1.0.ebuild:
+  QA: need-kde after R/DEPEND
+
+  18 Jun 2004; Dominik Stadler <centic@gentoo.org> amarok-1.0.ebuild:
+  According to the README we should require gstreamer 0.8.1
+
+*amarok-1.0 (18 Jun 2004)
+
+  18 Jun 2004; Dominik Stadler <centic@gentoo.org>
+  +files/amarok-1.0-cjk-a.diff, +amarok-1.0.ebuild:
+  Add Version 1.0, fixes Bug 54251 and add ~amd64, fixes Bug 54305
+
+*amarok-1.0_beta4 (15 Jun 2004)
+
+  15 Jun 2004; Jon Hood <squinky86@gentoo.org> +files/amarok-1.0-cjk.diff,
+  amarok-1.0_beta3.ebuild, +amarok-1.0_beta4.ebuild:
+  adding cjk patch and version bump from Jackey Yang <043936y@acadiau.ca>,
+  closes #52930
+
+*amarok-1.0_beta3 (22 May 2004)
+
+  22 May 2004; Jon Hood <squinky86@gentoo.org> -amarok-0.7.0.ebuild,
+  -amarok-0.8.3.ebuild, +amarok-1.0_beta3.ebuild:
+  version bump, closes #51133
+
+  25 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> amarok-0.9.ebuild:
+  marked ~amd64.
+
+  24 Apr 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.7.0.ebuild,
+  amarok-0.8.3.ebuild, amarok-0.9.ebuild, amarok-1.0_beta1.ebuild:
+  fix depend
+
+  20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> amarok-0.7.0.ebuild,
+  amarok-0.8.3.ebuild:
+  Added IUSE.
+
+*amarok-1.0_beta1 (12 Apr 2004)
+
+  12 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  amarok-1.0_beta1.ebuild:
+  Version bump closes bug #47539.
+
+  14 Apr 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.7.0.ebuild,
+  amarok-0.8.3.ebuild, amarok-0.9.ebuild:
+  fix depend, mark 0.9 stable
+
+  17 Mar 2004; David Holm <dholm@gentoo.org> amarok-0.9.ebuild:
+  Added to ~ppc.
+
+*amarok-0.9 (16 Mar 2004)
+
+  16 Mar 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.9.ebuild,
+  amarok-0.9_beta2.ebuild:
+  version bump
+
+  23 Feb 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.8.3.ebuild:
+  mark x86
+
+  23 Feb 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.9_beta2.ebuild:
+  version bump
+
+*amarok-0.7.0 (22 Jan 2004)
+*amarok-0.8.3 (22 Jan 2004)
+
+  22 Jan 2004; Heinrich Wendel <lanius@gentoo.org> amarok-0.6.0.ebuild,
+  amarok-0.6.91.ebuild, amarok-0.7.0.ebuild, amarok-0.8.3.ebuild:
+  version bump; mark 0.7.0 x86
+
+  15 Nov 2003; Heinrich Wendel <lanius@gentoo.org> :
+  bump
+
+*amarok-0.6.91 (30 Oct 2003)
+
+  30 Oct 2003; Heinrich Wendel <lanius@gentoo.org> amarok-0.6.91.ebuild:
+  bump
+
+  26 Sep 2003; Alex Veber <coronalvr@gentoo.org> amarok-0.6.0.ebuild:
+  added a missing dep on kdemultimedia
+
+*amarok-0.6.0 (21 Sep 2003)
+
+  21 Sep 2003; jje <jje@gentoo.org> amarok-0.6.0.ebuild:
+  Initial revision.
+  
+  Submitted by: Okrain Genady <mafteah@mafteah.co.il>
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
new file mode 100644
index 0000000..0f1114b
--- /dev/null
+++ b/media-sound/amarok/Manifest
@@ -0,0 +1,11 @@
+AUX amarok-2.3.2-fix-qt-regression.patch 2958 SHA256 2f2a77552a06e6ec30106d8cb1f012f3f4213ac3354e64c7fe7f6933deb6d6ab SHA512 11593a7be35c533bfef88d0683c34fb8c5e42652c0500422c7d89030115b6a14b047bb06468d0fbb4a5748b4d213d9ddab838ead973c8a5dc7dbef8e3190fae9 WHIRLPOOL 45d8341d22be5f5bee2cf948d3ca31c021fb10e6f048efd8c8bc4e34ace29984bde8d9a93a1c1a8eec5e41a5ed4ffa9135f71059a9dd5309100b766e901600ae
+AUX amarok-2.3.2-flac-fix.patch 1233 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1 SHA512 5ca8d8fdd2afb7423e03803bb8409756cbaf1986b9744b0962ded599a680df89f2ee2ff90bcbc6f1a83769b24391893c268ad586a15af13646dfb25b245067ac WHIRLPOOL 1b82bfeea2c5cc775ef40dace49478e5af1a2f82e0e38395fe1f0eb523e7945bdbdcf9dab88f27db548e8cb4801bb24ca28897195079b93e187984d14b96dbc9
+AUX amarok-2.4.0.90-fix-plugin-detection.patch 623 SHA256 aae0ceca58b36ae714516fe46f1a4011836a3e3256a7efd106fdb8568e1fdbcf SHA512 8ee5ecee47ee7590c7888081dc2a6c1fca925e56f39c8fe2354afba2c58f5aab2af84c33962291506b0c861220b31e30fea808fbb6daeb4e93918b3935a8df6f WHIRLPOOL 47dd4592d7a3a16511f86e09f740604adb179b817856680b260ebbeacf07d8075b7067d05a282e262142f88215b891624434d1a2f25658ccfd52242214c1332f
+AUX amarok-2.5.0-fix-context-view-on-startup.patch 1217 SHA256 8e9c224ff81a2d39898820a4a219a589fc9dd12c2cdea7d159db5329179fb49c SHA512 5a73ca88ed7503f69d999ca76f952d7681b172de1e12edff872e164db66d24bc92d89f696e69dbaa85ab55c82b776bf1e4876ffb4db4e67d5e80782efe436238 WHIRLPOOL 13e244cc9f645736469cb4fa991af74ee7d389914494fa6886c685dd41b8b7fbf8de5c417a43de8ad1d27e7c8465f59e627e4e27db469da4c847fe99101d479e
+AUX amarok-2.5.0-kde48.patch 2111 SHA256 4ee6b27d79d42e7fbb5469f46c3ebaf69eef73ff83cb0882e44f4d993ba0ce51 SHA512 27dfba494cf2a12db9b2300de3c2b217c1b84945daa32881152f9e9eddea637ace74ff37cf7d3855a405c6618bfeb45929600e0fedbffc255e91c7dbc5663e8e WHIRLPOOL 3f8968ecd3209dd284de1cae6138613a5c3ab2240f8bd3357884032424f3450b93d0c27f8ede70b6bd5f9136a249cd33508ac0c3df325184edc28c5eab389ada
+AUX amarok-2.5.0-qtdebug.patch 2787 SHA256 a2b4ff34c38741979a76b96e0a741e5da7cadecc1a592035e10773b233d38f29 SHA512 5ea1523e16d9889a027866ee5e3f8bf8bb9efe743f55f7b5871aa6ef1a8f5341744b6858547251a9f472f840911cc516f247021659280a28f35eed41e27f5f85 WHIRLPOOL e2b8a58ad15e3d76e0a66befa044dd5b32e3838ddd0a94f767d723288c40854d257e1fe110f5b13c57b1d5842a47a4489c60711f9c8240c67dfc67524a2a24a6
+AUX amarok-fix-upnp-dep.patch 1896 SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6 SHA512 7bc7f42ffed5501bd7479705228f4dbb0219f7e3375483bad38f4097ce636390bcde97bbf88d219f2f2af8c034333791086d7854c98fb6da9fabc0a077b9af7b WHIRLPOOL aed5d81ed31de6230f4a142b6668f73a730b1a383de75b94a0c08f6718ae6ec8197346079343a95f8f87c862b666972a04c1686cba5cee40af6e841265dff46d
+DIST amarok-2.6.0.tar.bz2 42331208 SHA256 a91280e588181cf9363d7146f339ef527220fe0c8057f26f010f592b01fdd2c0 SHA512 da67876dfc41dcc3e1f3087698d36dabb43a339cef1669ca0518de191e2d9dd2e3e72122ffe76ecfd763e83547e46c55bba8606c095d35c85058df77bf35fb4a WHIRLPOOL 70fadaff2565fc2e9d8cb628942ec8107c6f4fcea0bd3e898f4ba6a72231ebaca8cb1d924f1413ced7c82940790438c9dcbe2fba7760e356b100eb832d8a2edc
+EBUILD amarok-2.6.0-r1.ebuild 3372 SHA256 e3fc2a2b12e5e9caa48f8a666f16d3e838c440448d794f041a0823823f6c3798 SHA512 ed6714d6690dc839938ebffcb094a4a64c2fa82e84e483d299e7d6493b57398c892dfedc451fad51ab2b58d16efd219268b46ed0707c2bc1c007704e96ef0e05 WHIRLPOOL 34185a1c5db77fd6fe12d740fd3f0cbb862e7f639990bda3cd30fa7f1d536daea93cf9ac95cbad3d75288419aa2c0cff5330d8c21f8613c6de807acd5e99a1f6
+MISC ChangeLog 74665 SHA256 559147db3d9fb09c16d321de4f53e51f28576966fb1ee0864b33ea6a4c4e2793 SHA512 17a83242764dd0bb511fa6c2f00f79461a5e28e3da83d4c5c736465bfe25fd0b455a13be41fe9aca844b6a6674ceebc172b37d402311924c31fc5c573e49f95b WHIRLPOOL 10a6d89aabe776e0a1771935e2c54cdee370b33a5a8e4fdea777e8612210f5868838338c5a9c468b10be3d9661fc25f18de90df2487e9eda0d4847a2ce7648b9
+MISC metadata.xml 1283 SHA256 dbd309064732531993f21257f6db969c681545fcf7dd4766daac33bb41da0451 SHA512 f61fc22596e31125cd7e4964d0699527e79fb5bf39e7708c1051eb1a3bf9f23dbc4310f9e94da58672a81d1a93c57b7924d84fb8af86e9ac78962b0ee3ffee7f WHIRLPOOL 3e408437f2857ba19314e17056da6204226e42362cccc75fe2c26931499b2c05abb6c672255dc29682bd77f2acb069e36dac568daf13a388a047a6cf616a13d8
diff --git a/media-sound/amarok/amarok-2.6.0-r1.ebuild b/media-sound/amarok/amarok-2.6.0-r1.ebuild
new file mode 100644
index 0000000..ae159d1
--- /dev/null
+++ b/media-sound/amarok/amarok-2.6.0-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.6.0.ebuild,v 1.1 2012/08/11 20:40:33 scarabeus Exp $
+
+EAPI=4
+
+KDE_LINGUAS="bs ca cs da de el en_GB es et eu fi ga gl hu it ja lt lv nb nl pa
+pl pt pt_BR ru sl sr sr@latin sv uk zh_TW"
+KDE_SCM="git"
+KDE_REQUIRED="never"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+else
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+COMMONDEPEND="
+	app-crypt/qca:2
+	>=app-misc/strigi-0.5.7
+	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop?')
+	$(add_kdebase_dep kdebase-kioslaves)
+	>=media-libs/taglib-1.6.1[asf,mp4]
+	>=media-libs/taglib-extras-1.0.1
+	sys-libs/zlib
+	>=virtual/mysql-5.1[embedded?]
+	x11-libs/qt-core:4
+	x11-libs/qt-dbus:4
+	x11-libs/qt-script:4
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdda? (
+		$(add_kdebase_dep libkcddb)
+		$(add_kdebase_dep libkcompactdisc)
+	)
+	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
+	lastfm? ( =media-libs/liblastfm-0.3* )
+	mp3tunes? (
+		dev-libs/glib:2
+		dev-libs/libxml2
+		dev-libs/openssl
+		net-libs/loudmouth
+		net-misc/curl
+		x11-libs/qt-core:4[glib]
+	)
+	mtp? ( >=media-libs/libmtp-1.0.0 )
+	ofa? ( >=media-libs/libofa-0.9.0 )
+	opengl? ( virtual/opengl )
+"
+DEPEND="${COMMONDEPEND}
+	dev-util/automoc
+	virtual/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	!media-sound/amarok-utils
+	$(add_kdebase_dep phonon-kde)
+"
+
+src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+	local mycmakeargs
+
+	mycmakeargs=(
+		-DWITH_PLAYER=ON
+		-DWITH_Libgcrypt=OFF
+		-DWITH_SPECTRUM_ANALYZER=ON
+		$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
+		$(cmake-utils_use_with ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with lastfm LibLastFm)
+		$(cmake-utils_use_with mtp)
+		$(cmake-utils_use_with mp3tunes MP3Tunes)
+		$(cmake-utils_use_with ofa LibOFA)
+	)
+
+	mycmakeargs+=(
+		$(cmake-utils_use_with utils UTILITIES)
+	)
+
+	# $(cmake-utils_use_with semantic-desktop Nepomuk)
+	# $(cmake-utils_use_with semantic-desktop Soprano)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	if use daap; then
+		echo
+		elog "You have installed amarok with daap support."
+		elog "You may be interested in installing www-servers/mongrel as well."
+		echo
+	fi
+
+	if ! use embedded; then
+		echo
+		elog "You've disabled the amarok support for embedded mysql DBs."
+		elog "You'll have to configure amarok to use an external db server."
+		echo
+		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
+		elog "to configure the external db and migrate your data from the embedded database."
+		echo
+
+		if has_version "virtual/mysql[minimal]"; then
+			elog "You built mysql with the minimal use flag, so it doesn't include the server."
+			elog "You won't be able to use the local mysql installation to store your amarok collection."
+			echo
+		fi
+	fi
+}
diff --git a/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch b/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch
new file mode 100644
index 0000000..4e8faec
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch
@@ -0,0 +1,83 @@
+From 79d86829294ac54132c01153660e70e30c15c378 Mon Sep 17 00:00:00 2001
+From: Jeff Mitchell <mitchell@kde.org>
+Date: Wed, 22 Sep 2010 18:15:17 -0400
+Subject: [PATCH] Re-add some tests for unprintable but also invalid chars. Apparently Qt's XML classes don't properly check for invalid chars when writing XML, even if you tell them to.
+
+Also switch to QXmlStreamWriter, as apparently going forward it is the more supported class.
+
+BUG: 251762
+---
+ utilities/collectionscanner/CollectionScanner.cpp |   27 +++++++++++++-------
+ 1 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
+index 0a23a53..28c554b 100644
+--- a/utilities/collectionscanner/CollectionScanner.cpp
++++ b/utilities/collectionscanner/CollectionScanner.cpp
+@@ -37,13 +37,13 @@
+ #include <QByteArray>
+ #include <QDBusReply>
+ #include <QDir>
+-#include <QDomDocument>
+ #include <QFile>
+ #include <QtDebug>
+ #include <QTextCodec>
+ #include <QTextStream>
+ #include <QTimer>
+ #include <QThread>
++#include <QXmlStreamWriter>
+ 
+ //Taglib:
+ #include <apetag.h>
+@@ -814,8 +814,10 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
+ void
+ CollectionScanner::writeElement( const QString &name, const AttributeHash &attributes )
+ {
+-    QDomDocument doc; // A dummy. We don't really use DOM, but SAX2
+-    QDomElement element = doc.createElement( name );
++    QString text;
++    QXmlStreamWriter writer( &text );
++
++    writer.writeStartElement( name );
+ 
+     QHashIterator<QString, QString> it( attributes );
+     while( it.hasNext() )
+@@ -829,7 +831,15 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
+         bool noCategory = false;
+         for( unsigned i = 0; i < len; i++ )
+         {
+-            if( data[i].category() == QChar::NoCategory )
++            if( data[i].category() == QChar::NoCategory ||
++                data[i].category() == QChar::Other_Surrogate ||
++                ( 
++                    data[i].unicode() < 20 &&
++                    data[i].unicode() != 9 &&
++                    data[i].unicode() != 10 &&
++                    data[i].unicode() != 13
++                )
++            )
+             {
+                 noCategory = true;
+                 break;
+@@ -838,15 +848,12 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
+ 
+         if( noCategory )
+             continue;
+-
+-        element.setAttribute( it.key(), it.value() );
++        writer.writeAttribute( it.key(), it.value() );
+     }
+ 
+-    QString text;
+-    QTextStream stream( &text, QIODevice::WriteOnly );
+-    element.save( stream, 0 );
++    writer.writeEndElement();
+ 
+-    std::cout << text.toUtf8().data() << std::endl;
++    std::cout << text.toUtf8().data() << std::endl << std::endl;
+ }
+ 
+ // taken verbatim from Qt's sources, since it's stupidly in the QtGui module
+-- 
+1.7.0.4
+
diff --git a/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch b/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch
new file mode 100644
index 0000000..3415826
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch
@@ -0,0 +1,21 @@
+commit ce57e4264d0395b15e7253e3cdef48e36a8b129c
+Author: Jeff Mitchell <mitchell@kde.org>
+Date:   Fri Sep 17 13:02:38 2010 -0400
+
+    FLAC BPM tags could be read in incorrectly.
+    
+    BUG: 234166
+
+diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
+index a9d6755..0a23a53 100644
+--- a/utilities/collectionscanner/CollectionScanner.cpp
++++ b/utilities/collectionscanner/CollectionScanner.cpp
+@@ -701,7 +701,7 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
+                     attributes["composer"] = TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).trimmed();
+ 
+                 if ( !file->xiphComment()->fieldListMap()[ "BPM" ].isEmpty() )
+-                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed().toFloat();
++                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed();
+ 
+                 if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() )
+                     disc = TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).trimmed();
\ No newline at end of file
diff --git a/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch b/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
new file mode 100644
index 0000000..d075ba0
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
@@ -0,0 +1,19 @@
+commit 37eda947bd8181a73ad0fffc88e66c25ddd69f28
+Author: Rick W. Chen <stuffcorpse@archlinux.us>
+Date:   Thu Mar 17 18:38:19 2011 +1300
+
+    Fix plugin loading and bump_plugin_version.rb script
+
+diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
+index ff52646..1e34510 100644
+--- a/src/PluginManager.cpp
++++ b/src/PluginManager.cpp
+@@ -32,7 +32,7 @@
+ #include <QFile>
+ #include <QMetaEnum>
+ 
+-const int Plugins::PluginManager::s_pluginFrameworkVersion = 60;
++const int Plugins::PluginManager::s_pluginFrameworkVersion = 61;
+ Plugins::PluginManager* Plugins::PluginManager::s_instance = 0;
+ 
+ Plugins::PluginManager*
diff --git a/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch b/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch
new file mode 100644
index 0000000..f39113b
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch
@@ -0,0 +1,28 @@
+commit a0f4288e0b952830d38151264c0a8b042e32d8a4
+Author: Matěj Laitl <matej@laitl.cz>
+Date:   Tue Jun 26 00:42:50 2012 +0200
+
+    Fix Context view not being fully formed on startup
+    
+    Something from inside Plasma tries to resize context view's sceneRect()
+    to 200x200 px. I don't know why this happens, but let's hope we'll have
+    QML context view soon, so don't investigate and use a work-around.
+    
+    BUG: 292895
+    FIXED-IN: 2.6
+    DIGEST: popular bug fixed in Amarok
+
+diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
+index a23305f..8fa6f9b 100644
+--- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
++++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
+@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
+     if(!view())
+         return;
+ 
+-    QRectF rect = view()->sceneRect();
++    // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895
++    QRectF rect( view()->pos(), view()->maximumViewportSize() );
+     setGeometry( rect );
+     m_applets->setGeometry( rect );
+     m_applets->refresh();
diff --git a/media-sound/amarok/files/amarok-2.5.0-kde48.patch b/media-sound/amarok/files/amarok-2.5.0-kde48.patch
new file mode 100644
index 0000000..b110eeb
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.5.0-kde48.patch
@@ -0,0 +1,62 @@
+diff --git a/src/context/ToolbarView.cpp b/src/context/ToolbarView.cpp
+index f3b4916..840b99b 100644
+--- a/src/context/ToolbarView.cpp
++++ b/src/context/ToolbarView.cpp
+@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc
+     setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+ 
+     // now we create the toolbar
+-    m_toolbar = new AppletToolbar( containment );
++    m_toolbar = new AppletToolbar(0);
++    scene->addItem(m_toolbar.data());
++    m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
+     m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
+     m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
+ 
+@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc
+ 
+ Context::ToolbarView::~ToolbarView()
+ {
+-
++    delete m_toolbar.data();
+ }
+ 
+ void
+diff --git a/src/context/toolbar/AppletToolbar.cpp b/src/context/toolbar/AppletToolbar.cpp
+index 0e0deb5..c51762c 100644
+--- a/src/context/toolbar/AppletToolbar.cpp
++++ b/src/context/toolbar/AppletToolbar.cpp
+@@ -67,6 +67,19 @@ Context::AppletToolbar::~AppletToolbar()
+ }
+ 
+ void
++
++Context::AppletToolbar::setContainment( Containment * containment )
++{
++    m_cont = containment;
++}
++
++Context::Containment *
++Context::AppletToolbar::containment() const
++{
++    return m_cont;
++}
++
++void
+ Context::AppletToolbar::resizeEvent( QGraphicsSceneResizeEvent * event )
+ {
+     debug() << "setting layout to" << QRectF( QPointF( 0, 0 ), event->newSize() );
+diff --git a/src/context/toolbar/AppletToolbar.h b/src/context/toolbar/AppletToolbar.h
+index ee8a208..058baae 100644
+--- a/src/context/toolbar/AppletToolbar.h
++++ b/src/context/toolbar/AppletToolbar.h
+@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWidget
+         
+         void appletRemoved( Plasma::Applet* applet );
+ 
++        void setContainment( Containment * containment );
++        Containment* containment() const;
++
+     signals:
+         void showApplet( Plasma::Applet* );
+         void appletAddedToToolbar( Plasma::Applet* applet, int loc );
diff --git a/media-sound/amarok/files/amarok-2.5.0-qtdebug.patch b/media-sound/amarok/files/amarok-2.5.0-qtdebug.patch
new file mode 100644
index 0000000..8c6e022
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.5.0-qtdebug.patch
@@ -0,0 +1,55 @@
+Patch originally from KDE commit d1a1c80370e4132c26fa636308822fdb3aa1b2e6, modified to work with current Amarok.
+diff -ruN /root/amarok-2.5.0/ChangeLog amarok-2.5.0/ChangeLog
+--- a/amarok-2.5.0/ChangeLog	2011-12-15 02:36:48.000000000 -0500
++++ b/amarok-2.5.0/ChangeLog	2012-06-21 21:05:29.871236927 -0400
+@@ -8,6 +8,7 @@
+       Playlist's layout items.
+ 
+   BUGFIXES:
++    * Fix crash on start when Qt is build with debugging assertions. (BR 285720)
+     * Do not crash when iPod doesn't have a master playlist. (BR 288936)
+     * Fix Last.fm not finding KDE Wallet. (BR 286741)
+     * Put a border around bottom toolbars, visually separating them from
+diff -ruN /root/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp
+--- a/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp	2011-12-15 02:36:48.000000000 -0500
++++ b/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp	2012-06-21 21:05:09.810237474 -0400
+@@ -223,23 +223,15 @@
+         {
+             int &rowValue = groupList[insertedProxyRow-1];
+             if( idx.row() <= rowValue )
+-            {
+                 //increment the rows that come after the new row since they moved one place up.
+                 rowValue++;
+-            }
+             else
+-            {
+                 break;
+-            }
+         }
+ 
+         if( updatedGroups.contains( i.key() ) )
+-        {
+-            //the row needs to be added to this group
+-            beginInsertRows( index( i.key() ), insertedProxyRow, insertedProxyRow );
+-            groupList.insert( insertedProxyRow, idx.row() );
+-            endInsertRows();
+-        }
++            // we're inside beginInsertRows() or beginInsertRows(), don't re-enter it.
++	     groupList.insert( insertedProxyRow, idx.row() );
+     }
+ 
+     return updatedGroups;
+diff -ruN /root/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h
+--- a/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h	2011-12-15 02:36:48.000000000 -0500
++++ b/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h	2012-06-21 21:04:42.778238198 -0400
+@@ -38,8 +38,8 @@
+         void setGroupedColumn( int groupedColumn );
+ 
+         /* QAbstractProxyModel methods */
+-        virtual QModelIndex index( int, int c = 0,
+-                                   const QModelIndex& parent = QModelIndex() ) const;
++	virtual QModelIndex index( int row, int column = 0,
++				    const QModelIndex& parent = QModelIndex() ) const;
+         virtual Qt::ItemFlags flags( const QModelIndex &idx ) const;
+         virtual QModelIndex parent( const QModelIndex &idx ) const;
+         virtual int rowCount( const QModelIndex &idx = QModelIndex() ) const;
diff --git a/media-sound/amarok/files/amarok-fix-upnp-dep.patch b/media-sound/amarok/files/amarok-fix-upnp-dep.patch
new file mode 100644
index 0000000..878c013
--- /dev/null
+++ b/media-sound/amarok/files/amarok-fix-upnp-dep.patch
@@ -0,0 +1,37 @@
+diff -urN amarok-2.4.0.90.orig/CMakeLists.txt amarok-2.4.0.90/CMakeLists.txt
+--- amarok-2.4.0.90.orig/CMakeLists.txt	2011-04-19 00:03:27.910000016 +0000
++++ amarok-2.4.0.90/CMakeLists.txt	2011-04-19 00:06:17.466666683 +0000
+@@ -105,6 +105,10 @@
+     macro_optional_find_package(QJSON)
+     macro_log_feature( QJSON_FOUND "QJson" "Qt JSON Parser used for the Playdar Collection" "http://qjson.sourceforge.net/" FALSE "" "" )
+ 
++    # HUpnp is required for the upnp plugin
++    macro_optional_find_package(HUpnp)
++    macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and Play Library" "http://herqq.org/" FALSE "" "" )
++
+     # macro_optional_find_package(Strigi)
+     # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "" )
+ 
+diff -urN amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt
+--- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:03:27.940000015 +0000
++++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:07:06.753333348 +0000
+@@ -25,4 +25,6 @@
+ if( QJSON_FOUND )
+     add_subdirectory( playdarcollection )
+ endif( QJSON_FOUND )
+-add_subdirectory( upnpcollection )
++if( HUPNP_FOUND )
++    add_subdirectory( upnpcollection )
++endif( HUPNP_FOUND )
+diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
+--- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake	2011-04-19 01:59:14.313333349 +0000
++++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake	2011-04-19 02:14:13.670000016 +0000
+@@ -6,7 +6,7 @@
+ # HUPNP_LIBRARIES
+ # HUPNP_FOUND
+ 
+-find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
++find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
+ 
+ find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})
+ 
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
new file mode 100644
index 0000000..ef23673
--- /dev/null
+++ b/media-sound/amarok/metadata.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>kde</herd>
+<herd>sound</herd>
+<maintainer>
+	<email>jmbsvicetto@gentoo.org</email>
+	<name>Jorge Manuel B. S. Vicetto</name>
+</maintainer>
+<use>
+	<flag name="daap">
+		Enable the scripts for music sharing through DAAP. This flag adds
+		dependencies on <pkg>www-servers/mongrel</pkg> to allow sharing of
+		the Amarok music collection through DAAP protocol. Please note
+		that turning this flag off has no effect on DAAP browsing.
+	</flag>
+	<flag name="embedded">
+		Use libmysqld, MySQL embedded server library.
+		Try disabling this if you encounter -PIC related in amarok,
+		it will make amarok rely only on standalone MySQL server.
+	</flag>
+	<flag name="lastfm">
+		Enable Last.fm streaming services support through
+		<pkg>media-libs/liblastfm</pkg>
+	</flag>
+	<flag name="mp3tunes">Enable mp3tunes integration</flag>
+	<flag name="mtp">
+		Enable support for libMTP (Plays4Sure) devices access through libmtp
+	</flag>
+	<flag name="ofa">
+		Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic
+		fingerprints (used by MusicBrainz)
+	</flag>
+	<flag name="utils">
+		Build the utils - old <pkg>media-sound/amarok-utils</pkg>
+	</flag>
+</use>
+</pkgmetadata>
diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
new file mode 100644
index 0000000..e4988c7
--- /dev/null
+++ b/media-sound/mixxx/ChangeLog
@@ -0,0 +1,41 @@
+# ChangeLog for media-sound/mixxx
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  05 Oct 2011; Alex Barker (KWhat) <alex@1stleg.com>
+  files/mixxx-1.9.0-flags.patch, files/mixxx-9999-flags.patch:
+  Modifed flags patch to remove CCCOM and CXXCOM overrides that are not needed
+  after scons 1.0. CCFLAG change for mixxx-9999 has been applied upstream.
+
+  29 Sep 2011; Alex Barker (KWhat) <alex@1stleg.com> mixxx-1.9.0-r2.ebuild,
+  mixxx-9999.ebuild:
+  Added env vars for installation phase.
+
+  28 Sep 2011; Alex Barker (KWhat) <alex@1stleg.com> -mixxx-1.9.0-r1.ebuild,
+  +mixxx-1.9.0-r2.ebuild, files/mixxx-1.9.0-linux3.patch:
+  Added additional Linux 3.0 support patch from upstream.
+
+  29 Jun 2011; Alex Barker (KWhat) <alex@1stleg.com> -mixxx-1.9.0.ebuild,
+  +mixxx-1.9.0-r1.ebuild, +files/mixxx-1.9.0-linux3.patch:
+  Added Linux 3.0 support patch from upstream.
+
+  13 May 2011; Alex Barker (KWhat) <alex@1stleg.com> metadata.xml:
+  Added description for unorthodox pulseaudio use flag
+
+  06 May 2011; Alex Barker (KWhat) <alex@1stleg.com> -mixxx-1.8.2.ebuild,
+  -files/mixxx-1.8.2-flags.patch, -files/mixxx-1.8.2-libsoundtouch.patch,
+  mixxx-1.9.0.ebuild, mixxx-9999.ebuild, metadata.xml:
+  Developer approved builds.  Previous commit was premeture on my part.
+
+  06 May 2011; Michał Górny <mgorny@gentoo.org> mixxx-1.8.2.ebuild,
+  mixxx-1.9.0.ebuild, mixxx-9999.ebuild:
+  Drop redundant arguments to use_scons.
+
+  05 May 2011; Alex Barker (KWhat) <alex@1stleg.com> +mixxx-1.8.2.ebuild,
+  +files/mixxx-1.8.2-flags.patch, +files/mixxx-1.8.2-libsoundtouch.patch,
+  +mixxx-1.9.0.ebuild, +files/mixxx-1.9.0-flags.patch,
+  +files/mixxx-1.9.0-libsoundtouch.patch, +mixxx-9999.ebuild,
+  +files/mixxx-9999-flags.patch, +files/mixxx-9999-libsoundtouch.patch,
+  +metadata.xml:
+  New Ebuild for bug 310821
+
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
new file mode 100644
index 0000000..bacaf0f
--- /dev/null
+++ b/media-sound/mixxx/Manifest
@@ -0,0 +1,21 @@
+AUX mixxx-1.11.9999-cflags.patch 641 SHA256 5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549 SHA512 8fcd2ba6dba5fb3b0e0a0058b965fe25b6c34b1d787d1d920666f9426ffffc84253913ef5b606e14fd4b0f5dfb26bfeb04d4424c856fe7d57e62b837144dab37 WHIRLPOOL 8528a3ee74925a4e338fed9b9d803944cd001ef3f385892fc1d1abfdaab462f1118a3365599572005f9795a9763fdcb4345e9d9f008cacfcbba7d0f6751fbfa7
+AUX mixxx-1.11.9999-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
+AUX mixxx-1.11.9999-no-bzr.patch 1496 SHA256 b50722573af57129892a92f9e7502ddc2d679f29435b27581352dc075d40c5c0 SHA512 16ce2b20dc0fbd916f134926c997911b6f1a83f84b19f01feff5bc4d5237f7f1c2741ffd6adfb851abef04b9ed27538869337060f6e12707b8ec693a0e51ed4d WHIRLPOOL 3e39d2469b464fd4490f42eb306fc4651f456eedb5c62fbcaab883a14d5ce252daeab1a673a23ac2271196b46760a9fd512fc5ddc1614b3f2282719383d25594
+AUX mixxx-1.11.9999-system-libs.patch 6157 SHA256 a9b4737a03a1a4c6c32a1ebc2f501cf2fe74354b5ea09010b59cf9cc360a04fd SHA512 54d60392424e3809054685a595290f713c3688c3558b09ac082204f2da015c91c99ea455f6393ab31d846d7821050e352a77193e3f91813aab83bff291223a50 WHIRLPOOL fd254234b439ffc72eade2cea5cb32fc0fc3921c94fc47c64cb83b4cf5efb71c277257538b18e123d4c587edbe5556e729112fd68d085161f1c6d271c40ad768
+AUX mixxx-1.6.0_beta4-debug.patch 334 SHA256 caf3ee6cbd09853c281a351c9dbabc845c63128cc60a5ceee183a8cec560a0ad SHA512 c51c025dcfbb0131d7d3fd15ba72dbf834540e584221c33dbe6f9224396f4a3ae05298b0c579829f444e013a60ca15bc91601a7724d4ca2d2be0bef3479b3d35 WHIRLPOOL b2a382c73811e9843590dc0517f167400136e2969e295bc2f48b29ba5b2680d857726fa89d978783ab38ad87d76333f44e0e97909689b5d83e969ca09b7bace3
+AUX mixxx-1.9.0-flags.patch 1167 SHA256 491d3a76f704cb739180365d7cd987832c3c0154790e74943ff0753be4563044 SHA512 cf2130d65f4b9c56b85fd7bb8447e064bb6b7774552bd11668c039be208b0da21ae4247039b7c17d745570b690d90adf70542719effbb8a06385490e547aa0a1 WHIRLPOOL 09dbd5ddb827dea4a1c609d1b6877dca23b4c2811cb2a4da263298df13cc5b45139094f27a20f1d85d721561634ebd64dd2c0150d7b9daa5a5305a9ee9554ffd
+AUX mixxx-1.9.0-libsoundtouch.patch 3342 SHA256 234e058145ca14bbbbb0f34fe1c07e5d0ff55999d952547b054744edc5feaa0d SHA512 3d626851d4f0c84582b5862e5d1306fdeef8ac727706b600b8682ed1c9da497dfdabb80bc3497e579dca85ac61071985cae224d65068b4c6e566ef2655e0bf55 WHIRLPOOL 409e1fb722a18589d98cc8b405bdd50da3ee085ca62e050210165563f4887bb1c0d7a2182102cdfecf6eab5677a4f3b5eddc1dcc66e4cee5d47054a3e546dd3f
+AUX mixxx-1.9.0-linux3.patch 877 SHA256 bff40d8de8f6d6aea254c8243fc79f9bde3ac7932fc471aa23ca049fb3614b06 SHA512 9782954dbe0c866d76a3434589fd740c5f859c682e829c424e108acf45ec0b8a4bda00e9eed11f26d2c60e7c732ff196c7c59c31ced7697a1b46afdad3211718 WHIRLPOOL 5392de3e6c165460c27833fcaf0e904943cd78b231aaca1c828f12b6c36033cbcddeefebde2014f2d762edb385d41f161df0d4cb4b17d0f2cb46ac67eab053f9
+AUX mixxx-1.9.2-flags.patch 624 SHA256 1387d7c8e886d5c98b48639628b6ec5c73bcb507b92e0220ee8648a3c7b08dd5 SHA512 d451725c42a7dca4a5f0e98f6e5d91c811923c0c530ae6426c0e560d467148e034caa4650c593506a37694072120e16d825d7b4e11f673f77cb855fca557c910 WHIRLPOOL a8ae930d8efee1628d2e9491adc86f95c1464bf20e60541b571820983b1f5dabc3d178150d80a78a280d2f3e5b7c5d7d5df7b9f68702a6ccaa84df0d5628b5a2
+AUX mixxx-1.9.2-libsoundtouch.patch 3342 SHA256 234e058145ca14bbbbb0f34fe1c07e5d0ff55999d952547b054744edc5feaa0d SHA512 3d626851d4f0c84582b5862e5d1306fdeef8ac727706b600b8682ed1c9da497dfdabb80bc3497e579dca85ac61071985cae224d65068b4c6e566ef2655e0bf55 WHIRLPOOL 409e1fb722a18589d98cc8b405bdd50da3ee085ca62e050210165563f4887bb1c0d7a2182102cdfecf6eab5677a4f3b5eddc1dcc66e4cee5d47054a3e546dd3f
+AUX mixxx-9999-cflags.patch 641 SHA256 5a4a4256cabc06bf10c532c82f055737748f79f066758ae20038815ca8342549 SHA512 8fcd2ba6dba5fb3b0e0a0058b965fe25b6c34b1d787d1d920666f9426ffffc84253913ef5b606e14fd4b0f5dfb26bfeb04d4424c856fe7d57e62b837144dab37 WHIRLPOOL 8528a3ee74925a4e338fed9b9d803944cd001ef3f385892fc1d1abfdaab462f1118a3365599572005f9795a9763fdcb4345e9d9f008cacfcbba7d0f6751fbfa7
+AUX mixxx-9999-docs.patch 438 SHA256 19377d095e34071010ddda59b03b86a63b82f2663dca32f8dc6771e6d217f1f7 SHA512 c2ebe6043bea9bc793e92d98237ea8369169bc874354f58a88388a59f0d98630e97e44aea169418824b740cd0108689d7b8d4e619b7ce5788c9c72f5ce844846 WHIRLPOOL 31dea2227c3353ade49d7683b32a0c0b9db54870551d30b9d33b69a01762d3dc9a6e452059ee690762632732968043d0c57139fefcd66461c7723f38d66677bf
+AUX mixxx-9999-flags.patch 624 SHA256 1387d7c8e886d5c98b48639628b6ec5c73bcb507b92e0220ee8648a3c7b08dd5 SHA512 d451725c42a7dca4a5f0e98f6e5d91c811923c0c530ae6426c0e560d467148e034caa4650c593506a37694072120e16d825d7b4e11f673f77cb855fca557c910 WHIRLPOOL a8ae930d8efee1628d2e9491adc86f95c1464bf20e60541b571820983b1f5dabc3d178150d80a78a280d2f3e5b7c5d7d5df7b9f68702a6ccaa84df0d5628b5a2
+AUX mixxx-9999-libsoundtouch.patch 2233 SHA256 35abe2708d701a7cfaade4b33e76657a11bb620f73d484126d53c5ae95424759 SHA512 61155fcb1b0dee259636e57516cfcdd1d1e885e80f103b4d71595bfe2003785d53873f2f6a8bfea207d97ccb2a18134f67bb09915379a1cf622d8873ac298d4f WHIRLPOOL d7d8eb22d2e9a5ff2db9f9ebc148911ac2e399fc9e38afed7f5e7fc5eea1bb5636664a3a1bd047898319d0a40cfa07716ce845afde739f5b1cc8ffc8306c0ace
+AUX mixxx-9999-no-bzr.patch 1496 SHA256 b50722573af57129892a92f9e7502ddc2d679f29435b27581352dc075d40c5c0 SHA512 16ce2b20dc0fbd916f134926c997911b6f1a83f84b19f01feff5bc4d5237f7f1c2741ffd6adfb851abef04b9ed27538869337060f6e12707b8ec693a0e51ed4d WHIRLPOOL 3e39d2469b464fd4490f42eb306fc4651f456eedb5c62fbcaab883a14d5ce252daeab1a673a23ac2271196b46760a9fd512fc5ddc1614b3f2282719383d25594
+AUX mixxx-9999-qt4_paths.patch 1422 SHA256 6917b59e0b8cbebdffed0c86a26f06d6c212bf1d66bb944cfcc54b8c56903d6f SHA512 f35db1077c04f3b7c7e5d4c5665d633d5150561d7c867875ad1e0906ee4eb367e8d4f9937fb78bb19e4502c348188fc35635012a10a7821e59e3ae2151406b7f WHIRLPOOL f7ee177a83710200a90c319b06d2d48968c919dd9cccf7b4db2f9987418a0a7450b522c4ffc6d1dfd3e138ff90a89e1b67a19da32d6157973c6b6dca55980425
+AUX mixxx-9999-system-libs.patch 6157 SHA256 a9b4737a03a1a4c6c32a1ebc2f501cf2fe74354b5ea09010b59cf9cc360a04fd SHA512 54d60392424e3809054685a595290f713c3688c3558b09ac082204f2da015c91c99ea455f6393ab31d846d7821050e352a77193e3f91813aab83bff291223a50 WHIRLPOOL fd254234b439ffc72eade2cea5cb32fc0fc3921c94fc47c64cb83b4cf5efb71c277257538b18e123d4c587edbe5556e729112fd68d085161f1c6d271c40ad768
+EBUILD mixxx-9999.ebuild 2270 SHA256 20af50eb045a5e31ef713c576dda8b817bc10d04cc83837e6d0d3712391a1295 SHA512 43f18dc5de6dbbafa8d48851e3775b6a729fcde73427cb0168fe58f553ebc180f40187a036436be308e8eaf8b4630f96d20ee1c984e463df45f44535998bb881 WHIRLPOOL 478cdc0760906c6d7a411641f40ce67a125b93e5f800c7e684d761726abf606979829b2651bc2c92d5af1cb1f3b7f6f7efa6cce94bb92e23d63bf922d703ad9f
+MISC ChangeLog 1838 SHA256 8c0de8ac00f09f3ef2ac742421b4412e8092b720a057e73869dbf643a42ffa9a SHA512 9a1b667e364eae782cb0b823184f5e90cd3db6123ae674f1e046dc8f6a617aa8772db2b15465bf25a626c9ef5719ae26d21c8bb2e53473f51af9c8545a4ec6dc WHIRLPOOL e8b215c023449501596235c9db29bcaa73f9a332b017228cb6903d8a94f9bff748fecbb48b233ca912af0ca61cbf8748737bb4e98f2b410335531e5700210fba
+MISC metadata.xml 410 SHA256 812fc2fb4d75f2035068cd2f547174c6aedf91799a1fc64ef54d15c611a28128 SHA512 3ffe2ee7979f57a3a3d4c3b8ee7c792b8e377556ec69ab77de82f63d02e7696475e2c9ef4f14daf6171e81f33e1679cb4d16708b416996dce62ca9814cc5cb58 WHIRLPOOL 6bfe8d9a6b10cd16b46aeeafd1a0b47184e090a132ea3732eee199cb6090d00740107dba9ed58be77f3ef484d841e5a2002a133452d07516e8a554d480705eae
+MISC mixxx-9999-sunrise.ebuild.vorlage 1985 SHA256 223daa9768880775935d9493cd0719327181b7ed947bc76260a37278aa5efe56 SHA512 2d41cefd1a10b755bc1fe28b2c96f7327fac0af46b266de4da6ca3d3d3f8d3f1b880519f4e834cda94cf30646b739107912591f1d7fcc456d335ab23d5a572b4 WHIRLPOOL cc67a480181eb51c0516f514f281726d59e881549fc40f677327b23a7e3f15d3ac58a7e2e3557bad7ab239c2d0e6390b0fb5b7f2f11f64f2f94458bc7adcc4e5
diff --git a/media-sound/mixxx/files/.svn/entries b/media-sound/mixxx/files/.svn/entries
new file mode 100644
index 0000000..38135aa
--- /dev/null
+++ b/media-sound/mixxx/files/.svn/entries
@@ -0,0 +1,198 @@
+10
+
+dir
+12493
+svn://overlays.gentoo.org/proj/sunrise/reviewed/media-sound/mixxx/files
+svn://overlays.gentoo.org/proj/sunrise
+
+
+
+2011-10-09T10:54:47.754812Z
+12451
+hwoarang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+12608f7e-a915-0410-b2f3-ce240db1b126
+
+mixxx-9999-flags.patch
+file
+
+
+
+
+2011-10-09T18:09:26.010466Z
+4cc2f303d44c2b8cf82633823cae9fde
+2011-10-09T10:54:47.754812Z
+12451
+hwoarang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+624
+
+mixxx-1.9.0-flags.patch
+file
+
+
+
+
+2011-10-09T18:09:26.010466Z
+0f029ba026e97a9b26aac957726b3d5e
+2011-10-09T10:54:47.754812Z
+12451
+hwoarang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1167
+
+mixxx-9999-libsoundtouch.patch
+file
+
+
+
+
+2011-08-07T23:55:00.656896Z
+4cfab68bce22794cedcd60ba167f2ae3
+2011-05-26T08:39:11.369734Z
+12092
+mgorny
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3342
+
+mixxx-1.9.0-libsoundtouch.patch
+file
+
+
+
+
+2011-08-07T23:55:00.662896Z
+e61257b36a840ab4df9b01f30dca3209
+2011-05-26T08:39:11.369734Z
+12092
+mgorny
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3342
+
+mixxx-1.9.0-linux3.patch
+file
+
+
+
+
+2011-10-09T18:09:26.011466Z
+691528e8f36b675db60b7aa6f6f2c8c6
+2011-10-09T10:54:47.754812Z
+12451
+hwoarang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+877
+
diff --git a/media-sound/mixxx/files/.svn/text-base/mixxx-1.6.0_beta4-debug.patch.svn-base b/media-sound/mixxx/files/.svn/text-base/mixxx-1.6.0_beta4-debug.patch.svn-base
new file mode 100644
index 0000000..e9488c2
--- /dev/null
+++ b/media-sound/mixxx/files/.svn/text-base/mixxx-1.6.0_beta4-debug.patch.svn-base
@@ -0,0 +1,10 @@
+--- src/enginefilterblock.cpp.orig	2008-05-22 09:27:10.000000000 -0700
++++ src/enginefilterblock.cpp	2008-05-22 09:27:16.000000000 -0700
+@@ -21,6 +21,7 @@
+ #include "enginefilteriir.h"
+ #include "enginefilter.h"
+ #include "enginefilterbutterworth8.h"
++#include <QtDebug>
+ 
+ EngineFilterBlock::EngineFilterBlock(const char * group)
+ {
diff --git a/media-sound/mixxx/files/.svn/text-base/mixxx-1.9.0-flags.patch.svn-base b/media-sound/mixxx/files/.svn/text-base/mixxx-1.9.0-flags.patch.svn-base
new file mode 100644
index 0000000..09c0088
--- /dev/null
+++ b/media-sound/mixxx/files/.svn/text-base/mixxx-1.9.0-flags.patch.svn-base
@@ -0,0 +1,24 @@
+--- build/mixxx.py.orig	2010-12-22 11:21:56.000000000 -0800
++++ build/mixxx.py	2010-12-22 11:16:22.000000000 -0800
+@@ -189,7 +189,7 @@
+         if os.environ.has_key('CC'):
+             self.env['CC'] = os.environ['CC']
+         if os.environ.has_key('CFLAGS'):
+-            self.env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++            self.env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+         if os.environ.has_key('CXX'):
+             self.env['CXX'] = os.environ['CXX']
+         if os.environ.has_key('CXXFLAGS'):
+--- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
++++ build/depends.py	2010-12-22 11:14:02.000000000 -0800
+@@ -587,10 +587,8 @@
+         if build.toolchain_is_gnu:
+             # Default GNU Options
+             # TODO(XXX) always generate debugging info?
+-            build.env.Append(CCFLAGS = '-pipe')
+             build.env.Append(CCFLAGS = '-Wall')
+             build.env.Append(CCFLAGS = '-Wextra')
+-            build.env.Append(CCFLAGS = '-g')
+ 
+             # Check that g++ is present (yeah, SCONS is a bit dumb here)
+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/.svn/text-base/mixxx-1.9.0-libsoundtouch.patch.svn-base b/media-sound/mixxx/files/.svn/text-base/mixxx-1.9.0-libsoundtouch.patch.svn-base
new file mode 100644
index 0000000..25f349c
--- /dev/null
+++ b/media-sound/mixxx/files/.svn/text-base/mixxx-1.9.0-libsoundtouch.patch.svn-base
@@ -0,0 +1,68 @@
+--- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
++++ build/depends.py	2010-12-22 11:33:29.000000000 -0800
+@@ -234,60 +234,16 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.4.1'
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+-        if build.platform_is_windows and build.toolchain_is_msvs:
+-            if build.machine_is_64bit:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
+-            elif build.machine == 'x86':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                raise Exception("Unhandled CPU configuration for SoundTouch")
+-        elif build.toolchain_is_gnu:
+-            if build.machine == 'x86_64':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            raise Exception("Unhandled CPU configuration for SoundTouch")
+-
+-        # TODO(XXX) when we figure out a better way to represent features, fix
+-        # this.
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if build.machine_is_64bit or \
+-                (build.toolchain_is_msvs and optimize > 1) or \
+-                (build.toolchain_is_gnu and optimize > 2):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 ])
+-        if build.toolchain_is_msvs and not build.machine_is_64bit:
+-            sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
+-            # it.
+-            pass
+-
++        sources =  ['engine/enginebufferscalest.cpp']
+         return sources
+ 
+     def configure(self, build, conf):
+-        if build.platform_is_windows:
+-            build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
+-        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+         # TODO(XXX) when we figure out a better way to represent features, fix
+         # this.
diff --git a/media-sound/mixxx/files/.svn/text-base/mixxx-1.9.0-linux3.patch.svn-base b/media-sound/mixxx/files/.svn/text-base/mixxx-1.9.0-linux3.patch.svn-base
new file mode 100644
index 0000000..89bac8e
--- /dev/null
+++ b/media-sound/mixxx/files/.svn/text-base/mixxx-1.9.0-linux3.patch.svn-base
@@ -0,0 +1,23 @@
+=== modified file 'mixxx/build/mixxx.py'
+--- mixxx/build/mixxx.py	2011-06-13 01:29:39 +0000
++++ mixxx/build/mixxx.py	2011-06-17 17:37:59 +0000
+@@ -188,7 +188,7 @@
+         # Should cover {Net,Open,Free,DragonFly}BSD, but only tested on OpenBSD
+         if 'bsd' in sys.platform:
+             return 'bsd'
+-        if 'linux2' == sys.platform:
++        if sys.platform in ['linux2', 'linux3']:
+             return 'linux'
+         if sys.platform == 'darwin':
+             return 'osx'
+--- mixxx/build/qt4.py	2011-09-15 01:05:21.872433812 +0100
++++ mixxx/build/qt4.py	2011-09-15 01:06:34.628431259 +0100
+@@ -409,7 +409,7 @@
+ 		self.AppendUnique(CPPFLAGS=['-DQT_GUI_LIB'])
+ 
+ 	debugSuffix = ''
+-	if sys.platform == "linux2" :
++	if sys.platform in ["linux2", "linux3"]:
+ 		if debug : debugSuffix = '_debug'
+ 		for module in modules :
+ 			if module not in pclessModules : continue
diff --git a/media-sound/mixxx/files/.svn/text-base/mixxx-9999-flags.patch.svn-base b/media-sound/mixxx/files/.svn/text-base/mixxx-9999-flags.patch.svn-base
new file mode 100644
index 0000000..c543e76
--- /dev/null
+++ b/media-sound/mixxx/files/.svn/text-base/mixxx-9999-flags.patch.svn-base
@@ -0,0 +1,13 @@
+--- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
++++ build/depends.py	2010-12-22 11:14:02.000000000 -0800
+@@ -587,10 +587,8 @@
+         if build.toolchain_is_gnu:
+             # Default GNU Options
+             # TODO(XXX) always generate debugging info?
+-            build.env.Append(CCFLAGS = '-pipe')
+             build.env.Append(CCFLAGS = '-Wall')
+             build.env.Append(CCFLAGS = '-Wextra')
+-            build.env.Append(CCFLAGS = '-g')
+ 
+             # Check that g++ is present (yeah, SCONS is a bit dumb here)
+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/.svn/text-base/mixxx-9999-libsoundtouch.patch.svn-base b/media-sound/mixxx/files/.svn/text-base/mixxx-9999-libsoundtouch.patch.svn-base
new file mode 100644
index 0000000..d18b7b2
--- /dev/null
+++ b/media-sound/mixxx/files/.svn/text-base/mixxx-9999-libsoundtouch.patch.svn-base
@@ -0,0 +1,68 @@
+--- build/depends.py.orig	2011-04-26 11:55:25.000000000 -0700
++++ build/depends.py	2011-04-26 11:58:53.000000000 -0700
+@@ -230,60 +230,16 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.5.0'
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+-        if build.platform_is_windows and build.toolchain_is_msvs:
+-            if build.machine_is_64bit:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
+-            elif build.machine == 'x86':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                raise Exception("Unhandled CPU configuration for SoundTouch")
+-        elif build.toolchain_is_gnu:
+-            if build.machine == 'x86_64':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            raise Exception("Unhandled CPU configuration for SoundTouch")
+-
+-        # TODO(XXX) when we figure out a better way to represent features, fix
+-        # this.
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if build.machine_is_64bit or \
+-                (build.toolchain_is_msvs and optimize > 1) or \
+-                (build.toolchain_is_gnu and optimize > 2):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 ])
+-        if build.toolchain_is_msvs and not build.machine_is_64bit:
+-            sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
+-            # it.
+-            pass
+-
++        sources =  ['engine/enginebufferscalest.cpp']
+         return sources
+ 
+     def configure(self, build, conf):
+-        if build.platform_is_windows:
+-            build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
+-        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+         # TODO(XXX) when we figure out a better way to represent features, fix
+         # this.
diff --git a/media-sound/mixxx/files/.svn/text-base/mixxx-9999-qt4_paths.patch.svn-base b/media-sound/mixxx/files/.svn/text-base/mixxx-9999-qt4_paths.patch.svn-base
new file mode 100644
index 0000000..3a8ca65
--- /dev/null
+++ b/media-sound/mixxx/files/.svn/text-base/mixxx-9999-qt4_paths.patch.svn-base
@@ -0,0 +1,22 @@
+--- src/SConscript.orig	2007-07-21 13:59:44.000000000 +0200
++++ src/SConscript	2007-07-21 14:02:01.000000000 +0200
+@@ -325,7 +325,7 @@
+ 	env.Append(LIBS = 'shell32')
+ 
+ env.Append(CXXFLAGS = ' -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT') #Stolen from Mixxx's build output
+-env.Append(CXXFLAGS = ' -I$QTDIR/include/Qt3Support -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui -I$QTDIR/include/QtXml -I$QTDIR/include/QtOpenGl -I$QTDIR/include/Qt -I"$VCINSTALLDIR/include/atl"')
++env.Append(CXXFLAGS = ' -I/usr/include/qt4 -I/usr/include/qt4/Qt3Support -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtOpenGl -I/usr/include/qt4/Qt -I"$VCINSTALLDIR/include/atl"')
+ 
+ if not platform == 'win32':
+ 	env.Append(CXXFLAGS = ' -pipe -O3 -pipe -Wall -W -g -D_REENTRANT') # omghax
+--- src/qt4.py.orig	2007-07-21 15:29:25.000000000 +0200
++++ src/qt4.py	2007-07-21 15:31:06.000000000 +0200
+@@ -246,7 +246,7 @@
+ 		QTDIR  = _detect(env),
+ 		QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
+ 		QT4_CPPPATH = os.path.join('$QTDIR', 'include'),
+-		QT4_LIBPATH = os.path.join('$QTDIR', 'lib'),
++		QT4_LIBPATH = os.path.join('/usr/lib/qt4'),
+ 		# TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants
+ 		QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']),
+ 		QT4_UIC = locateQt4Command(env,'uic', env['QTDIR']),
diff --git a/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch b/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch
new file mode 100644
index 0000000..94ef76e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.11.9999-cflags.patch
@@ -0,0 +1,13 @@
+--- mixxx-9999/build/depends.py	2010-12-22 11:13:22.000000000 -0800
++++ mixxx-9999/build/depends.py	2010-12-22 11:14:02.000000000 -0800
+@@ -587,10 +587,8 @@
+         if build.toolchain_is_gnu:
+             # Default GNU Options
+             # TODO(XXX) always generate debugging info?
+-            build.env.Append(CCFLAGS = '-pipe')
+             build.env.Append(CCFLAGS = '-Wall')
+             build.env.Append(CCFLAGS = '-Wextra')
+-            build.env.Append(CCFLAGS = '-g')
+ 
+             # Check that g++ is present (yeah, SCONS is a bit dumb here)
+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-1.11.9999-docs.patch b/media-sound/mixxx/files/mixxx-1.11.9999-docs.patch
new file mode 100644
index 0000000..65bd39d
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.11.9999-docs.patch
@@ -0,0 +1,10 @@
+--- mixxx-9999/src/SConscript

++++ mixxx-9999/src/SConscript

+@@ -223,7 +223,6 @@

+                 env.Alias('install', keyboardmappings)

+                 if int(flags['ladspa']):

+                         env.Alias('install', ladspapresets)

+-                env.Alias('install', docs)

+                 env.Alias('install', dotdesktop)

+                 env.Alias('install', icon)

+                 env.Alias('install', promotracks)

diff --git a/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch b/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch
new file mode 100644
index 0000000..4476f18
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.11.9999-no-bzr.patch
@@ -0,0 +1,38 @@
+--- mixxx-9999/src/SConscript.env
++++ mixxx-9999/src/SConscript.env
+@@ -19,21 +19,6 @@
+     print "Deleting deprecated build file: %s" % defs
+     os.remove(defs)
+ 
+-#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
+-## instead, embed BZR version into build
+-## Put version info into a file, so it doesn't force a rebuild of everything :)
+-f = open("build.h","w")
+-try:
+-    branch_name = util.get_bzr_branch_name()
+-    modified = util.get_bzr_modified() > 0
+-    # Do not emit BUILD_BRANCH on release branches.
+-    if not branch_name.startswith('release'):
+-        f.write('#define BUILD_BRANCH "%s"\n' % branch_name)
+-    f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(),
+-                                            '+' if modified else ''))
+-finally:
+-    f.close()
+-
+ #Check for dependencies if we're not doing a clean...
+ #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
+ conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : util.CheckForPKGConfig,
+
+--- mixxx-9999/src/SConscript
++++ mixxx-9999/src/SConscript
+@@ -12,8 +12,8 @@
+ from build import util
+ 
+ mixxx_version = util.get_mixxx_version()
+-branch_name = util.get_bzr_branch_name()
+-bazaar_revision = util.get_bzr_revision()
++#branch_name = util.get_bzr_branch_name()
++#bazaar_revision = util.get_bzr_revision()
+ print "WE ARE IN:", os.getcwd()
+ 
+ plugins = []
diff --git a/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch b/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch
new file mode 100644
index 0000000..41c4af1
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.11.9999-system-libs.patch
@@ -0,0 +1,150 @@
+=== modified file 'mixxx/build/depends.py'
+--- mixxx-9999/build/depends.py	2012-04-22 17:33:25 +0000
++++ mixxx-9999/build/depends.py	2012-04-23 23:49:03 +0000
+@@ -189,25 +189,10 @@
+ 
+ class FidLib(Dependence):
+ 
+-    def sources(self, build):
+-        symbol = None
+-        if build.platform_is_windows:
+-            if build.toolchain_is_msvs:
+-                symbol = 'T_MSVC'
+-            elif build.crosscompile:
+-                # Not sure why, but fidlib won't build with mingw32msvc and
+-                # T_MINGW
+-                symbol = 'T_LINUX'
+-            elif build.toolchain_is_gnu:
+-                symbol = 'T_MINGW'
+-        else:
+-            symbol = 'T_LINUX'
+-
+-        return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
+-                                       CPPDEFINES=symbol)]
+-
+     def configure(self, build, conf):
+-        build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
++        if not conf.CheckLib('fidlib'):
++            raise Exception('Did not find fidlib library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
+ 
+ class ReplayGain(Dependence):
+ 
+@@ -218,7 +203,6 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
+ 
+     def sse_enabled(self, build):
+         optimize = int(util.get_flags(build.env, 'optimize', 1))
+@@ -227,42 +211,13 @@
+                 (build.toolchain_is_gnu and optimize > 1))
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+-
+-        # SoundTouch CPU optimizations are only for x86
+-        # architectures. SoundTouch automatically ignores these files when it is
+-        # not being built for an architecture that supports them.
+-        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
+-            '#lib/%s/cpu_detect_x86_gcc.cpp'
+-        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
+-
+-        # Check if the compiler has SSE extention enabled
+-        # Allways the case on x64 (core instructions)
+-        if self.sse_enabled(build):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,])
+-        return sources
++        return ['engine/enginebufferscalest.cpp']
+ 
+     def configure(self, build, conf):
+-        if build.platform_is_windows:
+-            # Regardless of the bitwidth, ST checks for WIN32
+-            build.env.Append(CPPDEFINES = 'WIN32')
+-        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+-
+-        # Check if the compiler has SSE extention enabled
+-        # Allways the case on x64 (core instructions)
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if self.sse_enabled(build):
+-            build.env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find SoundTouch library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+ class TagLib(Dependence):
+     def configure(self, build, conf):
+
+--- mixxx-9999/build/features.py	2011-12-08 11:47:54 +0000
++++ mixxx-9999/build/features.py	2012-03-21 20:41:47 +0000
+@@ -595,25 +595,15 @@
+         test_env.Append(CCFLAGS = '-pthread')
+         test_env.Append(LINKFLAGS = '-pthread')
+ 
+-        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
+-        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
+-        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
+-        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
+-        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
+-
+-        env = test_env
+-        SCons.Export('env')
+-        env.SConscript(env.File('SConscript', gtest_dir))
+-
+-        # build and configure gmock
+-        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
+-        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
+-        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
+-        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
+-
+-        env.SConscript(env.File('SConscript', gmock_dir))
+-
+-        return []
++        if not conf.CheckLib('gtest'):
++            raise Exception('Did not find gtest library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
++        test_env.Append(LIBS='gtest')
++
++        if not conf.CheckLib('gmock'):
++            raise Exception('Did not find gmock library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
++        test_env.Append(LIBS='gmock')
+ 
+ class Shoutcast(Feature):
+     def description(self):
+
+--- mixxx-9999/src/engine/enginefilter.h	2011-07-24 21:50:31 +0000
++++ mixxx-9999/src/engine/enginefilter.h	2012-03-21 20:41:47 +0000
+@@ -20,7 +20,7 @@
+ 
+ #define MIXXX
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.10/fidlib.h"
++#include "fidlib.h"
+ #include "defs.h"
+ 
+ enum filterType{
+
+--- mixxx-9999/src/engine/enginefilterbutterworth8.cpp	2011-07-24 21:50:31 +0000
++++ mixxx-9999/src/engine/enginefilterbutterworth8.cpp	2012-03-21 20:41:47 +0000
+@@ -20,7 +20,6 @@
+ #include "engine/enginefilterbutterworth8.h"

+ #include "engine/enginefilter.h"

+ #include "engine/engineobject.h"

+-#include "../lib/fidlib-0.9.10/fidlib.h"

+ 

+ /* Local Prototypes */

+ inline double _processLowpass(double *coef, double *buf, register double val);

+
diff --git a/media-sound/mixxx/files/mixxx-1.6.0_beta4-debug.patch b/media-sound/mixxx/files/mixxx-1.6.0_beta4-debug.patch
new file mode 100644
index 0000000..e9488c2
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.6.0_beta4-debug.patch
@@ -0,0 +1,10 @@
+--- src/enginefilterblock.cpp.orig	2008-05-22 09:27:10.000000000 -0700
++++ src/enginefilterblock.cpp	2008-05-22 09:27:16.000000000 -0700
+@@ -21,6 +21,7 @@
+ #include "enginefilteriir.h"
+ #include "enginefilter.h"
+ #include "enginefilterbutterworth8.h"
++#include <QtDebug>
+ 
+ EngineFilterBlock::EngineFilterBlock(const char * group)
+ {
diff --git a/media-sound/mixxx/files/mixxx-1.9.0-flags.patch b/media-sound/mixxx/files/mixxx-1.9.0-flags.patch
new file mode 100644
index 0000000..09c0088
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.9.0-flags.patch
@@ -0,0 +1,24 @@
+--- build/mixxx.py.orig	2010-12-22 11:21:56.000000000 -0800
++++ build/mixxx.py	2010-12-22 11:16:22.000000000 -0800
+@@ -189,7 +189,7 @@
+         if os.environ.has_key('CC'):
+             self.env['CC'] = os.environ['CC']
+         if os.environ.has_key('CFLAGS'):
+-            self.env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++            self.env['CFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+         if os.environ.has_key('CXX'):
+             self.env['CXX'] = os.environ['CXX']
+         if os.environ.has_key('CXXFLAGS'):
+--- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
++++ build/depends.py	2010-12-22 11:14:02.000000000 -0800
+@@ -587,10 +587,8 @@
+         if build.toolchain_is_gnu:
+             # Default GNU Options
+             # TODO(XXX) always generate debugging info?
+-            build.env.Append(CCFLAGS = '-pipe')
+             build.env.Append(CCFLAGS = '-Wall')
+             build.env.Append(CCFLAGS = '-Wextra')
+-            build.env.Append(CCFLAGS = '-g')
+ 
+             # Check that g++ is present (yeah, SCONS is a bit dumb here)
+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-1.9.0-libsoundtouch.patch b/media-sound/mixxx/files/mixxx-1.9.0-libsoundtouch.patch
new file mode 100644
index 0000000..25f349c
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.9.0-libsoundtouch.patch
@@ -0,0 +1,68 @@
+--- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
++++ build/depends.py	2010-12-22 11:33:29.000000000 -0800
+@@ -234,60 +234,16 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.4.1'
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+-        if build.platform_is_windows and build.toolchain_is_msvs:
+-            if build.machine_is_64bit:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
+-            elif build.machine == 'x86':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                raise Exception("Unhandled CPU configuration for SoundTouch")
+-        elif build.toolchain_is_gnu:
+-            if build.machine == 'x86_64':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            raise Exception("Unhandled CPU configuration for SoundTouch")
+-
+-        # TODO(XXX) when we figure out a better way to represent features, fix
+-        # this.
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if build.machine_is_64bit or \
+-                (build.toolchain_is_msvs and optimize > 1) or \
+-                (build.toolchain_is_gnu and optimize > 2):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 ])
+-        if build.toolchain_is_msvs and not build.machine_is_64bit:
+-            sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
+-            # it.
+-            pass
+-
++        sources =  ['engine/enginebufferscalest.cpp']
+         return sources
+ 
+     def configure(self, build, conf):
+-        if build.platform_is_windows:
+-            build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
+-        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+         # TODO(XXX) when we figure out a better way to represent features, fix
+         # this.
diff --git a/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch b/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch
new file mode 100644
index 0000000..89bac8e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.9.0-linux3.patch
@@ -0,0 +1,23 @@
+=== modified file 'mixxx/build/mixxx.py'
+--- mixxx/build/mixxx.py	2011-06-13 01:29:39 +0000
++++ mixxx/build/mixxx.py	2011-06-17 17:37:59 +0000
+@@ -188,7 +188,7 @@
+         # Should cover {Net,Open,Free,DragonFly}BSD, but only tested on OpenBSD
+         if 'bsd' in sys.platform:
+             return 'bsd'
+-        if 'linux2' == sys.platform:
++        if sys.platform in ['linux2', 'linux3']:
+             return 'linux'
+         if sys.platform == 'darwin':
+             return 'osx'
+--- mixxx/build/qt4.py	2011-09-15 01:05:21.872433812 +0100
++++ mixxx/build/qt4.py	2011-09-15 01:06:34.628431259 +0100
+@@ -409,7 +409,7 @@
+ 		self.AppendUnique(CPPFLAGS=['-DQT_GUI_LIB'])
+ 
+ 	debugSuffix = ''
+-	if sys.platform == "linux2" :
++	if sys.platform in ["linux2", "linux3"]:
+ 		if debug : debugSuffix = '_debug'
+ 		for module in modules :
+ 			if module not in pclessModules : continue
diff --git a/media-sound/mixxx/files/mixxx-1.9.2-flags.patch b/media-sound/mixxx/files/mixxx-1.9.2-flags.patch
new file mode 100644
index 0000000..c543e76
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.9.2-flags.patch
@@ -0,0 +1,13 @@
+--- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
++++ build/depends.py	2010-12-22 11:14:02.000000000 -0800
+@@ -587,10 +587,8 @@
+         if build.toolchain_is_gnu:
+             # Default GNU Options
+             # TODO(XXX) always generate debugging info?
+-            build.env.Append(CCFLAGS = '-pipe')
+             build.env.Append(CCFLAGS = '-Wall')
+             build.env.Append(CCFLAGS = '-Wextra')
+-            build.env.Append(CCFLAGS = '-g')
+ 
+             # Check that g++ is present (yeah, SCONS is a bit dumb here)
+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-1.9.2-libsoundtouch.patch b/media-sound/mixxx/files/mixxx-1.9.2-libsoundtouch.patch
new file mode 100644
index 0000000..25f349c
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.9.2-libsoundtouch.patch
@@ -0,0 +1,68 @@
+--- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
++++ build/depends.py	2010-12-22 11:33:29.000000000 -0800
+@@ -234,60 +234,16 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.4.1'
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+-        if build.platform_is_windows and build.toolchain_is_msvs:
+-            if build.machine_is_64bit:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_win.cpp' % self.SOUNDTOUCH_PATH)
+-            elif build.machine == 'x86':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_win.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                raise Exception("Unhandled CPU configuration for SoundTouch")
+-        elif build.toolchain_is_gnu:
+-            if build.machine == 'x86_64':
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x64_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-            else:
+-                sources.append(
+-                    '#lib/%s/cpu_detect_x86_gcc.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            raise Exception("Unhandled CPU configuration for SoundTouch")
+-
+-        # TODO(XXX) when we figure out a better way to represent features, fix
+-        # this.
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if build.machine_is_64bit or \
+-                (build.toolchain_is_msvs and optimize > 1) or \
+-                (build.toolchain_is_gnu and optimize > 2):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 ])
+-        if build.toolchain_is_msvs and not build.machine_is_64bit:
+-            sources.append('#lib/%s/3dnow_win.cpp' % self.SOUNDTOUCH_PATH)
+-        else:
+-            # TODO(XXX) the docs refer to a 3dnow_gcc, but we don't seem to have
+-            # it.
+-            pass
+-
++        sources =  ['engine/enginebufferscalest.cpp']
+         return sources
+ 
+     def configure(self, build, conf):
+-        if build.platform_is_windows:
+-            build.env.Append(CPPDEFINES = 'WIN%s' % build.bitwidth)
+-        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+         # TODO(XXX) when we figure out a better way to represent features, fix
+         # this.
diff --git a/media-sound/mixxx/files/mixxx-9999-cflags.patch b/media-sound/mixxx/files/mixxx-9999-cflags.patch
new file mode 100644
index 0000000..94ef76e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-cflags.patch
@@ -0,0 +1,13 @@
+--- mixxx-9999/build/depends.py	2010-12-22 11:13:22.000000000 -0800
++++ mixxx-9999/build/depends.py	2010-12-22 11:14:02.000000000 -0800
+@@ -587,10 +587,8 @@
+         if build.toolchain_is_gnu:
+             # Default GNU Options
+             # TODO(XXX) always generate debugging info?
+-            build.env.Append(CCFLAGS = '-pipe')
+             build.env.Append(CCFLAGS = '-Wall')
+             build.env.Append(CCFLAGS = '-Wextra')
+-            build.env.Append(CCFLAGS = '-g')
+ 
+             # Check that g++ is present (yeah, SCONS is a bit dumb here)
+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-9999-docs.patch b/media-sound/mixxx/files/mixxx-9999-docs.patch
new file mode 100644
index 0000000..65bd39d
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-docs.patch
@@ -0,0 +1,10 @@
+--- mixxx-9999/src/SConscript

++++ mixxx-9999/src/SConscript

+@@ -223,7 +223,6 @@

+                 env.Alias('install', keyboardmappings)

+                 if int(flags['ladspa']):

+                         env.Alias('install', ladspapresets)

+-                env.Alias('install', docs)

+                 env.Alias('install', dotdesktop)

+                 env.Alias('install', icon)

+                 env.Alias('install', promotracks)

diff --git a/media-sound/mixxx/files/mixxx-9999-flags.patch b/media-sound/mixxx/files/mixxx-9999-flags.patch
new file mode 100644
index 0000000..c543e76
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-flags.patch
@@ -0,0 +1,13 @@
+--- build/depends.py.orig	2010-12-22 11:13:22.000000000 -0800
++++ build/depends.py	2010-12-22 11:14:02.000000000 -0800
+@@ -587,10 +587,8 @@
+         if build.toolchain_is_gnu:
+             # Default GNU Options
+             # TODO(XXX) always generate debugging info?
+-            build.env.Append(CCFLAGS = '-pipe')
+             build.env.Append(CCFLAGS = '-Wall')
+             build.env.Append(CCFLAGS = '-Wextra')
+-            build.env.Append(CCFLAGS = '-g')
+ 
+             # Check that g++ is present (yeah, SCONS is a bit dumb here)
+             if os.system("which g++ > /dev/null"): #Checks for non-zero return code
diff --git a/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch b/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch
new file mode 100644
index 0000000..abd779e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-libsoundtouch.patch
@@ -0,0 +1,43 @@
+=== modified file 'mixxx/build/depends.py'
+--- build/depends.py	2011-11-08 20:10:32 +0000
++++ build/depends.py	2011-11-08 23:38:43 +0000
+@@ -222,33 +222,19 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,]
+-
+-        # SoundTouch CPU optimizations are only for x86
+-        # architectures. SoundTouch automatically ignores these files when it is
+-        # not being built for an architecture that supports them.
+-        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else '#lib/%s/cpu_detect_x86_gcc.cpp'
+-        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
++        sources =  ['engine/enginebufferscalest.cpp']
+         return sources
+ 
+     def configure(self, build, conf):
+         if build.platform_is_windows:
+             # Regardless of the bitwidth, ST checks for WIN32
+             build.env.Append(CPPDEFINES = 'WIN32')
+-        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find libSoundTouch.a, libSoundTouch.lib, or the libSoundTouch development header files - exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix', '/usr/local') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+ class TagLib(Dependence):
+     def configure(self, build, conf):
+
diff --git a/media-sound/mixxx/files/mixxx-9999-no-bzr.patch b/media-sound/mixxx/files/mixxx-9999-no-bzr.patch
new file mode 100644
index 0000000..4476f18
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-no-bzr.patch
@@ -0,0 +1,38 @@
+--- mixxx-9999/src/SConscript.env
++++ mixxx-9999/src/SConscript.env
+@@ -19,21 +19,6 @@
+     print "Deleting deprecated build file: %s" % defs
+     os.remove(defs)
+ 
+-#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
+-## instead, embed BZR version into build
+-## Put version info into a file, so it doesn't force a rebuild of everything :)
+-f = open("build.h","w")
+-try:
+-    branch_name = util.get_bzr_branch_name()
+-    modified = util.get_bzr_modified() > 0
+-    # Do not emit BUILD_BRANCH on release branches.
+-    if not branch_name.startswith('release'):
+-        f.write('#define BUILD_BRANCH "%s"\n' % branch_name)
+-    f.write('#define BUILD_REV "%s%s"\n' % (util.get_bzr_revision(),
+-                                            '+' if modified else ''))
+-finally:
+-    f.close()
+-
+ #Check for dependencies if we're not doing a clean...
+ #if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):
+ conf = Configure(env, custom_tests = { 'CheckForPKGConfig' : util.CheckForPKGConfig,
+
+--- mixxx-9999/src/SConscript
++++ mixxx-9999/src/SConscript
+@@ -12,8 +12,8 @@
+ from build import util
+ 
+ mixxx_version = util.get_mixxx_version()
+-branch_name = util.get_bzr_branch_name()
+-bazaar_revision = util.get_bzr_revision()
++#branch_name = util.get_bzr_branch_name()
++#bazaar_revision = util.get_bzr_revision()
+ print "WE ARE IN:", os.getcwd()
+ 
+ plugins = []
diff --git a/media-sound/mixxx/files/mixxx-9999-qt4_paths.patch b/media-sound/mixxx/files/mixxx-9999-qt4_paths.patch
new file mode 100644
index 0000000..3a8ca65
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-qt4_paths.patch
@@ -0,0 +1,22 @@
+--- src/SConscript.orig	2007-07-21 13:59:44.000000000 +0200
++++ src/SConscript	2007-07-21 14:02:01.000000000 +0200
+@@ -325,7 +325,7 @@
+ 	env.Append(LIBS = 'shell32')
+ 
+ env.Append(CXXFLAGS = ' -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT') #Stolen from Mixxx's build output
+-env.Append(CXXFLAGS = ' -I$QTDIR/include/Qt3Support -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui -I$QTDIR/include/QtXml -I$QTDIR/include/QtOpenGl -I$QTDIR/include/Qt -I"$VCINSTALLDIR/include/atl"')
++env.Append(CXXFLAGS = ' -I/usr/include/qt4 -I/usr/include/qt4/Qt3Support -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtOpenGl -I/usr/include/qt4/Qt -I"$VCINSTALLDIR/include/atl"')
+ 
+ if not platform == 'win32':
+ 	env.Append(CXXFLAGS = ' -pipe -O3 -pipe -Wall -W -g -D_REENTRANT') # omghax
+--- src/qt4.py.orig	2007-07-21 15:29:25.000000000 +0200
++++ src/qt4.py	2007-07-21 15:31:06.000000000 +0200
+@@ -246,7 +246,7 @@
+ 		QTDIR  = _detect(env),
+ 		QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
+ 		QT4_CPPPATH = os.path.join('$QTDIR', 'include'),
+-		QT4_LIBPATH = os.path.join('$QTDIR', 'lib'),
++		QT4_LIBPATH = os.path.join('/usr/lib/qt4'),
+ 		# TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants
+ 		QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']),
+ 		QT4_UIC = locateQt4Command(env,'uic', env['QTDIR']),
diff --git a/media-sound/mixxx/files/mixxx-9999-system-libs.patch b/media-sound/mixxx/files/mixxx-9999-system-libs.patch
new file mode 100644
index 0000000..41c4af1
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-9999-system-libs.patch
@@ -0,0 +1,150 @@
+=== modified file 'mixxx/build/depends.py'
+--- mixxx-9999/build/depends.py	2012-04-22 17:33:25 +0000
++++ mixxx-9999/build/depends.py	2012-04-23 23:49:03 +0000
+@@ -189,25 +189,10 @@
+ 
+ class FidLib(Dependence):
+ 
+-    def sources(self, build):
+-        symbol = None
+-        if build.platform_is_windows:
+-            if build.toolchain_is_msvs:
+-                symbol = 'T_MSVC'
+-            elif build.crosscompile:
+-                # Not sure why, but fidlib won't build with mingw32msvc and
+-                # T_MINGW
+-                symbol = 'T_LINUX'
+-            elif build.toolchain_is_gnu:
+-                symbol = 'T_MINGW'
+-        else:
+-            symbol = 'T_LINUX'
+-
+-        return [build.env.StaticObject('#lib/fidlib-0.9.10/fidlib.c',
+-                                       CPPDEFINES=symbol)]
+-
+     def configure(self, build, conf):
+-        build.env.Append(CPPPATH='#lib/fidlib-0.9.10/')
++        if not conf.CheckLib('fidlib'):
++            raise Exception('Did not find fidlib library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/fidlib'])
+ 
+ class ReplayGain(Dependence):
+ 
+@@ -218,7 +203,6 @@
+         build.env.Append(CPPPATH="#lib/replaygain")
+ 
+ class SoundTouch(Dependence):
+-    SOUNDTOUCH_PATH = 'soundtouch-1.6.0'
+ 
+     def sse_enabled(self, build):
+         optimize = int(util.get_flags(build.env, 'optimize', 1))
+@@ -227,42 +211,13 @@
+                 (build.toolchain_is_gnu and optimize > 1))
+ 
+     def sources(self, build):
+-        sources = ['engine/enginebufferscalest.cpp',
+-                   '#lib/%s/SoundTouch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/TDStretch.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/RateTransposer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/AAFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIFOSampleBuffer.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/FIRFilter.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/PeakFinder.cpp' % self.SOUNDTOUCH_PATH,
+-                   '#lib/%s/BPMDetect.cpp' % self.SOUNDTOUCH_PATH]
+-
+-        # SoundTouch CPU optimizations are only for x86
+-        # architectures. SoundTouch automatically ignores these files when it is
+-        # not being built for an architecture that supports them.
+-        cpu_detection = '#lib/%s/cpu_detect_x86_win.cpp' if build.toolchain_is_msvs else \
+-            '#lib/%s/cpu_detect_x86_gcc.cpp'
+-        sources.append(cpu_detection % self.SOUNDTOUCH_PATH)
+-
+-        # Check if the compiler has SSE extention enabled
+-        # Allways the case on x64 (core instructions)
+-        if self.sse_enabled(build):
+-            sources.extend(
+-                ['#lib/%s/mmx_optimized.cpp' % self.SOUNDTOUCH_PATH,
+-                 '#lib/%s/sse_optimized.cpp' % self.SOUNDTOUCH_PATH,])
+-        return sources
++        return ['engine/enginebufferscalest.cpp']
+ 
+     def configure(self, build, conf):
+-        if build.platform_is_windows:
+-            # Regardless of the bitwidth, ST checks for WIN32
+-            build.env.Append(CPPDEFINES = 'WIN32')
+-        build.env.Append(CPPPATH=['#lib/%s' % self.SOUNDTOUCH_PATH])
+-
+-        # Check if the compiler has SSE extention enabled
+-        # Allways the case on x64 (core instructions)
+-        optimize = int(util.get_flags(build.env, 'optimize', 1))
+-        if self.sse_enabled(build):
+-            build.env.Append(CPPDEFINES='SOUNDTOUCH_ALLOW_X86_OPTIMIZATIONS')
++        if not conf.CheckLib(['SoundTouch','libSoundTouch']):
++            raise Exception('Did not find SoundTouch library, exiting!')
++        build.env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/soundtouch'])
++        build.env.Append(LIBS='SoundTouch')
+ 
+ class TagLib(Dependence):
+     def configure(self, build, conf):
+
+--- mixxx-9999/build/features.py	2011-12-08 11:47:54 +0000
++++ mixxx-9999/build/features.py	2012-03-21 20:41:47 +0000
+@@ -595,25 +595,15 @@
+         test_env.Append(CCFLAGS = '-pthread')
+         test_env.Append(LINKFLAGS = '-pthread')
+ 
+-        test_env.Append(CPPPATH="#lib/gtest-1.5.0/include")
+-        gtest_dir = test_env.Dir("#lib/gtest-1.5.0")
+-        #gtest_dir.addRepository(build.env.Dir('#lib/gtest-1.5.0'))
+-        #build.env['EXE_OUTPUT'] = '#/lib/gtest-1.3.0/bin'  # example, optional
+-        test_env['LIB_OUTPUT'] = '#/lib/gtest-1.5.0/lib'
+-
+-        env = test_env
+-        SCons.Export('env')
+-        env.SConscript(env.File('SConscript', gtest_dir))
+-
+-        # build and configure gmock
+-        test_env.Append(CPPPATH="#lib/gmock-1.5.0/include")
+-        gmock_dir = test_env.Dir("#lib/gmock-1.5.0")
+-        #gmock_dir.addRepository(build.env.Dir('#lib/gmock-1.5.0'))
+-        test_env['LIB_OUTPUT'] = '#/lib/gmock-1.5.0/lib'
+-
+-        env.SConscript(env.File('SConscript', gmock_dir))
+-
+-        return []
++        if not conf.CheckLib('gtest'):
++            raise Exception('Did not find gtest library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gtest'])
++        test_env.Append(LIBS='gtest')
++
++        if not conf.CheckLib('gmock'):
++            raise Exception('Did not find gmock library, exiting!')
++        test_env.Append(CPPPATH=[SCons.ARGUMENTS.get('prefix') + '/include/gmock'])
++        test_env.Append(LIBS='gmock')
+ 
+ class Shoutcast(Feature):
+     def description(self):
+
+--- mixxx-9999/src/engine/enginefilter.h	2011-07-24 21:50:31 +0000
++++ mixxx-9999/src/engine/enginefilter.h	2012-03-21 20:41:47 +0000
+@@ -20,7 +20,7 @@
+ 
+ #define MIXXX
+ #include "engine/engineobject.h"
+-#include "../lib/fidlib-0.9.10/fidlib.h"
++#include "fidlib.h"
+ #include "defs.h"
+ 
+ enum filterType{
+
+--- mixxx-9999/src/engine/enginefilterbutterworth8.cpp	2011-07-24 21:50:31 +0000
++++ mixxx-9999/src/engine/enginefilterbutterworth8.cpp	2012-03-21 20:41:47 +0000
+@@ -20,7 +20,6 @@
+ #include "engine/enginefilterbutterworth8.h"

+ #include "engine/enginefilter.h"

+ #include "engine/engineobject.h"

+-#include "../lib/fidlib-0.9.10/fidlib.h"

+ 

+ /* Local Prototypes */

+ inline double _processLowpass(double *coef, double *buf, register double val);

+
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
new file mode 100644
index 0000000..211ab6b
--- /dev/null
+++ b/media-sound/mixxx/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+	<use>
+		<flag name="pulseaudio">Disables <pkg>media-sound/pulseaudio</pkg> support for mixxx with pasuspender</flag>
+		<flag name="shout">Enables <pkg>media-libs/libshout</pkg> support</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/mixxx/mixxx-9999-sunrise.ebuild.vorlage b/media-sound/mixxx/mixxx-9999-sunrise.ebuild.vorlage
new file mode 100644
index 0000000..a51a5bf
--- /dev/null
+++ b/media-sound/mixxx/mixxx-9999-sunrise.ebuild.vorlage
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+
+inherit bzr eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="A QT based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net"
+EBZR_REPO_URI="lp:mixxx"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac debug mp4 pulseaudio shout wavpack"
+
+RDEPEND="media-libs/flac
+	media-libs/libid3tag
+	media-libs/libmad
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/taglib
+	virtual/opengl
+	virtual/glu
+	>=x11-libs/qt-gui-4.6:4
+	>=x11-libs/qt-svg-4.6:4
+	>=x11-libs/qt-opengl-4.6:4
+	>=x11-libs/qt-qt3support-4.6:4
+	>=x11-libs/qt-webkit-4.6:4
+	>=x11-libs/qt-xmlpatterns-4.6:4
+	aac? ( media-libs/faad2 )
+	mp4? (	media-libs/faad2
+		media-libs/libmp4v2
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+SCONS_MIN_VERSION="2.0.1"
+
+S=${S}/${PN}
+
+src_prepare() {
+	# patch CFLAGS issue
+	epatch "${FILESDIR}"/${P}-flags.patch
+
+	# patch external libsoundtouch
+#	epatch "${FILESDIR}"/${P}-libsoundtouch.patch
+
+	# Patch startup command if not using pulse audio
+	use pulseaudio || sed -i -e 's:pasuspender ::' src/mixxx.desktop || die
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="/usr/$(get_libdir)" escons \
+		prefix=/usr \
+		qtdir=/usr/$(get_libdir)/qt4 \
+		$(use_scons aac faad) \
+		$(use_scons debug qdebug) \
+		$(use_scons mp4 m4a) \
+		$(use_scons shout shoutcast) \
+		$(use_scons wavpack wv) \
+		$(use_scons ipod ipod) \
+		$(use_scons ffmpeg ffmpeg) \
+		$(use_scons ladspa ladspa) \
+		hifieq=1 \
+		vinylcontrol=1 \
+		optimize=0 \
+		|| die
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBPATH="/usr/$(get_libdir)" escons install \
+		prefix=/usr \
+		install_root="${D}"/usr \
+		|| die
+}
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
new file mode 100644
index 0000000..f914d05
--- /dev/null
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit bzr eutils multilib scons-utils toolchain-funcs
+
+DESCRIPTION="A Qt based Digital DJ tool"
+HOMEPAGE="http://mixxx.sourceforge.net"
+EBZR_REPO_URI="lp:mixxx"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="aac debug doc mp3 mp4 pulseaudio shout wavpack"
+
+RDEPEND="dev-libs/protobuf
+	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
+	media-libs/vamp-plugin-sdk
+	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 )
+	mp4? ( media-libs/libmp4v2 )
+	pulseaudio? ( media-sound/pulseaudio )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${S}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-system-libs.patch
+	epatch "${FILESDIR}"/${P}-docs.patch
+	#epatch "${FILESDIR}"/${P}-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 mp4 m4a) \
+		$(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 \
+		install_root="${D}"/usr
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
new file mode 100644
index 0000000..8925477
--- /dev/null
+++ b/media-sound/mumble/Manifest
@@ -0,0 +1,6 @@
+AUX mumble-jack-support-r2.patch 16201 RMD160 03d3f838be6a4ec4e9553cd7aeacec56fbbce7de SHA1 4192cf9d18862f237f3b7e87161ab682caa1c983 SHA256 a2b6fc5a0f5d4b399af89f474c4b0ff878ce77fac01848f1681c9eec32739efb
+AUX mumble-jack-support.patch 16200 RMD160 2f060b1db79b2393daa52b4a42870a00fddc4b90 SHA1 bc1f8eca9c0399409cf75fd3c43f42c6aedeaba7 SHA256 8fb331d65363e394b7020c321e1105418c2150208bb9ab5f974e6f361dc557d4
+DIST mumble-1.2.2.tar.gz 2920587 RMD160 501aa1c4c170fb5aad2841cdfe3421376e62a07b SHA1 b2a7fd50e70147b3ea2361cbc5a577b0e1ae45ea SHA256 2c564e3d5b7481129482f2365375a2dc77e134c0c00012073cfdfbeadaa49be8
+DIST mumble-1.2.3.tar.gz 3448053 RMD160 c02e1c42e6996e7b6052772089febd22be67582d SHA1 420e245ef978d7e51ca3ed97922acf13f5ef982d SHA256 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c
+EBUILD mumble-1.2.2-r1.ebuild 3437 RMD160 de7cbe3e4c6d26f9a7b1dcb01fc7c412f60aadf2 SHA1 03512ed9bccc432b55f6472cf271f08e235a7bd0 SHA256 44f8ac6159aa91c3590bc2b38df357763481bf111cc36439f7867d678e83c8dd
+EBUILD mumble-1.2.3-r2.ebuild 3656 RMD160 89e045ccfcaecdd778fa07e54ee2f4629704f48e SHA1 e84db7964d904aff477cb4bb03cd4015e4d7bf8b SHA256 3c8e802cbcdcf61678dfbecbc29ca781b7037782a9c5eaa557abeb8774d42b68
diff --git a/media-sound/mumble/files/mumble-jack-support-r2.patch b/media-sound/mumble/files/mumble-jack-support-r2.patch
new file mode 100644
index 0000000..fa94f44
--- /dev/null
+++ b/media-sound/mumble/files/mumble-jack-support-r2.patch
@@ -0,0 +1,454 @@
+diff -U 3 -H -d -r -N -- mumble-1.2.3/src/mumble/JackAudio.cpp mumble-1.2.3/src/mumble/JackAudio.cpp
+--- mumble-1.2.3/src/mumble/JackAudio.cpp	1970-01-01 01:00:00.000000000 +0100
++++ mumble-1.2.3/src/mumble/JackAudio.cpp	2011-01-26 06:02:00.000000000 +0000
+@@ -0,0 +1,314 @@
++/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
++   Copyright (C) 2011, Filipe Coelho <falktx@gmail.com>
++
++   All rights reserved.
++
++   Redistribution and use in source and binary forms, with or without
++   modification, are permitted provided that the following conditions
++   are met:
++
++   - Redistributions of source code must retain the above copyright notice,
++     this list of conditions and the following disclaimer.
++   - Redistributions in binary form must reproduce the above copyright notice,
++     this list of conditions and the following disclaimer in the documentation
++     and/or other materials provided with the distribution.
++   - Neither the name of the Mumble Developers nor the names of its
++     contributors may be used to endorse or promote products derived from this
++     software without specific prior written permission.
++
++   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
++   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++#include "JackAudio.h"
++#include "User.h"
++#include "Global.h"
++#include "MainWindow.h"
++#include "Timer.h"
++
++#include <cstring>
++
++static JackAudioSystem *jasys = NULL;
++
++class JackAudioInputRegistrar : public AudioInputRegistrar {
++        public:
++                JackAudioInputRegistrar();
++                virtual AudioInput *create();
++                virtual const QList<audioDevice> getDeviceChoices();
++                virtual void setDeviceChoice(const QVariant &, Settings &);
++                virtual bool canEcho(const QString &) const;
++};
++
++class JackAudioOutputRegistrar : public AudioOutputRegistrar {
++        public:
++                JackAudioOutputRegistrar();
++                virtual AudioOutput *create();
++                virtual const QList<audioDevice> getDeviceChoices();
++                virtual void setDeviceChoice(const QVariant &, Settings &);
++};
++
++class JackAudioInit : public DeferInit {
++        public:
++                JackAudioInputRegistrar *airJackAudio;
++                JackAudioOutputRegistrar *aorJackAudio;
++                void initialize() {
++                        jasys = new JackAudioSystem();
++                        jasys->init_jack();
++                        jasys->qmWait.lock();
++                        jasys->qwcWait.wait(&jasys->qmWait, 1000);
++                        jasys->qmWait.unlock();
++                        if (jasys->bJackIsGood) {
++                                airJackAudio = new JackAudioInputRegistrar();
++                                aorJackAudio = new JackAudioOutputRegistrar();
++                        } else {
++                                airJackAudio = NULL;
++                                aorJackAudio = NULL;
++                                delete jasys;
++                                jasys = NULL;
++                        }
++                };
++                void destroy() {
++                        if (airJackAudio)
++                                delete airJackAudio;
++                        if (aorJackAudio)
++                                delete aorJackAudio;
++                        if (jasys) {
++                                jasys->close_jack();
++                                delete jasys;
++                                jasys = NULL;
++                        }
++                };
++};
++
++static JackAudioInit jackinit; //unused
++
++JackAudioSystem::JackAudioSystem() {
++        bJackIsGood = false;
++        iSampleRate = 0;
++}
++
++JackAudioSystem::~JackAudioSystem() {
++}
++
++void JackAudioSystem::init_jack()
++{
++        client = jack_client_open("mumble", JackNullOption, 0);
++
++        if (client) {
++                in_port = jack_port_register(client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
++                out_port = jack_port_register(client, "output", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
++                jack_set_process_callback(client, process_callback, this);
++                jack_set_sample_rate_callback(client, srate_callback, this);
++                jack_on_shutdown(client, shutdown_callback, this);
++
++                iSampleRate = jack_get_sample_rate(client);
++
++                if (jack_activate(client) || in_port == NULL || out_port == NULL) {
++                    client = NULL;
++                    return;
++                }
++
++                int port_flags;
++                unsigned i = -1;
++                const char** ports = jack_get_ports(client, 0, 0, JackPortIsPhysical);
++
++                if (ports) {
++                    while (ports[++i])
++                    {
++                        jack_port_t* port = jack_port_by_name(client, ports[i]);
++                        port_flags = jack_port_flags(port);
++
++                        if (port_flags & (JackPortIsPhysical|JackPortIsOutput) && strstr(jack_port_type(port), "audio")) {
++                            jack_connect(client, ports[i], jack_port_name(in_port));
++                        }
++                        if (port_flags & (JackPortIsPhysical|JackPortIsInput) && strstr(jack_port_type(port), "audio")) {
++                            jack_connect(client, jack_port_name(out_port), ports[i]);
++                        }
++                    }
++                }
++
++                jack_free(ports);
++
++                // If we made it this far, then everything is okay
++                qhInput.insert(QString(), tr("Hardware Ports"));
++                qhOutput.insert(QString(), tr("Hardware Ports"));
++                bJackIsGood = true;
++
++            } else {
++                bJackIsGood = false;
++                client = NULL;
++            }
++}
++
++void JackAudioSystem::close_jack()
++{
++        if (client) {
++                jack_deactivate(client);
++                jack_client_close(client);
++                client = NULL;
++        }
++}
++
++int JackAudioSystem::process_callback(jack_nframes_t nframes, void *arg)
++{
++        JackAudioSystem *jas = (JackAudioSystem*)arg;
++
++        if (jas && jas->bJackIsGood) {
++                AudioInputPtr ai = g.ai;
++                AudioOutputPtr ao = g.ao;
++                JackAudioInput *jai = (JackAudioInput*)(ai.get());
++                JackAudioOutput *jao = (JackAudioOutput*)(ao.get());
++
++                if (jai && jai->bRunning && jai->iMicChannels > 0 && !jai->isFinished()) {
++                        void* input = jack_port_get_buffer(jas->in_port, nframes);
++                        if ((float*)input != 0)
++                            jai->addMic(input, nframes);
++                }
++
++                if (jao && jao->bRunning && jao->iChannels > 0 && !jao->isFinished()) {
++                        jack_default_audio_sample_t* output = (jack_default_audio_sample_t*)jack_port_get_buffer(jas->out_port, nframes);
++                        memset(output, 0, sizeof(jack_default_audio_sample_t)*nframes); //TEST
++                        jao->mix(output, nframes);
++                }
++        }
++
++        return 0;
++}
++
++int JackAudioSystem::srate_callback(jack_nframes_t frames, void *arg)
++{
++        JackAudioSystem *jas = (JackAudioSystem*)arg;
++        jas->iSampleRate = frames;
++        return 0;
++}
++
++void JackAudioSystem::shutdown_callback(void *arg)
++{
++        JackAudioSystem *jas = (JackAudioSystem*)arg;
++        jas->bJackIsGood = false;
++}
++
++JackAudioInputRegistrar::JackAudioInputRegistrar() : AudioInputRegistrar(QLatin1String("JACK"), 10) {
++}
++
++AudioInput *JackAudioInputRegistrar::create() {
++        return new JackAudioInput();
++}
++
++const QList<audioDevice> JackAudioInputRegistrar::getDeviceChoices() {
++        QList<audioDevice> qlReturn;
++
++        QStringList qlInputDevs = jasys->qhInput.keys();
++        qSort(qlInputDevs);
++
++        foreach(const QString &dev, qlInputDevs) {
++                qlReturn << audioDevice(jasys->qhInput.value(dev), dev);
++        }
++
++        return qlReturn;
++}
++
++void JackAudioInputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
++        Q_UNUSED(choice);
++        Q_UNUSED(s);
++}
++
++bool JackAudioInputRegistrar::canEcho(const QString &osys) const {
++        Q_UNUSED(osys);
++        return false;
++}
++
++JackAudioOutputRegistrar::JackAudioOutputRegistrar() : AudioOutputRegistrar(QLatin1String("JACK"), 10) {
++}
++
++AudioOutput *JackAudioOutputRegistrar::create() {
++        return new JackAudioOutput();
++}
++
++const QList<audioDevice> JackAudioOutputRegistrar::getDeviceChoices() {
++        QList<audioDevice> qlReturn;
++
++        QStringList qlOutputDevs = jasys->qhOutput.keys();
++        qSort(qlOutputDevs);
++
++        foreach(const QString &dev, qlOutputDevs) {
++                qlReturn << audioDevice(jasys->qhOutput.value(dev), dev);
++        }
++
++        return qlReturn;
++}
++
++void JackAudioOutputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
++        Q_UNUSED(choice);
++        Q_UNUSED(s);
++}
++
++JackAudioInput::JackAudioInput() {
++        bRunning = true;
++        iMicChannels = 0;
++};
++
++JackAudioInput::~JackAudioInput() {
++        bRunning = false;
++        iMicChannels = 0;
++        qmMutex.lock();
++        qwcWait.wakeAll();
++        qmMutex.unlock();
++        wait();
++}
++
++void JackAudioInput::run() {
++        if (jasys && jasys->bJackIsGood) {
++            iMicFreq = jasys->iSampleRate;
++            iMicChannels = 1;
++            eMicFormat = SampleFloat;
++            initializeMixer();
++        }
++
++        qmMutex.lock();
++        while (bRunning)
++                qwcWait.wait(&qmMutex);
++        qmMutex.unlock();
++}
++
++JackAudioOutput::JackAudioOutput() {
++        bRunning = true;
++        iChannels = 0;
++}
++
++JackAudioOutput::~JackAudioOutput() {
++        bRunning = false;
++        iChannels = 0;
++        qmMutex.lock();
++        qwcWait.wakeAll();
++        qmMutex.unlock();
++        wait();
++}
++
++void JackAudioOutput::run() {
++        if (jasys && jasys->bJackIsGood) {
++            unsigned int chanmasks[32];
++
++            chanmasks[0] = SPEAKER_FRONT_LEFT;
++            chanmasks[1] = SPEAKER_FRONT_RIGHT;
++
++            eSampleFormat = SampleFloat;
++            iMixerFreq = jasys->iSampleRate;
++            iChannels = 1;
++            initializeMixer(chanmasks);
++        }
++
++        qmMutex.lock();
++        while (bRunning)
++                qwcWait.wait(&qmMutex);
++        qmMutex.unlock();
++}
+diff -U 3 -H -d -r -N -- mumble-1.2.3/src/mumble/JackAudio.h mumble-1.2.3/src/mumble/JackAudio.h
+--- mumble-1.2.3/src/mumble/JackAudio.h	1970-01-01 01:00:00.000000000 +0100
++++ mumble-1.2.3/src/mumble/JackAudio.h	2011-01-26 06:03:58.000000000 +0000
+@@ -0,0 +1,97 @@
++/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
++   Copyright (C) 2011, Filipe Coelho <falktx@gmail.com>
++
++   All rights reserved.
++
++   Redistribution and use in source and binary forms, with or without
++   modification, are permitted provided that the following conditions
++   are met:
++
++   - Redistributions of source code must retain the above copyright notice,
++     this list of conditions and the following disclaimer.
++   - Redistributions in binary form must reproduce the above copyright notice,
++     this list of conditions and the following disclaimer in the documentation
++     and/or other materials provided with the distribution.
++   - Neither the name of the Mumble Developers nor the names of its
++     contributors may be used to endorse or promote products derived from this
++     software without specific prior written permission.
++
++   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
++   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++#ifndef _JACKAUDIO_H
++#define _JACKAUDIO_H
++
++#include "AudioInput.h"
++#include "AudioOutput.h"
++#include <jack/jack.h>
++
++class JackAudioOutput;
++class JackAudioInput;
++
++class JackAudioSystem : public QObject {
++        private:
++                Q_OBJECT
++                Q_DISABLE_COPY(JackAudioSystem)
++        protected:
++                jack_client_t* client;
++                jack_port_t* in_port;
++                jack_port_t* out_port;
++
++                static int process_callback(jack_nframes_t nframes, void *arg);
++                static int srate_callback(jack_nframes_t frames, void *arg);
++                static void shutdown_callback(void *arg);
++        public:
++                QHash<QString, QString> qhInput;
++                QHash<QString, QString> qhOutput;
++                bool bJackIsGood;
++                int iSampleRate;
++                QMutex qmWait;
++                QWaitCondition qwcWait;
++
++                void init_jack();
++                void close_jack();
++
++                JackAudioSystem();
++                ~JackAudioSystem();
++};
++
++class JackAudioInput : public AudioInput {
++                friend class JackAudioSystem;
++        private:
++                Q_OBJECT
++                Q_DISABLE_COPY(JackAudioInput)
++        protected:
++                QMutex qmMutex;
++                QWaitCondition qwcWait;
++        public:
++                JackAudioInput();
++                ~JackAudioInput();
++                void run();
++};
++
++class JackAudioOutput : public AudioOutput {
++                friend class JackAudioSystem;
++        private:
++                Q_OBJECT
++                Q_DISABLE_COPY(JackAudioOutput)
++        protected:
++                QMutex qmMutex;
++                QWaitCondition qwcWait;
++        public:
++                JackAudioOutput();
++                ~JackAudioOutput();
++                void run();
++};
++
++#endif
+diff -U 3 -H -d -r -N -- mumble-1.2.3/src/mumble/mumble.pro mumble-1.2.3/src/mumble/mumble.pro
+--- mumble-1.2.3/src/mumble/mumble.pro	2011-02-19 22:35:17.000000000 +0000
++++ mumble-1.2.3/src/mumble/mumble.pro	2011-08-22 00:19:05.000000000 +0000
+@@ -99,11 +100,17 @@
+ unix {
+   HAVE_PULSEAUDIO=$$system(pkg-config --modversion --silence-errors libpulse)
+   HAVE_PORTAUDIO=$$system(pkg-config --modversion --silence-errors portaudio-2.0)
++  HAVE_JACKAUDIO=$$system(pkg-config --modversion --silence-errors jack)
+ 
+   !isEmpty(HAVE_PORTAUDIO):!CONFIG(no-portaudio) {
+     CONFIG *= portaudio
+   }
+ 
++  !isEmpty(HAVE_JACKAUDIO):!CONFIG(no-jackaudio) {
++    CONFIG -= portaudio
++    CONFIG *= jackaudio
++  }
++
+   !isEmpty(HAVE_PULSEAUDIO):!CONFIG(no-pulseaudio) {
+     CONFIG -= portaudio
+     CONFIG *= pulseaudio
+@@ -116,6 +123,13 @@
+     QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild
+   }
+ 
++  jackaudio {
++        DEFINES *= USE_JACKAUDIO
++        PKGCONFIG *= jack
++        HEADERS *= JackAudio.h
++        SOURCES *= JackAudio.cpp
++  }
++
+   CONFIG *= link_pkgconfig
+ 
+   PKGCONFIG *= openssl sndfile
diff --git a/media-sound/mumble/files/mumble-jack-support.patch b/media-sound/mumble/files/mumble-jack-support.patch
new file mode 100644
index 0000000..8ab2d07
--- /dev/null
+++ b/media-sound/mumble/files/mumble-jack-support.patch
@@ -0,0 +1,454 @@
+diff -U 3 -H -d -r -N -- mumble-1.2.2/src/mumble/JackAudio.cpp mumble-1.2.2/src/mumble/JackAudio.cpp
+--- mumble-1.2.2/src/mumble/JackAudio.cpp	1970-01-01 01:00:00.000000000 +0100
++++ mumble-1.2.2/src/mumble/JackAudio.cpp	2011-01-26 06:02:00.000000000 +0000
+@@ -0,0 +1,314 @@
++/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
++   Copyright (C) 2011, Filipe Coelho <falktx@gmail.com>
++
++   All rights reserved.
++
++   Redistribution and use in source and binary forms, with or without
++   modification, are permitted provided that the following conditions
++   are met:
++
++   - Redistributions of source code must retain the above copyright notice,
++     this list of conditions and the following disclaimer.
++   - Redistributions in binary form must reproduce the above copyright notice,
++     this list of conditions and the following disclaimer in the documentation
++     and/or other materials provided with the distribution.
++   - Neither the name of the Mumble Developers nor the names of its
++     contributors may be used to endorse or promote products derived from this
++     software without specific prior written permission.
++
++   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
++   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++#include "JackAudio.h"
++#include "User.h"
++#include "Global.h"
++#include "MainWindow.h"
++#include "Timer.h"
++
++#include <cstring>
++
++static JackAudioSystem *jasys = NULL;
++
++class JackAudioInputRegistrar : public AudioInputRegistrar {
++        public:
++                JackAudioInputRegistrar();
++                virtual AudioInput *create();
++                virtual const QList<audioDevice> getDeviceChoices();
++                virtual void setDeviceChoice(const QVariant &, Settings &);
++                virtual bool canEcho(const QString &) const;
++};
++
++class JackAudioOutputRegistrar : public AudioOutputRegistrar {
++        public:
++                JackAudioOutputRegistrar();
++                virtual AudioOutput *create();
++                virtual const QList<audioDevice> getDeviceChoices();
++                virtual void setDeviceChoice(const QVariant &, Settings &);
++};
++
++class JackAudioInit : public DeferInit {
++        public:
++                JackAudioInputRegistrar *airJackAudio;
++                JackAudioOutputRegistrar *aorJackAudio;
++                void initialize() {
++                        jasys = new JackAudioSystem();
++                        jasys->init_jack();
++                        jasys->qmWait.lock();
++                        jasys->qwcWait.wait(&jasys->qmWait, 1000);
++                        jasys->qmWait.unlock();
++                        if (jasys->bJackIsGood) {
++                                airJackAudio = new JackAudioInputRegistrar();
++                                aorJackAudio = new JackAudioOutputRegistrar();
++                        } else {
++                                airJackAudio = NULL;
++                                aorJackAudio = NULL;
++                                delete jasys;
++                                jasys = NULL;
++                        }
++                };
++                void destroy() {
++                        if (airJackAudio)
++                                delete airJackAudio;
++                        if (aorJackAudio)
++                                delete aorJackAudio;
++                        if (jasys) {
++                                jasys->close_jack();
++                                delete jasys;
++                                jasys = NULL;
++                        }
++                };
++};
++
++static JackAudioInit jackinit; //unused
++
++JackAudioSystem::JackAudioSystem() {
++        bJackIsGood = false;
++        iSampleRate = 0;
++}
++
++JackAudioSystem::~JackAudioSystem() {
++}
++
++void JackAudioSystem::init_jack()
++{
++        client = jack_client_open("mumble", JackNullOption, 0);
++
++        if (client) {
++                in_port = jack_port_register(client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
++                out_port = jack_port_register(client, "output", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
++                jack_set_process_callback(client, process_callback, this);
++                jack_set_sample_rate_callback(client, srate_callback, this);
++                jack_on_shutdown(client, shutdown_callback, this);
++
++                iSampleRate = jack_get_sample_rate(client);
++
++                if (jack_activate(client) || in_port == NULL || out_port == NULL) {
++                    client = NULL;
++                    return;
++                }
++
++                int port_flags;
++                unsigned i = -1;
++                const char** ports = jack_get_ports(client, 0, 0, JackPortIsPhysical);
++
++                if (ports) {
++                    while (ports[++i])
++                    {
++                        jack_port_t* port = jack_port_by_name(client, ports[i]);
++                        port_flags = jack_port_flags(port);
++
++                        if (port_flags & (JackPortIsPhysical|JackPortIsOutput) && strstr(jack_port_type(port), "audio")) {
++                            jack_connect(client, ports[i], jack_port_name(in_port));
++                        }
++                        if (port_flags & (JackPortIsPhysical|JackPortIsInput) && strstr(jack_port_type(port), "audio")) {
++                            jack_connect(client, jack_port_name(out_port), ports[i]);
++                        }
++                    }
++                }
++
++                jack_free(ports);
++
++                // If we made it this far, then everything is okay
++                qhInput.insert(QString(), tr("Hardware Ports"));
++                qhOutput.insert(QString(), tr("Hardware Ports"));
++                bJackIsGood = true;
++
++            } else {
++                bJackIsGood = false;
++                client = NULL;
++            }
++}
++
++void JackAudioSystem::close_jack()
++{
++        if (client) {
++                jack_deactivate(client);
++                jack_client_close(client);
++                client = NULL;
++        }
++}
++
++int JackAudioSystem::process_callback(jack_nframes_t nframes, void *arg)
++{
++        JackAudioSystem *jas = (JackAudioSystem*)arg;
++
++        if (jas && jas->bJackIsGood) {
++                AudioInputPtr ai = g.ai;
++                AudioOutputPtr ao = g.ao;
++                JackAudioInput *jai = (JackAudioInput*)(ai.get());
++                JackAudioOutput *jao = (JackAudioOutput*)(ao.get());
++
++                if (jai && jai->bRunning && jai->iMicChannels > 0 && !jai->isFinished()) {
++                        void* input = jack_port_get_buffer(jas->in_port, nframes);
++                        if ((float*)input != 0)
++                            jai->addMic(input, nframes);
++                }
++
++                if (jao && jao->bRunning && jao->iChannels > 0 && !jao->isFinished()) {
++                        jack_default_audio_sample_t* output = (jack_default_audio_sample_t*)jack_port_get_buffer(jas->out_port, nframes);
++                        memset(output, 0, sizeof(jack_default_audio_sample_t)*nframes); //TEST
++                        jao->mix(output, nframes);
++                }
++        }
++
++        return 0;
++}
++
++int JackAudioSystem::srate_callback(jack_nframes_t frames, void *arg)
++{
++        JackAudioSystem *jas = (JackAudioSystem*)arg;
++        jas->iSampleRate = frames;
++        return 0;
++}
++
++void JackAudioSystem::shutdown_callback(void *arg)
++{
++        JackAudioSystem *jas = (JackAudioSystem*)arg;
++        jas->bJackIsGood = false;
++}
++
++JackAudioInputRegistrar::JackAudioInputRegistrar() : AudioInputRegistrar(QLatin1String("JACK"), 10) {
++}
++
++AudioInput *JackAudioInputRegistrar::create() {
++        return new JackAudioInput();
++}
++
++const QList<audioDevice> JackAudioInputRegistrar::getDeviceChoices() {
++        QList<audioDevice> qlReturn;
++
++        QStringList qlInputDevs = jasys->qhInput.keys();
++        qSort(qlInputDevs);
++
++        foreach(const QString &dev, qlInputDevs) {
++                qlReturn << audioDevice(jasys->qhInput.value(dev), dev);
++        }
++
++        return qlReturn;
++}
++
++void JackAudioInputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
++        Q_UNUSED(choice);
++        Q_UNUSED(s);
++}
++
++bool JackAudioInputRegistrar::canEcho(const QString &osys) const {
++        Q_UNUSED(osys);
++        return false;
++}
++
++JackAudioOutputRegistrar::JackAudioOutputRegistrar() : AudioOutputRegistrar(QLatin1String("JACK"), 10) {
++}
++
++AudioOutput *JackAudioOutputRegistrar::create() {
++        return new JackAudioOutput();
++}
++
++const QList<audioDevice> JackAudioOutputRegistrar::getDeviceChoices() {
++        QList<audioDevice> qlReturn;
++
++        QStringList qlOutputDevs = jasys->qhOutput.keys();
++        qSort(qlOutputDevs);
++
++        foreach(const QString &dev, qlOutputDevs) {
++                qlReturn << audioDevice(jasys->qhOutput.value(dev), dev);
++        }
++
++        return qlReturn;
++}
++
++void JackAudioOutputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
++        Q_UNUSED(choice);
++        Q_UNUSED(s);
++}
++
++JackAudioInput::JackAudioInput() {
++        bRunning = true;
++        iMicChannels = 0;
++};
++
++JackAudioInput::~JackAudioInput() {
++        bRunning = false;
++        iMicChannels = 0;
++        qmMutex.lock();
++        qwcWait.wakeAll();
++        qmMutex.unlock();
++        wait();
++}
++
++void JackAudioInput::run() {
++        if (jasys && jasys->bJackIsGood) {
++            iMicFreq = jasys->iSampleRate;
++            iMicChannels = 1;
++            eMicFormat = SampleFloat;
++            initializeMixer();
++        }
++
++        qmMutex.lock();
++        while (bRunning)
++                qwcWait.wait(&qmMutex);
++        qmMutex.unlock();
++}
++
++JackAudioOutput::JackAudioOutput() {
++        bRunning = true;
++        iChannels = 0;
++}
++
++JackAudioOutput::~JackAudioOutput() {
++        bRunning = false;
++        iChannels = 0;
++        qmMutex.lock();
++        qwcWait.wakeAll();
++        qmMutex.unlock();
++        wait();
++}
++
++void JackAudioOutput::run() {
++        if (jasys && jasys->bJackIsGood) {
++            unsigned int chanmasks[32];
++
++            chanmasks[0] = SPEAKER_FRONT_LEFT;
++            chanmasks[1] = SPEAKER_FRONT_RIGHT;
++
++            eSampleFormat = SampleFloat;
++            iMixerFreq = jasys->iSampleRate;
++            iChannels = 1;
++            initializeMixer(chanmasks);
++        }
++
++        qmMutex.lock();
++        while (bRunning)
++                qwcWait.wait(&qmMutex);
++        qmMutex.unlock();
++}
+diff -U 3 -H -d -r -N -- mumble-1.2.2/src/mumble/JackAudio.h mumble-1.2.2/src/mumble/JackAudio.h
+--- mumble-1.2.2/src/mumble/JackAudio.h	1970-01-01 01:00:00.000000000 +0100
++++ mumble-1.2.2/src/mumble/JackAudio.h	2011-01-26 06:03:58.000000000 +0000
+@@ -0,0 +1,97 @@
++/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
++   Copyright (C) 2011, Filipe Coelho <falktx@gmail.com>
++
++   All rights reserved.
++
++   Redistribution and use in source and binary forms, with or without
++   modification, are permitted provided that the following conditions
++   are met:
++
++   - Redistributions of source code must retain the above copyright notice,
++     this list of conditions and the following disclaimer.
++   - Redistributions in binary form must reproduce the above copyright notice,
++     this list of conditions and the following disclaimer in the documentation
++     and/or other materials provided with the distribution.
++   - Neither the name of the Mumble Developers nor the names of its
++     contributors may be used to endorse or promote products derived from this
++     software without specific prior written permission.
++
++   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
++   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
++   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
++   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++*/
++
++#ifndef _JACKAUDIO_H
++#define _JACKAUDIO_H
++
++#include "AudioInput.h"
++#include "AudioOutput.h"
++#include <jack/jack.h>
++
++class JackAudioOutput;
++class JackAudioInput;
++
++class JackAudioSystem : public QObject {
++        private:
++                Q_OBJECT
++                Q_DISABLE_COPY(JackAudioSystem)
++        protected:
++                jack_client_t* client;
++                jack_port_t* in_port;
++                jack_port_t* out_port;
++
++                static int process_callback(jack_nframes_t nframes, void *arg);
++                static int srate_callback(jack_nframes_t frames, void *arg);
++                static void shutdown_callback(void *arg);
++        public:
++                QHash<QString, QString> qhInput;
++                QHash<QString, QString> qhOutput;
++                bool bJackIsGood;
++                int iSampleRate;
++                QMutex qmWait;
++                QWaitCondition qwcWait;
++
++                void init_jack();
++                void close_jack();
++
++                JackAudioSystem();
++                ~JackAudioSystem();
++};
++
++class JackAudioInput : public AudioInput {
++                friend class JackAudioSystem;
++        private:
++                Q_OBJECT
++                Q_DISABLE_COPY(JackAudioInput)
++        protected:
++                QMutex qmMutex;
++                QWaitCondition qwcWait;
++        public:
++                JackAudioInput();
++                ~JackAudioInput();
++                void run();
++};
++
++class JackAudioOutput : public AudioOutput {
++                friend class JackAudioSystem;
++        private:
++                Q_OBJECT
++                Q_DISABLE_COPY(JackAudioOutput)
++        protected:
++                QMutex qmMutex;
++                QWaitCondition qwcWait;
++        public:
++                JackAudioOutput();
++                ~JackAudioOutput();
++                void run();
++};
++
++#endif
+diff -U 3 -H -d -r -N -- mumble-1.2.2/src/mumble/mumble.pro mumble-1.2.2/src/mumble/mumble.pro
+--- mumble-1.2.2/src/mumble/mumble.pro	2010-02-09 16:34:51.000000000 +0000
++++ mumble-1.2.2/src/mumble/mumble.pro	2011-01-26 01:45:55.000000000 +0000
+@@ -93,11 +93,17 @@
+ unix {
+   HAVE_PULSEAUDIO=$$system(pkg-config --modversion --silence-errors libpulse)
+   HAVE_PORTAUDIO=$$system(pkg-config --modversion --silence-errors portaudio-2.0)
++  HAVE_JACKAUDIO=$$system(pkg-config --modversion --silence-errors jack)
+ 
+   !isEmpty(HAVE_PORTAUDIO):!CONFIG(no-portaudio) {
+     CONFIG *= portaudio
+   }
+ 
++  !isEmpty(HAVE_JACKAUDIO):!CONFIG(no-jackaudio) {
++    CONFIG -= portaudio
++    CONFIG *= jackaudio
++  }
++
+   !isEmpty(HAVE_PULSEAUDIO):!CONFIG(no-pulseaudio) {
+     CONFIG -= portaudio
+     CONFIG *= pulseaudio
+@@ -110,6 +116,13 @@
+     QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild
+   }
+ 
++  jackaudio {
++        DEFINES *= USE_JACKAUDIO
++        PKGCONFIG *= jack
++        HEADERS *= JackAudio.h
++        SOURCES *= JackAudio.cpp
++  }
++
+   CONFIG *= link_pkgconfig
+ 
+   PKGCONFIG *= openssl sndfile
diff --git a/media-sound/mumble/mumble-1.2.2-r1.ebuild b/media-sound/mumble/mumble-1.2.2-r1.ebuild
new file mode 100644
index 0000000..e86f0d6
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.2-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.2.ebuild,v 1.1 2010/02/10 21:48:20 tgurr Exp $
+
+EAPI="2"
+
+inherit eutils multilib qt4
+
+MY_P="${PN}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software."
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa +dbus debug g15 jack oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.36.0-r1
+	dev-libs/openssl
+	>=dev-libs/protobuf-2.2.0
+	>=media-libs/celt-0.7.0
+	>=media-libs/libsndfile-1.0.20
+	>=media-libs/speex-1.2_rc1
+	x11-libs/qt-core:4[ssl]
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-sql:4[sqlite]
+	x11-libs/qt-svg:4
+	x11-libs/qt-xmlpatterns:4
+	x11-proto/inputproto
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( x11-libs/qt-dbus:4 )
+	g15? ( app-misc/g15daemon )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( app-accessibility/speech-dispatcher )
+	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	use jack && cd "${S}"
+	use jack && epatch "${FILESDIR}"/mumble-jack-support.patch
+}
+
+src_configure() {
+	local conf_add
+
+	if has_version '<=sys-devel/gcc-4.2'; then
+		conf_add="${conf_add} no-pch"
+	else
+		use pch || conf_add="${conf_add} no-pch"
+	fi
+
+	use alsa || conf_add="${conf_add} no-alsa"
+	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use g15 || conf_add="${conf_add} no-g15"
+	use oss || conf_add="${conf_add} no-oss"
+	use portaudio || conf_add="${conf_add} no-portaudio"
+	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
+	use speech || conf_add="${conf_add} no-speechd"
+	use zeroconf || conf_add="${conf_add} no-bonjour"
+
+	eqmake4 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add} \
+			no-11x \
+			no-bundled-celt \
+			no-bundled-speex \
+			no-embed-qt-translations \
+			no-server" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" \
+		|| die "eqmake4 failed."
+}
+
+src_install() {
+	newdoc README.Linux README || die "Installing docs failed."
+	dodoc CHANGES || die "Installing docs failed."
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/mumble || die "Installing mumble binary failed."
+	dobin scripts/mumble-overlay || die "Installing overlay script failed."
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol || die "Installing mumble.protocol file failed."
+
+	domenu scripts/mumble.desktop || die "Installing menu entry failed."
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins icons/mumble.svg || die "Installing icon failed."
+
+	doman man/mumble-overlay.1 || die "Installing mumble-overlay manpage failed."
+	doman man/mumble.1 || die "Installing mumble manpage failed."
+
+	insopts -o root -g root -m 0755
+	insinto "/usr/$(get_libdir)/mumble"
+	doins "${dir}"/lib*.so* || die "Installing plugins failed."
+	doins "${dir}"/plugins/lib*.so* || die "Installing plugins failed."
+}
+
+pkg_postinst() {
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
diff --git a/media-sound/mumble/mumble-1.2.3-r2.ebuild b/media-sound/mumble/mumble-1.2.3-r2.ebuild
new file mode 100644
index 0000000..687e375
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.3-r2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.3-r1.ebuild,v 1.2 2011/06/14 20:10:41 maekke Exp $
+
+EAPI="2"
+
+inherit eutils multilib qt4-r2
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+alsa +dbus debug g15 jack oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+	>=dev-libs/openssl-1.0.0b
+	>=dev-libs/protobuf-2.2.0
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/speex-1.2_rc1
+	sys-apps/lsb-release
+	x11-libs/qt-core:4[ssl]
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-sql:4[sqlite]
+	x11-libs/qt-svg:4
+	x11-libs/qt-xmlpatterns:4
+	x11-proto/inputproto
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( x11-libs/qt-dbus:4 )
+	g15? ( app-misc/g15daemon )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( app-accessibility/speech-dispatcher )
+	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHDIR="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	use jack && cd ${PATCHDIR}
+	use jack && epatch "${FILESDIR}"/mumble-jack-support-r2.patch
+}
+
+src_configure() {
+	local conf_add
+
+	if has_version '<=sys-devel/gcc-4.2'; then
+		conf_add="${conf_add} no-pch"
+	else
+		use pch || conf_add="${conf_add} no-pch"
+	fi
+
+	use alsa || conf_add="${conf_add} no-alsa"
+	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use g15 || conf_add="${conf_add} no-g15"
+	use oss || conf_add="${conf_add} no-oss"
+	use portaudio || conf_add="${conf_add} no-portaudio"
+	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
+	use speech || conf_add="${conf_add} no-speechd"
+	use zeroconf || conf_add="${conf_add} no-bonjour"
+
+	eqmake4 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add} \
+			bundled-celt \
+			no-11x \
+			no-bundled-speex \
+			no-embed-qt-translations \
+			no-server \
+			no-update" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" \
+		|| die "eqmake4 failed."
+}
+
+src_install() {
+	newdoc README.Linux README || die "Installing docs failed."
+	dodoc CHANGES || die "Installing docs failed."
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/mumble || die "Installing mumble binary failed."
+	dobin scripts/mumble-overlay || die "Installing overlay script failed."
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol || die "Installing mumble.protocol file failed."
+
+	domenu scripts/mumble.desktop || die "Installing menu entry failed."
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins icons/mumble.svg || die "Installing icon failed."
+
+	doman man/mumble-overlay.1 || die "Installing mumble-overlay manpage failed."
+	doman man/mumble.1 || die "Installing mumble manpage failed."
+
+	insopts -o root -g root -m 0755
+	insinto "/usr/$(get_libdir)/mumble"
+	doins "${dir}"/libmumble.so.${PV} || die "Installing mumble lib failed."
+	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1 || die "Installing libmumble symlink failed."
+	doins "${dir}"/libcelt0.so.0.{7,11}.0 || die "Installing celt libs failed."
+	doins "${dir}"/plugins/lib*.so* || die "Installing plugins failed."
+}
+
+pkg_postinst() {
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
diff --git a/media-sound/pyjama/Manifest b/media-sound/pyjama/Manifest
new file mode 100644
index 0000000..4475226
--- /dev/null
+++ b/media-sound/pyjama/Manifest
@@ -0,0 +1,2 @@
+DIST pyjama-0.3.0.1.tar.gz 845105 RMD160 646f4d09ad2dfd3a5addaabbaccb841ace277c5f SHA1 f2059bf6b05f04dccb01c2f3c1ec50419281f92d SHA256 6354cb364aa9f2aee69949b2d1c0f01a937dd27f65a10b1bd680198b326a0120
+EBUILD pyjama-0.3.0.1.ebuild 1467 RMD160 93ecff60ca3575a2822d23eb719f01f2672660d1 SHA1 adb3cae4b095b9541620f9148a39c3e77e841093 SHA256 d430576c48d7259e3aff2930b7e8c2a0d18447e8b54ff576a4f5b97ea3131fc0
diff --git a/media-sound/pyjama/pyjama-0.3.0.1.ebuild b/media-sound/pyjama/pyjama-0.3.0.1.ebuild
new file mode 100644
index 0000000..41e7fb1
--- /dev/null
+++ b/media-sound/pyjama/pyjama-0.3.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v3
+# $Header: $
+
+EAPI=2
+
+DESCRIPTION="A Python/GTK application to play free music from Jamendo"
+HOMEPAGE="https://launchpad.net/pyjama"
+SRC_URI="http://launchpad.net/pyjama/trunk/0.3/+download/${P}_all.tar.gz
+         -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="gnome"
+
+RDEPEND="dev-python/pygtk
+	dev-python/simplejson
+	|| ( dev-python/lxml dev-python/pyxml )
+	|| ( dev-lang/python:2.6[sqlite] dev-python/pysqlite )
+	dev-lang/python:2.6
+	>=dev-python/gst-python-0.10
+	>=media-plugins/gst-plugins-soup-0.10
+	gnome? ( dev-python/gnome-python-extras )"
+
+DEPEND="${DEPEND}"
+
+src_compile() {
+	einfo "Nothing to compile for ${P}."
+}
+
+src_install() {
+
+    if [ -e /usr/lib/pyjama/pyjama.py ]
+    then
+       ewarn "Please delete /usr/lib/pyjama!"
+       ewarn "This directory is not needed any more"
+    fi
+
+    einfo "1/3 Copying files"
+    dodir /usr/share/apps/pyjama
+    cp -R "${S}_all"/src/* ${D}/usr/share/apps/pyjama/
+    dosym /usr/share/apps/pyjama/pyjama.py /usr/bin/pyjama
+
+    einfo "2/3 Checking modules..."
+    ${D}/usr/bin/pyjama check-modules
+
+    einfo "3/3 Creating menu-entry for pyjama"
+    dosym /usr/share/apps/pyjama/images/pyjama.xpm /usr/share/pixmaps/pyjama.xpm
+    dosym /usr/share/apps/pyjama/pyjama.desktop /usr/share/applications/pyjama.desktop
+
+    einfo "Pyjama has been installed. Just type 'pyjama' to run it."
+}