[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2024-05-31 Thread Ionen Wolkens
commit: 3a615ebd42b60deb2fb5e41b68da412ad44086eb
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jun  1 01:03:23 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun  1 03:45:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a615ebd

media-sound/audacity: Stabilize 3.4.2-r1 x86, #932083

Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-sound/audacity/audacity-3.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-3.4.2-r1.ebuild 
b/media-sound/audacity/audacity-3.4.2-r1.ebuild
index 2b2306dcc356..5e345770b011 100644
--- a/media-sound/audacity/audacity-3.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-3.4.2-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/audacity/audacity.git;
 else
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
MY_P="Audacity-${PV}"
S="${WORKDIR}/${PN}-sources-${PV}"

SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz;



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2024-05-17 Thread Sam James
commit: 0573d378e952ecc44db56ade430590ec6380c718
Author: Sam James  gentoo  org>
AuthorDate: Fri May 17 18:25:43 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 17 18:25:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0573d378

media-sound/audacity: Stabilize 3.4.2-r1 amd64, #932083

Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-3.4.2-r1.ebuild 
b/media-sound/audacity/audacity-3.4.2-r1.ebuild
index f88c0660d2e3..2b2306dcc356 100644
--- a/media-sound/audacity/audacity-3.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-3.4.2-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/audacity/audacity.git;
 else
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
MY_P="Audacity-${PV}"
S="${WORKDIR}/${PN}-sources-${PV}"

SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz;



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2024-04-16 Thread Yixun Lan
commit: 72e8c24fcd0beb997a88f7d185a02a212abafe37
Author: Aliaksei Urbanski  gmail  com>
AuthorDate: Tue Apr 16 19:03:31 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Apr 16 22:53:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e8c24f

media-sound/audacity: fix various issues

The flac USE flag was mistakenly used
instead of the opus USE flag for configuring.

Also, Audacity 3.4.2 introduced a brand new
USE_OPUSFILE option which must be set properly.

These changes:
  - fix the opus USE flag
  - add proper REQUIRED_USE
  - replace media-sound/mpg123 with media-sound/mpg123-base
  - move dev-libs/rapidjson from RDEPEND to DEPEND
  - fix missing `#include ` for 2.4.2-r4
  - limit media-video/ffmpeg to <5 for 2.4.2-r4
  - add x11-base/xorg-proto to DEPEND
  - add some ASM to BDEPEND
  - add audacity-3.4.2-audiocom-std-string.patch to PATCHES for 3.3.3-r1
  - add audacity-2.4.2-fix-libflac-undefined-references.patch to PATCHES for 
2.4.2-r4
  - reset KEYWORDS for 2.4.2-r4 and 3.3.3-r1

Closes: https://bugs.gentoo.org/741969
Closes: https://bugs.gentoo.org/884747
Closes: https://bugs.gentoo.org/910723
Closes: https://bugs.gentoo.org/922595
Closes: https://bugs.gentoo.org/927659
Closes: https://github.com/gentoo/gentoo/pull/35903
Co-authored-by: Matthew White  inventati.org>
Signed-off-by: Aliaksei Urbanski  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r4.ebuild  | 135 +
 ...acity-3.3.3.ebuild => audacity-3.3.3-r1.ebuild} |  33 ++---
 ...acity-3.4.2.ebuild => audacity-3.4.2-r1.ebuild} |  24 ++--
 media-sound/audacity/audacity-.ebuild  |  24 ++--
 ...audacity-2.4.2-add-missing-include-limits.patch |  10 ++
 ...ty-2.4.2-fix-libflac-undefined-references.patch |  61 ++
 media-sound/audacity/metadata.xml  |   4 +-
 7 files changed, 258 insertions(+), 33 deletions(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r4.ebuild 
b/media-sound/audacity/audacity-2.4.2-r4.ebuild
new file mode 100644
index ..b29bbbcdba5e
--- /dev/null
+++ b/media-sound/audacity/audacity-2.4.2-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/;
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+   doc? ( 
https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
+   portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+   media-libs/libsndfile
+   media-libs/libsoundtouch:=
+   media-libs/portaudio[alsa?]
+   media-libs/soxr
+   >=media-sound/lame-3.100-r3
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   alsa? ( media-libs/alsa-lib )
+   ffmpeg? ( =media-libs/lilv-0.24.6-r2
+   media-libs/lv2
+   media-libs/sratom
+   media-libs/suil
+   )
+   mad? ( >=media-libs/libmad-0.15.1b )
+   ogg? ( media-libs/libogg )
+   portmidi? ( media-libs/portmidi )
+   sbsms? ( media-libs/libsbsms )
+   twolame? ( media-sound/twolame )
+   vamp? ( media-libs/vamp-plugin-sdk )
+   vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"
+BDEPEND="app-arch/unzip
+   || ( dev-lang/nasm dev-lang/yasm )
+   sys-devel/gettext
+   virtual/pkgconfig"
+
+REQUIRED_USE="portmidi? ( portsmf )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+   "${FILESDIR}/${P}-fix-vertical-track-resizing.patch"
+   "${FILESDIR}/${P}-fix-gettimeofday.patch"
+   "${FILESDIR}/${P}-fix-metainfo.patch"
+   "${FILESDIR}/${P}-add-missing-include-limits.patch"
+   "${FILESDIR}/${P}-add-missing-include-portaudio.patch"
+   "${FILESDIR}/${P}-disable-ccache.patch"
+   "${FILESDIR}/${P}-fix-libflac-undefined-references.patch"
+)
+
+src_prepare() {
+   cmake_src_prepare
+}
+
+src_configure() {
+   setup-wxwidgets
+   append-cxxflags -std=gnu++14
+
+   # * always use system libraries if possible
+   # * options listed in the order that cmake-gui lists them
+   local mycmakeargs=(
+#  --disable-dynamic-loading
+   -Daudacity_lib_preference=system
+   -Daudacity_use_expat=system
+   -Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+   -Daudacity_use_flac=$(usex flac system off)
+   -Daudacity_use_id3tag=$(usex id3tag system off)
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2024-04-02 Thread Sam James
commit: 02f3b7274ed135a62f48821833e86413d42ad947
Author: Aliaksei Urbanski  gmail  com>
AuthorDate: Tue Apr  2 10:19:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr  2 10:28:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f3b727

media-sound/audacity: fix build with USE="-lv2" in 3.4.2

Due to a bug in the upstream, Audacity 3.4.2 can't be built with USE="-lv2".
At the same time, there is a fix available in the upstream.

Closes: https://bugs.gentoo.org/928380
Co-authored-by: Chris Mayo  gmail.com>
Signed-off-by: Aliaksei Urbanski  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35887
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.4.2.ebuild |  3 ++
 ...audacity-3.4.2-fix-build-with-use-lv2-off.patch | 36 ++
 2 files changed, 39 insertions(+)

diff --git a/media-sound/audacity/audacity-3.4.2.ebuild 
b/media-sound/audacity/audacity-3.4.2.ebuild
index 27f06abecfde..69a039bc866a 100644
--- a/media-sound/audacity/audacity-3.4.2.ebuild
+++ b/media-sound/audacity/audacity-3.4.2.ebuild
@@ -128,6 +128,9 @@ PATCHES=(
 
# #920363
"${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
+
+   # Fix build with USE="-lv2"
+   "${FILESDIR}/audacity-3.4.2-fix-build-with-use-lv2-off.patch"
 )
 
 src_prepare() {

diff --git 
a/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch 
b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch
new file mode 100644
index ..8c47ff8642d7
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch
@@ -0,0 +1,36 @@
+From e10034c19ed1911b730637fbc722030eb3dfd04b Mon Sep 17 00:00:00 2001
+From: Chris Mayo 
+Date: Wed, 22 Nov 2023 19:29:05 +
+Subject: [PATCH] Fix build with -Daudacity_use_lv2=off
+
+libraries/lib-lv2/LV2Utils.h:18:10: fatal error: lilv/lilv.h: No such file or 
directory
+   18 | #include "lilv/lilv.h" // for lilv_free
+  |  ^
+compilation terminated.
+---
+ libraries/CMakeLists.txt | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index b1ebefa1b023..879cd948791d 100644
+--- a/libraries/CMakeLists.txt
 b/libraries/CMakeLists.txt
+@@ -50,7 +50,6 @@ set( LIBRARIES
+lib-vst3
+lib-snapping
+lib-vst
+-   lib-lv2
+lib-ladspa
+lib-audio-unit
+lib-playable-track
+@@ -63,6 +62,10 @@ set( LIBRARIES
+lib-viewport
+ )
+ 
++if ( ${_OPT}use_lv2 )
++   list( APPEND LIBRARIES lib-lv2)
++endif()
++
+ if ( ${_OPT}has_networking )
+list( APPEND LIBRARIES lib-network-manager)
+ endif()



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2024-03-23 Thread Sam James
commit: 2dd375c26a958c83bee4119b499fa65adb4b3f29
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Sun Feb 18 20:31:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 23 08:29:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd375c2

media-sound/audacity: add 3.4.2, update 

Closes: https://bugs.gentoo.org/916782
Closes: https://bugs.gentoo.org/920363

Signed-off-by: Azamat H. Hackimov  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/Manifest  |   3 +-
 ...{audacity-.ebuild => audacity-3.4.2.ebuild} | 103 +
 media-sound/audacity/audacity-.ebuild  |  94 +--
 .../files/audacity-3.4.2-audiocom-std-string.patch |  30 ++
 4 files changed, 123 insertions(+), 107 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 6af378802534..ab7fe68fc43e 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,7 @@
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
 SHA512 
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B 
b8e48cab1c89cadb343a17fcb1d811a7363231152867f8426dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24
 SHA512 
850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
+DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 
566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c
 SHA512 
c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
 DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B 
e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa7b5d0b6a00e14bd420d6f064515455055233a45f5ebf47
 SHA512 
9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
-DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 
566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c
 SHA512 
c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
+DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B 
deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5
 SHA512 
5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 
54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14
 SHA512 
f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d

diff --git a/media-sound/audacity/audacity-.ebuild 
b/media-sound/audacity/audacity-3.4.2.ebuild
similarity index 78%
copy from media-sound/audacity/audacity-.ebuild
copy to media-sound/audacity/audacity-3.4.2.ebuild
index be537c7c96c0..27f06abecfde 100644
--- a/media-sound/audacity/audacity-.ebuild
+++ b/media-sound/audacity/audacity-3.4.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake flag-o-matic wxwidgets xdg virtualx
+inherit cmake wxwidgets xdg virtualx
 
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/;
@@ -20,10 +20,10 @@ if [[ ${PV} = * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/audacity/audacity.git;
 else
-   KEYWORDS="~amd64 ~riscv"
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
MY_P="Audacity-${PV}"
-   S="${WORKDIR}/${PN}-${MY_P}"
-   SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;
+   S="${WORKDIR}/${PN}-sources-${PV}"
+   
SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz;
 fi
 
 SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
@@ -39,7 +39,6 @@ SLOT="0"
 IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
opus +portmixer sbsms test twolame vamp +vorbis wavpack"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( mpg123 )"
 
 # dev-db/sqlite:3 hard 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2024-03-23 Thread Sam James
commit: cef88867dbdc89ea1aeb12fc8169e9cb7a84
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Sun Feb 18 20:34:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 23 08:29:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef8

media-sound/audacity: drop 3.2.5-r1

Signed-off-by: Azamat H. Hackimov  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35414
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/Manifest  |   2 -
 media-sound/audacity/audacity-3.2.5-r1.ebuild  | 229 -
 .../audacity/files/audacity-3.2.5-gcc13-deux.patch |  57 -
 .../files/audacity-3.2.5-gettext-0.22.patch|  36 
 4 files changed, 324 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index ab7fe68fc43e..28fe9c10d805 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,7 +1,5 @@
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
 SHA512 
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B 
b8e48cab1c89cadb343a17fcb1d811a7363231152867f8426dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24
 SHA512 
850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
 DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 
566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c
 SHA512 
c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B 
e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa7b5d0b6a00e14bd420d6f064515455055233a45f5ebf47
 SHA512 
9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
 DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B 
deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5
 SHA512 
5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 
54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14
 SHA512 
f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d

diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild 
b/media-sound/audacity/audacity-3.2.5-r1.ebuild
deleted file mode 100644
index 2eb91ea6190a..
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit cmake wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://www.audacityteam.org/;
-
-# A header-only thread pool library, without a build system, about 100
-# lines of code.  Probably not worth packaging individually.  Check
-# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
-MY_THREADPOOL_DATE=20140926
-MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
 -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-   doc? ( 
https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz
 )
-   audiocom? ( ${MY_THREADPOOL} )"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-# GPL-2+, GPL-3 - Audacity itself
-# ZLIB - The ThreadPool single-header library
-# CC-BY-3.0 - Documentation
-LICENSE="GPL-2+
-   GPL-3
-   doc? ( CC-BY-3.0 )
-   audiocom? ( ZLIB )
-"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
-   opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
-
-# dev-db/sqlite:3 hard dependency.
-# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
-#   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2024-03-20 Thread Sam James
commit: cfda6472a0295fea133b45c3ac958c394a66c41c
Author: Matthew White  inventati  org>
AuthorDate: Sun Feb 25 17:00:40 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 21 02:51:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfda6472

media-sound/audacity: add myself as maintainer (again)

Adding myself as maintainer again after fixing my bugzilla account's
email address.

See also:
77348568b0bfd1713c2589ef756dae7f3fa0df5c
0709977edc2401e81a05f30dcce909bb855407e1
https://github.com/gentoo/gentoo/pull/32128#pullrequestreview-1651803940
https://github.com/gentoo/gentoo/pull/32128#issuecomment-1742335121
https://github.com/gentoo/gentoo/pull/33155#issuecomment-1745134157

Signed-off-by: Matthew White  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/35523
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-sound/audacity/metadata.xml 
b/media-sound/audacity/metadata.xml
index b55217fe7ef8..63566f7f9050 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -10,6 +10,10 @@
 Richard Ash
 Upstream - please CC on bugs that concerns 
upstream
   
+  
+mehw.is...@inventati.org
+Matthew White
+  
   
 audacity/audacity
   



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2024-03-04 Thread Sam James
commit: 54238035c9abd9b278e2fd14312e893922c3be5f
Author: Eli Schwartz  gmail  com>
AuthorDate: Tue Mar  5 00:49:58 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  5 04:47:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54238035

media-sound/audacity: mark as LTO-unsafe, strict-aliasing unsafe

Bug report says ODR violations, but I could not reproduce since I hit
strict-aliasing issues first. I'm assuming both are an issue, but on the
other hand either one is a good reason to turn off LTO.

Closes: https://bugs.gentoo.org/915226
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.3.3.ebuild | 9 -
 media-sound/audacity/audacity-.ebuild  | 9 -
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/audacity-3.3.3.ebuild 
b/media-sound/audacity/audacity-3.3.3.ebuild
index a839024bcc60..2cba5da71a87 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake wxwidgets xdg virtualx
+inherit cmake flag-o-matic wxwidgets xdg virtualx
 
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/;
@@ -157,6 +157,13 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # Reportedly also -Werror=odr but I could not get that far.
+   # https://bugs.gentoo.org/915226
+   # https://github.com/audacity/audacity/issues/6096
+   append-flags -fno-strict-aliasing
+   filter-lto
+
setup-wxwidgets
 
# * always use system libraries if possible

diff --git a/media-sound/audacity/audacity-.ebuild 
b/media-sound/audacity/audacity-.ebuild
index f00f0a9e1f66..be537c7c96c0 100644
--- a/media-sound/audacity/audacity-.ebuild
+++ b/media-sound/audacity/audacity-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake wxwidgets xdg virtualx
+inherit cmake flag-o-matic wxwidgets xdg virtualx
 
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/;
@@ -144,6 +144,13 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing
+   # Reportedly also -Werror=odr but I could not get that far.
+   # https://bugs.gentoo.org/915226
+   # https://github.com/audacity/audacity/issues/6096
+   append-flags -fno-strict-aliasing
+   filter-lto
+
setup-wxwidgets
 
# * always use system libraries if possible



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2024-01-15 Thread Sam James
commit: 22c33800f13cec1f820f815ae26fd78191c841ba
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Jan 16 02:02:05 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 16 03:35:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c33800

media-sound/audacity: update live ebuild

Bug: https://bugs.gentoo.org/916258
Signed-off-by: Matoro Mahri  matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34829
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/audacity-.ebuild 
b/media-sound/audacity/audacity-.ebuild
index d245b905cad3..b8d173af117a 100644
--- a/media-sound/audacity/audacity-.ebuild
+++ b/media-sound/audacity/audacity-.ebuild
@@ -39,6 +39,7 @@ SLOT="0"
 IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
opus +portmixer sbsms test twolame vamp +vorbis wavpack"
 RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( mpg123 )"
 
 # dev-db/sqlite:3 hard dependency.
 # dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -65,6 +66,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="dev-db/sqlite:3
dev-libs/expat
dev-libs/glib:2
+   dev-libs/rapidjson
media-libs/libsndfile
media-libs/libsoundtouch:=
media-libs/portaudio[alsa?]
@@ -127,8 +129,8 @@ PATCHES=(
 src_prepare() {
cmake_src_prepare
 
-   local header_subs="${S}/lib-src/header-substitutes"
-   cat <<-EOF >"${header_subs}/allegro.h" || die
+   local header_subs="${S}/libraries/lib-note-track"
+   cat <<-EOF >"${header_subs}/WrapAllegro.h" || die
/* Hack the allegro.h header substitute to use system headers.  */
#include 
EOF



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2024-01-15 Thread Sam James
commit: 62fba13fd0b86e6428ea2eae77138219cb2110b6
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Jan 16 01:29:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 16 03:35:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62fba13f

media-sound/audacity: wire up tests

Patch not submitted upstream yet.

See: https://github.com/audacity/audacity/discussions/5841
Bug: https://bugs.gentoo.org/916258
Signed-off-by: Matoro Mahri  matoro.tk>
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.3.3.ebuild | 20 +++
 media-sound/audacity/audacity-.ebuild  | 20 +++
 ...dacity-3.3.3-remove-conan-test-dependency.patch | 39 ++
 3 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/media-sound/audacity/audacity-3.3.3.ebuild 
b/media-sound/audacity/audacity-3.3.3.ebuild
index 4e68dd30ca14..f77da513d7d2 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake wxwidgets xdg
+inherit cmake wxwidgets xdg virtualx
 
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/;
@@ -37,10 +37,8 @@ LICENSE="GPL-2+
 "
 SLOT="0"
 IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
-   opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
+   opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+RESTRICT="!test? ( test )"
 
 # dev-db/sqlite:3 hard dependency.
 # dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -104,7 +102,8 @@ RDEPEND="dev-db/sqlite:3
vorbis? ( media-libs/libvorbis )
wavpack? ( media-sound/wavpack )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   test? ( dev-cpp/catch:0 )"
 BDEPEND="app-arch/unzip
sys-devel/gettext
virtual/pkgconfig
@@ -135,6 +134,9 @@ PATCHES=(
 
# gettext 0.22
"${FILESDIR}/${PN}-3.3.3-gettext-0.22.patch"
+
+   # Allows running tests without conan
+   "${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
 )
 
 src_prepare() {
@@ -215,11 +217,17 @@ src_configure() {
## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
## AFAICT it introduces no deps as-is, but that could change.
## Similar goes for PA_HAS_JACK.
+
+   -Daudacity_has_tests=$(usex test ON OFF)
)
 
cmake_src_configure
 }
 
+src_test() {
+   virtx cmake_src_test
+}
+
 src_install() {
cmake_src_install
 

diff --git a/media-sound/audacity/audacity-.ebuild 
b/media-sound/audacity/audacity-.ebuild
index ad59e3249ef7..d245b905cad3 100644
--- a/media-sound/audacity/audacity-.ebuild
+++ b/media-sound/audacity/audacity-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake wxwidgets xdg
+inherit cmake wxwidgets xdg virtualx
 
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/;
@@ -37,10 +37,8 @@ LICENSE="GPL-2+
 "
 SLOT="0"
 IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
-   opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
+   opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+RESTRICT="!test? ( test )"
 
 # dev-db/sqlite:3 hard dependency.
 # dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -103,7 +101,8 @@ RDEPEND="dev-db/sqlite:3
vorbis? ( media-libs/libvorbis )
wavpack? ( media-sound/wavpack )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   test? ( dev-cpp/catch:0 )"
 BDEPEND="app-arch/unzip
sys-devel/gettext
virtual/pkgconfig
@@ -120,6 +119,9 @@ PATCHES=(
 
# For has_networking
"${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+
+   # Allows running tests without conan
+   "${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
 )
 
 src_prepare() {
@@ -199,11 +201,17 @@ src_configure() {
## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
## AFAICT it introduces no deps as-is, but that could change.
## Similar goes for PA_HAS_JACK.
+
+   -Daudacity_has_tests=$(usex test ON OFF)
)
 
cmake_src_configure
 }
 
+src_test() {
+   virtx cmake_src_test
+}
+
 src_install() {
cmake_src_install
 

diff --git 
a/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch 
b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
new file mode 100644
index ..63dd3b58f0f0
--- /dev/null
+++ 
b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/916258
+https://github.com/audacity/audacity/discussions/5841

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2024-01-11 Thread Sam James
commit: fb004b1b81732a8e0830e7d62ebe835a39ee36b9
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 11 13:02:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 11 13:02:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb004b1b

media-sound/audacity: backport PCH fix

Backport 986e00639a6bd9ca0d650743941a1d7e6b903821.

Bug: https://bugs.gentoo.org/921731
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r3.ebuild | 4 ++--
 media-sound/audacity/audacity-3.2.5-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r3.ebuild 
b/media-sound/audacity/audacity-2.4.2-r3.ebuild
index f0e17b7904b4..1abe82ab11b8 100644
--- a/media-sound/audacity/audacity-2.4.2-r3.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -95,7 +95,7 @@ src_configure() {
-Daudacity_use_pa_alsa=$(usex alsa)
-Daudacity_use_pa_jack=$(usex jack linked off)
-Daudacity_use_pa_oss=$(usex oss)
-   #-Daudacity_use_pch leaving it to the default behavior
+   -Daudacity_use_pch=OFF
-Daudacity_use_portaudio=local # only 'local' option is present
-Daudacity_use_portmixer=$(usex portmixer local off)
-Daudacity_use_portsmf=$(usex portsmf local off)

diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild 
b/media-sound/audacity/audacity-3.2.5-r1.ebuild
index b9ffe050c949..2eb91ea6190a 100644
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ b/media-sound/audacity/audacity-3.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -159,7 +159,7 @@ src_configure() {
# Tell the CMake-based build system it's building a release.
-DAUDACITY_BUILD_LEVEL=2
-Daudacity_use_nyquist=local
-   #-Daudacity_use_pch leaving it to the default behavior
+   -Daudacity_use_pch=OFF
-Daudacity_use_portmixer=$(usex portmixer system off)
-Daudacity_use_soxr=system
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2024-01-11 Thread Sam James
commit: 986e00639a6bd9ca0d650743941a1d7e6b903821
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan 11 12:57:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 11 13:00:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986e0063

media-sound/audacity: disable PCH harder

The build system handles its "config.h" header in an unusual way, where it
passes -include via CMake as long as PCH is disabled. But it only checks
its own build system option, not the standard CMake option to force off PCH,
so we started getting build failures w/ the recent cmake.eclass change to pass
the latter.

Closes: https://bugs.gentoo.org/921731
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.3.3.ebuild | 4 ++--
 media-sound/audacity/audacity-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/audacity/audacity-3.3.3.ebuild 
b/media-sound/audacity/audacity-3.3.3.ebuild
index e242d4ca99ae..4e68dd30ca14 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -166,7 +166,7 @@ src_configure() {
# Tell the CMake-based build system it's building a release.
-DAUDACITY_BUILD_LEVEL=2
-Daudacity_use_nyquist=local
-   #-Daudacity_use_pch leaving it to the default behavior
+   -Daudacity_use_pch=OFF
-Daudacity_use_portmixer=$(usex portmixer system off)
-Daudacity_use_soxr=system
 

diff --git a/media-sound/audacity/audacity-.ebuild 
b/media-sound/audacity/audacity-.ebuild
index 82ce039fc3a4..ad59e3249ef7 100644
--- a/media-sound/audacity/audacity-.ebuild
+++ b/media-sound/audacity/audacity-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -151,7 +151,7 @@ src_configure() {
# Tell the CMake-based build system it's building a release.
-DAUDACITY_BUILD_LEVEL=2
-Daudacity_use_nyquist=local
-   #-Daudacity_use_pch leaving it to the default behavior
+   -Daudacity_use_pch=OFF
-Daudacity_use_portmixer=$(usex portmixer system off)
-Daudacity_use_soxr=system
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-12-15 Thread Arthur Zamarin
commit: 812b6c867e09fbaf44b7222cc05882e02398f9f4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec 15 12:37:41 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec 15 12:37:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=812b6c86

media-sound/audacity: Stabilize 3.3.3 ppc64, #916258

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-sound/audacity/audacity-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-3.3.3.ebuild 
b/media-sound/audacity/audacity-3.3.3.ebuild
index 8aa845473b79..e242d4ca99ae 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/audacity/audacity.git;
 else
-   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86"
MY_P="Audacity-${PV}"
S="${WORKDIR}/${PN}-${MY_P}"
SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-12-14 Thread Sam James
commit: c05c7bad00e451c29f60da4262aa124c34c4981b
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 15 03:28:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 15 03:28:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05c7bad

media-sound/audacity: Stabilize 3.3.3 amd64, #916258

Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-3.3.3.ebuild 
b/media-sound/audacity/audacity-3.3.3.ebuild
index 5f70fb7be4d3..8aa845473b79 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/audacity/audacity.git;
 else
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
MY_P="Audacity-${PV}"
S="${WORKDIR}/${PN}-${MY_P}"
SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-12-04 Thread Sam James
commit: 33d6cf92de678b1e3ac39faf5d0e802dff7e24b2
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  4 10:20:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  4 10:20:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d6cf92

media-sound/audacity: Keyword 3.3.3 arm64, #891517

Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-3.3.3.ebuild 
b/media-sound/audacity/audacity-3.3.3.ebuild
index 4f1b16d516a1..f3cab795cdb8 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/audacity/audacity.git;
 else
-   KEYWORDS="~amd64 ~riscv"
+   KEYWORDS="~amd64 ~arm64 ~riscv"
MY_P="Audacity-${PV}"
S="${WORKDIR}/${PN}-${MY_P}"
SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-10-03 Thread Mike Gilbert
commit: 77348568b0bfd1713c2589ef756dae7f3fa0df5c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Oct  3 14:44:29 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Oct  3 14:44:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77348568

media-sound/audacity: drop maintainer without a bugzilla account

Signed-off-by: Mike Gilbert  gentoo.org>

 media-sound/audacity/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/media-sound/audacity/metadata.xml 
b/media-sound/audacity/metadata.xml
index e37b9049dcc8..b55217fe7ef8 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -10,10 +10,6 @@
 Richard Ash
 Upstream - please CC on bugs that concerns 
upstream
   
-  
-mehw.is...@inventati.org
-Matteo Bianco
-  
   
 audacity/audacity
   



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-10-02 Thread Miroslav Šulc
commit: 0709977edc2401e81a05f30dcce909bb855407e1
Author: Matthew White  inventati  org>
AuthorDate: Mon Oct  2 02:45:47 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Oct  2 07:01:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0709977e

media-sound/audacity: add myself as maintainer

Signed-off-by: Matteo Bianco  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/33155
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-sound/audacity/metadata.xml 
b/media-sound/audacity/metadata.xml
index b55217fe7ef8..e37b9049dcc8 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -10,6 +10,10 @@
 Richard Ash
 Upstream - please CC on bugs that concerns 
upstream
   
+  
+mehw.is...@inventati.org
+Matteo Bianco
+  
   
 audacity/audacity
   



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2023-09-24 Thread Sam James
commit: 46b0fc511e098676b8069a6012f1a81b57d5ff5c
Author: Sam James  gentoo  org>
AuthorDate: Mon Sep 25 00:23:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 25 00:24:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b0fc51

media-sound/audacity: style tweaks, add upstream refs

Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.3.3.ebuild | 2 +-
 media-sound/audacity/audacity-.ebuild  | 2 +-
 media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch | 3 +++
 media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/audacity-3.3.3.ebuild 
b/media-sound/audacity/audacity-3.3.3.ebuild
index 986fcd8fb4bb..4f1b16d516a1 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -26,7 +26,7 @@ else
SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;
 fi
 
-SRC_URI+=$'\n'"audiocom? ( ${MY_THREADPOOL} )"
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
 
 # GPL-2+, GPL-3 - Audacity itself
 # ZLIB - The ThreadPool single-header library

diff --git a/media-sound/audacity/audacity-.ebuild 
b/media-sound/audacity/audacity-.ebuild
index 55d1545cfcb8..82ce039fc3a4 100644
--- a/media-sound/audacity/audacity-.ebuild
+++ b/media-sound/audacity/audacity-.ebuild
@@ -26,7 +26,7 @@ else
SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;
 fi
 
-SRC_URI+=$'\n'"audiocom? ( ${MY_THREADPOOL} )"
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
 
 # GPL-2+, GPL-3 - Audacity itself
 # ZLIB - The ThreadPool single-header library

diff --git a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch 
b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
index 9bf4176a39e0..7237614782b3 100644
--- a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
@@ -1,3 +1,6 @@
+https://github.com/audacity/audacity/pull/4916
+https://github.com/audacity/audacity/pull/4917
+
 From b42dfbe2be1994ccfeff449b5c5cbe49994ffb38 Mon Sep 17 00:00:00 2001
 From: Matthew White 
 Date: Fri, 14 Jul 2023 21:17:45 +

diff --git 
a/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch 
b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
index cb9da30bf423..c95676a18cfe 100644
--- a/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
@@ -1,3 +1,6 @@
+https://github.com/audacity/audacity/commit/6edaa3f26b34adc65c109c1a5a85923e04330e2d
+https://github.com/audacity/audacity/pull/4918
+
 From 6edaa3f26b34adc65c109c1a5a85923e04330e2d Mon Sep 17 00:00:00 2001
 From: Dmitry Vedenko 
 Date: Mon, 7 Aug 2023 17:12:49 +0300



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2023-09-24 Thread Sam James
commit: f528815c332f51e266338f65336e9d85d134105b
Author: Matthew White  inventati  org>
AuthorDate: Tue Aug  1 17:05:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 25 00:24:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f528815c

media-sound/audacity-3.3.3: version bump and new  ebuild

NOTE: Upstream planned the removal of libmad support with the merge of
the https://github.com/audacity/audacity/pull/4384 PR.

Closes: https://bugs.gentoo.org/906959
Closes: https://bugs.gentoo.org/910398
Package-Manager: portage-3.0.49-r1
Signed-off-by: Matteo Bianco  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/32129
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/Manifest  |   1 +
 media-sound/audacity/audacity-3.3.3.ebuild | 228 +
 media-sound/audacity/audacity-.ebuild  | 212 +++
 .../audacity/files/audacity-3.3.3-Findlibmad.patch |  52 +
 .../files/audacity-3.3.3-fix-includes.patch|  55 +
 .../audacity/files/audacity-3.3.3-fix-rpaths.patch |  95 +
 .../files/audacity-3.3.3-gettext-0.22.patch|  27 +++
 ...audacity-3.3.3-local-threadpool-libraries.patch |  30 +++
 .../audacity-3.3.3-upstream-fix-rapidjson.patch|  60 ++
 9 files changed, 760 insertions(+)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 4c36f4db70da..6af378802534 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -2,4 +2,5 @@ DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be317
 DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B 
b8e48cab1c89cadb343a17fcb1d811a7363231152867f8426dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24
 SHA512 
850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
 DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B 
e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa7b5d0b6a00e14bd420d6f064515455055233a45f5ebf47
 SHA512 
9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
+DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 
566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c
 SHA512 
c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 
54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14
 SHA512 
f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d

diff --git a/media-sound/audacity/audacity-3.3.3.ebuild 
b/media-sound/audacity/audacity-3.3.3.ebuild
new file mode 100644
index ..986fcd8fb4bb
--- /dev/null
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets xdg
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/;
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
 -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/audacity/audacity.git;
+else
+   KEYWORDS="~amd64 ~riscv"
+   MY_P="Audacity-${PV}"
+   S="${WORKDIR}/${PN}-${MY_P}"
+   SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;
+fi
+
+SRC_URI+=$'\n'"audiocom? ( ${MY_THREADPOOL} )"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+   GPL-3
+   audiocom? ( ZLIB )
+"
+SLOT="0"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
+   opus +portmixer sbsms twolame vamp +vorbis wavpack"
+
+# The testsuite consists of two tests, 50% of which fail.
+RESTRICT="test"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2023-06-30 Thread David Seifert
commit: 59188fa2f4f5c378c475a2d687dedf7b746453bf
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jun 30 12:31:11 2023 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jun 30 12:31:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59188fa2

media-sound/audacity: fix gettext 0.22 breakage

Closes: https://bugs.gentoo.org/909201
Signed-off-by: David Seifert  gentoo.org>

 media-sound/audacity/audacity-3.2.5-r1.ebuild  |  3 ++
 .../files/audacity-3.2.5-gettext-0.22.patch| 36 ++
 2 files changed, 39 insertions(+)

diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild 
b/media-sound/audacity/audacity-3.2.5-r1.ebuild
index b23b0ca973d6..b9ffe050c949 100644
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ b/media-sound/audacity/audacity-3.2.5-r1.ebuild
@@ -125,6 +125,9 @@ PATCHES=(
 
# GCC 13
"${FILESDIR}/${PN}-3.2.5-gcc13-deux.patch"
+
+   # gettext 0.22
+   "${FILESDIR}/${PN}-3.2.5-gettext-0.22.patch"
 )
 
 src_prepare() {

diff --git a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch 
b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
new file mode 100644
index ..f84508a2c903
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/909201
+upstream fix: https://github.com/audacity/audacity/pull/4866
+
+--- a/locale/be.po
 b/locale/be.po
+@@ -3097,7 +3097,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "Памылка (магчыма, файл не запісаны): %hs"
++msgstr "Памылка (магчыма, файл не запісаны): %s"
+ 
+ #: src/FileFormats.cpp
+ #, fuzzy
+--- a/locale/fa.po
 b/locale/fa.po
+@@ -3053,7 +3053,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs"
++msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s"
+ 
+ #: src/FileFormats.cpp
+ msgid " uncompressed files into the project (safer)"
+--- a/locale/fr.po
 b/locale/fr.po
+@@ -3142,7 +3142,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %hs"
++msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %s"
+ 
+ # trebmuh to check (accélérateur)
+ #: src/FileFormats.cpp



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-06-19 Thread Miroslav Šulc
commit: e9dec6993d1d4a37a601e3ebd80c6ce7decca7a8
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jun 18 09:02:47 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jun 19 06:47:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9dec699

media-sound/audacity: update HOMEPAGE

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r3.ebuild | 4 ++--
 media-sound/audacity/audacity-3.2.5-r1.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r3.ebuild 
b/media-sound/audacity/audacity-2.4.2-r3.ebuild
index eb19e72b84a0..5d2b57c57e89 100644
--- a/media-sound/audacity/audacity-2.4.2-r3.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit cmake flag-o-matic wxwidgets xdg
 MY_P="Audacity-${PV}"
 DOC_PV="${PV}"
 DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/;
+HOMEPAGE="https://www.audacityteam.org/;
 # wget doesn't seem to work on FossHub links, so we mirror
 SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
doc? ( 
https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"

diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild 
b/media-sound/audacity/audacity-3.2.5-r1.ebuild
index b4df0d5f6fbb..b23b0ca973d6 100644
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ b/media-sound/audacity/audacity-3.2.5-r1.ebuild
@@ -10,7 +10,7 @@ inherit cmake wxwidgets xdg
 MY_P="Audacity-${PV}"
 DOC_PV="${PV}"
 DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/;
+HOMEPAGE="https://www.audacityteam.org/;
 
 # A header-only thread pool library, without a build system, about 100
 # lines of code.  Probably not worth packaging individually.  Check



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/

2023-06-08 Thread Miroslav Šulc
commit: 3dcd5278870cceb9ae53e905c106b2595c3ac14e
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Jun  8 08:48:06 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jun  8 11:43:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcd5278

media-sound/audacity: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/31348
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../audacity/files/audacity-3.2.5-gcc13.patch  | 25 --
 1 file changed, 25 deletions(-)

diff --git a/media-sound/audacity/files/audacity-3.2.5-gcc13.patch 
b/media-sound/audacity/files/audacity-3.2.5-gcc13.patch
deleted file mode 100644
index 265d73fd9e71..
--- a/media-sound/audacity/files/audacity-3.2.5-gcc13.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://github.com/audacity/audacity/issues/4489
-https://bugs.gentoo.org/899764
-
 a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
-+++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
-@@ -47,6 +47,7 @@
- #endif
- 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -355,10 +356,6 @@
- typedef signed int SINT32;
- typedef float FLOAT32;
- typedef double FLOAT64;
--// added by RBD
--#ifdef __linux__
--#define intptr_t long
--#endif
- 
- // The default sampling rate.
- const StkFloat SRATE = 44100.0;
-



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-06-06 Thread Miroslav Šulc
commit: 765fb021abb4e2c5e7fedccf5fde4a0bd5e00b5d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jun  7 05:19:41 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jun  7 05:19:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765fb021

media-sound/audacity: dropped obsolete 3.2.5

Bug: https://bugs.gentoo.org/907938
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-3.2.5.ebuild | 226 -
 1 file changed, 226 deletions(-)

diff --git a/media-sound/audacity/audacity-3.2.5.ebuild 
b/media-sound/audacity/audacity-3.2.5.ebuild
deleted file mode 100644
index 8a011864b2d7..
--- a/media-sound/audacity/audacity-3.2.5.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit cmake wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/;
-
-# A header-only thread pool library, without a build system, about 100
-# lines of code.  Probably not worth packaging individually.  Check
-# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
-MY_THREADPOOL_DATE=20140926
-MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
 -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-   doc? ( 
https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz
 )
-   audiocom? ( ${MY_THREADPOOL} )"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-# GPL-2+, GPL-3 - Audacity itself
-# ZLIB - The ThreadPool single-header library
-# CC-BY-3.0 - Documentation
-LICENSE="GPL-2+
-   GPL-3
-   doc? ( CC-BY-3.0 )
-   audiocom? ( ZLIB )
-"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
-   opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
-
-# dev-db/sqlite:3 hard dependency.
-# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
-#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
-# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
-#   for libuuid
-# portmidi became non-optional: building without it results in build
-#   failures, even with some of the Debian patches.  It's probably not
-#   in our best interest to fix that as a patch series.
-# glib, gtk and gdk are all directly relied on in the source, not just
-
-# Libraries used at runtime via dlopen:
-# - dev-libs/{serd,sord} - for LV2 support
-# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
-# - media-sound/lame :: For MP3 export
-# - media-video/ffmpeg :: For generic FFMPEG export
-#   This one has the interesting property of many versions being
-#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
-#   Current support grid:
-#   - Lavf - 5[789]
-#   - Lavc - 5[789]
-#   - Lavu - 5[2567]
-
-RDEPEND="dev-db/sqlite:3
-   dev-libs/expat
-   dev-libs/glib:2
-   media-libs/libsndfile
-   media-libs/libsoundtouch:=
-   media-libs/portaudio[alsa?]
-   media-libs/portmidi
-   media-libs/portsmf:=
-   media-libs/soxr
-   media-sound/lame
-   x11-libs/gdk-pixbuf:2
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}[X]
-   sys-apps/util-linux
-   alsa? ( media-libs/alsa-lib )
-   audiocom? (
-   dev-libs/rapidjson
-   net-misc/curl
-   )
-   ffmpeg? ( media-video/ffmpeg )
-   flac? ( media-libs/flac:=[cxx] )
-   id3tag? ( media-libs/libid3tag:= )
-   lv2? (
-   dev-libs/serd
-   dev-libs/sord
-   media-libs/lilv
-   media-libs/lv2
-   media-libs/sratom
-   media-libs/suil
-   )
-   mad? ( media-libs/libmad )
-   mpg123? ( media-sound/mpg123 )
-   ogg? ( media-libs/libogg )
-   opus? ( media-libs/opus )
-   sbsms? ( media-libs/libsbsms )
-   twolame? ( media-sound/twolame )
-   vamp? ( media-libs/vamp-plugin-sdk )
-   vorbis? ( media-libs/libvorbis )
-   wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-
-REQUIRED_USE="
-   mad? ( !mpg123 )
-"
-
-PATCHES=(
-   # Equivalent to previous versions
-   "${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
-   # From Debian
-   "${FILESDIR}/${PN}-3.2.3-fix-rpaths.patch"
-
-   # Disables some header-based detection
-   "${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
-
-   # For has_networking
-   "${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch"
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-06-06 Thread Arthur Zamarin
commit: dba9ec5c0ead4fe3d955053d120a4eaa422a6851
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jun  6 16:55:37 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jun  6 16:55:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba9ec5c

media-sound/audacity: Stabilize 3.2.5-r1 amd64, #907938

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-sound/audacity/audacity-3.2.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild 
b/media-sound/audacity/audacity-3.2.5-r1.ebuild
index 504ee61be19b..b4df0d5f6fbb 100644
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ b/media-sound/audacity/audacity-3.2.5-r1.ebuild
@@ -31,7 +31,7 @@ LICENSE="GPL-2+
audiocom? ( ZLIB )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
opus +portmixer sbsms twolame vamp +vorbis wavpack"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2023-05-06 Thread Sam James
commit: ef498907c07351ce8726b90e8bdf6c74080cedf2
Author: Sam James  gentoo  org>
AuthorDate: Sat May  6 06:18:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  6 06:19:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef498907

media-sound/audacity: fix build w/ gcc 13

Closes: https://bugs.gentoo.org/903771
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.2.5-r1.ebuild  | 226 +
 .../audacity/files/audacity-3.2.5-gcc13-deux.patch |  57 ++
 2 files changed, 283 insertions(+)

diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild 
b/media-sound/audacity/audacity-3.2.5-r1.ebuild
new file mode 100644
index ..504ee61be19b
--- /dev/null
+++ b/media-sound/audacity/audacity-3.2.5-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
 -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+   doc? ( 
https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz
 )
+   audiocom? ( ${MY_THREADPOOL} )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+   GPL-3
+   doc? ( CC-BY-3.0 )
+   audiocom? ( ZLIB )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
+   opus +portmixer sbsms twolame vamp +vorbis wavpack"
+
+# The testsuite consists of two tests, 50% of which fail.
+RESTRICT="test"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's probably not
+#   in our best interest to fix that as a patch series.
+# glib, gtk and gdk are all directly relied on in the source, not just
+
+# Libraries used at runtime via dlopen:
+# - dev-libs/{serd,sord} - for LV2 support
+# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
+# - media-sound/lame :: For MP3 export
+# - media-video/ffmpeg :: For generic FFMPEG export
+#   This one has the interesting property of many versions being
+#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
+#   Current support grid:
+#   - Lavf - 5[789]
+#   - Lavc - 5[789]
+#   - Lavu - 5[2567]
+
+RDEPEND="dev-db/sqlite:3
+   dev-libs/expat
+   dev-libs/glib:2
+   media-libs/libsndfile
+   media-libs/libsoundtouch:=
+   media-libs/portaudio[alsa?]
+   media-libs/portmidi
+   media-libs/portsmf:=
+   media-libs/soxr
+   media-sound/lame
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   sys-apps/util-linux
+   alsa? ( media-libs/alsa-lib )
+   audiocom? (
+   dev-libs/rapidjson
+   net-misc/curl
+   )
+   ffmpeg? ( media-video/ffmpeg )
+   flac? ( media-libs/flac:=[cxx] )
+   id3tag? ( media-libs/libid3tag:= )
+   lv2? (
+   dev-libs/serd
+   dev-libs/sord
+   media-libs/lilv
+   media-libs/lv2
+   media-libs/sratom
+   media-libs/suil
+   )
+   mad? ( media-libs/libmad )
+   mpg123? ( media-sound/mpg123 )
+   ogg? ( media-libs/libogg )
+   opus? ( media-libs/opus )
+   sbsms? ( media-libs/libsbsms )
+   twolame? ( media-sound/twolame )
+   vamp? ( media-libs/vamp-plugin-sdk )
+   vorbis? ( media-libs/libvorbis )
+   wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+REQUIRED_USE="
+   mad? ( !mpg123 )
+"
+
+PATCHES=(
+   # Equivalent to previous versions
+   "${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+   # From Debian
+   "${FILESDIR}/${PN}-3.2.3-fix-rpaths.patch"
+
+   # Disables some header-based detection
+   "${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+
+   # For has_networking
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-05-01 Thread Miroslav Šulc
commit: 6b8ef0c4821f3bb7ea15169e9ff6fdd5dc95d27e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon May  1 08:32:05 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon May  1 08:32:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8ef0c4

media-sound/audacity: dropped obsolete 3.2.4

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/Manifest  |   2 -
 media-sound/audacity/audacity-3.2.4.ebuild | 223 -
 2 files changed, 225 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 3c8299ab108c..4c36f4db70da 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,7 +1,5 @@
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
 SHA512 
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST Audacity-3.2.4.tar.gz 57016943 BLAKE2B 
df36f5f7162cc6303b2bcb4861f0b418fd3dfd97a8d664b9c0fe1e84b57df5342864a82e7652c2e706e723b6eb6faded50a0ce4fb96f36ac1e6ba48726db40a7
 SHA512 
d69459839760f0db7d23ad5ee5601e0a0b8e918a7f9ad6773bb45b525f732d09ff0fc6ca59c6400b62d7b0b905411dd97673b6d6f2102c9ed549e9f833b60a96
 DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B 
b8e48cab1c89cadb343a17fcb1d811a7363231152867f8426dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24
 SHA512 
850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-manual-3.2.4.tar.gz 22251911 BLAKE2B 
ba2cf1a3b13f59bf03014fd301e3e50654d39fa0a79076760b68edca725513ea18c7be6e68452471e25274597e0629fff2964a135a81d1c54e0c0ae7b55f94fc
 SHA512 
6f2d6339dfe150a1eb57a42a957154237c6ade0beb0a2a06ed2c59b5d23ff6b40d1dea0bc91851951a7df26aeb1c43c79f85ac71ba5361165f8524dbf1301424
 DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B 
e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa7b5d0b6a00e14bd420d6f064515455055233a45f5ebf47
 SHA512 
9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 
54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14
 SHA512 
f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d

diff --git a/media-sound/audacity/audacity-3.2.4.ebuild 
b/media-sound/audacity/audacity-3.2.4.ebuild
deleted file mode 100644
index 9b1ee5735698..
--- a/media-sound/audacity/audacity-3.2.4.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit cmake wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/;
-
-# A header-only thread pool library, without a build system, about 100
-# lines of code.  Probably not worth packaging individually.  Check
-# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
-MY_THREADPOOL_DATE=20140926
-MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
 -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-   doc? ( 
https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz
 )
-   audiocom? ( ${MY_THREADPOOL} )"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-# GPL-2+, GPL-3 - Audacity itself
-# ZLIB - The ThreadPool single-header library
-# CC-BY-3.0 - Documentation
-LICENSE="GPL-2+
-   GPL-3
-   doc? ( CC-BY-3.0 )
-   audiocom? ( ZLIB )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
-   opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
-
-# dev-db/sqlite:3 hard dependency.
-# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
-#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
-# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
-#   for libuuid
-# portmidi became non-optional: building without it results in build
-#   failures, even with some of the Debian patches.  

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-05-01 Thread Arthur Zamarin
commit: 4747acc72f8f114f4714709dbd47be8c8a8c0d2d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May  1 07:35:42 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May  1 07:35:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4747acc7

media-sound/audacity: Stabilize 3.2.5 amd64, #898520

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-sound/audacity/audacity-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-3.2.5.ebuild 
b/media-sound/audacity/audacity-3.2.5.ebuild
index 0d2e26a3d311..8a011864b2d7 100644
--- a/media-sound/audacity/audacity-3.2.5.ebuild
+++ b/media-sound/audacity/audacity-3.2.5.ebuild
@@ -31,7 +31,7 @@ LICENSE="GPL-2+
audiocom? ( ZLIB )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
opus +portmixer sbsms twolame vamp +vorbis wavpack"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2023-04-14 Thread Sam James
commit: 0e748c0d213d1fde1baa4cdbe01252c409d3341f
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 15 00:45:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 15 00:45:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e748c0d

media-sound/audacity: add partial GCC 13 fix

Closes: https://bugs.gentoo.org/899764
Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-3.2.5.ebuild |  3 +++
 .../audacity/files/audacity-3.2.5-gcc13.patch  | 25 ++
 2 files changed, 28 insertions(+)

diff --git a/media-sound/audacity/audacity-3.2.5.ebuild 
b/media-sound/audacity/audacity-3.2.5.ebuild
index 9b1ee5735698..0d2e26a3d311 100644
--- a/media-sound/audacity/audacity-3.2.5.ebuild
+++ b/media-sound/audacity/audacity-3.2.5.ebuild
@@ -122,6 +122,9 @@ PATCHES=(
# For has_networking
"${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch"
"${FILESDIR}/${PN}-3.2.3-allow-finding-rapidjson-pkgconfig.patch"
+
+   # GCC 13
+   "${FILESDIR}/${PN}-3.2.5-gcc13.patch"
 )
 
 src_prepare() {

diff --git a/media-sound/audacity/files/audacity-3.2.5-gcc13.patch 
b/media-sound/audacity/files/audacity-3.2.5-gcc13.patch
new file mode 100644
index ..265d73fd9e71
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.5-gcc13.patch
@@ -0,0 +1,25 @@
+https://github.com/audacity/audacity/issues/4489
+https://bugs.gentoo.org/899764
+
+--- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
 b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
+@@ -47,6 +47,7 @@
+ #endif
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -355,10 +356,6 @@
+ typedef signed int SINT32;
+ typedef float FLOAT32;
+ typedef double FLOAT64;
+-// added by RBD
+-#ifdef __linux__
+-#define intptr_t long
+-#endif
+ 
+ // The default sampling rate.
+ const StkFloat SRATE = 44100.0;
+



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-03-01 Thread Miroslav Šulc
commit: 4ff133018753021ee8d96a8f6615f4d23bd4fdad
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Mar  2 06:42:38 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Mar  2 06:42:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff13301

media-sound/audacity: bump to 3.2.5

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/Manifest  |   2 +
 media-sound/audacity/audacity-3.2.5.ebuild | 223 +
 2 files changed, 225 insertions(+)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index cad7eba5923c..3c8299ab108c 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,5 +1,7 @@
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
 SHA512 
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST Audacity-3.2.4.tar.gz 57016943 BLAKE2B 
df36f5f7162cc6303b2bcb4861f0b418fd3dfd97a8d664b9c0fe1e84b57df5342864a82e7652c2e706e723b6eb6faded50a0ce4fb96f36ac1e6ba48726db40a7
 SHA512 
d69459839760f0db7d23ad5ee5601e0a0b8e918a7f9ad6773bb45b525f732d09ff0fc6ca59c6400b62d7b0b905411dd97673b6d6f2102c9ed549e9f833b60a96
+DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B 
b8e48cab1c89cadb343a17fcb1d811a7363231152867f8426dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24
 SHA512 
850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
 DIST audacity-manual-3.2.4.tar.gz 22251911 BLAKE2B 
ba2cf1a3b13f59bf03014fd301e3e50654d39fa0a79076760b68edca725513ea18c7be6e68452471e25274597e0629fff2964a135a81d1c54e0c0ae7b55f94fc
 SHA512 
6f2d6339dfe150a1eb57a42a957154237c6ade0beb0a2a06ed2c59b5d23ff6b40d1dea0bc91851951a7df26aeb1c43c79f85ac71ba5361165f8524dbf1301424
+DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B 
e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa7b5d0b6a00e14bd420d6f064515455055233a45f5ebf47
 SHA512 
9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 
54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14
 SHA512 
f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d

diff --git a/media-sound/audacity/audacity-3.2.5.ebuild 
b/media-sound/audacity/audacity-3.2.5.ebuild
new file mode 100644
index ..9b1ee5735698
--- /dev/null
+++ b/media-sound/audacity/audacity-3.2.5.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
 -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+   doc? ( 
https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz
 )
+   audiocom? ( ${MY_THREADPOOL} )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+   GPL-3
+   doc? ( CC-BY-3.0 )
+   audiocom? ( ZLIB )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
+   opus +portmixer sbsms twolame vamp +vorbis wavpack"
+
+# The testsuite consists of two tests, 50% of which fail.
+RESTRICT="test"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's probably 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-01-29 Thread Miroslav Šulc
commit: 1ceb09f1f73b0972145fb52ce4b1f9b52148c89f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jan 29 11:11:54 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jan 29 11:12:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ceb09f1

media-sound/audacity: bug-fix bump to 3.2.4 + eapi8 + dep versions cleanup, 
dropped 3.2.3

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/Manifest | 4 ++--
 .../audacity/{audacity-3.2.3.ebuild => audacity-3.2.4.ebuild} | 8 
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index d2043bedc60f..cad7eba5923c 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,5 +1,5 @@
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
 SHA512 
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST Audacity-3.2.3.tar.gz 57017395 BLAKE2B 
3b74c381c9d8e5cbd22e3e53a2e497a45cc48f61b79395b1e17c15e4c645c661ad544cd050885f104562f0f05d08c9e52821f1b9737c32f5f7942d6b8f3102fb
 SHA512 
759eb951ecbc690501c32a7cfc78b3c6f083ed62a4b57cc7935eef7b5dfd930ab4022c54e90de9523a4664ae7749868303fc4e597f19b319f23b07a9776a23cb
+DIST Audacity-3.2.4.tar.gz 57016943 BLAKE2B 
df36f5f7162cc6303b2bcb4861f0b418fd3dfd97a8d664b9c0fe1e84b57df5342864a82e7652c2e706e723b6eb6faded50a0ce4fb96f36ac1e6ba48726db40a7
 SHA512 
d69459839760f0db7d23ad5ee5601e0a0b8e918a7f9ad6773bb45b525f732d09ff0fc6ca59c6400b62d7b0b905411dd97673b6d6f2102c9ed549e9f833b60a96
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-manual-3.2.3.tar.gz 22264928 BLAKE2B 
7b9441a7d6c2ca05d1be0a2635a7685cff3960f03380c04229a6b2155453a8da861f185adf38f430f2c23214a6fc794533ed7ee23362801fb31eef32977e4a25
 SHA512 
6978ac874f9318fd283098ea5a4b6aa7096acdab229c7bb96c8da33413ed326b1de0c262132e03e4e8127cf0a430a182fb718c9c753556832aea7c527bf5c2cb
+DIST audacity-manual-3.2.4.tar.gz 22251911 BLAKE2B 
ba2cf1a3b13f59bf03014fd301e3e50654d39fa0a79076760b68edca725513ea18c7be6e68452471e25274597e0629fff2964a135a81d1c54e0c0ae7b55f94fc
 SHA512 
6f2d6339dfe150a1eb57a42a957154237c6ade0beb0a2a06ed2c59b5d23ff6b40d1dea0bc91851951a7df26aeb1c43c79f85ac71ba5361165f8524dbf1301424
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 
54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14
 SHA512 
f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d

diff --git a/media-sound/audacity/audacity-3.2.3.ebuild 
b/media-sound/audacity/audacity-3.2.4.ebuild
similarity index 98%
rename from media-sound/audacity/audacity-3.2.3.ebuild
rename to media-sound/audacity/audacity-3.2.4.ebuild
index 8ecea0118165..9b1ee5735698 100644
--- a/media-sound/audacity/audacity-3.2.3.ebuild
+++ b/media-sound/audacity/audacity-3.2.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
@@ -69,7 +69,7 @@ RDEPEND="dev-db/sqlite:3
media-libs/portmidi
media-libs/portsmf:=
media-libs/soxr
-   >=media-sound/lame-3.100-r3
+   media-sound/lame
x11-libs/gdk-pixbuf:2
x11-libs/gtk+:3
x11-libs/wxGTK:${WX_GTK_VER}[X]
@@ -85,12 +85,12 @@ RDEPEND="dev-db/sqlite:3
lv2? (
dev-libs/serd
dev-libs/sord
-   >=media-libs/lilv-0.24.6-r2
+   media-libs/lilv
media-libs/lv2
media-libs/sratom
media-libs/suil
)
-   mad? ( >=media-libs/libmad-0.15.1b )
+   mad? ( media-libs/libmad )
mpg123? ( media-sound/mpg123 )
ogg? ( media-libs/libogg )
opus? ( media-libs/opus )



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2023-01-21 Thread Arsen Arsenović
commit: b9ef7dab0166ebdab09ec22775ab1d1319e49696
Author: Arsen Arsenović  gentoo  org>
AuthorDate: Sat Jan 21 16:12:37 2023 +
Commit: Arsen Arsenović  gentoo  org>
CommitDate: Sat Jan 21 16:13:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ef7dab

media-sound/audacity: Keyword 3.2.3 riscv, #891517

Signed-off-by: Arsen Arsenović  gentoo.org>

 media-sound/audacity/audacity-3.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-3.2.3.ebuild 
b/media-sound/audacity/audacity-3.2.3.ebuild
index ad84d68e3e60..8ecea0118165 100644
--- a/media-sound/audacity/audacity-3.2.3.ebuild
+++ b/media-sound/audacity/audacity-3.2.3.ebuild
@@ -31,7 +31,7 @@ LICENSE="GPL-2+
audiocom? ( ZLIB )
 "
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
opus +portmixer sbsms twolame vamp +vorbis wavpack"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2023-01-20 Thread Arsen Arsenović
commit: 75e46d7319ae344ddd180417ff380bcda495d9a8
Author: Arsen Arsenović  gentoo  org>
AuthorDate: Fri Jan 20 21:25:40 2023 +
Commit: Arsen Arsenović  gentoo  org>
CommitDate: Fri Jan 20 22:15:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e46d73

media-sound/audacity: add 3.2.3

This update also links against system portaudio.

Keywords dropped to ~amd64 due to media-libs/portsmf.

Closes: https://bugs.gentoo.org/777366
Closes: https://bugs.gentoo.org/822978
Closes: https://github.com/gentoo/gentoo/pull/28715
Signed-off-by: Arsen Arsenović  gentoo.org>

 media-sound/audacity/Manifest  |   3 +
 media-sound/audacity/audacity-3.2.3.ebuild | 223 +
 ...y-3.2.3-allow-finding-rapidjson-pkgconfig.patch |  24 +++
 ...audacity-3.2.3-allow-overriding-alsa-jack.patch |  48 +
 .../files/audacity-3.2.3-disable-ccache.patch  |  33 +++
 .../audacity/files/audacity-3.2.3-fix-rpaths.patch | 144 +
 .../audacity-3.2.3-remove-conan-threadpool.patch   |  58 ++
 media-sound/audacity/metadata.xml  |  10 +-
 8 files changed, 541 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 9c6a1401ae13..d2043bedc60f 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,2 +1,5 @@
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
 SHA512 
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
+DIST Audacity-3.2.3.tar.gz 57017395 BLAKE2B 
3b74c381c9d8e5cbd22e3e53a2e497a45cc48f61b79395b1e17c15e4c645c661ad544cd050885f104562f0f05d08c9e52821f1b9737c32f5f7942d6b8f3102fb
 SHA512 
759eb951ecbc690501c32a7cfc78b3c6f083ed62a4b57cc7935eef7b5dfd930ab4022c54e90de9523a4664ae7749868303fc4e597f19b319f23b07a9776a23cb
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
+DIST audacity-manual-3.2.3.tar.gz 22264928 BLAKE2B 
7b9441a7d6c2ca05d1be0a2635a7685cff3960f03380c04229a6b2155453a8da861f185adf38f430f2c23214a6fc794533ed7ee23362801fb31eef32977e4a25
 SHA512 
6978ac874f9318fd283098ea5a4b6aa7096acdab229c7bb96c8da33413ed326b1de0c262132e03e4e8127cf0a430a182fb718c9c753556832aea7c527bf5c2cb
+DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 
54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14
 SHA512 
f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d

diff --git a/media-sound/audacity/audacity-3.2.3.ebuild 
b/media-sound/audacity/audacity-3.2.3.ebuild
new file mode 100644
index ..ad84d68e3e60
--- /dev/null
+++ b/media-sound/audacity/audacity-3.2.3.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
 -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+   doc? ( 
https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz
 )
+   audiocom? ( ${MY_THREADPOOL} )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+   GPL-3
+   doc? ( CC-BY-3.0 )
+   audiocom? ( ZLIB )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
+   opus +portmixer sbsms twolame vamp +vorbis wavpack"
+
+# The testsuite consists of two tests, 50% of which fail.
+RESTRICT="test"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2021-09-22 Thread Yixun Lan
commit: 9c74038dd097408f8e0993593d67fad0f301f010
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Sep 22 14:25:58 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Sep 22 14:29:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c74038d

media-sound/audacity: keyword ~riscv

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r2.ebuild 
b/media-sound/audacity/audacity-2.4.2-r2.ebuild
index 31ae2a91f84..a1800d264fb 100644
--- a/media-sound/audacity/audacity-2.4.2-r2.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r2.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 ~riscv x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2021-08-16 Thread Sam James
commit: 932bb025a7767b942480baf2cfe35e055d665b13
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 16 21:14:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 16 21:22:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932bb025

media-sound/audacity: add missing slot operator dep (libid3tag)

Signed-off-by: Sam James  gentoo.org>

 .../audacity/{audacity-2.4.2-r1.ebuild => audacity-2.4.2-r2.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r2.ebuild
similarity index 97%
rename from media-sound/audacity/audacity-2.4.2-r1.ebuild
rename to media-sound/audacity/audacity-2.4.2-r2.ebuild
index 4c5130a8044..31ae2a91f84 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,7 @@ RESTRICT="test"
 
 RDEPEND="dev-libs/expat
media-libs/libsndfile
-   media-libs/libsoundtouch
+   media-libs/libsoundtouch:=
media-libs/portaudio[alsa?]
media-libs/soxr
>=media-sound/lame-3.100-r3
@@ -33,7 +33,7 @@ RDEPEND="dev-libs/expat
alsa? ( media-libs/alsa-lib )
ffmpeg? ( media-video/ffmpeg:= )
flac? ( media-libs/flac[cxx] )
-   id3tag? ( media-libs/libid3tag )
+   id3tag? ( media-libs/libid3tag:= )
jack? ( virtual/jack )
lv2? (
dev-libs/serd



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2020-09-19 Thread Miroslav Šulc
commit: 5cc9d2c25be36ffe088cb39216f042bd1116eedd
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Sep 19 11:52:45 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Sep 19 11:52:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc9d2c2

media-sound/audacity: removed obsolete 2.2.2 and 2.3.3

Closes: https://bugs.gentoo.org/699946
Closes: https://bugs.gentoo.org/646820
Closes: https://bugs.gentoo.org/618326
Closes: https://bugs.gentoo.org/626586
Closes: https://bugs.gentoo.org/632712
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/Manifest  |   4 -
 media-sound/audacity/audacity-2.2.2.ebuild | 131 
 media-sound/audacity/audacity-2.3.3.ebuild | 137 -
 .../audacity/files/audacity-2.2.1-portmixer.patch  |  36 -
 .../audacity/files/audacity-2.2.2-automake.patch   |  48 --
 .../audacity/files/audacity-2.2.2-midi.patch   | 168 -
 .../audacity/files/audacity-2.3.3-fno-common.patch |  62 
 media-sound/audacity/metadata.xml  |   3 -
 8 files changed, 589 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index b52eb2a23f6..9c6a1401ae1 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,2 @@
-DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B 
a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846
 SHA512 
0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
 SHA512 
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B 
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
 SHA512 
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
-DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B 
f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84
 SHA512 
2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B 
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
 SHA512 
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
deleted file mode 100644
index 414cf0f7772..000
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils wxwidgets xdg-utils
-
-MY_P="${PN}-minsrc-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/;
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
-   doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
-   # wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
-   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
-
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-   dev-libs/expat
-   >=media-libs/libsndfile-1.0.0
-   >=media-libs/portaudio-19_pre
-   =media-video/ffmpeg-1.2:= )
-   flac? ( >=media-libs/flac-1.3.1[cxx] )
-   id3tag? ( media-libs/libid3tag )
-   jack? ( virtual/jack )
-   lame? ( >=media-sound/lame-3.70 )
-   lv2? ( media-libs/lv2 )
-   mad? ( >=media-libs/libmad-0.14.2b )
-   midi? ( media-libs/portmidi )
-   sbsms? ( media-libs/libsbsms )
-   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-   twolame? ( media-sound/twolame )
-   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-   vorbis? ( >=media-libs/libvorbis-1.0 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-09-13 Thread Sergei Trofimovich
commit: 633c29953ba2d16052629e975424c4c4b6e5cc17
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep 13 08:42:58 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep 13 08:44:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633c2995

media-sound/audacity: stable 2.4.2-r1 for ppc

stable wrt bug #740054

Package-Manager: Portage-3.0.6, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index 471590b6502..a8acc69fa8e 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~mips ppc ppc64 x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-09-09 Thread Sergei Trofimovich
commit: 97a23c027647e4ea5fca6d6d1fee06f1610e4855
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Sep  9 21:46:18 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep  9 21:59:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a23c02

media-sound/audacity: stable 2.4.2-r1 for ppc64

stable wrt bug #740054

Package-Manager: Portage-3.0.6, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index 2ed0b3c6023..471590b6502 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc ppc64 x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-09-07 Thread Miroslav Šulc
commit: ab4c19d68105021ecf8e9d111bf76fea129205b9
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Sep  7 08:59:06 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Sep  7 08:59:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab4c19d6

media-sound/audacity: fixed compilation of 2.4.2-r1

Closes: https://bugs.gentoo.org/738830
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index f3d34ec54f6..2ed0b3c6023 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -111,6 +111,10 @@ src_configure() {
)
 
cmake_src_configure
+
+   # if git is not installed, this (empty) file is not being created and 
the compilation fails
+   # so we create it manually
+   touch "${BUILD_DIR}/src/private/RevisionIdent.h" || die "failed to 
create file"
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-09-07 Thread Sergei Trofimovich
commit: cb6419bd3515bad646896d019d448701e2ea33c1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  7 07:34:46 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  7 07:35:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6419bd

media-sound/audacity: keyworded 2.4.2-r1 for ppc64

keyworded wrt bug #740052

Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index 805c7254735..f3d34ec54f6 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips ~ppc x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc ~ppc64 x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-09-07 Thread Sergei Trofimovich
commit: 98487dbf23d5f6b8a8b9f0dee83c1b14c6ff4856
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  7 07:29:28 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  7 07:31:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98487dbf

media-sound/audacity: keyworded 2.4.2-r1 for ppc

keyworded wrt bug #740052

Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index 9d02a46225a..805c7254735 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~mips x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~ppc x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2020-09-02 Thread Miroslav Šulc
commit: 6128f01f2648d14c91363ddc89f868d8938a4b2e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Sep  2 08:32:47 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Sep  2 08:33:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6128f01f

media-sound/audacity: disabled ccache in 2.4.2-r1

Closes: https://bugs.gentoo.org/735642
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild |  1 +
 .../files/audacity-2.4.2-disable-ccache.patch | 19 +++
 2 files changed, 20 insertions(+)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index e6c8898ad22..f7df783a70c 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}/${P}-fix-gettimeofday.patch"
"${FILESDIR}/${P}-fix-metainfo.patch"
"${FILESDIR}/${P}-add-missing-include-portaudio.patch"
+   "${FILESDIR}/${P}-disable-ccache.patch"
 )
 
 src_prepare() {

diff --git a/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch 
b/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch
new file mode 100644
index 000..03acf6a2058
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ff5430..9c9dbf6 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -69,14 +69,6 @@ set( CMAKE_MODULE_PATH 
${CMAKE_SOURCE_DIR}/cmake-proxies/cmake-modules)
+ set( CMAKE_CXX_STANDARD 14 )
+ set( CMAKE_CXX_STANDARD_REQUIRED ON )
+ 
+-# Use ccache if available
+-find_program( CCACHE_PROGRAM ccache )
+-mark_as_advanced( FORCE CCACHE_PROGRAM )
+-
+-if( CCACHE_PROGRAM )
+-   set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
+-endif()
+-
+ # Our very own project
+ project( Audacity )
+ 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-08-23 Thread Miroslav Šulc
commit: ffe6fe6234d5ad867d173fe8e9153ba3cb74f3be
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug 23 10:39:15 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug 23 10:39:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffe6fe62

media-sound/audacity: leaving -Daudacity_use_pch to default in 2.4.2-r1

Bug: https://bugs.gentoo.org/735780
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index 5d0d8803043..e6c8898ad22 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -94,7 +94,7 @@ src_configure() {
-Daudacity_use_pa_alsa=$(usex alsa)
-Daudacity_use_pa_jack=$(usex jack linked off)
-Daudacity_use_pa_oss=$(usex oss)
-   -Daudacity_use_pch=ON
+   #-Daudacity_use_pch leaving it to the default behavior
-Daudacity_use_portaudio=local # only 'local' option is present
-Daudacity_use_portmixer=$(usex portmixer local off)
-Daudacity_use_portsmf=$(usex portsmf local off)



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/

2020-08-17 Thread Aaron Bauman
commit: a659cbc4376a23d8e8cfa2e50f3676d276c474ef
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Aug 13 18:49:01 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Aug 17 16:28:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a659cbc4

media-sound/audacity: remove unused patches

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17116
Signed-off-by: Aaron Bauman  gentoo.org>

 .../audacity-2.3.2-Fix-building-without-midi.patch | 71 --
 ...3.2-fix_building_against_system_portaudio.patch | 56 -
 2 files changed, 127 deletions(-)

diff --git 
a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch 
b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
deleted file mode 100644
index d4ec1a7320f..000
--- a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urpN a/src/Track.h b/src/Track.h
 a/src/Track.h  2019-05-04 13:38:57.0 +0300
-+++ b/src/Track.h  2019-08-27 19:32:36.937551831 +0300
-@@ -53,10 +53,6 @@ using WaveTrackConstArray = std::vector
- 
- using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > 
>;
- 
--#if defined(USE_MIDI)
--class NoteTrack;
--#endif
--
- class TrackList;
- 
- using ListOfTracks = std::list< std::shared_ptr< Track > >;
-@@ -74,9 +70,7 @@ enum class TrackKind
- {
-None,
-Wave,
--#if defined(USE_MIDI)
-Note,
--#endif
-Label,
-Time,
-Audio,
-diff -urpN a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
 a/src/menus/FileMenus.cpp  2019-05-04 13:38:57.0 +0300
-+++ b/src/menus/FileMenus.cpp  2019-08-27 19:32:36.939551720 +0300
-@@ -141,8 +141,6 @@ AudacityProject *DoImportMIDI(
- }
- #endif
- 
--#ifdef USE_MIDI
--
- // Menu handler functions
- 
- struct Handler : CommandHandlerObject {
-@@ -480,6 +478,7 @@ void OnImportLabels(const CommandContext
-}
- }
- 
-+#ifdef USE_MIDI
- void OnImportMIDI(const CommandContext )
- {
-auto  = context.project;
-@@ -496,7 +495,7 @@ void OnImportMIDI(const CommandContext &
-if (!fileName.empty())
-   DoImportMIDI(, fileName);
- }
--#endif
-+#endif // USE_MIDI
- 
- void OnImportRaw(const CommandContext )
- {
-diff -urpN a/src/tracks/ui/TimeShiftHandle.cpp 
b/src/tracks/ui/TimeShiftHandle.cpp
 a/src/tracks/ui/TimeShiftHandle.cpp2019-05-04 13:38:57.0 
+0300
-+++ b/src/tracks/ui/TimeShiftHandle.cpp2019-08-27 19:32:36.940551665 
+0300
-@@ -393,12 +393,12 @@ UIHandle::Result TimeShiftHandle::Click
-ok = false;
- else
-captureClips = true;
-- },
- #ifdef USE_MIDI
-+ },
-  [&](NoteTrack *) {
- captureClips = true;
-- }
- #endif
-+ }
-   );
- 
-if ( ! ok )

diff --git 
a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
 
b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
deleted file mode 100644
index fa785fdd6c5..000
--- 
a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
-From: Antonio Ospite 
-Date: Tue, 7 Nov 2017 13:06:33 +0100
-Subject: [PATCH] Fix building against the system portaudio library
-
-Building against the system portaudio results in this error:
-
-./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime'
-audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*,
-unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)':
-./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime'
-collect2: error: ld returned 1 exit status
-Makefile:2349: recipe for target 'audacity' failed
-make[3]: *** [audacity] Error 1
-
-This is because PaUtil_GetTime is declared as a C symbol in pa_util.h
-but is resolved as a C++ symbol at link time.
-
-Audacity fixes this in the local tree with this change:
-https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7
-
-However this is not general enough for the portaudio debian package.
-
-Since PaUtil_GetTime() is the only function causing problems, just copy
-over the code where it's used.

- src/AudioIO.cpp | 17 -
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
 a/src/AudioIO.cpp
-+++ b/src/AudioIO.cpp
-@@ -465,8 +465,23 @@ TimeTrack and AudioIOListener and whethe
-#define ROUND(x) (int) ((x)+0.5)
-//#include 
-#include "../lib-src/portmidi/pm_common/portmidi.h"
--   #include "../lib-src/portaudio-v19/src/common/pa_util.h"
-#include "NoteTrack.h"
-+
-+PaTime PaUtil_GetTime( void )
-+{
-+#ifdef HAVE_MACH_ABSOLUTE_TIME
-+return mach_absolute_time() * 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-08-06 Thread Miroslav Šulc
commit: 4ff643dc06f490e84c15930e4e091ac71148ebd0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Aug  6 07:33:06 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Aug  6 07:33:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff643dc

media-sound/audacity: portmidi use flag requires portsmf in 2.4.2-r1

Closes: https://bugs.gentoo.org/735668
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index e55b34a8ae8..5d0d8803043 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -57,6 +57,8 @@ BDEPEND="app-arch/unzip
virtual/pkgconfig
 "
 
+REQUIRED_USE="portmidi? ( portsmf )"
+
 PATCHES=(
"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
"${FILESDIR}/${P}-fix-vertical-track-resizing.patch"



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2020-08-05 Thread Miroslav Šulc
commit: 9043667c3f03113d9bed94fc64132e2519b17657
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Aug  6 04:57:26 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Aug  6 04:57:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9043667c

media-sound/audacity: fixed compilation wrt portaudio in 2.4.2-r1

patch by Matt Whitlock  mattwhitlock.name>

Closes: https://bugs.gentoo.org/735810
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild |  1 +
 .../files/audacity-2.4.2-add-missing-include-portaudio.patch  | 11 +++
 2 files changed, 12 insertions(+)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index 4f3f3dae4ec..e55b34a8ae8 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${P}-fix-vertical-track-resizing.patch"
"${FILESDIR}/${P}-fix-gettimeofday.patch"
"${FILESDIR}/${P}-fix-metainfo.patch"
+   "${FILESDIR}/${P}-add-missing-include-portaudio.patch"
 )
 
 src_prepare() {

diff --git 
a/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch 
b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch
new file mode 100644
index 000..7b845bc3181
--- /dev/null
+++ 
b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch
@@ -0,0 +1,11 @@
+diff -Naur a/src/AudioIOBase.cpp b/src/AudioIOBase.cpp
+--- a/src/AudioIOBase.cpp  2020-06-19 15:16:47.0 +
 b/src/AudioIOBase.cpp  2020-08-04 19:43:27.985734707 +
+@@ -21,6 +21,7 @@
+ #include "prefs/RecordingPrefs.h"
+ #include "widgets/MeterPanelBase.h"
+ 
++#include "portaudio.h"
+ #if USE_PORTMIXER
+ #include "portmixer.h"
+ #endif



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-08-05 Thread Sam James
commit: 97954d84d09dbf71901e01ec2322ae5ff3d9e3d3
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug  6 02:34:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug  6 02:35:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97954d84

media-sound/audacity: Keyword 2.4.2-r1 arm64, #734824

Signed-off-by: Sam James  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index d6d9d34fc96..4f3f3dae4ec 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86"
 IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-08-04 Thread Miroslav Šulc
commit: 5d8454d1cb7a5c86888ac51d5ebeff254ea050fd
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug  4 06:46:58 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug  4 06:47:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8454d1

media-sound/audacity: use flags cleanup in 2.4.2-r1

Closes: https://bugs.gentoo.org/735574
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index 5c79d8c9882..d6d9d34fc96 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -18,8 +18,8 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
-   +lv2 mad midi nls ogg oss portmidi +portmixer portsmf sbsms +soundtouch 
twolame vamp +vorbis +vst"
+IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
+   portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
 
 RESTRICT="test"
 
@@ -53,8 +53,8 @@ RDEPEND="dev-libs/expat
 "
 DEPEND="${RDEPEND}"
 BDEPEND="app-arch/unzip
+   sys-devel/gettext
virtual/pkgconfig
-   nls? ( sys-devel/gettext )
 "
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-08-02 Thread Miroslav Šulc
commit: 0c90b828ce1b43eb173e89427ad01d011548fd54
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Aug  3 05:00:11 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Aug  3 05:00:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c90b828

media-sound/audacity: fixed lilv dep in 2.4.2-r1

Closes: https://bugs.gentoo.org/735256
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-2.4.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index 3cb2f876023..5c79d8c9882 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -38,7 +38,7 @@ RDEPEND="dev-libs/expat
lv2? (
dev-libs/serd
dev-libs/sord
-   media-libs/lilv
+   >=media-libs/lilv-0.24.6-r2
media-libs/lv2
media-libs/sratom
media-libs/suil



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-08-02 Thread Miroslav Šulc
commit: 1bccb35a57f821522e391c2342b24d0efbed06ef
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  2 18:22:59 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  2 18:23:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bccb35a

media-sound/audacity: restricted 2.4.2 dep to lame with .pc file

otherwise audacity silently uses the bundled one

Bug: https://bugs.gentoo.org/735168
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../audacity/{audacity-2.4.2.ebuild => audacity-2.4.2-r1.ebuild}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.4.2.ebuild 
b/media-sound/audacity/audacity-2.4.2-r1.ebuild
similarity index 99%
rename from media-sound/audacity/audacity-2.4.2.ebuild
rename to media-sound/audacity/audacity-2.4.2-r1.ebuild
index 833ff268bdc..3cb2f876023 100644
--- a/media-sound/audacity/audacity-2.4.2.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="dev-libs/expat
media-libs/libsoundtouch
media-libs/portaudio[alsa?]
media-libs/soxr
-   media-sound/lame
+   >=media-sound/lame-3.100-r3
x11-libs/wxGTK:${WX_GTK_VER}[X]
alsa? ( media-libs/alsa-lib )
ffmpeg? ( media-video/ffmpeg:= )



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-08-02 Thread Miroslav Šulc
commit: 5c847ef376234741c701851f63316618b426ad16
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  2 11:09:58 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  2 11:09:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c847ef3

media-sound/audacity: removed obsolete 2.3.2

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/Manifest  |   2 -
 media-sound/audacity/audacity-2.3.2.ebuild | 138 -
 2 files changed, 140 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 8242e7c042b..b52eb2a23f6 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,8 +1,6 @@
-DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 
968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802
 SHA512 
a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
 DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B 
a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846
 SHA512 
0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
 SHA512 
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B 
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
 SHA512 
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
-DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 
6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44
 SHA512 
5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
 DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B 
f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84
 SHA512 
2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B 
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
 SHA512 
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c

diff --git a/media-sound/audacity/audacity-2.3.2.ebuild 
b/media-sound/audacity/audacity-2.3.2.ebuild
deleted file mode 100644
index a3ac1df60e7..000
--- a/media-sound/audacity/audacity-2.3.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/;
-# wget doesn't seem to work on FossHub links, so we mirror
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-   doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
-   +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
-
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-   dev-libs/expat
-   >=media-libs/libsndfile-1.0.0
-   >=media-libs/portaudio-19.06.00-r2[alsa?]
-   =media-video/ffmpeg-1.2:= )
-   flac? ( >=media-libs/flac-1.3.1[cxx] )
-   id3tag? ( media-libs/libid3tag )
-   jack? ( virtual/jack )
-   lame? ( >=media-sound/lame-3.70 )
-   lv2? (
-   media-libs/lilv
-   media-libs/lv2
-   media-libs/suil
-   )
-   mad? ( >=media-libs/libmad-0.14.2b )
-   sbsms? ( media-libs/libsbsms )
-   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-   twolame? ( media-sound/twolame )
-   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2020-08-02 Thread Miroslav Šulc
commit: 5a8d2f6d2fd27971422031f4a8311b5317288540
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  2 10:54:24 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  2 10:54:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8d2f6d

media-sound/audacity: bump to 2.4.2 + switched to cmake

Closes: https://bugs.gentoo.org/725268
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/Manifest  |   2 +
 media-sound/audacity/audacity-2.4.2.ebuild | 124 +
 .../files/audacity-2.4.2-fix-gettimeofday.patch|  12 ++
 .../files/audacity-2.4.2-fix-metainfo.patch|  12 ++
 ...udacity-2.4.2-fix-vertical-track-resizing.patch |  14 +++
 media-sound/audacity/metadata.xml  |   2 +
 6 files changed, 166 insertions(+)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 910df0fff27..8242e7c042b 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,8 @@
 DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 
968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802
 SHA512 
a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
 DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B 
a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846
 SHA512 
0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
+DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B 
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
 SHA512 
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B 
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
 SHA512 
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
 DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 
6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44
 SHA512 
5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
 DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B 
f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84
 SHA512 
2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
+DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
 SHA512 
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B 
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
 SHA512 
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c

diff --git a/media-sound/audacity/audacity-2.4.2.ebuild 
b/media-sound/audacity/audacity-2.4.2.ebuild
new file mode 100644
index 000..833ff268bdc
--- /dev/null
+++ b/media-sound/audacity/audacity-2.4.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+   doc? ( 
https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
+   +lv2 mad midi nls ogg oss portmidi +portmixer portsmf sbsms +soundtouch 
twolame vamp +vorbis +vst"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+   media-libs/libsndfile
+   media-libs/libsoundtouch
+   media-libs/portaudio[alsa?]
+   media-libs/soxr
+   media-sound/lame
+   x11-libs/wxGTK:${WX_GTK_VER}[X]
+   alsa? ( media-libs/alsa-lib )
+   ffmpeg? ( media-video/ffmpeg:= )
+   flac? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2020-04-30 Thread Lars Wendler
commit: 570aee4e7db0a9182bdca1e5cced4af0b5579e9c
Author: Alexander Tsoy  tsoy  me>
AuthorDate: Sat Mar 14 07:33:45 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Apr 30 23:55:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570aee4e

media-sound/audacity: Fix building with -fno-common

Closes: https://bugs.gentoo.org/709840
Signed-off-by: Alexander Tsoy  tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14949
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/audacity/audacity-2.3.3.ebuild |  1 +
 .../audacity/files/audacity-2.3.3-fno-common.patch | 62 ++
 2 files changed, 63 insertions(+)

diff --git a/media-sound/audacity/audacity-2.3.3.ebuild 
b/media-sound/audacity/audacity-2.3.3.ebuild
index d72fafa615e..0418e4cc865 100644
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -55,6 +55,7 @@ BDEPEND="app-arch/unzip
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+   "${FILESDIR}"/${PN}-2.3.3-fno-common.patch
 )
 
 src_prepare() {

diff --git a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch 
b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
new file mode 100644
index 000..5b922638aa5
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
@@ -0,0 +1,62 @@
+From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001
+From: Leland Lucius 
+Date: Mon, 16 Dec 2019 00:59:33 -0600
+Subject: [PATCH] Misc changes to get new Nyquist to build
+
+[backport of bd6ec9c0ed9fe94ae2f6e171969ae8a9fe45c11d]
+---
+ lib-src/libnyquist/nyquist/cmt/cmtio.h   | 4 ++--
+ lib-src/libnyquist/nyquist/cmt/userio.c  | 4 
+ lib-src/libnyquist/nyquist/sys/unix/io.c | 6 +++---
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/lib-src/libnyquist/nyquist/cmt/cmtio.h 
b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+index 3e50ad957..232862b50 100644
+--- a/lib-src/libnyquist/nyquist/cmt/cmtio.h
 b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+@@ -1,7 +1,7 @@
+ #define NOCHAR -2
+ 
+-int IOinputfd;
+-int IOnochar;
++extern int IOinputfd;
++extern int IOnochar;
+ 
+ int IOsetup(int inputfd);
+ int IOcleanup(void);
+diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c 
b/lib-src/libnyquist/nyquist/cmt/userio.c
+index f442376c5..a33ac98c9 100644
+--- a/lib-src/libnyquist/nyquist/cmt/userio.c
 b/lib-src/libnyquist/nyquist/cmt/userio.c
+@@ -153,6 +153,10 @@ extern int debug;
+ #include "xlisp.h"
+ #endif
+ 
++int IOinputfd;  /* input file descriptor (usually 0) */
++
++int IOnochar;   /* Value to be returned by IOgetchar()
++   where there is no input to be had */
+ 
+ /
+ *
+diff --git a/lib-src/libnyquist/nyquist/sys/unix/io.c 
b/lib-src/libnyquist/nyquist/sys/unix/io.c
+index 21b2abed8..f3e499c0d 100644
+--- a/lib-src/libnyquist/nyquist/sys/unix/io.c
 b/lib-src/libnyquist/nyquist/sys/unix/io.c
+@@ -16,10 +16,10 @@
+ #include 
+ #include "cext.h"
+ 
+-int IOinputfd;  /* input file descriptor (usually 0) */
++extern int IOinputfd;  /* input file descriptor (usually 0) */
+ 
+-int IOnochar;   /* Value to be returned by IOgetchar()
+-   where there is no input to be had */
++extern int IOnochar;   /* Value to be returned by IOgetchar()
++  where there is no input to be had */
+ 
+ static  struct sgttyb IOoldmodes, IOcurrentmodes;
+ /* Initial and current tty modes */
+-- 
+2.24.1
+



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-04-25 Thread Mikle Kolyada
commit: 7674806882902c2987a75dfe82815d9c65a2c03d
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Apr 25 20:07:17 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Apr 25 20:08:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76748068

media-sound/audacity: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-sound/audacity/audacity-2.2.2.ebuild | 9 +++--
 media-sound/audacity/audacity-2.3.2.ebuild | 9 +++--
 media-sound/audacity/audacity-2.3.3.ebuild | 7 ++-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index d9ca1cb5302..414cf0f7772 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ 
SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
 
 RESTRICT="test"
@@ -29,10 +29,7 @@ RDEPEND=">=app-arch/zip-2.3
media-libs/soxr
x11-libs/wxGTK:3.0[X]
alsa? ( media-libs/alsa-lib )
-   ffmpeg? (
-   libav? ( media-video/libav:= )
-   !libav? ( >=media-video/ffmpeg-1.2:= )
-   )
+   ffmpeg? ( >=media-video/ffmpeg-1.2:= )
flac? ( >=media-libs/flac-1.3.1[cxx] )
id3tag? ( media-libs/libid3tag )
jack? ( virtual/jack )

diff --git a/media-sound/audacity/audacity-2.3.2.ebuild 
b/media-sound/audacity/audacity-2.3.2.ebuild
index 1f561978a5f..a3ac1df60e7 100644
--- a/media-sound/audacity/audacity-2.3.2.ebuild
+++ b/media-sound/audacity/audacity-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
 
 RESTRICT="test"
@@ -29,10 +29,7 @@ RDEPEND=">=app-arch/zip-2.3
media-libs/soxr
x11-libs/wxGTK:3.0[X]
alsa? ( media-libs/alsa-lib )
-   ffmpeg? (
-   libav? ( media-video/libav:= )
-   !libav? ( >=media-video/ffmpeg-1.2:= )
-   )
+   ffmpeg? ( >=media-video/ffmpeg-1.2:= )
flac? ( >=media-libs/flac-1.3.1[cxx] )
id3tag? ( media-libs/libid3tag )
jack? ( virtual/jack )

diff --git a/media-sound/audacity/audacity-2.3.3.ebuild 
b/media-sound/audacity/audacity-2.3.3.ebuild
index d6f6c12ec16..d72fafa615e 100644
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
 
 RESTRICT="test"
@@ -30,10 +30,7 @@ RDEPEND="dev-libs/expat
media-libs/soxr
x11-libs/wxGTK:${WX_GTK_VER}[X]
alsa? ( media-libs/alsa-lib )
-   ffmpeg? (
-   libav? ( media-video/libav:= )
-   !libav? ( >=media-video/ffmpeg-1.2:= )
-   )
+   ffmpeg? ( >=media-video/ffmpeg-1.2:= )
flac? ( >=media-libs/flac-1.3.1[cxx] )
id3tag? ( media-libs/libid3tag )
jack? ( virtual/jack )



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2020-02-12 Thread Miroslav Šulc
commit: 4e14b6c2ce221dada541706c719b99ec30e9eac8
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Feb 12 14:14:05 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Feb 12 14:14:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e14b6c2

media-sound/audacity: fixed doc installation in 2.3.3

fix by Adrian Bassett  hotmail.co.uk>

Closes: https://bugs.gentoo.org/708980
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/audacity-2.3.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/audacity-2.3.3.ebuild 
b/media-sound/audacity/audacity-2.3.3.ebuild
index 17a5ff0f70b..d6f6c12ec16 100644
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -120,8 +120,8 @@ src_install() {
 
if use doc ; then
docinto html
-   dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
-   dodoc 
"${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+   dodoc -r "${WORKDIR}"/manual/{m,man,manual}
+   dodoc 
"${WORKDIR}"/manual/{favicon.ico,index.html,quick_help.html}
dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
fi
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2020-02-08 Thread Miroslav Šulc
commit: c011df2ba115c9b79d4e8e4e8e5a214631bfc369
Author: Alexander Tsoy  tsoy  me>
AuthorDate: Fri Jan 31 18:21:54 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Feb  8 10:26:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c011df2b

media-sound/audacity: Version bump to 2.3.3

Also switch to wxGTK "3.0-gtk3" slot.

Closes: https://bugs.gentoo.org/700942
Signed-off-by: Alexander Tsoy  tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14517
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/audacity/Manifest  |   2 +
 media-sound/audacity/audacity-2.3.3.ebuild | 139 +
 ...3.3-Fix-building-against-system-portaudio.patch |  56 +
 3 files changed, 197 insertions(+)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 252b82de0a3..910df0fff27 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,4 +1,6 @@
 DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 
968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802
 SHA512 
a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
+DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B 
a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846
 SHA512 
0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B 
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
 SHA512 
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
 DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 
6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44
 SHA512 
5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
+DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B 
f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84
 SHA512 
2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B 
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
 SHA512 
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c

diff --git a/media-sound/audacity/audacity-2.3.3.ebuild 
b/media-sound/audacity/audacity-2.3.3.ebuild
new file mode 100644
index 000..ceb9bb0503a
--- /dev/null
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+   doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+   +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+   >=media-libs/libsndfile-1.0.0
+   >=media-libs/portaudio-19.06.00-r2[alsa?]
+   =media-video/ffmpeg-1.2:= )
+   )
+   flac? ( >=media-libs/flac-1.3.1[cxx] )
+   id3tag? ( media-libs/libid3tag )
+   jack? ( virtual/jack )
+   lame? ( >=media-sound/lame-3.70 )
+   lv2? (
+   media-libs/lilv
+   media-libs/lv2
+   media-libs/suil
+   )
+   mad? ( >=media-libs/libmad-0.14.2b )
+   sbsms? ( media-libs/libsbsms )
+   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+   twolame? ( media-sound/twolame )
+   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+   vorbis? ( >=media-libs/libvorbis-1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+)
+
+src_prepare() {
+   default
+
+   use midi || sed -i \
+   -e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
+ 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2019-08-28 Thread Lars Wendler
commit: e6b9364ffd66913edfbf0276653a7f881ca4bde6
Author: Alexander Tsoy  tsoy  me>
AuthorDate: Wed Aug 28 07:43:54 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Aug 28 07:44:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b9364f

media-sound/audacity: Bump to version 2.3.2

Closes: https://bugs.gentoo.org/680028
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/audacity/Manifest  |   2 +
 media-sound/audacity/audacity-2.3.2.ebuild | 141 +
 .../audacity-2.3.2-Fix-building-without-midi.patch |  71 +++
 ...3.2-fix_building_against_system_portaudio.patch |  56 
 4 files changed, 270 insertions(+)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 907b27be528..252b82de0a3 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,2 +1,4 @@
+DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 
968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802
 SHA512 
a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B 
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
 SHA512 
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
+DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 
6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44
 SHA512 
5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B 
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
 SHA512 
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c

diff --git a/media-sound/audacity/audacity-2.3.2.ebuild 
b/media-sound/audacity/audacity-2.3.2.ebuild
new file mode 100644
index 000..1f561978a5f
--- /dev/null
+++ b/media-sound/audacity/audacity-2.3.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+   doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+   +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
+
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+   dev-libs/expat
+   >=media-libs/libsndfile-1.0.0
+   >=media-libs/portaudio-19.06.00-r2[alsa?]
+   =media-video/ffmpeg-1.2:= )
+   )
+   flac? ( >=media-libs/flac-1.3.1[cxx] )
+   id3tag? ( media-libs/libid3tag )
+   jack? ( virtual/jack )
+   lame? ( >=media-sound/lame-3.70 )
+   lv2? (
+   media-libs/lilv
+   media-libs/lv2
+   media-libs/suil
+   )
+   mad? ( >=media-libs/libmad-0.14.2b )
+   sbsms? ( media-libs/libsbsms )
+   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+   twolame? ( media-sound/twolame )
+   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+   vorbis? ( >=media-libs/libvorbis-1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+   nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.3.2-fix_building_against_system_portaudio.patch
+   "${FILESDIR}"/${PN}-2.3.2-Fix-building-without-midi.patch
+)
+
+src_prepare() {
+   default
+
+   use midi || sed -i \
+   -e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
+   src/Experimental.h || die
+}
+
+src_configure() {
+   local WX_GTK_VER="3.0"
+   setup-wxwidgets
+   append-cxxflags -std=gnu++14
+
+   # * always use system libraries if possible
+   # * options listed in the order that configure --help lists them
+   local myeconfargs=(
+   --disable-dynamic-loading
+   --enable-nyquist=local
+   --enable-unicode
+   --with-expat
+   --with-lib-preference=system
+   --with-libsndfile
+   --with-libsoxr
+   --with-mod-script-pipe
+ 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2019-03-11 Thread Lars Wendler
commit: e44b2d678918e597db32fc0348495a16d9900203
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 11 15:53:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 11 15:53:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44b2d67

media-sound/audacity: Adjusted portaudio dependency.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/audacity/audacity-2.2.2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index 13149d281eb..d9ca1cb5302 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,8 @@ RESTRICT="test"
 RDEPEND=">=app-arch/zip-2.3
dev-libs/expat
>=media-libs/libsndfile-1.0.0
-   =media-libs/portaudio-19*
+   >=media-libs/portaudio-19_pre
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-11-04 Thread Andreas Sturmlechner
commit: 6d5a93a48f6b5b3c6c281a284fe13c7a44345434
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov  4 22:22:26 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov  4 22:22:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d5a93a4

media-sound/audacity: Drop 2.1.3-r1

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/audacity/Manifest |   2 -
 media-sound/audacity/audacity-2.1.3-r1.ebuild | 104 --
 2 files changed, 106 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 1ac62e940a0..907b27be528 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,4 +1,2 @@
-DIST audacity-help-2.1.3.zip 20682229 BLAKE2B 
f3a7c5870c2fd10e5d1420c03ea608d39e9768989ac106b6b1554994646200fb58550bb07ba889002dc652e9c2ea5a16f2ee87daa1e66433fc6f322d24fbc564
 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B 
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
 SHA512 
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
-DIST audacity-minsrc-2.1.3.tar.xz 8073388 BLAKE2B 
4ab323ad9daa93c568d46d00cb3a7f2460a3b6022b990f1eb1759790cd343d5e61d6080c94a7cd00f25c72280f3a459c79049292fdca69be89644e539f04c119
 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B 
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
 SHA512 
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c

diff --git a/media-sound/audacity/audacity-2.1.3-r1.ebuild 
b/media-sound/audacity/audacity-2.1.3-r1.ebuild
deleted file mode 100644
index 7c2c2b2d5b6..000
--- a/media-sound/audacity/audacity-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets
-
-MY_P="${PN}-minsrc-${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
-   doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${PV}.zip )"
-   # wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
-   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-   dev-libs/expat
-   >=media-libs/libsndfile-1.0.0
-   =media-libs/portaudio-19*
-   media-libs/soxr
-   x11-libs/wxGTK:3.0[X]
-   alsa? ( media-libs/alsa-lib )
-   ffmpeg? ( libav? ( media-video/libav:= )
-   !libav? ( >=media-video/ffmpeg-1.2:= ) )
-   flac? ( >=media-libs/flac-1.3.1[cxx] )
-   id3tag? ( media-libs/libid3tag )
-   jack? ( virtual/jack )
-   lame? ( >=media-sound/lame-3.70 )
-   lv2? ( media-libs/lv2 )
-   mad? ( >=media-libs/libmad-0.14.2b )
-   midi? ( media-libs/portmidi )
-   sbsms? ( media-libs/libsbsms )
-   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-   twolame? ( media-sound/twolame )
-   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-   vorbis? ( >=media-libs/libvorbis-1.0 )"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-   WX_GTK_VER="3.0"
-   need-wxwidgets unicode
-
-   # * always use system libraries if possible
-   # * options listed in the order that configure --help lists them
-   local myeconfargs=(
-   --disable-dynamic-loading
-   --enable-nyquist
-   --enable-unicode
-   --with-expat=system
-   --with-libsndfile=system
-   --with-libsoxr=system
-   --with-portaudio
-   --with-widgetextra=local
-   --with-wx-version=${WX_GTK_VER}
-   $(use_enable cpu_flags_x86_sse sse)
-   $(use_enable ladspa)
-   $(use_enable nls)
-   $(use_enable vst)
-   #$(use_with alsa)
-   $(use_with ffmpeg)
-   $(use_with flac libflac)
-   $(use_with id3tag libid3tag)
-   #$(use_with jack)
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-11-04 Thread Sergei Trofimovich
commit: 5508d9250e21096c5a0b5838beba3daf94151760
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov  4 21:58:02 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov  4 22:02:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5508d925

media-sound/audacity: stable 2.2.2 for ppc, bug #658644

Tested-by: ernsteiswuerfel
Signed-off-by: Sergei Trofimovich  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 media-sound/audacity/audacity-2.2.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index 13e4b20853c..13149d281eb 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ 
SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
 IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-08-25 Thread Sergei Trofimovich
commit: 97ac0c6f3de154527d3c490b1e0a96df176786af
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Aug 25 18:47:08 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Aug 25 18:55:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ac0c6f

media-sound/audacity: stable 2.2.2 for ppc64, bug #658644

Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc64"

 media-sound/audacity/audacity-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index 7f0a6fabb20..13e4b20853c 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
 IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-08-22 Thread Mikle Kolyada
commit: 510eb6a56914a147e7312692f0fb357dbc57b24c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Aug 23 02:32:34 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Aug 23 02:32:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510eb6a5

media-sound/audacity: amd64 stable wrt bug #658644

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/audacity/audacity-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index 2e462c0578b..7f0a6fabb20 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
 IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-08-22 Thread Thomas Deutschmann
commit: 1bd3016cfc0ecfdc1769d26c8d7a6f4b236f7f1d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Aug 23 01:28:16 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Aug 23 01:28:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd3016c

media-sound/audacity: x86 stable (bug #658644)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/audacity/audacity-2.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index 4bbaa54c136..2e462c0578b 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 x86"
 IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2018-08-22 Thread Andreas Sturmlechner
commit: da166eab920f04e1e532646e93b244793a65a65d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 22 17:10:02 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 22 17:10:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da166eab

media-sound/audacity: Drop 2.2.1

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/audacity/Manifest  |   1 -
 media-sound/audacity/audacity-2.2.1.ebuild | 123 -
 .../files/audacity-2.2.1-without-libid3tag.patch   |  87 ---
 3 files changed, 211 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index d02bd38a5d5..1ac62e940a0 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,5 +1,4 @@
 DIST audacity-help-2.1.3.zip 20682229 BLAKE2B 
f3a7c5870c2fd10e5d1420c03ea608d39e9768989ac106b6b1554994646200fb58550bb07ba889002dc652e9c2ea5a16f2ee87daa1e66433fc6f322d24fbc564
 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B 
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
 SHA512 
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 BLAKE2B 
4ab323ad9daa93c568d46d00cb3a7f2460a3b6022b990f1eb1759790cd343d5e61d6080c94a7cd00f25c72280f3a459c79049292fdca69be89644e539f04c119
 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
-DIST audacity-minsrc-2.2.1.tar.xz 8111992 BLAKE2B 
99b4a7602ed8e03714ff8c59c226ba98fb35344964d5033e541079f7f12a71f6c5264aa60613d02cdb6f254d5a542dc9380e6dfbfd870f2f3536c031c0cec54e
 SHA512 
92c094e4903c438b0aac27b1fb6c9ccc9ca089e4d3123769ff23e434de1e6a519482b42588a54f56afdf5d2013e5681fce3d143f9e092731a9511d4bba31cfaa
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B 
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
 SHA512 
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c

diff --git a/media-sound/audacity/audacity-2.2.1.ebuild 
b/media-sound/audacity/audacity-2.2.1.ebuild
deleted file mode 100644
index 1e1c6ebc158..000
--- a/media-sound/audacity/audacity-2.2.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets xdg-utils
-
-MY_P="${PN}-minsrc-${PV}"
-DOC_PV="2.1.3"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
-   doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${DOC_PV}.zip )"
-   # wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
-   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-   dev-libs/expat
-   >=media-libs/libsndfile-1.0.0
-   =media-libs/portaudio-19*
-   media-libs/soxr
-   x11-libs/wxGTK:3.0[X]
-   alsa? ( media-libs/alsa-lib )
-   ffmpeg? ( libav? ( media-video/libav:= )
-   !libav? ( >=media-video/ffmpeg-1.2:= ) )
-   flac? ( >=media-libs/flac-1.3.1[cxx] )
-   id3tag? ( media-libs/libid3tag )
-   jack? ( virtual/jack )
-   lame? ( >=media-sound/lame-3.70 )
-   lv2? ( media-libs/lv2 )
-   mad? ( >=media-libs/libmad-0.14.2b )
-   midi? ( media-libs/portmidi )
-   sbsms? ( media-libs/libsbsms )
-   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-   twolame? ( media-sound/twolame )
-   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-   vorbis? ( >=media-libs/libvorbis-1.0 )"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S="${WORKDIR}/${MY_P}-rc3"
-
-PATCHES=(
-   "${FILESDIR}/${P}-without-libid3tag.patch"
-)
-
-src_prepare() {
-   epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-   local WX_GTK_VER="3.0"
-   need-wxwidgets unicode
-
-   # * always use system libraries if possible
-   # * options listed in the order that configure --help lists them
-   local myeconfargs=(
-   --disable-dynamic-loading
-   --enable-nyquist
-   --enable-unicode
-   --with-expat=system
-   --with-libsndfile=system
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-08-22 Thread Andreas Sturmlechner
commit: c51d0e22fb646104c2f40d57c8c564e39197c4a5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 22 16:23:28 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 22 17:05:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c51d0e22

media-sound/audacity: EAPI-6

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/audacity/audacity-2.2.2.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index 5c71e713a5d..1bec573f600 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils gnome2-utils wxwidgets xdg-utils
+EAPI=6
+
+inherit autotools gnome2-utils wxwidgets xdg-utils
 
 MY_P="${PN}-minsrc-${PV}"
 DOC_PV="${PV}"
@@ -17,6 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
+
 RESTRICT="test"
 
 RDEPEND=">=app-arch/zip-2.3
@@ -56,7 +58,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   epatch "${PATCHES[@]}"
+   default
 
# needed because of portmixer patch
eautoreconf



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-08-22 Thread Andreas Sturmlechner
commit: f58c246d4ce33df203b8603203c1da66ccdc24de
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 22 16:49:57 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 22 17:05:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f58c246d

media-sound/audacity: https, minor DEPEND style fix

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-sound/audacity/audacity-2.2.2.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index 1bec573f600..4bbaa54c136 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -8,7 +8,7 @@ inherit autotools gnome2-utils wxwidgets xdg-utils
 MY_P="${PN}-minsrc-${PV}"
 DOC_PV="${PV}"
 DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
+HOMEPAGE="https://web.audacityteam.org/;
 SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
# wget doesn't seem to work on FossHub links, so we mirror
@@ -28,8 +28,10 @@ RDEPEND=">=app-arch/zip-2.3
media-libs/soxr
x11-libs/wxGTK:3.0[X]
alsa? ( media-libs/alsa-lib )
-   ffmpeg? ( libav? ( media-video/libav:= )
-   !libav? ( >=media-video/ffmpeg-1.2:= ) )
+   ffmpeg? (
+   libav? ( media-video/libav:= )
+   !libav? ( >=media-video/ffmpeg-1.2:= )
+   )
flac? ( >=media-libs/flac-1.3.1[cxx] )
id3tag? ( media-libs/libid3tag )
jack? ( virtual/jack )
@@ -43,7 +45,6 @@ RDEPEND=">=app-arch/zip-2.3
vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
vorbis? ( >=media-libs/libvorbis-1.0 )"
 DEPEND="${RDEPEND}
-   app-arch/xz-utils
virtual/pkgconfig
nls? ( sys-devel/gettext )"
 
@@ -59,7 +60,6 @@ PATCHES=(
 
 src_prepare() {
default
-
# needed because of portmixer patch
eautoreconf
 }
@@ -110,7 +110,7 @@ src_install() {
rm -r "${D%/}"/usr/share/doc || die
 
# Install our docs
-   dodoc README.txt
+   einstalldocs
 
if use doc ; then
docinto html



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2018-02-21 Thread Lars Wendler
commit: 18dbd4fcf1bca48ad8b368346bfe73e2f2f40f02
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 21 10:42:32 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 21 11:08:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18dbd4fc

media-sound/audacity: Fixed compilation with USE="-midi"

Thanks to Matt Whitlock for providing the initial patch.

Closes: https://bugs.gentoo.org/637110
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/audacity/audacity-2.2.2.ebuild |   8 +
 .../audacity/files/audacity-2.2.2-midi.patch   | 168 +
 2 files changed, 176 insertions(+)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index af62f464499..cb2b8ea861f 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -49,6 +49,14 @@ REQUIRED_USE="soundtouch? ( midi )"
 
 S="${WORKDIR}/${MY_P}-rc1"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-2.2.2-midi.patch"
+)
+
+src_prepare() {
+   epatch "${PATCHES[@]}"
+}
+
 src_configure() {
local WX_GTK_VER="3.0"
need-wxwidgets unicode

diff --git a/media-sound/audacity/files/audacity-2.2.2-midi.patch 
b/media-sound/audacity/files/audacity-2.2.2-midi.patch
new file mode 100644
index 000..10a0f1f6eb0
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.2.2-midi.patch
@@ -0,0 +1,168 @@
+https://bugs.gentoo.org/637110
+
+Original patch by Matt Whitlock
+Forward-ported from version 2.2.0 to 2.2.2
+
+--- audacity-minsrc-2.2.2-rc1/src/AudioIO.cpp
 audacity-minsrc-2.2.2-rc1/src/AudioIO.cpp
+@@ -976,6 +976,7 @@
+ };
+ #endif
+ 
++#ifdef EXPERIMENTAL_MIDI_OUT
+ // return the system time as a double
+ static double streamStartTime = 0; // bias system time to small number
+ 
+@@ -995,6 +996,7 @@
+ 
+return PaUtil_GetTime() - streamStartTime;
+ }
++#endif
+ 
+ const int AudioIO::StandardRates[] = {
+8000,
+@@ -1803,6 +1805,7 @@
+}
+ #endif
+ 
++#ifdef EXPERIMENTAL_MIDI_OUT
+// We use audio latency to estimate how far ahead of DACS we are writing
+if (mPortStreamV19 != NULL && mLastPaError == paNoError) {
+   const PaStreamInfo* info = Pa_GetStreamInfo(mPortStreamV19);
+@@ -1811,6 +1814,7 @@
+   mAudioOutLatency = info->outputLatency;
+   mSystemMinusAudioTimePlusLatency += mAudioOutLatency;
+}
++#endif
+ 
+return (mLastPaError == paNoError);
+ }
+@@ -1955,8 +1959,10 @@
+ 
+double playbackTime = 4.0;
+ 
++#ifdef EXPERIMENTAL_MIDI_OUT
+streamStartTime = 0;
+streamStartTime = SystemTime(mUsingAlsa);
++#endif
+ 
+ #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
+bool scrubbing = (options.pScrubbingOptions != nullptr);
+@@ -2830,7 +2836,9 @@
+ 
+mPlaybackTracks.clear();
+mCaptureTracks.clear();
++#ifdef HAVE_MIDI
+mMidiPlaybackTracks.clear();
++#endif
+ 
+ #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
+mScrubQueue.reset();
+@@ -4669,13 +4677,13 @@
+  (float *)alloca(framesPerBuffer*numPlaybackChannels * sizeof(float)) 
:
+  (float *)outputBuffer;
+ 
++#ifdef EXPERIMENTAL_MIDI_OUT
+if (gAudioIO->mCallbackCount++ == 0) {
+// This is effectively mSystemMinusAudioTime when the buffer is empty:
+gAudioIO->mStartTime = SystemTime(gAudioIO->mUsingAlsa) - 
gAudioIO->mT0;
+// later, mStartTime - mSystemMinusAudioTime will tell us latency
+}
+ 
+-#ifdef EXPERIMENTAL_MIDI_OUT
+/* GSW: Save timeInfo in case MidiPlayback needs it */
+gAudioIO->mAudioCallbackClockTime = PaUtil_GetTime();
+ 
+@@ -5051,7 +5059,9 @@
+   : gAudioIO->mTime >= gAudioIO->mT1))
+   // PRL: singalling MIDI output complete is necessary if
+   // not USE_MIDI_THREAD, otherwise it's harmlessly redundant
++#ifdef EXPERIMENTAL_MIDI_OUT
+   gAudioIO->mMidiOutputComplete = true,
++#endif
+   callbackReturn = paComplete;
+ }
+ 
+@@ -5114,7 +5124,9 @@
+ 
+// PRL: singalling MIDI output complete is necessary if
+// not USE_MIDI_THREAD, otherwise it's harmlessly redundant
++#ifdef EXPERIMENTAL_MIDI_OUT
+gAudioIO->mMidiOutputComplete = true,
++#endif
+callbackReturn = paComplete;
+ }
+  }
+--- audacity-minsrc-2.2.2-rc1/src/Project.cpp
 audacity-minsrc-2.2.2-rc1/src/Project.cpp
+@@ -460,10 +460,11 @@
+  } );
+ 
+  for (const auto  : sortednames) {
+-
++#ifdef USE_MIDI
+ if (Importer::IsMidi(name))
+AudacityProject::DoImportMIDI(mProject, name);
+ else
++#endif
+mProject->Import(name);
+  }
+ 
+@@ -3046,9 +3047,11 @@
+ #endif
+ 
+   {
++#ifdef USE_MIDI
+  if (Importer::IsMidi(fileName))
+ DoImportMIDI(this, fileName);
+  else
++#endif
+ Import(fileName);
+ 
+  ZoomAfterImport(nullptr);
+--- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2018-02-21 Thread Lars Wendler
commit: 2756b165ad00e4e78bfe5b02a3c0f5bd6f6be82c
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 21 11:08:36 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 21 11:08:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2756b165

media-sound/audacity: Fixed compilation with USE="-portmixer"

Closes: https://bugs.gentoo.org/624264
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/audacity/audacity-2.2.2.ebuild |  9 +++-
 .../audacity/files/audacity-2.2.1-portmixer.patch  | 36 
 .../audacity/files/audacity-2.2.2-automake.patch   | 48 ++
 3 files changed, 91 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index cb2b8ea861f..5c71e713a5d 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils gnome2-utils wxwidgets xdg-utils
+inherit autotools eutils gnome2-utils wxwidgets xdg-utils
 
 MY_P="${PN}-minsrc-${PV}"
 DOC_PV="${PV}"
@@ -50,11 +50,16 @@ REQUIRED_USE="soundtouch? ( midi )"
 S="${WORKDIR}/${MY_P}-rc1"
 
 PATCHES=(
-   "${FILESDIR}/${PN}-2.2.2-midi.patch"
+   "${FILESDIR}/${PN}-2.2.1-portmixer.patch" #624264
+   "${FILESDIR}/${PN}-2.2.2-automake.patch" # or else eautoreconf breaks
+   "${FILESDIR}/${PN}-2.2.2-midi.patch" #637110
 )
 
 src_prepare() {
epatch "${PATCHES[@]}"
+
+   # needed because of portmixer patch
+   eautoreconf
 }
 
 src_configure() {

diff --git a/media-sound/audacity/files/audacity-2.2.1-portmixer.patch 
b/media-sound/audacity/files/audacity-2.2.1-portmixer.patch
new file mode 100644
index 000..0df43f5c07a
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.2.1-portmixer.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/624264
+
+Patch by Vladimir
+
+--- audacity-minsrc-2.2.1-rc3/configure.ac
 audacity-minsrc-2.2.1-rc3/configure.ac
+@@ -540,7 +540,7 @@
+  [compile with PortMixer [default=yes]])],
+   use_portmixer=$withval,
+   use_portmixer="yes")
+-
++AM_CONDITIONAL([USE_PORTMIXER], [test "$use_portmixer" = yes])
+ 
+ AC_CANONICAL_HOST
+ 
+--- audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am
 audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am
+@@ -92,7 +92,6 @@
+   libsoxr \
+   lib-widget-extra \
+   lv2 \
+-  portmixer \
+   portsmf \
+   sbsms \
+   $(NULL)
+@@ -156,8 +155,10 @@
+ SUBDIRS += portaudio-v19
+ endif
+ 
++if USE_PORTMIXER
+ # Note: portmixer needs to be linked against (the local or system) portaudio.
+ SUBDIRS += portmixer
++endif
+ 
+ if USE_LOCAL_PORTSMF
+ SUBDIRS += portsmf

diff --git a/media-sound/audacity/files/audacity-2.2.2-automake.patch 
b/media-sound/audacity/files/audacity-2.2.2-automake.patch
new file mode 100644
index 000..56343e3ede2
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.2.2-automake.patch
@@ -0,0 +1,48 @@
+Remove subdirs that are non-exisitng in the tarball
+or else autoreconf breaks.
+
+--- audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am
 audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am
+@@ -107,18 +107,6 @@
+ SUBDIRS = FileDialog
+ OPTIONAL_SUBDIRS =
+ 
+-if USE_LOCAL_EXPAT
+-OPTIONAL_SUBDIRS += expat
+-endif
+-
+-if USE_LOCAL_LIBID3TAG
+-OPTIONAL_SUBDIRS += libid3tag
+-endif
+-
+-if USE_LOCAL_LIBMAD
+-OPTIONAL_SUBDIRS += libmad
+-endif
+-
+ if USE_LOCAL_LIBNYQUIST
+ SUBDIRS += libnyquist
+ endif
+@@ -131,23 +119,10 @@
+ OPTIONAL_SUBDIRS += libsoxr
+ endif
+ 
+-if USE_LOCAL_LIBSOUNDTOUCH
+-OPTIONAL_SUBDIRS += soundtouch
+-endif
+-
+ if USE_LOCAL_LIBTWOLAME
+ OPTIONAL_SUBDIRS += twolame
+ endif
+ 
+-if USE_LOCAL_LIBVORBIS
+-OPTIONAL_SUBDIRS += libogg libvorbis
+-endif
+-
+-if USE_LOCAL_LIBFLAC
+-# Note: libflac needs to be linked against (the local or system) libogg.
+-OPTIONAL_SUBDIRS += libflac
+-endif
+-
+ if USE_LOCAL_LV2
+ SUBDIRS += lv2
+ endif



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-02-21 Thread Lars Wendler
commit: d966fd1089fc0d1219c105b7bd47b773f702696c
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 21 10:18:46 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 21 10:18:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d966fd10

media-sound/audacity: Update icon cache.

Closes: https://bugs.gentoo.org/640264
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/audacity/audacity-2.2.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index da0be8df73c..af62f464499 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils wxwidgets xdg-utils
+inherit eutils gnome2-utils wxwidgets xdg-utils
 
 MY_P="${PN}-minsrc-${PV}"
 DOC_PV="${PV}"
@@ -106,11 +106,13 @@ src_install() {
 }
 
 pkg_postinst() {
+   gnome2_icon_cache_update
xdg_desktop_database_update
xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
+   gnome2_icon_cache_update
xdg_desktop_database_update
xdg_mimeinfo_database_update
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-02-21 Thread Lars Wendler
commit: 74fa47da0d2bcd5623b81f04ef479d78eb185b52
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 21 10:02:05 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 21 10:14:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74fa47da

media-sound/audacity: Bump to version 2.2.2

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/audacity/Manifest  |   2 +
 media-sound/audacity/audacity-2.2.2.ebuild | 116 +
 2 files changed, 118 insertions(+)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 8dadee1cfdc..0c7212e7bca 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,4 +1,6 @@
 DIST audacity-help-2.1.3.zip 20682229 BLAKE2B 
f3a7c5870c2fd10e5d1420c03ea608d39e9768989ac106b6b1554994646200fb58550bb07ba889002dc652e9c2ea5a16f2ee87daa1e66433fc6f322d24fbc564
 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
+DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B 
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
 SHA512 
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 BLAKE2B 
4ab323ad9daa93c568d46d00cb3a7f2460a3b6022b990f1eb1759790cd343d5e61d6080c94a7cd00f25c72280f3a459c79049292fdca69be89644e539f04c119
 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 DIST audacity-minsrc-2.2.0.tar.xz 10191924 BLAKE2B 
e0f84978e351c9486302c3d07079932840e12c7c1b71ad7f45521cb513e18a468421326e7c595c9ea8f09370445dc9ab0cc07bbec1ad2e15ddad15cb1dccf605
 SHA512 
2b0cfbedce279faff4d26b8a8fc68730596891394a6cc7d9bce9d48f2e180d6ecdebfb87cdd381f1f92111a9d143d2ebd3906517206d888a2d922dc176a0f7ec
 DIST audacity-minsrc-2.2.1.tar.xz 8111992 BLAKE2B 
99b4a7602ed8e03714ff8c59c226ba98fb35344964d5033e541079f7f12a71f6c5264aa60613d02cdb6f254d5a542dc9380e6dfbfd870f2f3536c031c0cec54e
 SHA512 
92c094e4903c438b0aac27b1fb6c9ccc9ca089e4d3123769ff23e434de1e6a519482b42588a54f56afdf5d2013e5681fce3d143f9e092731a9511d4bba31cfaa
+DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B 
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
 SHA512 
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
new file mode 100644
index 000..da0be8df73c
--- /dev/null
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils wxwidgets xdg-utils
+
+MY_P="${PN}-minsrc-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/;
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
+   doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
+   # wget doesn't seem to work on FossHub links, so we mirror
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+   dev-libs/expat
+   >=media-libs/libsndfile-1.0.0
+   =media-libs/portaudio-19*
+   media-libs/soxr
+   x11-libs/wxGTK:3.0[X]
+   alsa? ( media-libs/alsa-lib )
+   ffmpeg? ( libav? ( media-video/libav:= )
+   !libav? ( >=media-video/ffmpeg-1.2:= ) )
+   flac? ( >=media-libs/flac-1.3.1[cxx] )
+   id3tag? ( media-libs/libid3tag )
+   jack? ( virtual/jack )
+   lame? ( >=media-sound/lame-3.70 )
+   lv2? ( media-libs/lv2 )
+   mad? ( >=media-libs/libmad-0.14.2b )
+   midi? ( media-libs/portmidi )
+   sbsms? ( media-libs/libsbsms )
+   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+   twolame? ( media-sound/twolame )
+   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+   vorbis? ( >=media-libs/libvorbis-1.0 )"
+DEPEND="${RDEPEND}
+   app-arch/xz-utils
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S="${WORKDIR}/${MY_P}-rc1"
+
+src_configure() {
+   local WX_GTK_VER="3.0"
+   need-wxwidgets unicode
+
+   # * always use system libraries if possible
+   # * options listed in the order that configure --help lists them
+   local myeconfargs=(
+   --disable-dynamic-loading
+   --enable-nyquist
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2018-02-21 Thread Lars Wendler
commit: afd94e80acb0b02db8ada2f427bd8c51e77aed6b
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 21 10:03:18 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 21 10:14:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afd94e80

media-sound/audacity: Removed old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/audacity/Manifest  |   1 -
 media-sound/audacity/audacity-2.2.0.ebuild | 115 -
 2 files changed, 116 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 0c7212e7bca..d02bd38a5d5 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,5 @@
 DIST audacity-help-2.1.3.zip 20682229 BLAKE2B 
f3a7c5870c2fd10e5d1420c03ea608d39e9768989ac106b6b1554994646200fb58550bb07ba889002dc652e9c2ea5a16f2ee87daa1e66433fc6f322d24fbc564
 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B 
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
 SHA512 
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 BLAKE2B 
4ab323ad9daa93c568d46d00cb3a7f2460a3b6022b990f1eb1759790cd343d5e61d6080c94a7cd00f25c72280f3a459c79049292fdca69be89644e539f04c119
 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
-DIST audacity-minsrc-2.2.0.tar.xz 10191924 BLAKE2B 
e0f84978e351c9486302c3d07079932840e12c7c1b71ad7f45521cb513e18a468421326e7c595c9ea8f09370445dc9ab0cc07bbec1ad2e15ddad15cb1dccf605
 SHA512 
2b0cfbedce279faff4d26b8a8fc68730596891394a6cc7d9bce9d48f2e180d6ecdebfb87cdd381f1f92111a9d143d2ebd3906517206d888a2d922dc176a0f7ec
 DIST audacity-minsrc-2.2.1.tar.xz 8111992 BLAKE2B 
99b4a7602ed8e03714ff8c59c226ba98fb35344964d5033e541079f7f12a71f6c5264aa60613d02cdb6f254d5a542dc9380e6dfbfd870f2f3536c031c0cec54e
 SHA512 
92c094e4903c438b0aac27b1fb6c9ccc9ca089e4d3123769ff23e434de1e6a519482b42588a54f56afdf5d2013e5681fce3d143f9e092731a9511d4bba31cfaa
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B 
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
 SHA512 
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c

diff --git a/media-sound/audacity/audacity-2.2.0.ebuild 
b/media-sound/audacity/audacity-2.2.0.ebuild
deleted file mode 100644
index 9bfd7eae4ac..000
--- a/media-sound/audacity/audacity-2.2.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets xdg-utils
-
-MY_P="${PN}-minsrc-${PV}"
-DOC_PV="2.1.3"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
-   doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${DOC_PV}.zip )"
-   # wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
-   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-   dev-libs/expat
-   >=media-libs/libsndfile-1.0.0
-   =media-libs/portaudio-19*
-   media-libs/soxr
-   x11-libs/wxGTK:3.0[X]
-   alsa? ( media-libs/alsa-lib )
-   ffmpeg? ( libav? ( media-video/libav:= )
-   !libav? ( >=media-video/ffmpeg-1.2:= ) )
-   flac? ( >=media-libs/flac-1.3.1[cxx] )
-   id3tag? ( media-libs/libid3tag )
-   jack? ( virtual/jack )
-   lame? ( >=media-sound/lame-3.70 )
-   lv2? ( media-libs/lv2 )
-   mad? ( >=media-libs/libmad-0.14.2b )
-   midi? ( media-libs/portmidi )
-   sbsms? ( media-libs/libsbsms )
-   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-   twolame? ( media-sound/twolame )
-   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-   vorbis? ( >=media-libs/libvorbis-1.0 )"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-   local WX_GTK_VER="3.0"
-   need-wxwidgets unicode
-
-   # * always use system libraries if possible
-   # * options listed in the order that configure --help lists them
-   local myeconfargs=(
-   --disable-dynamic-loading
-   --enable-nyquist
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2018-02-18 Thread Lars Wendler
commit: fa8c4f250b9a44c2a30d47bf7351e5fba08dc794
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Feb 18 11:13:03 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Feb 18 11:13:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8c4f25

media-sound/audacity: Fixed USE="id3tag" compilation.

Closes: https://github.com/gentoo/gentoo/pull/6843
Closes: https://bugs.gentoo.org/636722
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/audacity/audacity-2.2.1.ebuild | 10 ++-
 .../files/audacity-2.2.1-without-libid3tag.patch   | 87 ++
 2 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.2.1.ebuild 
b/media-sound/audacity/audacity-2.2.1.ebuild
index 34176a73de4..1e1c6ebc158 100644
--- a/media-sound/audacity/audacity-2.2.1.ebuild
+++ b/media-sound/audacity/audacity-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -49,6 +49,14 @@ REQUIRED_USE="soundtouch? ( midi )"
 
 S="${WORKDIR}/${MY_P}-rc3"
 
+PATCHES=(
+   "${FILESDIR}/${P}-without-libid3tag.patch"
+)
+
+src_prepare() {
+   epatch "${PATCHES[@]}"
+}
+
 src_configure() {
local WX_GTK_VER="3.0"
need-wxwidgets unicode

diff --git a/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch 
b/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch
new file mode 100644
index 000..0a227ebbf9f
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch
@@ -0,0 +1,87 @@
+From 499c6b4f36102325541cdad55afe5dc3a0e23b37 Mon Sep 17 00:00:00 2001
+From: Richard Ash 
+Date: Sun, 7 Jan 2018 17:06:33 +
+Subject: [PATCH] Fix building without libid3tag (#230)
+
+* Fix building without libid3tag
+
+Extend the pull Audacity#214 from torto9 to fix building
+with twolame but without libid3tag
+---
+ src/export/ExportMP2.cpp | 3 +++
+ src/export/ExportMP3.cpp | 2 ++
+ src/export/ExportPCM.cpp | 2 ++
+ src/import/ImportPCM.cpp | 2 ++
+ 4 files changed, 9 insertions(+)
+
+diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp
+index 1aa259aed..cae2b7dcb 100644
+--- a/src/export/ExportMP2.cpp
 b/src/export/ExportMP2.cpp
+@@ -322,10 +322,13 @@ wxWindow *ExportMP2::OptionsCreate(wxWindow *parent, int 
format)
+return safenew ExportMP2Options(parent, format);
+ }
+ 
++
++#ifdef USE_LIBID3TAG
+ struct id3_tag_deleter {
+void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
+ };
+ using id3_tag_holder = std::unique_ptr;
++#endif
+ 
+ // returns buffer len; caller frees
+ int ExportMP2::AddTags(
+diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp
+index e0f8aa824..34963fc63 100644
+--- a/src/export/ExportMP3.cpp
 b/src/export/ExportMP3.cpp
+@@ -2009,10 +2009,12 @@ int ExportMP3::AskResample(int bitrate, int rate, int 
lowrate, int highrate)
+return wxAtoi(choice->GetStringSelection());
+ }
+ 
++#ifdef USE_LIBID3TAG
+ struct id3_tag_deleter {
+void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
+ };
+ using id3_tag_holder = std::unique_ptr;
++#endif
+ 
+ // returns buffer len; caller frees
+ int ExportMP3::AddTags(AudacityProject *WXUNUSED(project), ArrayOf 
, bool *endOfFile, const Tags *tags)
+diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp
+index eb2369977..021dec4aa 100644
+--- a/src/export/ExportPCM.cpp
 b/src/export/ExportPCM.cpp
+@@ -700,10 +700,12 @@ bool ExportPCM::AddStrings(AudacityProject * 
WXUNUSED(project), SNDFILE *sf, con
+return true;
+ }
+ 
++#ifdef USE_LIBID3TAG
+ struct id3_tag_deleter {
+void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
+ };
+ using id3_tag_holder = std::unique_ptr;
++#endif
+ 
+ bool ExportPCM::AddID3Chunk(wxString fName, const Tags *tags, int sf_format)
+ {
+diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp
+index c943b0ae1..5790551c3 100644
+--- a/src/import/ImportPCM.cpp
 b/src/import/ImportPCM.cpp
+@@ -335,10 +335,12 @@ static wxString AskCopyOrEdit()
+return oldCopyPref;
+ }
+ 
++#ifdef USE_LIBID3TAG
+ struct id3_tag_deleter {
+void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
+ };
+ using id3_tag_holder = std::unique_ptr;
++#endif
+ 
+ ProgressResult PCMImportFileHandle::Import(TrackFactory *trackFactory,
+ TrackHolders ,
+-- 
+2.13.6



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2017-12-07 Thread Lars Wendler
commit: b62dd3b2220735ceee02ba6e773c56f85f6ead6e
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec  7 11:16:53 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec  7 11:17:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62dd3b2

media-sound/audacity: Bump to version 2.2.1

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-sound/audacity/Manifest  |   3 +-
 media-sound/audacity/audacity-2.2.1.ebuild | 115 +
 2 files changed, 117 insertions(+), 1 deletion(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index e8f2e122009..45f8a51c000 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,3 +1,4 @@
 DIST audacity-help-2.1.3.zip 20682229 SHA256 
35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 WHIRLPOOL 
413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256 
c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 WHIRLPOOL 
730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483
-DIST audacity-minsrc-2.2.0.tar.xz 10191924 SHA256 
87635ed19ebcc80d6e4bb88d578c67277c63a02bd22d09d5489080ad216f606b SHA512 
2b0cfbedce279faff4d26b8a8fc68730596891394a6cc7d9bce9d48f2e180d6ecdebfb87cdd381f1f92111a9d143d2ebd3906517206d888a2d922dc176a0f7ec
 WHIRLPOOL 
b171864dc0419a17d08693d9c97086021283601dc48c2487fc0a89264dd2ee30bfbf22264052564ef82f063ce9f3ae42a9df94486ac3f8041d50b96537473f29
+DIST audacity-minsrc-2.2.0.tar.xz 10191924 BLAKE2B 
e0f84978e351c9486302c3d07079932840e12c7c1b71ad7f45521cb513e18a468421326e7c595c9ea8f09370445dc9ab0cc07bbec1ad2e15ddad15cb1dccf605
 SHA512 
2b0cfbedce279faff4d26b8a8fc68730596891394a6cc7d9bce9d48f2e180d6ecdebfb87cdd381f1f92111a9d143d2ebd3906517206d888a2d922dc176a0f7ec
+DIST audacity-minsrc-2.2.1.tar.xz 8111992 BLAKE2B 
99b4a7602ed8e03714ff8c59c226ba98fb35344964d5033e541079f7f12a71f6c5264aa60613d02cdb6f254d5a542dc9380e6dfbfd870f2f3536c031c0cec54e
 SHA512 
92c094e4903c438b0aac27b1fb6c9ccc9ca089e4d3123769ff23e434de1e6a519482b42588a54f56afdf5d2013e5681fce3d143f9e092731a9511d4bba31cfaa

diff --git a/media-sound/audacity/audacity-2.2.1.ebuild 
b/media-sound/audacity/audacity-2.2.1.ebuild
new file mode 100644
index 000..34176a73de4
--- /dev/null
+++ b/media-sound/audacity/audacity-2.2.1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils wxwidgets xdg-utils
+
+MY_P="${PN}-minsrc-${PV}"
+DOC_PV="2.1.3"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/;
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
+   doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${DOC_PV}.zip )"
+   # wget doesn't seem to work on FossHub links, so we mirror
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+   dev-libs/expat
+   >=media-libs/libsndfile-1.0.0
+   =media-libs/portaudio-19*
+   media-libs/soxr
+   x11-libs/wxGTK:3.0[X]
+   alsa? ( media-libs/alsa-lib )
+   ffmpeg? ( libav? ( media-video/libav:= )
+   !libav? ( >=media-video/ffmpeg-1.2:= ) )
+   flac? ( >=media-libs/flac-1.3.1[cxx] )
+   id3tag? ( media-libs/libid3tag )
+   jack? ( virtual/jack )
+   lame? ( >=media-sound/lame-3.70 )
+   lv2? ( media-libs/lv2 )
+   mad? ( >=media-libs/libmad-0.14.2b )
+   midi? ( media-libs/portmidi )
+   sbsms? ( media-libs/libsbsms )
+   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+   twolame? ( media-sound/twolame )
+   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+   vorbis? ( >=media-libs/libvorbis-1.0 )"
+DEPEND="${RDEPEND}
+   app-arch/xz-utils
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S="${WORKDIR}/${MY_P}-rc3"
+
+src_configure() {
+   local WX_GTK_VER="3.0"
+   need-wxwidgets unicode
+
+   # * always use system libraries if possible
+   # * options listed in the order that configure --help lists them
+   local myeconfargs=(
+   --disable-dynamic-loading
+   --enable-nyquist
+   --enable-unicode
+   --with-expat=system
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2017-11-06 Thread Lars Wendler
commit: ef231e98381b4ffd6579e245f7e0250d654e2620
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Nov  6 11:11:16 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Nov  6 11:11:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef231e98

media-sound/audacity: Forgot to add xdg_desktop_database_update.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/audacity/audacity-2.2.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-sound/audacity/audacity-2.2.0.ebuild 
b/media-sound/audacity/audacity-2.2.0.ebuild
index 8b3556c2f1a..9bfd7eae4ac 100644
--- a/media-sound/audacity/audacity-2.2.0.ebuild
+++ b/media-sound/audacity/audacity-2.2.0.ebuild
@@ -105,9 +105,11 @@ src_install() {
 }
 
 pkg_postinst() {
+   xdg_desktop_database_update
xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
+   xdg_desktop_database_update
xdg_mimeinfo_database_update
 }



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2017-11-06 Thread Lars Wendler
commit: 80fbe6815d4224101db6c9799ae60a0a6d791c9d
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Nov  6 11:09:21 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Nov  6 11:09:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80fbe681

media-sound/audacity: Bump to version 2.2.0

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 media-sound/audacity/Manifest  |   1 +
 media-sound/audacity/audacity-2.2.0.ebuild | 113 +
 2 files changed, 114 insertions(+)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 901f6dc8175..e8f2e122009 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,2 +1,3 @@
 DIST audacity-help-2.1.3.zip 20682229 SHA256 
35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 WHIRLPOOL 
413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256 
c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 WHIRLPOOL 
730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483
+DIST audacity-minsrc-2.2.0.tar.xz 10191924 SHA256 
87635ed19ebcc80d6e4bb88d578c67277c63a02bd22d09d5489080ad216f606b SHA512 
2b0cfbedce279faff4d26b8a8fc68730596891394a6cc7d9bce9d48f2e180d6ecdebfb87cdd381f1f92111a9d143d2ebd3906517206d888a2d922dc176a0f7ec
 WHIRLPOOL 
b171864dc0419a17d08693d9c97086021283601dc48c2487fc0a89264dd2ee30bfbf22264052564ef82f063ce9f3ae42a9df94486ac3f8041d50b96537473f29

diff --git a/media-sound/audacity/audacity-2.2.0.ebuild 
b/media-sound/audacity/audacity-2.2.0.ebuild
new file mode 100644
index 000..8b3556c2f1a
--- /dev/null
+++ b/media-sound/audacity/audacity-2.2.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils wxwidgets xdg-utils
+
+MY_P="${PN}-minsrc-${PV}"
+DOC_PV="2.1.3"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/;
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
+   doc? ( 
https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${DOC_PV}.zip )"
+   # wget doesn't seem to work on FossHub links, so we mirror
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+   dev-libs/expat
+   >=media-libs/libsndfile-1.0.0
+   =media-libs/portaudio-19*
+   media-libs/soxr
+   x11-libs/wxGTK:3.0[X]
+   alsa? ( media-libs/alsa-lib )
+   ffmpeg? ( libav? ( media-video/libav:= )
+   !libav? ( >=media-video/ffmpeg-1.2:= ) )
+   flac? ( >=media-libs/flac-1.3.1[cxx] )
+   id3tag? ( media-libs/libid3tag )
+   jack? ( virtual/jack )
+   lame? ( >=media-sound/lame-3.70 )
+   lv2? ( media-libs/lv2 )
+   mad? ( >=media-libs/libmad-0.14.2b )
+   midi? ( media-libs/portmidi )
+   sbsms? ( media-libs/libsbsms )
+   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+   twolame? ( media-sound/twolame )
+   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+   vorbis? ( >=media-libs/libvorbis-1.0 )"
+DEPEND="${RDEPEND}
+   app-arch/xz-utils
+   virtual/pkgconfig
+   nls? ( sys-devel/gettext )"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+   local WX_GTK_VER="3.0"
+   need-wxwidgets unicode
+
+   # * always use system libraries if possible
+   # * options listed in the order that configure --help lists them
+   local myeconfargs=(
+   --disable-dynamic-loading
+   --enable-nyquist
+   --enable-unicode
+   --with-expat=system
+   --with-libsndfile=system
+   --with-libsoxr=system
+   --with-portaudio
+   --with-widgetextra=local
+   --with-wx-version=${WX_GTK_VER}
+   $(use_enable cpu_flags_x86_sse sse)
+   $(use_enable ladspa)
+   $(use_enable nls)
+   $(use_enable vst)
+   #$(use_with alsa)
+   $(use_with ffmpeg)
+   $(use_with flac libflac)
+   $(use_with id3tag libid3tag)
+   #$(use_with jack)
+   $(use_with lame)
+   $(use_with lv2)
+   $(use_with mad libmad)
+   $(use_with 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2017-09-11 Thread Alexis Ballier
commit: fd83ca6d6fd474fee159bf4a80063e69227deab9
Author: Michael Everitt  iee  org>
AuthorDate: Mon Sep  4 23:40:03 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Sep 11 12:09:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd83ca6d

media-sound/audacity: Fix incorrect dependency on media-libs/flac

See-Also: Gentoo-Bug #629920
Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-sound/audacity/audacity-2.1.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.1.3-r1.ebuild 
b/media-sound/audacity/audacity-2.1.3-r1.ebuild
index bdb7f484375..7c2c2b2d5b6 100644
--- a/media-sound/audacity/audacity-2.1.3-r1.ebuild
+++ b/media-sound/audacity/audacity-2.1.3-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND=">=app-arch/zip-2.3
alsa? ( media-libs/alsa-lib )
ffmpeg? ( libav? ( media-video/libav:= )
!libav? ( >=media-video/ffmpeg-1.2:= ) )
-   flac? ( >=media-libs/flac-1.2.0[cxx] )
+   flac? ( >=media-libs/flac-1.3.1[cxx] )
id3tag? ( media-libs/libid3tag )
jack? ( virtual/jack )
lame? ( >=media-sound/lame-3.70 )



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2017-07-15 Thread Pacho Ramos
commit: 726527e0e8cd003d1bae981bdf99713939203982
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jul 15 09:36:19 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jul 15 09:46:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726527e0

media-sound/audacity: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/audacity/Manifest  |   1 -
 media-sound/audacity/audacity-2.0.5-r2.ebuild  | 100 
 media-sound/audacity/audacity-2.0.5.ebuild | 101 -
 .../audacity/files/audacity-1.3.13-automagic.patch |  61 -
 media-sound/audacity/metadata.xml  |  10 --
 5 files changed, 273 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 494eb45fad1..901f6dc8175 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,3 +1,2 @@
 DIST audacity-help-2.1.3.zip 20682229 SHA256 
35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 WHIRLPOOL 
413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
-DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 
e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 
d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004
 WHIRLPOOL 
106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256 
c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 WHIRLPOOL 
730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483

diff --git a/media-sound/audacity/audacity-2.0.5-r2.ebuild 
b/media-sound/audacity/audacity-2.0.5-r2.ebuild
deleted file mode 100644
index 19daf4ede7a..000
--- a/media-sound/audacity/audacity-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils wxwidgets autotools versionator
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}"
-MY_T="${PN}-minsrc-${MY_PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="mirror://gentoo/${MY_T}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms 
soundtouch twolame vamp vorbis"
-RESTRICT="test"
-
-COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
-   >=app-arch/zip-2.3
-   >=media-libs/libsndfile-1.0.0
-   dev-libs/expat
-   libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-   !libsamplerate? ( media-libs/soxr )
-   vorbis? ( >=media-libs/libvorbis-1.0 )
-   mp3? ( >=media-libs/libmad-0.14.2b )
-   flac? ( >=media-libs/flac-1.2.0[cxx] )
-   id3tag? ( media-libs/libid3tag )
-   sbsms? ( media-libs/libsbsms )
-   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-   twolame? ( media-sound/twolame )
-   ffmpeg? ( virtual/ffmpeg )
-   alsa? ( media-libs/alsa-lib )
-   jack? ( virtual/jack )"
-# Crashes at  startup here...
-#  lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
-   mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
-   app-arch/xz-utils
-   virtual/pkgconfig"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
-
-   AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_configure() {
-   WX_GTK_VER="2.8"
-   need-wxwidgets unicode
-
-   # * always use system libraries if possible
-   # * options listed in the order that configure --help lists them
-   # * use libsoxr if libsamplerate is not requested
-   econf \
-   --enable-unicode \
-   --enable-nyquist \
-   --disable-dynamic-loading \
-   $(use_enable ladspa) \
-   --with-libsndfile=system \
-   --with-expat=system \
-   $(use_with libsamplerate) \
-   $(use_with !libsamplerate libsoxr) \
-   $(use_with vorbis libvorbis) \
-   $(use_with mp3 libmad) \
-   $(use_with flac libflac) \
-   $(use_with id3tag libid3tag) \
-   $(use_with sbsms) \
-   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2017-06-18 Thread Alexis Ballier
commit: af190ba3bc723a1399f9fae4257a2b1ce18ef150
Author: Simon van der Veldt  gmail  com>
AuthorDate: Sun Jun 18 13:16:30 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Jun 18 16:41:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af190ba3

media-sound/audacity: depend on virtual/jack

Fixes bug 614846 https://bugs.gentoo.org/show_bug.cgi?id=614846

 .../audacity/{audacity-2.0.5-r1.ebuild => audacity-2.0.5-r2.ebuild} | 2 +-
 .../audacity/{audacity-2.1.3.ebuild => audacity-2.1.3-r1.ebuild}| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/audacity-2.0.5-r1.ebuild 
b/media-sound/audacity/audacity-2.0.5-r2.ebuild
similarity index 97%
rename from media-sound/audacity/audacity-2.0.5-r1.ebuild
rename to media-sound/audacity/audacity-2.0.5-r2.ebuild
index 861fc8f1c62..19daf4ede7a 100644
--- a/media-sound/audacity/audacity-2.0.5-r1.ebuild
+++ b/media-sound/audacity/audacity-2.0.5-r2.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
twolame? ( media-sound/twolame )
ffmpeg? ( virtual/ffmpeg )
alsa? ( media-libs/alsa-lib )
-   jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+   jack? ( virtual/jack )"
 # Crashes at  startup here...
 #  lv2? ( >=media-libs/slv2-0.6.0 )
 # Disabled upstream ATM

diff --git a/media-sound/audacity/audacity-2.1.3.ebuild 
b/media-sound/audacity/audacity-2.1.3-r1.ebuild
similarity index 97%
rename from media-sound/audacity/audacity-2.1.3.ebuild
rename to media-sound/audacity/audacity-2.1.3-r1.ebuild
index 417bdcd645c..856c2c073c8 100644
--- a/media-sound/audacity/audacity-2.1.3.ebuild
+++ b/media-sound/audacity/audacity-2.1.3-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND=">=app-arch/zip-2.3
!libav? ( >=media-video/ffmpeg-1.2:= ) )
flac? ( >=media-libs/flac-1.2.0[cxx] )
id3tag? ( media-libs/libid3tag )
-   jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
+   jack? ( virtual/jack )
lame? ( >=media-sound/lame-3.70 )
lv2? ( media-libs/lv2 )
mad? ( >=media-libs/libmad-0.14.2b )



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2017-06-13 Thread Agostino Sarubbo
commit: bae407cbfeb5deeb49023556c99f8ae57f066f07
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun 13 12:30:24 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun 13 12:31:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae407cb

media-sound/audacity: ppc64 stable wrt bug #620880

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/audacity/audacity-2.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/audacity/audacity-2.0.5-r1.ebuild 
b/media-sound/audacity/audacity-2.0.5-r1.ebuild
index d1b30bf0e75..861fc8f1c62 100644
--- a/media-sound/audacity/audacity-2.0.5-r1.ebuild
+++ b/media-sound/audacity/audacity-2.0.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_T}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
 IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms 
soundtouch twolame vamp vorbis"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2017-06-05 Thread Agostino Sarubbo
commit: 7fcbab54bb493b3e318c29155da393d52e22b57d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun  5 11:05:14 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun  5 11:05:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fcbab54

media-sound/audacity: amd64 stable wrt bug #620880

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/audacity/audacity-2.0.5-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/audacity/audacity-2.0.5-r1.ebuild 
b/media-sound/audacity/audacity-2.0.5-r1.ebuild
index 20e0fabd327..20a30b1dde3 100644
--- a/media-sound/audacity/audacity-2.0.5-r1.ebuild
+++ b/media-sound/audacity/audacity-2.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_T}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms 
soundtouch twolame vamp vorbis"
 RESTRICT="test"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/

2017-06-05 Thread Pacho Ramos
commit: f73e0c56176dfc52d4ced771f89d0414487adcc2
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Jun  5 09:42:13 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Jun  5 09:44:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f73e0c56

media-sound/audacity: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/audacity/Manifest  |   2 -
 media-sound/audacity/audacity-2.1.2.ebuild | 102 -
 .../audacity/files/audacity-2.1.2-fix-c++14.patch  |  41 -
 3 files changed, 145 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 638874aced3..494eb45fad1 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,5 +1,3 @@
 DIST audacity-help-2.1.3.zip 20682229 SHA256 
35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 WHIRLPOOL 
413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
-DIST audacity-manual-2.1.2.zip 20533055 SHA256 
5c80ae719e0314011443cf5caaa7e27d5733bf70b1b1549f0c5ef8a4f71e5c0b SHA512 
f4313c50f12259838a869a135e6c1366e0d746657654a31b5f05ed3a6e330d67b4567db7533df54d461873813982c47b48b463ee607c88fe0f018c9f75f06fe8
 WHIRLPOOL 
64e56177e6584a9094c1690e3de08097e1f1da6f80cf4bc98c6671cf0517cd1de3a6e9d73ba599ce9387571d83834a9b9c38faa13414e0c80dd41512e6a74464
 DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 
e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 
d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004
 WHIRLPOOL 
106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
-DIST audacity-minsrc-2.1.2.tar.xz 7233500 SHA256 
0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 SHA512 
46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
 WHIRLPOOL 
7c5cb69e38154de21a88aae5e4710035e459ca093c7d116bb96bd99bdced2526d3c727c8930bb80faad78c20f8d9b6ce801c5858f370b53c1412373956b39b3f
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256 
c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 WHIRLPOOL 
730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483

diff --git a/media-sound/audacity/audacity-2.1.2.ebuild 
b/media-sound/audacity/audacity-2.1.2.ebuild
deleted file mode 100644
index 16f9d28c094..000
--- a/media-sound/audacity/audacity-2.1.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets
-
-MY_P="${PN}-minsrc-${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
-   doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${PV}.zip 
)"
-   # wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
-   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-   dev-libs/expat
-   >=media-libs/libsndfile-1.0.0
-   =media-libs/portaudio-19*
-   media-libs/soxr
-   x11-libs/wxGTK:3.0[X]
-   alsa? ( media-libs/alsa-lib )
-   ffmpeg? ( libav? ( media-video/libav:= )
-   !libav? ( >=media-video/ffmpeg-1.2:= ) )
-   flac? ( >=media-libs/flac-1.2.0[cxx] )
-   id3tag? ( media-libs/libid3tag )
-   jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
-   lame? ( >=media-sound/lame-3.70 )
-   lv2? ( media-libs/lv2 )
-   mad? ( >=media-libs/libmad-0.14.2b )
-   midi? ( media-libs/portmidi )
-   sbsms? ( media-libs/libsbsms )
-   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-   twolame? ( media-sound/twolame )
-   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-   vorbis? ( >=media-libs/libvorbis-1.0 )"
-DEPEND="${RDEPEND}
-   app-arch/xz-utils
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   epatch "${FILESDIR}/${PN}-2.1.2-fix-c++14.patch"
-}
-
-src_configure() {
-   WX_GTK_VER="3.0"
-   need-wxwidgets unicode
-
-   # * always use system libraries if 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2017-05-11 Thread Lars Wendler
commit: a126aab128ad6005cb6096b0a184ad7634a71cde
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 11 09:36:38 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 11 09:37:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a126aab1

media-sound/audacity: Removed old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-sound/audacity/Manifest  |   2 -
 media-sound/audacity/audacity-2.1.1.ebuild | 103 -
 2 files changed, 105 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index e80b51ea942..638874aced3 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,7 +1,5 @@
 DIST audacity-help-2.1.3.zip 20682229 SHA256 
35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 WHIRLPOOL 
413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
-DIST audacity-manual-2.1.1.zip 20224419 SHA256 
fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512 
0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84
 WHIRLPOOL 
4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b
 DIST audacity-manual-2.1.2.zip 20533055 SHA256 
5c80ae719e0314011443cf5caaa7e27d5733bf70b1b1549f0c5ef8a4f71e5c0b SHA512 
f4313c50f12259838a869a135e6c1366e0d746657654a31b5f05ed3a6e330d67b4567db7533df54d461873813982c47b48b463ee607c88fe0f018c9f75f06fe8
 WHIRLPOOL 
64e56177e6584a9094c1690e3de08097e1f1da6f80cf4bc98c6671cf0517cd1de3a6e9d73ba599ce9387571d83834a9b9c38faa13414e0c80dd41512e6a74464
 DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 
e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 
d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004
 WHIRLPOOL 
106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
-DIST audacity-minsrc-2.1.1.tar.xz 7154008 SHA256 
49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872 SHA512 
36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d
 WHIRLPOOL 
240715af6b17aa424e50fc6727fffac83368236afc4d3d376274d8e554d7bf2439a55ae22f439669c4e3115668ec875425aacde7f5aee6d7b05975f7466f5762
 DIST audacity-minsrc-2.1.2.tar.xz 7233500 SHA256 
0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 SHA512 
46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
 WHIRLPOOL 
7c5cb69e38154de21a88aae5e4710035e459ca093c7d116bb96bd99bdced2526d3c727c8930bb80faad78c20f8d9b6ce801c5858f370b53c1412373956b39b3f
 DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256 
c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 WHIRLPOOL 
730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483

diff --git a/media-sound/audacity/audacity-2.1.1.ebuild 
b/media-sound/audacity/audacity-2.1.1.ebuild
deleted file mode 100644
index a272541869d..000
--- a/media-sound/audacity/audacity-2.1.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets
-
-MY_P="${PN}-minsrc-${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${MY_P}.tar.xz
-   doc? ( https://dev.gentoo.org/~yngwin/distfiles/${PN}-manual-${PV}.zip 
)"
-   # wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
-   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-   dev-libs/expat
-   >=media-libs/libsndfile-1.0.0
-   =media-libs/portaudio-19*
-   media-libs/soxr
-   x11-libs/wxGTK:2.8[X]
-   alsa? ( media-libs/alsa-lib )
-   ffmpeg? ( libav? ( media-video/libav:= )
-   !libav? ( >=media-video/ffmpeg-1.2:= ) )
-   flac? ( >=media-libs/flac-1.2.0[cxx] )
-   id3tag? ( media-libs/libid3tag )
-   jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
-   lame? ( >=media-sound/lame-3.70 )
-   lv2? ( 

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2017-05-11 Thread Lars Wendler
commit: f73963fc7c7a4aafb69081a7b14b142b8831ddbf
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu May 11 09:34:00 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu May 11 09:37:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f73963fc

media-sound/audacity: Bump to version 2.1.3

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-sound/audacity/Manifest  |   2 +
 media-sound/audacity/audacity-2.1.3.ebuild | 104 +
 2 files changed, 106 insertions(+)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index b4de984cd0e..e80b51ea942 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,5 +1,7 @@
+DIST audacity-help-2.1.3.zip 20682229 SHA256 
35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512 
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
 WHIRLPOOL 
413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
 DIST audacity-manual-2.1.1.zip 20224419 SHA256 
fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512 
0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84
 WHIRLPOOL 
4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b
 DIST audacity-manual-2.1.2.zip 20533055 SHA256 
5c80ae719e0314011443cf5caaa7e27d5733bf70b1b1549f0c5ef8a4f71e5c0b SHA512 
f4313c50f12259838a869a135e6c1366e0d746657654a31b5f05ed3a6e330d67b4567db7533df54d461873813982c47b48b463ee607c88fe0f018c9f75f06fe8
 WHIRLPOOL 
64e56177e6584a9094c1690e3de08097e1f1da6f80cf4bc98c6671cf0517cd1de3a6e9d73ba599ce9387571d83834a9b9c38faa13414e0c80dd41512e6a74464
 DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 
e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 
d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004
 WHIRLPOOL 
106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
 DIST audacity-minsrc-2.1.1.tar.xz 7154008 SHA256 
49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872 SHA512 
36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d
 WHIRLPOOL 
240715af6b17aa424e50fc6727fffac83368236afc4d3d376274d8e554d7bf2439a55ae22f439669c4e3115668ec875425aacde7f5aee6d7b05975f7466f5762
 DIST audacity-minsrc-2.1.2.tar.xz 7233500 SHA256 
0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 SHA512 
46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
 WHIRLPOOL 
7c5cb69e38154de21a88aae5e4710035e459ca093c7d116bb96bd99bdced2526d3c727c8930bb80faad78c20f8d9b6ce801c5858f370b53c1412373956b39b3f
+DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256 
c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512 
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
 WHIRLPOOL 
730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483

diff --git a/media-sound/audacity/audacity-2.1.3.ebuild 
b/media-sound/audacity/audacity-2.1.3.ebuild
new file mode 100644
index 000..417bdcd645c
--- /dev/null
+++ b/media-sound/audacity/audacity-2.1.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils wxwidgets
+
+MY_P="${PN}-minsrc-${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/;
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
+   doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${PV}.zip )"
+   # wget doesn't seem to work on FossHub links, so we mirror
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+   dev-libs/expat
+   >=media-libs/libsndfile-1.0.0
+   =media-libs/portaudio-19*
+   media-libs/soxr
+   x11-libs/wxGTK:3.0[X]
+   alsa? ( media-libs/alsa-lib )
+   ffmpeg? ( libav? ( media-video/libav:= )
+   !libav? ( >=media-video/ffmpeg-1.2:= ) )
+   flac? ( >=media-libs/flac-1.2.0[cxx] )
+   id3tag? ( media-libs/libid3tag )
+   jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
+   lame? ( >=media-sound/lame-3.70 )
+   

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2016-09-17 Thread David Seifert
commit: 5c43afe6861275a05aeb4d6b6e45cdbbccfef21b
Author: David Seifert  gentoo  org>
AuthorDate: Sat Sep 17 13:15:50 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep 17 13:16:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c43afe6

media-sound/audacity: Allow for compiling with GCC 6

Gentoo-bug: 592448
* Patch by OpenSUSE

Package-Manager: portage-2.3.0

 media-sound/audacity/audacity-2.1.2.ebuild |  7 ++--
 .../audacity/files/audacity-2.1.2-fix-c++14.patch  | 41 ++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/media-sound/audacity/audacity-2.1.2.ebuild 
b/media-sound/audacity/audacity-2.1.2.ebuild
index 0a0dd61..4331f0c 100644
--- a/media-sound/audacity/audacity-2.1.2.ebuild
+++ b/media-sound/audacity/audacity-2.1.2.ebuild
@@ -49,10 +49,9 @@ REQUIRED_USE="soundtouch? ( midi )"
 
 S=${WORKDIR}/${MY_P}
 
-#src_prepare() {
-#  epatch "${FILESDIR}"/${P}-automagic.patch
-#  AT_M4DIR="${S}/m4" eautoreconf
-#}
+src_prepare() {
+   epatch "${FILESDIR}/${PN}-2.1.2-fix-c++14.patch"
+}
 
 src_configure() {
WX_GTK_VER="3.0"

diff --git a/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch 
b/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch
new file mode 100644
index ..32bcf42
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch
@@ -0,0 +1,41 @@
+Fix building with C++14, which errors out due to bool -> T* conversions
+See also: https://bugs.gentoo.org/show_bug.cgi?id=592448
+
+Patch by OpenSUSE
+
+Index: src/effects/vamp/LoadVamp.cpp
+===
+--- src/effects/vamp/LoadVamp.cpp.orig
 src/effects/vamp/LoadVamp.cpp
+@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co
+Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate 
doesn't matter here
+if (!vp)
+{
+-  return false;
++  return NULL;
+}
+ 
+// We limit the listed plugin outputs to those whose results can
+Index: src/import/ImportFLAC.cpp
+===
+--- src/import/ImportFLAC.cpp.orig
 src/import/ImportFLAC.cpp
+@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open
+int cnt;
+wxFile binaryFile;
+if (!binaryFile.Open(filename)) {
+-  return false; // File not found
++  return NULL; // File not found
+}
+ 
+ #ifdef USE_LIBID3TAG
+@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open
+ 
+if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) {
+   // File is not a FLAC file
+-  return false;
++  return NULL;
+}
+ 
+// Open the file for import
+



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

2016-03-31 Thread Lars Wendler
commit: cb7aafd6bb1bc403b096383487b0c996f7a8257b
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 31 12:18:49 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 31 12:22:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7aafd6

media-sound/audacity: Removed old.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/audacity/Manifest  |   1 -
 media-sound/audacity/audacity-2.0.2.ebuild |  98 
 .../audacity/files/audacity-1.3.13-ffmpeg.patch| 164 -
 .../audacity/files/audacity-1.3.14-typecast.patch  |  15 --
 4 files changed, 278 deletions(-)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index a630944..b4de984 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,5 @@
 DIST audacity-manual-2.1.1.zip 20224419 SHA256 
fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512 
0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84
 WHIRLPOOL 
4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b
 DIST audacity-manual-2.1.2.zip 20533055 SHA256 
5c80ae719e0314011443cf5caaa7e27d5733bf70b1b1549f0c5ef8a4f71e5c0b SHA512 
f4313c50f12259838a869a135e6c1366e0d746657654a31b5f05ed3a6e330d67b4567db7533df54d461873813982c47b48b463ee607c88fe0f018c9f75f06fe8
 WHIRLPOOL 
64e56177e6584a9094c1690e3de08097e1f1da6f80cf4bc98c6671cf0517cd1de3a6e9d73ba599ce9387571d83834a9b9c38faa13414e0c80dd41512e6a74464
-DIST audacity-minsrc-2.0.2.tar.bz2 6794285 SHA256 
ac8a5ec62a5748de7f885fb3f82a6b6acdb26b28276827a678ec17ce65b9879d SHA512 
3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e
 WHIRLPOOL 
3fe42264f20920d1cadd3386c4521ce557c5f10ee5168cb4222843a25894de6a0106f2ed4246a5ab827fd4765a30cca21d81945092f5fe21bd1009483e098868
 DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 
e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 
d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004
 WHIRLPOOL 
106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
 DIST audacity-minsrc-2.1.1.tar.xz 7154008 SHA256 
49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872 SHA512 
36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d
 WHIRLPOOL 
240715af6b17aa424e50fc6727fffac83368236afc4d3d376274d8e554d7bf2439a55ae22f439669c4e3115668ec875425aacde7f5aee6d7b05975f7466f5762
 DIST audacity-minsrc-2.1.2.tar.xz 7233500 SHA256 
0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 SHA512 
46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
 WHIRLPOOL 
7c5cb69e38154de21a88aae5e4710035e459ca093c7d116bb96bd99bdced2526d3c727c8930bb80faad78c20f8d9b6ce801c5858f370b53c1412373956b39b3f

diff --git a/media-sound/audacity/audacity-2.0.2.ebuild 
b/media-sound/audacity/audacity-2.0.2.ebuild
deleted file mode 100644
index 438ab4e..000
--- a/media-sound/audacity/audacity-2.0.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils wxwidgets autotools versionator
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}"
-MY_T="${PN}-minsrc-${MY_PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="mirror://gentoo/${MY_T}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms 
soundtouch twolame vamp vorbis"
-RESTRICT="test"
-
-COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
-   >=app-arch/zip-2.3
-   >=media-libs/libsndfile-1.0.0
-   dev-libs/expat
-   libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
-   vorbis? ( >=media-libs/libvorbis-1.0 )
-   mp3? ( >=media-libs/libmad-0.14.2b )
-   flac? ( >=media-libs/flac-1.2.0[cxx] )
-   id3tag? ( media-libs/libid3tag )
-   sbsms? ( media-libs/libsbsms )
-   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-   twolame? ( media-sound/twolame )
-   ffmpeg? ( virtual/ffmpeg )
-   alsa? ( media-libs/alsa-lib )
-   jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
-# Crashes at  startup here...
-#  lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
-   mp3? ( >=media-sound/lame-3.70 )"

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2016-03-31 Thread Lars Wendler
commit: 7a91644d1007d90cca81f74cd6cfc8e3d2ef9dda
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 31 12:17:40 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 31 12:22:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a91644d

media-sound/audacity: Bump to version 2.1.2 (bug #524242).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/audacity/Manifest  |   2 +
 media-sound/audacity/audacity-2.1.2.ebuild | 104 +
 2 files changed, 106 insertions(+)

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 567204e..a630944 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,4 +1,6 @@
 DIST audacity-manual-2.1.1.zip 20224419 SHA256 
fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512 
0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84
 WHIRLPOOL 
4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b
+DIST audacity-manual-2.1.2.zip 20533055 SHA256 
5c80ae719e0314011443cf5caaa7e27d5733bf70b1b1549f0c5ef8a4f71e5c0b SHA512 
f4313c50f12259838a869a135e6c1366e0d746657654a31b5f05ed3a6e330d67b4567db7533df54d461873813982c47b48b463ee607c88fe0f018c9f75f06fe8
 WHIRLPOOL 
64e56177e6584a9094c1690e3de08097e1f1da6f80cf4bc98c6671cf0517cd1de3a6e9d73ba599ce9387571d83834a9b9c38faa13414e0c80dd41512e6a74464
 DIST audacity-minsrc-2.0.2.tar.bz2 6794285 SHA256 
ac8a5ec62a5748de7f885fb3f82a6b6acdb26b28276827a678ec17ce65b9879d SHA512 
3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e
 WHIRLPOOL 
3fe42264f20920d1cadd3386c4521ce557c5f10ee5168cb4222843a25894de6a0106f2ed4246a5ab827fd4765a30cca21d81945092f5fe21bd1009483e098868
 DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 
e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 
d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004
 WHIRLPOOL 
106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
 DIST audacity-minsrc-2.1.1.tar.xz 7154008 SHA256 
49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872 SHA512 
36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d
 WHIRLPOOL 
240715af6b17aa424e50fc6727fffac83368236afc4d3d376274d8e554d7bf2439a55ae22f439669c4e3115668ec875425aacde7f5aee6d7b05975f7466f5762
+DIST audacity-minsrc-2.1.2.tar.xz 7233500 SHA256 
0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 SHA512 
46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
 WHIRLPOOL 
7c5cb69e38154de21a88aae5e4710035e459ca093c7d116bb96bd99bdced2526d3c727c8930bb80faad78c20f8d9b6ce801c5858f370b53c1412373956b39b3f

diff --git a/media-sound/audacity/audacity-2.1.2.ebuild 
b/media-sound/audacity/audacity-2.1.2.ebuild
new file mode 100644
index 000..0a0dd61
--- /dev/null
+++ b/media-sound/audacity/audacity-2.1.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils wxwidgets
+
+MY_P="${PN}-minsrc-${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/;
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
+   doc? ( https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${PV}.zip 
)"
+   # wget doesn't seem to work on FossHub links, so we mirror
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+   +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis 
+vst"
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+   dev-libs/expat
+   >=media-libs/libsndfile-1.0.0
+   =media-libs/portaudio-19*
+   media-libs/soxr
+   x11-libs/wxGTK:3.0[X]
+   alsa? ( media-libs/alsa-lib )
+   ffmpeg? ( libav? ( media-video/libav:= )
+   !libav? ( >=media-video/ffmpeg-1.2:= ) )
+   flac? ( >=media-libs/flac-1.2.0[cxx] )
+   id3tag? ( media-libs/libid3tag )
+   jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
+   lame? ( >=media-sound/lame-3.70 )
+   lv2? ( media-libs/lv2 )
+   mad? ( >=media-libs/libmad-0.14.2b )
+   midi? ( media-libs/portmidi )
+   sbsms? ( media-libs/libsbsms )
+   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+   twolame? ( media-sound/twolame )
+   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+   vorbis? ( >=media-libs/libvorbis-1.0 )"

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2015-11-08 Thread Alexis Ballier
commit: a9428f9a8297c3336a09490dcb3f6fe7cf333d17
Author: Marc Joliet  gmx  de>
AuthorDate: Fri Nov  6 22:41:38 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Nov  6 22:58:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9428f9a

media-sound/audacity: fix libsoxr USE flag desc

The description of the libsoxr USE flag is inaccurate: libsoxr is both faster
*and* yields higher quality results than libsamplerate.  This matches the way
the Audacity project described libsoxr in the 2.0.3 release notes at
http://wiki.audacityteam.org/wiki/Release_Notes_2.0.3#Resampling, but can also
be verified by comparing the two, e.g., at http://src.infinitewave.ca/.

Signed-off-by: Marc Joliet  gmx.de>

 media-sound/audacity/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/audacity/metadata.xml 
b/media-sound/audacity/metadata.xml
index efb5914..807ba67 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -10,9 +10,9 @@
   
 Enables ID3 tagging with id3tag library
 
-  Uses media-libs/soxr as audio resampling library: Better
-  quality than the included resampler and much faster than libsamplerate
-  while keeping almost the same quality.
+  Uses media-libs/soxr as audio resampling library: Higher
+  quality and much faster than both the included resampler and
+  libsamplerate.
 
 Add support for Ladspa V2
 Enables MIDI support



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2015-11-08 Thread Alexis Ballier
commit: 0250db360bb450514d3db3524401268664b317f7
Author: Marc Joliet  gmx  de>
AuthorDate: Fri Nov  6 22:50:46 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Nov  6 23:31:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0250db36

media-sound/audacity: add a libsamplerate USE desc

Add a local description of the libsamplerate USE flag that is more specific
with regards to its impact on Audacity.

Signed-off-by: Marc Joliet  gmx.de>

 media-sound/audacity/metadata.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-sound/audacity/metadata.xml 
b/media-sound/audacity/metadata.xml
index 807ba67..b524f75 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -14,6 +14,11 @@
   quality and much faster than both the included resampler and
   libsamplerate.
 
+
+  Uses media-libs/libsamplerate as audio resampling library:
+  Higher quality than the included resampler but lower quality and much
+  slower than libsoxr.
+
 Add support for Ladspa V2
 Enables MIDI support
 Enable the internal portmixer feature



[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

2015-10-30 Thread Alexis Ballier
commit: 4d6221c436747e6dfd39db9c91bb168b1f6d7f36
Author: Marc Joliet  gmx  de>
AuthorDate: Mon Oct 26 10:17:31 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Oct 30 13:55:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6221c4

media-sound/audacity: fix libsamplerate/libsox dep

Starting with audacity 2.0.3, only *one* resampling library can be enabled at a
time.  Due to this, the way the USE flags are currently handled make it
impossible to use the libsoxr library.  This commit does two things to remedy
this:

- never enable libresample (which isn't recommended anymore), and
- drop the libsoxr USE flag so that the libsamplerate/libsoxr choice is
  controlled only through the libsamplerate USE flag, thus allowing only one
  choice, which reflects the way the build system works.

These two minimal changes make it possible to properly select between the two
recommended resampling libraries.

Gentoo-bug: 536208
Signed-off-by: Marc Joliet  gmx.de>

 media-sound/audacity/audacity-2.0.5-r1.ebuild | 101 ++
 1 file changed, 101 insertions(+)

diff --git a/media-sound/audacity/audacity-2.0.5-r1.ebuild 
b/media-sound/audacity/audacity-2.0.5-r1.ebuild
new file mode 100644
index 000..50f9262
--- /dev/null
+++ b/media-sound/audacity/audacity-2.0.5-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils wxwidgets autotools versionator
+
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}"
+MY_T="${PN}-minsrc-${MY_PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/;
+SRC_URI="mirror://gentoo/${MY_T}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms 
soundtouch twolame vamp vorbis"
+RESTRICT="test"
+
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
+   >=app-arch/zip-2.3
+   >=media-libs/libsndfile-1.0.0
+   dev-libs/expat
+   libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+   !libsamplerate? ( media-libs/soxr )
+   vorbis? ( >=media-libs/libvorbis-1.0 )
+   mp3? ( >=media-libs/libmad-0.14.2b )
+   flac? ( >=media-libs/flac-1.2.0[cxx] )
+   id3tag? ( media-libs/libid3tag )
+   sbsms? ( media-libs/libsbsms )
+   soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+   vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+   twolame? ( media-sound/twolame )
+   ffmpeg? ( virtual/ffmpeg )
+   alsa? ( media-libs/alsa-lib )
+   jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+# Crashes at  startup here...
+#  lv2? ( >=media-libs/slv2-0.6.0 )
+# Disabled upstream ATM
+#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
+
+RDEPEND="${COMMON_DEPEND}
+   mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+   app-arch/xz-utils
+   virtual/pkgconfig"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
+
+   AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+   WX_GTK_VER="2.8"
+   need-wxwidgets unicode
+
+   # * always use system libraries if possible
+   # * options listed in the order that configure --help lists them
+   # * use libsoxr if libsamplerate is not requested
+   econf \
+   --enable-unicode \
+   --enable-nyquist \
+   --disable-dynamic-loading \
+   $(use_enable ladspa) \
+   --with-libsndfile=system \
+   --with-expat=system \
+   $(use_with libsamplerate) \
+   $(use_with !libsamplerate libsoxr) \
+   $(use_with vorbis libvorbis) \
+   $(use_with mp3 libmad) \
+   $(use_with flac libflac) \
+   $(use_with id3tag libid3tag) \
+   $(use_with sbsms) \
+   $(use_with soundtouch) \
+   $(use_with vamp libvamp) \
+   $(use_with twolame libtwolame) \
+   $(use_with ffmpeg) \
+   $(use_with midi) \
+   $(use_with alsa) \
+   $(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+# $(use_with ladspa liblrdf) \
+
+src_install() {
+   emake DESTDIR="${D}" install
+
+   # Remove bad doc install
+   rm -rf "${D}"/usr/share/doc
+
+   # Install our docs
+   dodoc README.txt
+}