commit: 796c79ae5c21967d86132a5913ff16d89b4c1399
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 14:11:33 2020 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Thu May 28 14:13:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=796c79ae
media-sound/ardour: version bump to 6.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org>
media-sound/ardour/Manifest | 1 +
.../{ardour-9999.ebuild => ardour-6.0.ebuild} | 27 ++++++++++++++--------
media-sound/ardour/ardour-9999.ebuild | 27 ++++++++++++++--------
media-sound/ardour/metadata.xml | 3 +++
4 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 2715b3fb7e1..bf2aa3d6bda 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
+DIST Ardour-6.0.0.tar.bz2 10999598 BLAKE2B
d403a76bb95a7c8dc411b45b54d9b1afb64ab0ba104c283c6890ec5bb152c9f67b825222460bb7b29a28724e7581023e5d3c7ce3b7ff9c88f3d584fab8cb03f7
SHA512
42cd5ea69200aefc60fc93ca7347f08fc511a9821a03023c4362d626f0957570ba0a7b174af67016f7fa27a29eed3c932d502e090d780125c63b5690faa642a3
DIST ardour-5.12.tar.bz2 8852834 BLAKE2B
0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b
SHA512
c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
diff --git a/media-sound/ardour/ardour-9999.ebuild
b/media-sound/ardour/ardour-6.0.ebuild
similarity index 80%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-6.0.ebuild
index 36ca3e79777..304e08fcb60 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-6.0.ebuild
@@ -5,7 +5,8 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='threads(+)'
#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
DESCRIPTION="Digital Audio Workstation"
HOMEPAGE="http://ardour.org/";
@@ -15,13 +16,13 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ SRC_URI="https://community.ardour.org/src/Ardour-${PV}.0.tar.bz2";
S="${WORKDIR}/Ardour-${PV}.0"
fi
LICENSE="GPL-2"
SLOT="6"
-IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx
cpu_flags_x86_3dnow"
RDEPEND="
>=dev-cpp/glibmm-2.32.0
@@ -60,6 +61,7 @@ RDEPEND="
dev-libs/sord
>=media-libs/suil-0.6.10
>=media-libs/lv2-1.4.0"
+# !bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to
be able to unbundle...
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -77,10 +79,6 @@ pkg_setup() {
src_prepare() {
eapply_user
- if ! [[ ${PV} == *9999* ]]; then
- eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\
\'\','/' -i "${S}"/wscript || die
MARCH=$(get-flag march)
OPTFLAGS=""
@@ -106,6 +104,10 @@ src_prepare() {
append-flags "-lboost_system"
python_fix_shebang "${S}"/wscript
python_fix_shebang "${S}"/waf
+ my_lcmsg() {
+ rm -f
{gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
+ }
+ l10n_for_each_disabled_locale_do my_lcmsg
}
src_configure() {
@@ -115,13 +117,18 @@ src_configure() {
$(usex doc "--docs" '') \
$({ use altivec || use cpu_flags_x86_sse; } && echo
"--fpu-optimization" || echo "--no-fpu-optimization") \
$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa
--libjack=weak") \
- --destdir="${D}" \
+ $( use phonehome && echo "--phone-home" ) || echo
"--no-phone-home" \
+ $( use nls && echo "--nls" ) || echo --no-nls \
+ --destdir="${D}" \
--prefix=/usr \
--configdir=/etc \
- --nls \
--optimize
+#not possible right now --use-external-libs
+}
+src_compile() {
+ waf-utils_src_compile
+ use nls && waf-utils_src_compile i18n
}
-
src_install() {
waf-utils_src_install
mv ${PN}.1 ${PN}${SLOT}.1
diff --git a/media-sound/ardour/ardour-9999.ebuild
b/media-sound/ardour/ardour-9999.ebuild
index 36ca3e79777..304e08fcb60 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -5,7 +5,8 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='threads(+)'
#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
DESCRIPTION="Digital Audio Workstation"
HOMEPAGE="http://ardour.org/";
@@ -15,13 +16,13 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ SRC_URI="https://community.ardour.org/src/Ardour-${PV}.0.tar.bz2";
S="${WORKDIR}/Ardour-${PV}.0"
fi
LICENSE="GPL-2"
SLOT="6"
-IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx
cpu_flags_x86_3dnow"
RDEPEND="
>=dev-cpp/glibmm-2.32.0
@@ -60,6 +61,7 @@ RDEPEND="
dev-libs/sord
>=media-libs/suil-0.6.10
>=media-libs/lv2-1.4.0"
+# !bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to
be able to unbundle...
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -77,10 +79,6 @@ pkg_setup() {
src_prepare() {
eapply_user
- if ! [[ ${PV} == *9999* ]]; then
- eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\
\'\','/' -i "${S}"/wscript || die
MARCH=$(get-flag march)
OPTFLAGS=""
@@ -106,6 +104,10 @@ src_prepare() {
append-flags "-lboost_system"
python_fix_shebang "${S}"/wscript
python_fix_shebang "${S}"/waf
+ my_lcmsg() {
+ rm -f
{gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
+ }
+ l10n_for_each_disabled_locale_do my_lcmsg
}
src_configure() {
@@ -115,13 +117,18 @@ src_configure() {
$(usex doc "--docs" '') \
$({ use altivec || use cpu_flags_x86_sse; } && echo
"--fpu-optimization" || echo "--no-fpu-optimization") \
$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa
--libjack=weak") \
- --destdir="${D}" \
+ $( use phonehome && echo "--phone-home" ) || echo
"--no-phone-home" \
+ $( use nls && echo "--nls" ) || echo --no-nls \
+ --destdir="${D}" \
--prefix=/usr \
--configdir=/etc \
- --nls \
--optimize
+#not possible right now --use-external-libs
+}
+src_compile() {
+ waf-utils_src_compile
+ use nls && waf-utils_src_compile i18n
}
-
src_install() {
waf-utils_src_install
mv ${PN}.1 ${PN}${SLOT}.1
diff --git a/media-sound/ardour/metadata.xml b/media-sound/ardour/metadata.xml
index 20dec2c8d4e..1f9044f06be 100644
--- a/media-sound/ardour/metadata.xml
+++ b/media-sound/ardour/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<remote-id type="github">Ardour/ardour</remote-id>
</upstream>
+ <use>
+ <flag name="phonehome">contact ardour.org at startup for new
announcements</flag>
+ </use>
</pkgmetadata>
