summaryrefslogtreecommitdiff
path: root/media-sound
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/abcde/abcde-2.7.ebuild2
-rw-r--r--media-sound/alsa-utils/alsa-utils-1.0.29.ebuild1
-rw-r--r--media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch44
-rw-r--r--media-sound/apetag/apetag-1.12.ebuild2
-rw-r--r--media-sound/asunder/Manifest2
-rw-r--r--media-sound/asunder/asunder-2.8.ebuild (renamed from media-sound/asunder/asunder-2.5.ebuild)2
-rw-r--r--media-sound/cmus/cmus-2.7.1.ebuild2
-rw-r--r--media-sound/easytag/Manifest5
-rw-r--r--media-sound/easytag/easytag-2.2.2.ebuild81
-rw-r--r--media-sound/easytag/easytag-2.2.3.ebuild81
-rw-r--r--media-sound/easytag/easytag-2.2.4.ebuild81
-rw-r--r--media-sound/easytag/easytag-2.2.6.ebuild3
-rw-r--r--media-sound/easytag/easytag-2.4.0.ebuild (renamed from media-sound/easytag/easytag-2.2.5.ebuild)36
-rw-r--r--media-sound/karlyriceditor/Manifest2
-rw-r--r--media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch320
-rw-r--r--media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild37
-rw-r--r--media-sound/karlyriceditor/karlyriceditor-1.3.ebuild31
-rw-r--r--media-sound/kwave/kwave-0.8.10.ebuild1
-rw-r--r--media-sound/kwave/kwave-0.8.12.ebuild1
-rw-r--r--media-sound/kwave/kwave-0.8.99.ebuild1
-rw-r--r--media-sound/mac/mac-3.99.4.5.7-r1.ebuild2
-rw-r--r--media-sound/mp3diags/metadata.xml4
-rw-r--r--media-sound/mumble/mumble-1.2.10-r1.ebuild128
-rw-r--r--media-sound/musique/Manifest2
-rw-r--r--media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch13
-rw-r--r--media-sound/musique/musique-1.4.ebuild (renamed from media-sound/musique/musique-1.2.1.ebuild)18
-rw-r--r--media-sound/ncmpcpp/Manifest1
-rw-r--r--media-sound/ncmpcpp/ncmpcpp-0.6.4.ebuild65
-rw-r--r--media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild2
-rw-r--r--media-sound/nted/files/nted-1.10.18-freetype.patch11
-rw-r--r--media-sound/pasystray/Manifest1
-rw-r--r--media-sound/pasystray/metadata.xml6
-rw-r--r--media-sound/pasystray/pasystray-0.5.2.ebuild46
-rw-r--r--media-sound/pulseaudio/pulseaudio-6.0.ebuild2
-rw-r--r--media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild371
-rw-r--r--media-sound/qmmp/Manifest2
-rw-r--r--media-sound/qmmp/qmmp-0.9.2.ebuild128
-rw-r--r--media-sound/qmmp/qmmp-1.0.0.ebuild132
-rw-r--r--media-sound/spotify/Manifest4
-rw-r--r--media-sound/spotify/spotify-1.0.15.137.ebuild (renamed from media-sound/spotify/spotify-1.0.14.ebuild)14
40 files changed, 1282 insertions, 405 deletions
diff --git a/media-sound/abcde/abcde-2.7.ebuild b/media-sound/abcde/abcde-2.7.ebuild
index b5f9536118..49ac7435c7 100644
--- a/media-sound/abcde/abcde-2.7.ebuild
+++ b/media-sound/abcde/abcde-2.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://abcde.einval.com/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
# Enable MP3 related flags by default
IUSE="aac cdparanoia cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
index 284390bebc..120d48d28a 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
@@ -24,6 +24,7 @@ RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-alsa )"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-cross-compile.patch
epatch_user
}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch
new file mode 100644
index 0000000000..45aa8a9c3c
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch
@@ -0,0 +1,44 @@
+fix from upstream
+
+From c0130c8ec22a89960d9304297a904a2a14979506 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Thu, 8 Oct 2015 12:14:05 -0400
+Subject: [PATCH alsa-utils] build: Do not try to detect cross-compiler
+
+cross compilers are passed via path may not be a gcc based cross
+compiler in such cases this check fails and try's to force gcc based
+cross compiler detection, This code is a convenience that limits the
+build system.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ configure.ac | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c2d1a5..79a9aaf 100644
+--- a/configure
++++ b/configure
+@@ -6192,21 +6192,6 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+
+
+-if test "x$target" != "x$host" -a -z "`echo $CC | grep -e '-gcc'`";
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cross-compiler" >&5
+-$as_echo_n "checking for cross-compiler... " >&6; }
+-
+- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
+- which ${target_cpu}-${target_os}-gcc >/dev/null 2>&1 \
+- && CC=${target_cpu}-${target-os}-gcc
+- which ${target_cpu}-${target_vendor}-${target_os}-gcc >/dev/null 2>&1 \
+- && CC=${target_cpu}-${target_vendor}-${target_os}-gcc
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-fi
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/media-sound/apetag/apetag-1.12.ebuild b/media-sound/apetag/apetag-1.12.ebuild
index 044fc9a8ef..30515bb00f 100644
--- a/media-sound/apetag/apetag-1.12.ebuild
+++ b/media-sound/apetag/apetag-1.12.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://muth.org/Robert/Apetag/${PN}.${PV}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
S=${WORKDIR}/Apetag
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 3950b410d5..24cf5a3fdc 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,3 +1,3 @@
DIST asunder-2.2.tar.bz2 208936 SHA256 bb608c1cdefcce2f533fb5d5cc23838846b2810ec89d0ebb083507cf27e7822f SHA512 6f2a9a2f6d047a41ef0aaa221fafdc86f3fe6e49f9c8cfcaae4e325b62f3f17cddafa57982d2d3aca0922bce6aa29015d398cbf97ddfb44c7d7dfdd75aefab4c WHIRLPOOL 16b0da49f44d09f95d2a86f6290718d850c014c7aef0e875654efda05e0b959bf64a21f2c101a4e897aec633dce215f41ee3f1db221c25d8b04cb600372a633b
-DIST asunder-2.5.tar.bz2 226657 SHA256 0e548050143f964a0f869d44680554c7f7204b53262340ef0bd0f32e37507f20 SHA512 037a9c2478227de400d6dd2a86db80e6d3c6ac189cfbaf5a8c3107f8443590dc50c18f91abb47ee660880f56ba6f03435c3fb539f5df874ad1076fef1e54f474 WHIRLPOOL 6818c1a821cfec63e7082d2ff27eedbd04b17f3c0f9d7ec2aa48fd7b7cab95feb0695f9cce9fdbed4d15dbf2e44141fc569e05df1c0cddb42dec3a7e40562b68
DIST asunder-2.7.tar.bz2 268834 SHA256 e69698f9524e443ac564b5d4b2df135ed7e5b2f94d6b3cabeae5bb2a3c828914 SHA512 3c5116411a30d4ac95ee4303c1627a385bc1bb62680ce15536fa524c8301928a81b4987043490318548832834893d31e51e46b8afb43a4e76ac0aedfeb38b7b7 WHIRLPOOL d97eeed3c7f0497b0afab2401601f1e53a3f5a0da81f1f3d74c26284ab383b3c4c08c4b664dc02083eadcc8bb2518d2b58ac19f8defe3e75525aa12a9bf49579
+DIST asunder-2.8.tar.bz2 269472 SHA256 d8c7014b87ab3c5467876def4d8650fd09fe415ded9de2569c629296499b09db SHA512 54f606e10a27cc73aa5c0f1dc74a2df87020562fb74f14ad7030dd1b5f4ab1a4f42477c7d23b5285a7b0cba00f75929f444bc63e18e8da545c3cbdd2c3330ebe WHIRLPOOL 5e662a14908903ae12a897aa59aa3ca1ab164c628a908c57b298c0019fe46bf66d63e36b0eff6306acdc06704128f5e368e296ce831897428a35a6b2d353552c
diff --git a/media-sound/asunder/asunder-2.5.ebuild b/media-sound/asunder/asunder-2.8.ebuild
index c54d2df3b0..0b6f31c5f2 100644
--- a/media-sound/asunder/asunder-2.5.ebuild
+++ b/media-sound/asunder/asunder-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/media-sound/cmus/cmus-2.7.1.ebuild b/media-sound/cmus/cmus-2.7.1.ebuild
index 1fe39b0889..d5e865edbc 100644
--- a/media-sound/cmus/cmus-2.7.1.ebuild
+++ b/media-sound/cmus/cmus-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cmus/cmus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="aac alsa ao cue cdio cddb discid debug examples +flac jack libsamplerate
+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode
+vorbis wavpack wma"
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 494ef47b01..e0f6a306c9 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,6 +1,3 @@
DIST easytag-2.1.8.tar.xz 2459496 SHA256 1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9 SHA512 cf5d92902276b8d462c695aaa0d1072684d60cbfc45d07fb2ac7b345907a775b94665612088b33f3272db22d4b4eb78f4a4e36f2caf6e151a08f640841208e48 WHIRLPOOL ab37d4942bde4a88c233869b3cf84d13dd4a259cd894941bd9c26ec4f3b22c02af3fc7633a09670ee707d0287bb8bb9fc654ea00e0fe694319a6cf24b220420c
-DIST easytag-2.2.2.tar.xz 973116 SHA256 fb21ac51975c90c58c5dc38c28aa1030d6fa3420bc6b8406f085e34df9e14164 SHA512 1b49fdb080ad59f08c956e63fb0a286a2785e6c4483b2b4003e1b217ad1537999d76dcaedbe4a59782514b655ee53bac8b6907eff246c00bc1a578b2be674010 WHIRLPOOL 270403fe0573b80e93b4084a2089c1492253e1a678fd4b9aceba9ae78a0f590d9d905ddb9fa002d73870bdda47817b652bb29bacb21f2ac951f63063eca5c16b
-DIST easytag-2.2.3.tar.xz 987288 SHA256 f49cadc868a67faeb99bdbedc21a3009783609b380d098412c4799ec48aeaeb3 SHA512 d3a27c6f9b6326cd5850855ea2acae1f73330198247516b3f44d1553e830d29043ef973de81e13743c83aca685258b5a6ba2a19969f571664ac60ff99e71a0ea WHIRLPOOL 22db6d14c0df1001aa4488e224cabc514f91d85c1207eb517d7cfa0213381c003a5c716a391e37da94ae253f0714aa62d394a849c5d59b244604f8032e9e7968
-DIST easytag-2.2.4.tar.xz 989660 SHA256 458329ab17e07fac5e92a2d732f0f4e9b12ea8aa31707506b39d3b2428d0c091 SHA512 bafa1e26371bb95f5edf74424b3733d0ffbb80c740c65e404cf863445a835fdc87f958e9cfddaac7d85281cb3be5ad6584a5750415e294a96c5ef26d4e51f9bf WHIRLPOOL ddb789dfe838c0fa20fc2c42187778b78896b9e038cd1786adb2332764b167268fdd4eb410e45cfb5e6b8fe211745be0bd184083f8677b21905d98da64f82a06
-DIST easytag-2.2.5.tar.xz 1004688 SHA256 a6da3a094997fa225d1c01211b282f2d3c2dfd93a74f3bec24017bd5a13f3855 SHA512 4ffcce0edb49333d9fcf6dc382f58abc60f9e35cdcebc7a98115203523403a5b10795de7f46cd2787fa250dfa887283c4752435c57bf0f60a8000c735b648062 WHIRLPOOL 3af39aba7900a6cce8f7b72ae1ede6ce1ecf120b49301f59f62d1025942a0926ff505965710dae10fb2e8a47915bd7fc54dab59405d6f7e5a3ce206ab5f1ffe2
DIST easytag-2.2.6.tar.xz 1016508 SHA256 26437f0d698c3b16794336c335b40f53fa26aefeb77322e45e4e2501c4cff14a SHA512 abd2f0e0c378c487d6b8f4761db610bf596a97cdfa469d8e597b3965934aa4e3a2e374afb404dcbd68ea124de194f428fee4ec7fe5e2615e87e92be3c9b8a246 WHIRLPOOL 9425b6f9a6bda67ac91475d2f972d70b06861d41d9a994d8a2f67fc0110b343dc87b8c83435a30a46ff8faaf9193fda529df8c3e55d4540d90fe461490a3f9a4
+DIST easytag-2.4.0.tar.xz 1342852 SHA256 b8d882bc168abca96b1b369b10e5b97fa29a7a43f7b33f34489768d111610c3d SHA512 c2cf8c30871a7505c8fda1d6af71d9792aad64565e1351d616858f545ed05477dd48d41628efc22d2edf1aa0f38ceb91d433a51512f01ea81a512f6c9893da0f WHIRLPOOL 764d6a0a6d824ba4457291fdb314a53f29251c6722ba1da19e59874f3b1269b8e91fd1d0b8d2a991247c67bbc2d9acf0adc3d62121029427a8300ae53127be40
diff --git a/media-sound/easytag/easytag-2.2.2.ebuild b/media-sound/easytag/easytag-2.2.2.ebuild
deleted file mode 100644
index 8ad4c6c0b4..0000000000
--- a/media-sound/easytag/easytag-2.2.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit fdo-mime gnome.org gnome2-utils
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
-REQUIRED_USE="|| ( gtk2 gtk3 )
- opus? ( vorbis )
- speex? ( vorbis )"
-
-RDEPEND=">=dev-libs/glib-2.32:2
- flac? ( >=media-libs/flac-1.3 )
- gtk2? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( >=x11-libs/gtk+-3.4:3 )
- mp3? (
- >=media-libs/id3lib-3.8.3-r8
- >=media-libs/libid3tag-0.15.1b-r4
- )
- mp4? ( >=media-libs/taglib-1.9.1[mp4] )
- opus? (
- >=media-libs/opus-1.1
- >=media-libs/opusfile-0.4
- )
- speex? ( >=media-libs/speex-1.2_rc1 )
- vorbis? (
- >=media-libs/libogg-1.3.1
- >=media-libs/libvorbis-1.3.4
- )
- wavpack? ( >=media-sound/wavpack-4.70 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.4
- app-text/yelp-tools
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.18.3.2
- virtual/pkgconfig
- !<dev-util/pkgconfig-0.27
- test? (
- >=dev-util/appdata-tools-0.1.7
- >=dev-util/desktop-file-utils-0.22
- )"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-
-src_prepare() {
- sed -i \
- -e '/^DEPRECATED_CPPFLAGS="/d' \
- -e '/warning_flags/s: -Werror=.*:":' \
- configure || die
-}
-
-src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
- econf \
- $(use_enable test appdata-validate) \
- $(use_enable test tests) \
- $(use_enable mp3) \
- $(use_enable mp3 id3v23) \
- $(use_enable vorbis ogg) \
- $(use_enable opus) \
- $(use_enable speex) \
- $(use_enable flac) \
- $(use_enable mp4) \
- $(use_enable wavpack) \
- $(use_with gtk2)
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
-pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.3.ebuild b/media-sound/easytag/easytag-2.2.3.ebuild
deleted file mode 100644
index 8ad4c6c0b4..0000000000
--- a/media-sound/easytag/easytag-2.2.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit fdo-mime gnome.org gnome2-utils
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
-REQUIRED_USE="|| ( gtk2 gtk3 )
- opus? ( vorbis )
- speex? ( vorbis )"
-
-RDEPEND=">=dev-libs/glib-2.32:2
- flac? ( >=media-libs/flac-1.3 )
- gtk2? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( >=x11-libs/gtk+-3.4:3 )
- mp3? (
- >=media-libs/id3lib-3.8.3-r8
- >=media-libs/libid3tag-0.15.1b-r4
- )
- mp4? ( >=media-libs/taglib-1.9.1[mp4] )
- opus? (
- >=media-libs/opus-1.1
- >=media-libs/opusfile-0.4
- )
- speex? ( >=media-libs/speex-1.2_rc1 )
- vorbis? (
- >=media-libs/libogg-1.3.1
- >=media-libs/libvorbis-1.3.4
- )
- wavpack? ( >=media-sound/wavpack-4.70 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.4
- app-text/yelp-tools
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.18.3.2
- virtual/pkgconfig
- !<dev-util/pkgconfig-0.27
- test? (
- >=dev-util/appdata-tools-0.1.7
- >=dev-util/desktop-file-utils-0.22
- )"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-
-src_prepare() {
- sed -i \
- -e '/^DEPRECATED_CPPFLAGS="/d' \
- -e '/warning_flags/s: -Werror=.*:":' \
- configure || die
-}
-
-src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
- econf \
- $(use_enable test appdata-validate) \
- $(use_enable test tests) \
- $(use_enable mp3) \
- $(use_enable mp3 id3v23) \
- $(use_enable vorbis ogg) \
- $(use_enable opus) \
- $(use_enable speex) \
- $(use_enable flac) \
- $(use_enable mp4) \
- $(use_enable wavpack) \
- $(use_with gtk2)
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
-pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.4.ebuild b/media-sound/easytag/easytag-2.2.4.ebuild
deleted file mode 100644
index 8ad4c6c0b4..0000000000
--- a/media-sound/easytag/easytag-2.2.4.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit fdo-mime gnome.org gnome2-utils
-
-DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
-HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
-REQUIRED_USE="|| ( gtk2 gtk3 )
- opus? ( vorbis )
- speex? ( vorbis )"
-
-RDEPEND=">=dev-libs/glib-2.32:2
- flac? ( >=media-libs/flac-1.3 )
- gtk2? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( >=x11-libs/gtk+-3.4:3 )
- mp3? (
- >=media-libs/id3lib-3.8.3-r8
- >=media-libs/libid3tag-0.15.1b-r4
- )
- mp4? ( >=media-libs/taglib-1.9.1[mp4] )
- opus? (
- >=media-libs/opus-1.1
- >=media-libs/opusfile-0.4
- )
- speex? ( >=media-libs/speex-1.2_rc1 )
- vorbis? (
- >=media-libs/libogg-1.3.1
- >=media-libs/libvorbis-1.3.4
- )
- wavpack? ( >=media-sound/wavpack-4.70 )"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.4
- app-text/yelp-tools
- dev-libs/libxml2
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- >=sys-devel/gettext-0.18.3.2
- virtual/pkgconfig
- !<dev-util/pkgconfig-0.27
- test? (
- >=dev-util/appdata-tools-0.1.7
- >=dev-util/desktop-file-utils-0.22
- )"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
-
-src_prepare() {
- sed -i \
- -e '/^DEPRECATED_CPPFLAGS="/d' \
- -e '/warning_flags/s: -Werror=.*:":' \
- configure || die
-}
-
-src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
- econf \
- $(use_enable test appdata-validate) \
- $(use_enable test tests) \
- $(use_enable mp3) \
- $(use_enable mp3 id3v23) \
- $(use_enable vorbis ogg) \
- $(use_enable opus) \
- $(use_enable speex) \
- $(use_enable flac) \
- $(use_enable mp4) \
- $(use_enable wavpack) \
- $(use_with gtk2)
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
-pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
diff --git a/media-sound/easytag/easytag-2.2.6.ebuild b/media-sound/easytag/easytag-2.2.6.ebuild
index 8ad4c6c0b4..5eb03f22c0 100644
--- a/media-sound/easytag/easytag-2.2.6.ebuild
+++ b/media-sound/easytag/easytag-2.2.6.ebuild
@@ -59,9 +59,6 @@ src_prepare() {
}
src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
econf \
$(use_enable test appdata-validate) \
$(use_enable test tests) \
diff --git a/media-sound/easytag/easytag-2.2.5.ebuild b/media-sound/easytag/easytag-2.4.0.ebuild
index 8ad4c6c0b4..1017064c5b 100644
--- a/media-sound/easytag/easytag-2.2.5.ebuild
+++ b/media-sound/easytag/easytag-2.4.0.ebuild
@@ -11,15 +11,14 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="flac gtk2 +gtk3 mp3 mp4 opus speex test vorbis wavpack"
-REQUIRED_USE="|| ( gtk2 gtk3 )
- opus? ( vorbis )
+IUSE="flac mp3 mp4 opus speex test vorbis wavpack"
+REQUIRED_USE="opus? ( vorbis )
speex? ( vorbis )"
-RDEPEND=">=dev-libs/glib-2.32:2
+RDEPEND=">=dev-libs/glib-2.38:2
+ media-libs/libcanberra[gtk3]
+ >=x11-libs/gtk+-3.10:3
flac? ( >=media-libs/flac-1.3 )
- gtk2? ( >=x11-libs/gtk+-2.24:2 )
- gtk3? ( >=x11-libs/gtk+-3.4:3 )
mp3? (
>=media-libs/id3lib-3.8.3-r8
>=media-libs/libid3tag-0.15.1b-r4
@@ -59,9 +58,6 @@ src_prepare() {
}
src_configure() {
- # Kludge to make easytag find its locales (bug #503698)
- export DATADIRNAME=share
-
econf \
$(use_enable test appdata-validate) \
$(use_enable test tests) \
@@ -72,10 +68,22 @@ src_configure() {
$(use_enable speex) \
$(use_enable flac) \
$(use_enable mp4) \
- $(use_enable wavpack) \
- $(use_with gtk2)
+ $(use_enable wavpack)
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+ gnome2_schemas_savelist
}
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
-pkg_postrm() { gnome2_icon_cache_update; fdo-mime_desktop_database_update; }
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+ gnome2_schemas_update
+}
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
index 109d80eb65..0f7be280ee 100644
--- a/media-sound/karlyriceditor/Manifest
+++ b/media-sound/karlyriceditor/Manifest
@@ -1,2 +1,2 @@
-DIST karlyriceditor-1.3.tar.gz 215564 SHA256 f59bc9352e30a02228db65d47e190aa00e6f8e7f6ec18b093a30841548b90e57 SHA512 23e91e6f950b4f3d5ddaa474380dfd5904bd29f262144df6d587efbba070e1c84bd6d364981e0babb75aa4562c375734b16944817e49ad83ab0c169cf9d2e0e5 WHIRLPOOL d71b7111e2bf57a995acb10de14c39bce37c8f8072936812d8d672540dd22650ce1259cffccecfe6231ca0a3cba87546cd00247247bdc2b6deeb58f2e6c11c10
+DIST karlyriceditor-1.11.tar.gz 275744 SHA256 55c074111d5e22950d9ef270d5c38f52bc3da167081efe570f77b8f4e578b8dc SHA512 d86cc10c18bff321d2f22b4b810bcc52189602bfddbe8cbdd99120cf281dc673221ce75c9a8e07b8bab03f9a60c3634853177b3fa72e3f1213b96a3303568820 WHIRLPOOL 9495665856346ab54a0662a2a89bb7a10358f16d9844491ddcb9105cc266c1994b786b60bf56b5c206e2740aa77599653cb5c23ae88cdb026bd44adafa7a77a8
DIST karlyriceditor-1.4.tar.gz 236662 SHA256 b458eb21087cd0d92e8ea87b4ac094a2126cfbcf6471b0b1ea03173cec0ebfef SHA512 ac92e8f67be46880e71082ae1b2d099deb15ca1abca1fdf7eb8539d0346ca223ee50d9739f7879699fb190e7bc544c2a753402804df20c9b4c35eefae2d3bdbb WHIRLPOOL 9072da5010deb34fe9e09dee165f824b3aeace89a3fd0c1b464def17cf767a5ee84a77d7b2f8696f81364be5bc54003243faba3870198ba084b98e3bc2207984
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch b/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch
new file mode 100644
index 0000000000..6322c07085
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-1.11-libav.patch
@@ -0,0 +1,320 @@
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Tue, 13 Nov 2012 20:19:11 +0100
+Subject: Add missing includes for libavutil
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+Bug: http://sourceforge.net/tracker/?func=detail&aid=3512390&group_id=290648&atid=1229531
+Forwarded: not-needed
+
+Added includes necessary for the use of the function "av_rescale_q".
+Forwarding to upstream not needed because an equivalent patch has already been
+posted to upstream's bug tracker (see URL in the "Bug" field).
+---
+ src/audioplayerprivate.cpp | 3 +++
+ src/ffmpegvideoencoder.cpp | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/audioplayerprivate.cpp b/src/audioplayerprivate.cpp
+index ffff90e..1b6b32d 100644
+--- a/src/audioplayerprivate.cpp
++++ b/src/audioplayerprivate.cpp
+@@ -21,6 +21,9 @@
+
+ #include "audioplayer.h"
+ #include "audioplayerprivate.h"
++extern "C" {
++#include "libavutil/mathematics.h"
++}
+ #include <SDL/SDL.h>
+
+ // SDL defines its own main() function in SDL_main. And so does Qt, so if we continue without
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index 5734d2e..49182b5 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -28,6 +28,9 @@
+ #include "videoencodingprofiles.h"
+ #include "audioplayer.h"
+ #include "audioplayerprivate.h"
++extern "C" {
++#include "libavutil/mathematics.h"
++}
+
+
+ #define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Sat, 12 Apr 2014 15:19:48 +0200
+Subject: Fix compilation: FFmpeg/Libav
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+Forwarded: not-needed
+
+The upstream developers compile Karlyriceditor against FFmpeg, but in Debian
+there is only Libav available, whose API is slowly drifting away from
+FFmpeg's. This patch adapts the code to several of those differences:
+* The second parameters of "avformat_new_stream" is of non-const pointer
+ type, but the code tries to pass a const pointer to it.
+* There is no AV_ROUND_PASS_MINMAX flag for the rounding parameter of
+ av_rescale_q_rnd in Libav.
+* The member r_frame_rate is no longer present in AVStream. The recommended
+ replacement is avg_frame_rate.
+* The enums CODEC_ID_MP3 and CODEC_ID_AC3 have been prefixed with AV_.
+* The function avcodec_alloc_frame was removed in favor of av_frame_alloc.
+ The corresponding deallocation function is av_frame_free (not the generic
+ av_free).
+---
+ src/audioplayerprivate.cpp | 4 ++--
+ src/ffmpegvideodecoder.cpp | 8 ++++----
+ src/ffmpegvideoencoder.cpp | 32 ++++++++++++++++++++------------
+ 3 files changed, 26 insertions(+), 18 deletions(-)
+
+diff --git a/src/audioplayerprivate.cpp b/src/audioplayerprivate.cpp
+index 1b6b32d..a6536cd 100644
+--- a/src/audioplayerprivate.cpp
++++ b/src/audioplayerprivate.cpp
+@@ -118,7 +118,7 @@ void AudioPlayerPrivate::close()
+ }
+
+ if ( m_frame )
+- av_free( m_frame );
++ av_frame_free( &m_frame );
+
+ m_frame = 0;
+ pFormatCtx = 0;
+@@ -227,7 +227,7 @@ bool AudioPlayerPrivate::open( const QString& filename )
+ }
+
+ // Allocate the buffer
+- m_frame = avcodec_alloc_frame();
++ m_frame = av_frame_alloc();
+
+ if ( !m_frame )
+ {
+diff --git a/src/ffmpegvideodecoder.cpp b/src/ffmpegvideodecoder.cpp
+index 2ec5969..7820f72 100644
+--- a/src/ffmpegvideodecoder.cpp
++++ b/src/ffmpegvideodecoder.cpp
+@@ -113,8 +113,8 @@ bool FFMpegVideoDecoder::openFile( const QString& filename, unsigned int seekto
+ if ( d->videoStream == -1 )
+ return false; // Didn't find a video stream
+
+- d->m_fps_den = d->pFormatCtx->streams[d->videoStream]->r_frame_rate.den;
+- d->m_fps_num = d->pFormatCtx->streams[d->videoStream]->r_frame_rate.num;
++ d->m_fps_den = d->pFormatCtx->streams[d->videoStream]->avg_frame_rate.den;
++ d->m_fps_num = d->pFormatCtx->streams[d->videoStream]->avg_frame_rate.num;
+
+ if ( d->m_fps_den == 60000 )
+ d->m_fps_den = 30000;
+@@ -139,10 +139,10 @@ bool FFMpegVideoDecoder::openFile( const QString& filename, unsigned int seekto
+ }
+
+ // Allocate video frame
+- d->pFrame = avcodec_alloc_frame();
++ d->pFrame = av_frame_alloc();
+
+ // Allocate an AVFrame structure
+- d->pFrameRGB = avcodec_alloc_frame();
++ d->pFrameRGB = av_frame_alloc();
+
+ if ( !d->pFrame || !d->pFrameRGB )
+ {
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index 49182b5..bdf1730 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -174,10 +174,10 @@ bool FFMpegVideoEncoderPriv::close()
+ delete[] audioSampleBuffer;
+
+ if ( videoFrame )
+- av_free(videoFrame);
++ av_frame_free( &videoFrame );
+
+ if ( audioFrame )
+- av_free( audioFrame );
++ av_frame_free( &audioFrame );
+
+ outputFormatCtx = 0;
+ outputFormat = 0;
+@@ -383,7 +383,11 @@ av_log_set_level(AV_LOG_VERBOSE);
+ }
+
+ // Create the video stream, index
+- videoStream = avformat_new_stream( outputFormatCtx, videoCodecCtx->codec );
++ // Use a block to keep the helper variable "codec" local to avoid conflict with gotos
++ {
++ AVCodec codec = *videoCodecCtx->codec;
++ videoStream = avformat_new_stream( outputFormatCtx, &codec );
++ }
+
+ if ( !videoStream )
+ {
+@@ -425,10 +429,10 @@ av_log_set_level(AV_LOG_VERBOSE);
+ // We're copying the stream
+ memcpy( newCtx, m_aplayer->aCodecCtx, sizeof(AVCodecContext) );
+
+- if ( newCtx->block_align == 1 && newCtx->codec_id == CODEC_ID_MP3 )
++ if ( newCtx->block_align == 1 && newCtx->codec_id == AV_CODEC_ID_MP3 )
+ newCtx->block_align= 0;
+
+- if ( newCtx->codec_id == CODEC_ID_AC3 )
++ if ( newCtx->codec_id == AV_CODEC_ID_AC3 )
+ newCtx->block_align= 0;
+ }
+ else
+@@ -443,7 +447,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ }
+
+ // Hack to use the fixed AC3 codec if available
+- if ( audioCodec->id == CODEC_ID_AC3 && avcodec_find_encoder_by_name( "ac3_fixed" ) )
++ if ( audioCodec->id == AV_CODEC_ID_AC3 && avcodec_find_encoder_by_name( "ac3_fixed" ) )
+ audioCodec = avcodec_find_encoder_by_name( "ac3_fixed" );
+
+ // Allocate the audio context
+@@ -544,7 +548,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ goto cleanup;
+ }
+
+- audioFrame = avcodec_alloc_frame();
++ audioFrame = av_frame_alloc();
+
+ if ( !audioFrame )
+ {
+@@ -573,10 +577,10 @@ av_log_set_level(AV_LOG_VERBOSE);
+ goto cleanup;
+ }
+
+- if ( audioStream->codec->block_align == 1 && audioStream->codec->codec_id == CODEC_ID_MP3 )
++ if ( audioStream->codec->block_align == 1 && audioStream->codec->codec_id == AV_CODEC_ID_MP3 )
+ audioStream->codec->block_align= 0;
+
+- if ( audioStream->codec->codec_id == CODEC_ID_AC3 )
++ if ( audioStream->codec->codec_id == AV_CODEC_ID_AC3 )
+ audioStream->codec->block_align= 0;
+ }
+
+@@ -595,7 +599,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ }
+
+ // Allocate the YUV frame
+- videoFrame = avcodec_alloc_frame();
++ videoFrame = av_frame_alloc();
+
+ if ( !videoFrame )
+ {
+@@ -753,8 +757,12 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ pkt.flags |= AV_PKT_FLAG_KEY;
+
+ // Rescale output packet timestamp values from codec to stream timebase
+- pkt.pts = av_rescale_q_rnd( pkt.pts, audioCodecCtx->time_base, audioStream->time_base, (AVRounding) (AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX) );
+- pkt.dts = av_rescale_q_rnd( pkt.dts, audioCodecCtx->time_base, audioStream->time_base, (AVRounding) (AV_ROUND_NEAR_INF|AV_ROUND_PASS_MINMAX) );
++ if ( pkt.pts != AV_NOPTS_VALUE ) {
++ pkt.pts = av_rescale_q_rnd( pkt.pts, audioCodecCtx->time_base, audioStream->time_base, AV_ROUND_NEAR_INF );
++ }
++ if ( pkt.dts != AV_NOPTS_VALUE ) {
++ pkt.dts = av_rescale_q_rnd( pkt.dts, audioCodecCtx->time_base, audioStream->time_base, AV_ROUND_NEAR_INF );
++ }
+ pkt.duration = av_rescale_q( pkt.duration, audioCodecCtx->time_base, audioStream->time_base);
+
+ // And write the file
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Sat, 10 May 2014 01:04:56 +0200
+Subject: Fix segfault: AVFrame initialization (Libav/FFmpeg)
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+Forwarded: not-needed
+
+The upstream developers compile Karlyriceditor against FFmpeg, but in Debian
+there is only Libav available, whose API is slowly drifting away from
+FFmpeg's. This patch adapts the code to one of those differences.
+In Libav the function avcodec_get_frame_defaults cannot be called on a
+completely uninitialized object. It expects at least some pointers inside
+the struct to be initialized to NULL. Otherwise (depending on the random
+pointer value) it may perform a free() on that random pointer. In Libav the
+preferred way to initialize an AVFrame object is by calling
+avcodec_alloc_frame(), which allocates the memory, initializes it to zero
+and then calls avcodec_get_frame_defaults itself. This involves changing
+"srcaudio" from a stack object to a heap object and freeing it after use.
+---
+ src/ffmpegvideoencoder.cpp | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index bdf1730..ccfdc7c 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -685,12 +685,11 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ }
+
+ // Initialize the frame
+- AVFrame srcaudio;
+- avcodec_get_frame_defaults( &srcaudio );
++ AVFrame *srcaudio = av_frame_alloc();
+
+ // Decode the original audio into the srcaudio frame
+ int got_audio;
+- err = avcodec_decode_audio4( m_aplayer->aCodecCtx, &srcaudio, &got_audio, &pkt );
++ err = avcodec_decode_audio4( m_aplayer->aCodecCtx, srcaudio, &got_audio, &pkt );
+
+ if ( err < 0 )
+ {
+@@ -710,9 +709,9 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ NULL,
+ 0,
+ 0,
+- srcaudio.data,
++ srcaudio->data,
+ 0,
+- srcaudio.nb_samples )) < 0 )
++ srcaudio->nb_samples )) < 0 )
+ {
+ qWarning( "Error resampling decoded audio: %d", err );
+ return -1;
+@@ -777,6 +776,8 @@ int FFMpegVideoEncoderPriv::encodeImage( const QImage &img, qint64 )
+ av_free_packet( &pkt );
+ }
+ }
++
++ av_frame_free( &srcaudio );
+ }
+ }
+
+From: =?utf-8?q?Martin_Stegh=C3=B6fer?= <martin@steghoefer.eu>
+Date: Sat, 10 May 2014 13:19:25 +0200
+Subject: Fix FP exception: Sample aspect ratio (Libav/FFmpeg)
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Author: Martin Steghöfer <martin@steghoefer.eu>
+Forwarded: not-needed
+
+The upstream developers compile Karlyriceditor against FFmpeg, but in Debian
+there is only Libav available, whose API is slowly drifting away from
+FFmpeg's. This patch adapts the code to one of those differences.
+In Libav sample aspect ratio of a AVStream object is not automatically
+initialized to the one of its codec. So this has to be done manually.
+---
+ src/ffmpegvideoencoder.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ffmpegvideoencoder.cpp b/src/ffmpegvideoencoder.cpp
+index ccfdc7c..3122f2a 100644
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -399,6 +399,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ videoStream->codec = videoCodecCtx;
+
+ // Set the video stream timebase if not set
++ videoStream->sample_aspect_ratio = videoCodecCtx->sample_aspect_ratio;
+ if ( videoStream->time_base.den == 0 )
+ videoStream->time_base = videoCodecCtx->time_base;
+
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild
new file mode 100644
index 0000000000..6f968fa78d
--- /dev/null
+++ b/media-sound/karlyriceditor/karlyriceditor-1.11-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
+HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="
+ dev-libs/openssl:0
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ media-libs/libsdl[sound]
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:= )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-libav.patch" )
+
+src_install() {
+ dodoc Changelog
+ dobin bin/${PN}
+ doicon packages/${PN}.png
+ make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
+}
diff --git a/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild b/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild
deleted file mode 100644
index b9afaa0404..0000000000
--- a/media-sound/karlyriceditor/karlyriceditor-1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="A program which lets you edit and synchronize lyrics with karaoke songs in varions formats"
-HOMEPAGE="http://www.karlyriceditor.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:0
- media-libs/libsdl
- >=virtual/ffmpeg-0.9
- dev-qt/qtcore:4
- dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-libav.patch" )
-
-src_install() {
- dodoc Changelog
- dobin bin/${PN}
- doicon packages/${PN}.png
- make_desktop_entry ${PN} 'Karaoke Lyrics Editor'
-}
diff --git a/media-sound/kwave/kwave-0.8.10.ebuild b/media-sound/kwave/kwave-0.8.10.ebuild
index 9a00ffa36b..ceabb28f79 100644
--- a/media-sound/kwave/kwave-0.8.10.ebuild
+++ b/media-sound/kwave/kwave-0.8.10.ebuild
@@ -4,6 +4,7 @@
EAPI=5
+CMAKE_MAKEFILE_GENERATOR="emake"
KDE_LINGUAS="cs de fr"
KDE_HANDBOOK="optional"
inherit kde4-base
diff --git a/media-sound/kwave/kwave-0.8.12.ebuild b/media-sound/kwave/kwave-0.8.12.ebuild
index c5c0edf7ff..6dc0d5a92a 100644
--- a/media-sound/kwave/kwave-0.8.12.ebuild
+++ b/media-sound/kwave/kwave-0.8.12.ebuild
@@ -4,6 +4,7 @@
EAPI=5
+CMAKE_MAKEFILE_GENERATOR="emake"
KDE_LINGUAS="cs de es fr"
KDE_HANDBOOK="optional"
inherit kde4-base
diff --git a/media-sound/kwave/kwave-0.8.99.ebuild b/media-sound/kwave/kwave-0.8.99.ebuild
index 3d41ad90f2..a2b42cc6ea 100644
--- a/media-sound/kwave/kwave-0.8.99.ebuild
+++ b/media-sound/kwave/kwave-0.8.99.ebuild
@@ -4,6 +4,7 @@
EAPI=5
+CMAKE_MAKEFILE_GENERATOR="emake"
KDE_LINGUAS="cs de es fr"
KDE_HANDBOOK="optional"
inherit kde4-base
diff --git a/media-sound/mac/mac-3.99.4.5.7-r1.ebuild b/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
index f0b8f1d2d7..a59da999ba 100644
--- a/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-3.99.4.5.7-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://etree.org/shnutils/shntool/support/formats/ape/unix/${MY_PV}-${P
LICENSE="mac"
SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 x86"
IUSE="cpu_flags_x86_mmx static-libs"
RDEPEND=""
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
index 3159078fa4..32a4a36c9c 100644
--- a/media-sound/mp3diags/metadata.xml
+++ b/media-sound/mp3diags/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
<herd>qt</herd>
<upstream>
<remote-id type="sourceforge">mp3diags</remote-id>
diff --git a/media-sound/mumble/mumble-1.2.10-r1.ebuild b/media-sound/mumble/mumble-1.2.10-r1.ebuild
new file mode 100644
index 0000000000..267536ce79
--- /dev/null
+++ b/media-sound/mumble/mumble-1.2.10-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils multilib qt4-r2
+
+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 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND=">=dev-libs/boost-1.41.0
+ !libressl? ( >=dev-libs/openssl-1.0.0b:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/protobuf-2.2.0
+ >=media-libs/libsndfile-1.0.20[-minimal]
+ >=media-libs/opus-1.0.1
+ >=media-libs/speex-1.2_rc1
+ sys-apps/lsb-release
+ x11-libs/libX11
+ x11-libs/libXi
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtsvg:4
+ dev-qt/qtxmlpatterns:4
+ x11-proto/inputproto
+ alsa? ( media-libs/alsa-lib )
+ dbus? ( dev-qt/qtdbus:4 )
+ g15? ( app-misc/g15daemon )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-sound/pulseaudio )
+ speech? ( app-accessibility/speech-dispatcher )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+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-bundled-opus \
+ no-bundled-speex \
+ no-embed-qt-translations \
+ no-server \
+ no-update" \
+ DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_compile() {
+ # parallel make workaround, bug #445960
+ emake -j1
+}
+
+src_install() {
+ newdoc README.Linux README
+ dodoc CHANGES
+
+ local dir
+ if use debug; then
+ dir=debug
+ else
+ dir=release
+ fi
+
+ dobin "${dir}"/mumble
+ dobin scripts/mumble-overlay
+
+ insinto /usr/share/services
+ doins scripts/mumble.protocol
+
+ domenu scripts/mumble.desktop
+
+ insinto /usr/share/icons/hicolor/scalable/apps
+ doins icons/mumble.svg
+
+ doman man/mumble-overlay.1
+ doman man/mumble.1
+
+ insopts -o root -g root -m 0755
+ insinto "/usr/$(get_libdir)/mumble"
+ doins "${dir}"/libmumble.so.${PV}
+ dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
+ doins "${dir}"/libcelt0.so.0.{7,11}.0
+ doins "${dir}"/plugins/lib*.so*
+}
+
+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/musique/Manifest b/media-sound/musique/Manifest
index e22fbb7353..971fe7e25b 100644
--- a/media-sound/musique/Manifest
+++ b/media-sound/musique/Manifest
@@ -1,2 +1,2 @@
-DIST musique-1.2.1.tar.gz 374601 SHA256 cc0f626d7de981ff7fdd776fb9eab6a7750443ad55f6978132d9c9d11abd1f38 SHA512 b6d52d8345c69e5b4bfa6419cab4baeb5ed1c81106fbe98b74943cc4c6aa0712444e2189605132da2a2362d38de322926eb3f6ef0b8f25bb45e3e86e3b74cd33 WHIRLPOOL 775751a857dd2e4fbc1f9e50dea9ed0c9d40edd8af7c1bc0a9c7eb186aad39680760825b5c04bbc439d9ac98682952cf5fc2d8e8db595e0f0a99125e6112a078
DIST musique-1.3.tar.gz 399750 SHA256 401643ad9c750270a89d431806044c626dee3fe7ebc14d0ac72917197cdd0592 SHA512 eb197c315b77d4053960c8c18d012635f957eb9ae89bb8b576f938013db43f78ab0d5a0fe0d46fb32cc9f398f9d7f96a37cf975b2f192a6cbc3dd294c4cad279 WHIRLPOOL b4a48d2e8d57d3cfb6cb3d705b4cccbbaf9ae642f16864bb9c61ece02e658b941472a2767d82218c5bf36031af52354fd2868014d8af0a4b2bb71abdf96f3e6e
+DIST musique-1.4.tar.gz 390031 SHA256 08dfb4201aa0edc4b3fe4ef7788e618f754c3921f3a7c1cdce40ef3999760670 SHA512 0ecc7cf1038880fc302602967cd7563641310cbe19fe2394e8ce2c03562f5e336bfc76e1ea18b026c2602b11cfe278a106bc9b3b2dd625d7e70db0da57985a68 WHIRLPOOL 8185dcbe0559b34d3f8e7b93498312c375412faa83eed01acccc1faaabfb979672cb78969d2965251aa63bd2e38477654575e52d8a760fe186e39398efc08e36
diff --git a/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch b/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch
new file mode 100644
index 0000000000..ddd524261f
--- /dev/null
+++ b/media-sound/musique/files/musique-1.4-unbundle-qtsingleapplication.patch
@@ -0,0 +1,13 @@
+Use system copy of qtsingleapplication.
+
+--- musique.pro
++++ musique.pro
+@@ -16,7 +16,7 @@
+ TARGET = $${APP_UNIX_NAME}
+
+ QT += network xml sql
+-include(src/qtsingleapplication/qtsingleapplication.pri)
++CONFIG += qtsingleapplication
+
+ HEADERS += src/mainwindow.h \
+ src/aboutview.h \
diff --git a/media-sound/musique/musique-1.2.1.ebuild b/media-sound/musique/musique-1.4.ebuild
index 5cf7db1db5..6e40cbb2ae 100644
--- a/media-sound/musique/musique-1.2.1.ebuild
+++ b/media-sound/musique/musique-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,8 +8,7 @@ inherit eutils qt4-r2
DESCRIPTION="Qt4 music player"
HOMEPAGE="http://flavio.tordini.org/musique"
-# Same tarball for every release. We repackage it
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+SRC_URI="http://flavio.tordini.org/files/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -17,8 +16,10 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
+ dev-qt/qtcore:4
dev-qt/qtdbus:4
- dev-qt/qtgui:4[gtkstyle]
+ dev-qt/qtgui:4
+ dev-qt/qtsingleapplication[qt4,X]
dev-qt/qtsql:4[sqlite]
|| ( dev-qt/qtphonon:4 media-libs/phonon[qt4] )
media-libs/taglib
@@ -27,14 +28,11 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${PN}"
-DOCS="CHANGES TODO"
+DOCS=( CHANGES TODO )
src_prepare () {
- # bug 422665. Upstream only cares about ubuntu
- # so this bug will be fixed once ubuntu moves
- # to gcc-4.7. No, I will not send this patch upstream
- # *again*
- epatch "${FILESDIR}"/${PN}-1.1-gcc47.patch
+ epatch "${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch
+ rm -r src/qtsingleapplication || die
qt4-r2_src_prepare
}
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 2b97a836a4..bd48e1f542 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,3 +1,2 @@
-DIST ncmpcpp-0.6.4.tar.bz2 429705 SHA256 757e2e06b7e17009c24e2b46a69f008e61aa679476f93e00dc602ca087c805f1 SHA512 c60a6c2c89a9297d73360ec8819e8ae66ca53090c5ea5d3daf235e708467ee20006b1fff344c9312ccb0941c8307f3d84bcdc9cbf500955c74b10bd6a823c19f WHIRLPOOL 56bd22148f38289030a558b43008f83e9e0ccd1ff178be183ad935d08b397de51c49f2c7d84ab9504b62b0105516f460ff131d65a99af9e73519783e15c84797
DIST ncmpcpp-0.6.5.tar.bz2 429699 SHA256 51128f6835c592c8d4367a66b08e06a9419a86c9d5c6e91d0f1dc73af56cd1fd SHA512 b120bd3c0697d51755e04908d29ddd4180ae662d3f02d60e967ccbefca87471eaf0dcf4ebed5d76203b7a0a6dd17a397f318a65087c1b8ec1e3fb4178964e581 WHIRLPOOL c4fa51645de9f1c7a530ee06113bc0fce5954d155112de4921dec2af5da58465b646c193f8359708b51619ec5f0fc9968680ec22549f97352f9309006499c77b
DIST ncmpcpp-0.6.7.tar.bz2 429687 SHA256 08807dc515b4e093154a6e91cdd17ba64ebedcfcd7aa34d0d6eb4d4cc28a217b SHA512 2161a9799c218fe506aa7645338c6e5b32bc6fcb8ee5bcdc76484a068242ae39fd884ece845e1c2f895305d2e6867a3074c266548322f80766c1b8dfeb5d39bb WHIRLPOOL 9f1e4cda03fcb36c79c34a921e8bd272d1875b96a497c2af0a68f2928e82d0ecce208cd08c89a79643106c284757b85eb0f57bcd241f213c3f5d1bdbad087247
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.4.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.4.ebuild
deleted file mode 100644
index e0caa2bc6c..0000000000
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="http://ncmpcpp.rybczak.net/"
-SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="clock curl outputs taglib unicode visualizer"
-
-RDEPEND="
- >=media-libs/libmpdclient-2.1
- curl? ( net-misc/curl )
- dev-libs/boost:=[nls,threads]
- sys-libs/ncurses[unicode?]
- sys-libs/readline:*
- taglib? ( media-libs/taglib )
- visualizer? ( sci-libs/fftw:3.0 )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
- sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
-}
-
-src_configure() {
- econf \
- $(use_enable clock) \
- $(use_enable outputs) \
- $(use_enable unicode) \
- $(use_enable visualizer) \
- $(use_with curl) \
- $(use_with taglib) \
- $(use_with visualizer fftw) \
- --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
- default
-
- dodoc doc/{bindings,config}
-}
-
-pkg_postinst() {
- echo
- elog "Example configuration files have been installed at"
- elog "${ROOT}usr/share/doc/${PF}"
- elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
- elog "as user configuration files."
- echo
- if use visualizer; then
- elog "If you want to use the visualizer, you need mpd with fifo enabled."
- echo
- fi
-}
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
index fae8b4835a..583b4037bf 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ncmpcpp.rybczak.net/stable/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm hppa ~ppc ppc64 ~sparc ~x86"
IUSE="clock curl outputs taglib unicode visualizer"
RDEPEND="
diff --git a/media-sound/nted/files/nted-1.10.18-freetype.patch b/media-sound/nted/files/nted-1.10.18-freetype.patch
index 66acdf2c7f..505e756af5 100644
--- a/media-sound/nted/files/nted-1.10.18-freetype.patch
+++ b/media-sound/nted/files/nted-1.10.18-freetype.patch
@@ -1,16 +1,11 @@
-Description: Fix FTBFS caused by freetype headers path change.
-Author: Gilles Filippini <pini@debian.org>
-Bug-Debian: http://bugs.debian.org/733403
-Index: nted/mainwindow.cpp
-===================================================================
---- nted.orig/mainwindow.cpp 2013-12-30 17:45:21.000000000 +0100
-+++ nted/mainwindow.cpp 2013-12-30 17:45:44.000000000 +0100
+--- nted-1.10.18/mainwindow.cpp
++++ nted-1.10.18/mainwindow.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include <ft2build.h>
-#include <freetype/freetype.h>
-+#include <freetype.h>
++#include FT_FREETYPE_H
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <cairo-ps.h>
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index c669c188f5..72f748abf3 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -1 +1,2 @@
DIST pasystray-0.2.1.tar.bz2 100456 SHA256 d24fe23773e0a25fd32aefe101bb703ca42a487c8e25411c831621332cee61a7 SHA512 db7c05c2eb5fd3dada2e3c23f28978497d17a2147078390ab3e8c88654c4bd8ce48d07a15e9a5b3834acffcc2d86fa719ce2403255915bdfb2eb610bd0549041 WHIRLPOOL 71e4519b9bf6012e770820cf1a72bfb875a34eb87e74eab87edc4a18e01d88ecabf56b88e30686ae409d6fe2456a1058a3194ce539e72934410ba402d72cdd22
+DIST pasystray-0.5.2.tar.gz 51738 SHA256 0cb574843bd7883c51291de03cca237e53a89821d6965c8413dd89e42d8ffc3e SHA512 ef305f354e7e012bb3cf999e7e91b7d1ed2298f633fa67270f9998cb95476460e65a7e3c7fb512da69928ed6ad6579e2c97c4cbf74016e868415f4ba875e0aa7 WHIRLPOOL bbf6cbc416a452ae25495b9a68e153a13ad24cf085462caa18936253addbf1d83cea22fef07de94b16c7c8466944418f3a0389e54bae8be94edae019d79392fe
diff --git a/media-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
index ea0ac98285..fe4fdc23e0 100644
--- a/media-sound/pasystray/metadata.xml
+++ b/media-sound/pasystray/metadata.xml
@@ -2,6 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sound</herd>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lmiphay@gmail.com</email>
+ <name>Paul Healy</name>
+ <description>Proxy maintainer</description>
+ </maintainer>
<upstream>
<remote-id type="github">christophgysin/pasystray</remote-id>
</upstream>
diff --git a/media-sound/pasystray/pasystray-0.5.2.ebuild b/media-sound/pasystray/pasystray-0.5.2.ebuild
new file mode 100644
index 0000000000..16780cbe86
--- /dev/null
+++ b/media-sound/pasystray/pasystray-0.5.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2-utils autotools
+
+DESCRIPTION="PulseAudio system tray"
+HOMEPAGE="https://github.com/christophgysin/pasystray"
+SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="
+ >=media-sound/pulseaudio-5.0-r3[glib,zeroconf]
+ >=net-dns/avahi-0.6
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ libnotify? ( >=x11-libs/libnotify-0.7 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS="AUTHORS README.md TODO"
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+ eautoreconf
+}
+src_configure() {
+ econf $(use_enable libnotify notify)
+ sed -i -e 's:volume:volume;:' "data/pasystray.desktop"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc ${DOCS}
+ doman man/pasystray.1
+}
+
+pkg_preinst() { gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/pulseaudio/pulseaudio-6.0.ebuild b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
index a7c53583cb..28a8bf7be7 100644
--- a/media-sound/pulseaudio/pulseaudio-6.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
SLOT="0"
#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild
new file mode 100644
index 0000000000..284d4f0505
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://www.pulseaudio.org/"
+SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
+gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
++orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
++webrtc-aec +X xen zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+ bluetooth? ( dbus )
+ ofono-headset? ( bluetooth )
+ native-headset? ( bluetooth )
+ udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+RDEPEND="
+ || (
+ elibc_glibc? ( virtual/libc )
+ elibc_uclibc? ( virtual/libc )
+ dev-libs/libpcre
+ )
+ >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libICE[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ )
+ caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+ libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.19 )
+ glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
+ zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+ jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
+ tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+ lirc? ( app-misc/lirc )
+ dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+ gtk? ( x11-libs/gtk+:3 )
+ gnome? ( >=gnome-base/gconf-2.4.0 )
+ bluetooth? (
+ net-wireless/bluez:=
+ >=sys-apps/dbus-1.0.0
+ media-libs/sbc
+ )
+ asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+ udev? ( >=virtual/udev-143[hwdb(+)] )
+ realtime? ( sys-auth/rtkit )
+ equalizer? ( sci-libs/fftw:3.0 )
+ ofono-headset? ( >=net-misc/ofono-1.13 )
+ orc? ( >=dev-lang/orc-0.4.15 )
+ sox? ( >=media-libs/soxr-0.1.1 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ >=media-libs/speex-1.2_rc1
+ gdbm? ( sys-libs/gdbm )
+ webrtc-aec? ( media-libs/webrtc-audio-processing )
+ xen? ( app-emulation/xen-tools )
+ systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+ >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+ dev-libs/libltdl:0
+ selinux? ( sec-policy/selinux-pulseaudio )
+"
+# it's a valid RDEPEND, libltdl.so is used for native abi
+
+DEPEND="${RDEPEND}
+ sys-devel/m4
+ doc? ( app-doc/doxygen )
+ test? ( dev-libs/check )
+ X? (
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+ )
+ dev-libs/libatomic_ops
+ virtual/pkgconfig
+ system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+ dev-util/intltool
+ >=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+ alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt4 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+ equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
+ system-wide? (
+ alsa? ( media-sound/alsa-utils )
+ bluetooth? ( net-wireless/bluez:= )
+ )
+"
+
+pkg_pretend() {
+ CONFIG_CHECK="~HIGH_RES_TIMERS"
+ WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+ check_extra_config
+
+ if linux_config_exists; then
+ local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+ if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+ ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+ ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+ fi
+ fi
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ gnome2_environment_reset #543364
+
+ enewgroup audio 18 # Just make sure it exists
+
+ if use system-wide; then
+ enewgroup pulse-access
+ enewgroup pulse
+ enewuser pulse -1 -1 /var/run/pulse pulse,audio
+ fi
+}
+
+src_prepare() {
+ # Skip test that cannot work with sandbox, bug #501846
+ sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
+
+ epatch_user
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myconf=()
+
+ if use gdbm; then
+ myconf+=( --with-database=gdbm )
+ else
+ myconf+=( --with-database=simple )
+ fi
+
+ if use bluetooth; then
+ if multilib_is_native_abi; then
+ if has_version '<net-wireless/bluez-5'; then
+ myconf+=( --disable-bluez5 --enable-bluez4 )
+ else
+ myconf+=( --enable-bluez5 --disable-bluez4
+ $(use_enable native-headset bluez5-native-headset)
+ $(use_enable ofono-headset bluez5-ofono-headset) )
+ fi
+ fi
+ else
+ myconf+=( --disable-bluez5 --disable-bluez4 )
+ fi
+
+ myconf+=(
+ --enable-largefile
+ $(use_enable glib glib2)
+ --disable-solaris
+ $(use_enable asyncns)
+ $(use_enable oss oss-output)
+ $(use_enable alsa)
+ $(use_enable lirc)
+ $(use_enable neon neon-opt)
+ $(use_enable tcpd tcpwrap)
+ $(use_enable jack)
+ $(use_enable zeroconf avahi)
+ $(use_enable dbus)
+ $(use_enable gnome gconf)
+ $(use_enable gtk gtk3)
+ $(use_enable libsamplerate samplerate)
+ $(use_enable orc)
+ $(use_enable X x11)
+ $(use_enable test default-build-tests)
+ $(use_enable udev)
+ $(use_with sox soxr)
+ $(use_enable systemd systemd-daemon)
+ $(use_enable systemd systemd-login)
+ $(use_enable systemd systemd-journal)
+ $(use_enable ipv6)
+ $(use_enable ssl openssl)
+ $(use_enable webrtc-aec)
+ $(use_enable xen)
+ $(use_with caps)
+ $(use_with equalizer fftw)
+ --disable-adrian-aec
+ --disable-esound
+ --localstatedir="${EPREFIX}"/var
+ --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+ --with-systemduserunitdir=$(systemd_get_userunitdir)
+ )
+
+ if ! multilib_is_native_abi; then
+ # disable all the modules and stuff
+ myconf+=(
+ --disable-oss-output
+ --disable-alsa
+ --disable-lirc
+ --disable-jack
+ --disable-avahi
+ --disable-gconf
+ --disable-gtk3
+ --disable-samplerate
+ --disable-bluez4
+ --disable-bluez5
+ --disable-udev
+ --disable-openssl
+ --disable-orc
+ --disable-webrtc-aec
+ --disable-xen
+ --without-fftw
+ --without-soxr
+
+ # tests involve random modules, so just do them for the native
+ --disable-default-build-tests
+
+ # hack around unnecessary checks
+ # (results don't matter, we're not building anything using it)
+ ac_cv_lib_ltdl_lt_dladvise_init=yes
+ --with-database=simple
+ LIBSPEEX_CFLAGS=' '
+ LIBSPEEX_LIBS=' '
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ emake
+ use doc && emake doxygen
+ else
+ local targets=( libpulse.la libpulse-simple.la )
+ use glib && targets+=( libpulse-mainloop-glib.la )
+ emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
+ fi
+}
+
+multilib_src_test() {
+ # We avoid running the toplevel check target because that will run
+ # po/'s tests too, and they are broken. Officially, it should work
+ # with intltool 0.41, but that doesn't look like a stable release.
+ if multilib_is_native_abi; then
+ emake -C src check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+ use doc && dohtml -r doxygen/html/
+ else
+ local targets=( libpulse.la libpulse-simple.la )
+ use glib && targets+=( libpulse-mainloop-glib.la )
+ emake DESTDIR="${D}" install-pkgconfigDATA
+ emake DESTDIR="${D}" -C src \
+ install-libLTLIBRARIES \
+ install-padsplibLTLIBRARIES \
+ lib_LTLIBRARIES="${targets[*]}" \
+ install-pulseincludeHEADERS
+ fi
+}
+
+multilib_src_install_all() {
+ # Drop the script entirely if X is disabled
+ use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
+
+ if use system-wide; then
+ newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+ use_define() {
+ local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+ use "$1" && echo "-D$define" || echo "-U$define"
+ }
+
+ unifdef $(use_define zeroconf AVAHI) \
+ $(use_define alsa) \
+ $(use_define bluetooth) \
+ $(use_define udev) \
+ "${FILESDIR}/pulseaudio.init.d-5" \
+ > "${T}/pulseaudio"
+
+ doinitd "${T}/pulseaudio"
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ fi
+
+ use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
+
+ dodoc NEWS README todo
+
+ # Create the state directory
+ use prefix || diropts -o pulse -g pulse -m0755
+
+ # We need /var/run/pulse, bug #442852
+ use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+
+ # Prevent warnings when system-wide is not used, bug #447694
+ use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
+
+ prune_libtool_files --all
+}
+
+pkg_postinst() {
+ if use system-wide; then
+ elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+ elog "This mode should only be used on headless servers, embedded systems,"
+ elog "or thin clients. It will usually require manual configuration, and is"
+ elog "incompatible with many expected pulseaudio features."
+ elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+ elog "For more information, see"
+ elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+ elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+ elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+ if use gnome ; then
+ elog
+ elog "By enabling gnome USE flag, you enabled gconf support. Please note"
+ elog "that you might need to remove the gnome USE flag or disable the"
+ elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
+ elog "with a system-wide instance."
+ fi
+ fi
+
+ if use equalizer && ! use qt4; then
+ elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
+ elog "This will build the equalizer module, but the 'qpaeq' tool"
+ elog "which is required to set equalizer levels will not work."
+ fi
+
+ if use native-headset && use ofono-headset; then
+ elog "You have enabled both native and ofono headset profiles. The runtime decision"
+ elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+ fi
+
+ if use libsamplerate; then
+ elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+ elog "particular advantage over speex. Upstream suggests disabling them."
+ fi
+
+ # Needed for pulseaudio-6.0 update from older versions
+ if use udev; then
+ if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
+ udevadm control --reload && udevadm trigger
+ fi
+ fi
+}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index c78a1a501e..4d247cc007 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -3,3 +3,5 @@ DIST qmmp-0.8.4.tar.bz2 990768 SHA256 aef9f7685b5b5d79949bf501ac5420883ad2bceeeb
DIST qmmp-0.8.5.tar.bz2 991464 SHA256 7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d SHA512 07659ea7421079da77f6caa77c1e5f007664b1732a8bae160c154e3a687f330e476d5b2fec2e1b79da512ca1b68fdf6d462975821ced76f4f4c87799e6d79c39 WHIRLPOOL a46264d2886953f924fae40bd43cd5e23a59592ae8456a6120f6e41cd2d9572fa94a8c68f212dabfa97b8534f723ab9c91f26a0d98e0b6109266802ecb18d7f4
DIST qmmp-0.8.8.tar.bz2 993992 SHA256 23e422ef43e216f2d71f7d323d8345df2f3b6f46647e0ac0e03d4d69fbf62e57 SHA512 7882bfbc13ace5cca670a51b5f890b431163c4c0712222c16018b84080d7b42bed1f4cbe327ff767ececbf984193af7b0601be083ac1f0da1681d83e31f188de WHIRLPOOL 68f0a1f71dfe058226e4a4230c68fb48ac04935e16e326380ff3f0c6658c73921831ec5ced29073d3ce06de15cd7168cd7c6c7749db25ded6a092032b6bae025
DIST qmmp-0.9.1.tar.bz2 1112342 SHA256 9314f8b019689fa9f3f1bc8df4076a4b32d384ad992d578fd437284a5c86918b SHA512 1797662cb4b219c784ac591ff90eac05b66d43abed11021a9080aad5f709e0cb7b890bceeff3f5736500571154ba368cbec0611fa8143a313dae18b9989586e3 WHIRLPOOL 15c6c3af52bab35bd8208bef4597910fdfa5ea5eea434149c215c76d30bcd465df423934bca9e50a3fab43f94a610c049a192d38de921d6aacb309135dc5ee99
+DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
+DIST qmmp-1.0.0.tar.bz2 1092970 SHA256 25cd86c67f287e9e7d062b364202831bb25c0930cdc7fbda759fd9287fb24220 SHA512 cdaeaf0202c03e745e9f32ff1068830410691d827a9775588d5679ac551960565df9125014549a7fc1b5f59a99bcbd86db901289d87675b642b84928f4dd1bd0 WHIRLPOOL ee843ca3a4a45c9bf7306a65c28c1dced8f33bc97c59783475e0052c991ba6ef37fdf294da6acaff6ee62d5f28fe5d997f7e1b43d4c03df2733850ed9c08557b
diff --git a/media-sound/qmmp/qmmp-0.9.2.ebuild b/media-sound/qmmp/qmmp-0.9.2.ebuild
new file mode 100644
index 0000000000..5f82a4d0c1
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.9.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+ dev-qt/qtgui:4
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( media-video/mplayer )
+ mpris? ( dev-qt/qtdbus:4 )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:4 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use aac)
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use analyzer)
+ $(cmake-utils_use_use bs2b)
+ $(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
+ $(cmake-utils_use_use cover)
+ $(cmake-utils_use_use cue)
+ $(cmake-utils_use_use curl)
+ $(cmake-utils_use_use dbus)
+ $(cmake-utils_use_use enca)
+ $(cmake-utils_use_use ffmpeg)
+ -DUSE_FFMPEG_LEGACY=OFF
+ $(cmake-utils_use_use flac)
+ $(cmake-utils_use_use game GME)
+ -DUSE_HAL=OFF
+ $(cmake-utils_use_use jack)
+ $(cmake-utils_use_use kde KDENOTIFY)
+ $(cmake-utils_use_use ladspa)
+ $(cmake-utils_use_use lyrics)
+ $(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
+ $(cmake-utils_use_use mplayer)
+ $(cmake-utils_use_use mms)
+ $(cmake-utils_use_use modplug)
+ $(cmake-utils_use_use mpris)
+ $(cmake-utils_use_use musepack MPC)
+ $(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use opus)
+ $(cmake-utils_use_use oss)
+ $(cmake-utils_use_use projectm)
+ $(cmake-utils_use_use pulseaudio PULSE)
+ $(cmake-utils_use_use qsui)
+ $(cmake-utils_use_use scrobbler)
+ $(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
+ $(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udisks UDISKS2)
+ -DUSE_UDISKS=OFF
+ $(cmake-utils_use_use libsamplerate SRC)
+ $(cmake-utils_use_use vorbis)
+ $(cmake-utils_use_use wavpack)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.0.0.ebuild b/media-sound/qmmp/qmmp-1.0.0.ebuild
new file mode 100644
index 0000000000..f91be1d98a
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.0.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( media-video/mplayer )
+ mpris? ( dev-qt/qtdbus:5 )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:5 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use aac)
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use analyzer)
+ $(cmake-utils_use_use bs2b)
+ $(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
+ $(cmake-utils_use_use cover)
+ $(cmake-utils_use_use cue)
+ $(cmake-utils_use_use curl)
+ $(cmake-utils_use_use dbus)
+ $(cmake-utils_use_use enca)
+ $(cmake-utils_use_use ffmpeg)
+ $(cmake-utils_use_use flac)
+ $(cmake-utils_use_use game GME)
+ -DUSE_HAL=OFF
+ $(cmake-utils_use_use jack)
+ $(cmake-utils_use_use kde KDENOTIFY)
+ $(cmake-utils_use_use ladspa)
+ $(cmake-utils_use_use lyrics)
+ $(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
+ $(cmake-utils_use_use mplayer)
+ $(cmake-utils_use_use mms)
+ $(cmake-utils_use_use modplug)
+ $(cmake-utils_use_use mpris)
+ $(cmake-utils_use_use musepack MPC)
+ $(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use opus)
+ $(cmake-utils_use_use oss)
+ $(cmake-utils_use_use projectm)
+ $(cmake-utils_use_use pulseaudio PULSE)
+ $(cmake-utils_use_use qsui)
+ $(cmake-utils_use_use scrobbler)
+ $(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
+ $(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udisks UDISKS2)
+ $(cmake-utils_use_use libsamplerate SRC)
+ $(cmake-utils_use_use vorbis)
+ $(cmake-utils_use_use wavpack)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index b8837786b4..5e563cf4bd 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,3 +1,3 @@
DIST spotify-client_0.9.17.1.g9b85d43.7-1_amd64.deb 42733568 SHA256 717a878bcfa495852d19ac34bb4b0fa1b2f063ab94547defd32725d1dec10775 SHA512 a19403558c0a641b0264641501c9538f169b9e64d532e5d54dd67b7edbb27d400f07395014c9693fed298a1331c053cc9e62988d1293e9b1f1809d68a74646ad WHIRLPOOL 712ac07a3cd3230e3de17e9209380d0e0cc9a33c77cb4753e04490c5bb9a4e2d3e386ee92ffadecd9888ea701aa2a0c4c1b8c579cfa2f5b61d72981a5736f495
-DIST spotify-client_1.0.14.122.gf29d9be0_i386.deb 69292192 SHA256 a83243d333919cab99b1b215ef144c4bb9be8f9f662a7111cefb384439338c5e SHA512 04233a23632ba2d44526c99e6eaa2b56f2227f1fb8628d1d61e74966e0e0aa291f8b6d7307514086126ca3f0e52d7c65ee2e3e0834b87e39df0e6114b474efde WHIRLPOOL e1f234c541699962598d0efe15b7f07e9281e303dc228c122cf563ec13d11aeb11f680f6deeb9e445b494018e7dcd079c4677abed637b7cf29b6f0360447585d
-DIST spotify-client_1.0.14.124.g4dfabc51_amd64.deb 65887386 SHA256 6fed225815ada3a290dd588c7f19a5c83df2712cd016d8e6ad0a2bba4ef66257 SHA512 e7781aeb8c828d6cf4d27adbc717dc0d2d216a55a8c1501152780eb22b6a4aecb7631ce3c3657c79a1ec6f8a213fe5d442fbe9548c1cabce632600b863956c7b WHIRLPOOL 0e34476c73ee4655c5fca892a0a8dbdc711fbb518e7ce7a8c1d9000e02b7295fd0923f9f3b5a29b829bddb9081d2a9d1bd566ad37c9bfc82de3b61c41198d2ba
+DIST spotify-client_1.0.15.137.gbdf68615_amd64.deb 70266612 SHA256 7c9054348c675e350e097f24dce26119155d619c54fc49fc4295e3cb3c04e8c4 SHA512 588189bf76722e53b82c71cb10fa189ea7d7ba23319353c1db60fa1700517be87ce5950603f7314bfdf500b04c9615aa1cf235487c47c70a77b22d8a9d460bd8 WHIRLPOOL 5d98ae03c6afcf49479ed39472554d3f9d2ecfdb1aff2f7b92371a7022fdef418351493468f54f4a856845247fff712bea3d8008ac8fcfd49c89cb77a36f0d70
+DIST spotify-client_1.0.15.137.gbdf68615_i386.deb 75290058 SHA256 f783760cd6d50fd734a264ca6b994037b66b8cd4bc67b225eb6ea17804fa44d6 SHA512 e4402258825fdd59517afa2d1707bf6d2db54ba8d4b3c352c7242538f8e16b5b75bf727cc35a2c9c27b247827e1794d87cc08f82e488ce6b7b44c23ec2bdc34a WHIRLPOOL 8957cb611eed967a596e3f120d0584a568d6699ce8a3df1e4c259fb37c485723e430111179e4373bdb8ab50177937114bd5eb2a87b618716e824ad01098255a7
diff --git a/media-sound/spotify/spotify-1.0.14.ebuild b/media-sound/spotify/spotify-1.0.15.137.ebuild
index 1af9ca6bf8..22a7994f78 100644
--- a/media-sound/spotify/spotify-1.0.14.ebuild
+++ b/media-sound/spotify/spotify-1.0.15.137.ebuild
@@ -7,12 +7,11 @@ inherit eutils fdo-mime gnome2-utils pax-utils unpacker
DESCRIPTION="Spotify is a social music platform"
HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
-MY_PV_AMD64="${PV}.124.g4dfabc51"
-MY_PV_I386="${PV}.122.gf29d9be0"
-MY_P="${PN}-client_"
+MY_PV="${PV}.gbdf68615"
+MY_P="${PN}-client_${MY_PV}"
SRC_BASE="http://repository.spotify.com/pool/non-free/${PN:0:1}/${PN}-client/"
-SRC_URI="amd64? ( ${SRC_BASE}${MY_P}${MY_PV_AMD64}_amd64.deb )
- x86? ( ${SRC_BASE}${MY_P}${MY_PV_I386}_i386.deb )"
+SRC_URI="amd64? ( ${SRC_BASE}${MY_P}_amd64.deb )
+ x86? ( ${SRC_BASE}${MY_P}_i386.deb )"
LICENSE="Spotify"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -48,11 +47,6 @@ src_prepare() {
-e 's/spotify \%U/spotify-dbus.py \%U/g' \
usr/share/spotify/spotify.desktop || die "sed failed"
fi
- #TODO: the semicolons will be fixed in 1.0.15, remove it then
- sed -i \
- -e 's/x-scheme-handler\/spotify$/x-scheme-handler\/spotify\;/g' \
- -e 's/AudioVideo$/AudioVideo\;/g' \
- usr/share/spotify/spotify.desktop || die "sed failed"
}
src_install() {