commit: aea7767ff0dfa4e99a9cd6c4ce601428947842b3
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 07:03:55 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 07:04:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea7767f
*/*: bump to 3.9.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/maven-bin/Manifest | 1 +
dev-java/maven-bin/maven-bin-3.9.1.ebuild | 64 +++++++++++
media-sound/ardour/Manifest | 2 -
media-sound/ardour/ardour-7.1.ebuild | 185 ------------------------------
media-sound/ardour/ardour-7.2.ebuild | 185 ------------------------------
5 files changed, 65 insertions(+), 372 deletions(-)
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 7e6983ebd6ae..ab4378d05f18 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,2 +1,3 @@
DIST apache-maven-3.8.7-bin.tar.gz 8293440 BLAKE2B
0a586cf0eb2a579d99bbe5736f294369b774ee4b041b37ecd4721eb3b988e274fd6d88bb34cc20a48c98c4f70c256dd74441c0f57119f90958af05e8c16f89c6
SHA512
21c2be0a180a326353e8f6d12289f74bc7cd53080305f05358936f3a1b6dd4d91203f4cc799e81761cf5c53c5bbe9dcc13bdb27ec8f57ecf21b2f9ceec3c8d27
DIST apache-maven-3.9.0-bin.tar.gz 9024147 BLAKE2B
ba2545a44a20c7ed7791ea116fbb72d549409d955f8403355e13cf86b95ffda685d5ee0c3d3377f2b5481b25a2f0e6f45d51e89b1ba5913c9be0688a98f8d585
SHA512
1ea149f4e48bc7b34d554aef86f948eca7df4e7874e30caf449f3708e4f8487c71a5e5c072a05f17c60406176ebeeaf56b5f895090c7346f8238e2da06cf6ecd
+DIST apache-maven-3.9.1-bin.tar.gz 9039409 BLAKE2B
e1925202d8b5363f16cd734aca409091a1e7f56fa9220aa6060a79fae6dfd37772daf04bc15edc2918757ac718ea41e861583c86dff40b0e3172fa0a7cdfbcef
SHA512
d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3
diff --git a/dev-java/maven-bin/maven-bin-3.9.1.ebuild
b/dev-java/maven-bin/maven-bin-3.9.1.ebuild
new file mode 100644
index 000000000000..6748f5927604
--- /dev/null
+++ b/dev-java/maven-bin/maven-bin-3.9.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit java-pkg-2
+
+MY_PN=apache-${PN%%-bin}
+MY_PV=${PV/_alpha/-alpha-}
+MY_P="${MY_PN}-${MY_PV}"
+MY_MV="${PV%%.*}"
+
+DESCRIPTION="Project Management and Comprehension Tool for Java"
+SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
+HOMEPAGE="https://maven.apache.org/";
+
+LICENSE="Apache-2.0"
+SLOT="3.9"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ app-eselect/eselect-java"
+
+RDEPEND="
+ >=virtual/jre-1.8:*"
+
+S="${WORKDIR}/${MY_P}"
+
+MAVEN="${PN}-${SLOT}"
+MAVEN_SHARE="/usr/share/${MAVEN}"
+
+QA_FLAGS_IGNORED=(
+ "${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
+ "${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
+)
+
+# TODO:
+# We should use jars from packages, instead of what is bundled.
+src_install() {
+ dodir "${MAVEN_SHARE}"
+
+ cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
+
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
+ java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
+
+ dodoc NOTICE README.txt
+
+ dodir /usr/bin
+ dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
+
+ # See bug #342901.
+ echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
+ doenvd "${T}/25${MAVEN}"
+}
+
+pkg_postinst() {
+ eselect maven update mvn-${SLOT}
+}
+
+pkg_postrm() {
+ eselect maven update
+}
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index c05def17cf61..33ef2c14d55b 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,4 +1,2 @@
DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B
62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66
SHA512
ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
-DIST Ardour-7.1.0.tar.bz2 12731494 BLAKE2B
1473d89089b378db9d7cb665d0d3fb9980abe5344e3e35114352141116547490fba1446d61c1ff4ee1262ac114e78baec994a4671e8362a1c146ff7f6020332d
SHA512
e5fb26a03059eb96df3000977544f622e30aae0772f9265f5acb7da8f88460624dfed500423786975d69a6629821340dd74a03343f2c7ff70f959434e795c0fd
-DIST Ardour-7.2.0.tar.bz2 12882609 BLAKE2B
fe4912e4e6be318605f41cbd58ea51711d6ae6537c673c5534ff48a74455e54d92bcb6aa14b18b0014d8ebf4463d630e817696013b5b56255529183471a51566
SHA512
a8e1337324eed503e864f8fe3da34410b2a21e61a2b243a27ac68ac4d41b59ac3417e7713497f38f310a57b8d9885e758b99b00fec992b77756076a86f5ef7b3
DIST Ardour-7.3.0.tar.bz2 12897398 BLAKE2B
518de10fd43220e843c775c9374347cf827562ff979a99ecdb9507f69daad642345a1c2ddec6f601511b599167a6904905dcdd25ac15f71616c3cb432897545d
SHA512
4c0119768015aea447ea5c4ef15708a6440e189bd3578aca74b8ea2cac86920a8c8bd975e03f2af25108f76231d8afccf0003e6a2f8de1de28bcdce9085fe98c
diff --git a/media-sound/ardour/ardour-7.1.ebuild
b/media-sound/ardour/ardour-7.1.ebuild
deleted file mode 100644
index 2fb765891251..000000000000
--- a/media-sound/ardour/ardour-7.1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop
xdg
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/";
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git";
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
-
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2";
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="7"
-IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec
cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
- dev-cpp/glibmm:2
- dev-cpp/gtkmm:2.4
- dev-libs/boost:=
- dev-libs/glib:2
- dev-libs/libsigc++:2
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac:=
- media-libs/freetype:2
- media-libs/libart_lgpl
- media-libs/liblo
- media-libs/liblrdf
- media-libs/libsamplerate
- media-libs/libsndfile
- media-libs/libsoundtouch
- media-libs/raptor:2
- media-libs/rubberband
- media-libs/taglib
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sys-libs/readline:0=
- sci-libs/fftw:3.0[threads]
- virtual/libusb:1
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- jack? ( virtual/jack )
- pulseaudio? ( media-sound/pulseaudio )
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- media-libs/suil[gtk2]
- media-libs/lv2"
-# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to
be able to unbundle...
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )
- jack? ( virtual/jack )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.8-metadata.patch"
-)
-
-pkg_pretend() {
- [[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] ||
has_version sci-libs/fftw[threads]) && \
- ewarn "Linking with gold linker might produce broken
executable, see bug #733972"
-}
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- xdg_src_prepare
-
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\
\'\','/' -i "${S}"/wscript || die
- MARCH=$(get-flag march)
- OPTFLAGS=""
- if use cpu_flags_x86_sse; then
- if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
- elog "You enabled sse but use an march that does not
support sse!"
- elog "We add -msse to the flags now, but please
consider switching your march in make.conf!"
- fi
- OPTFLAGS="sse"
- fi
- if use cpu_flags_x86_mmx; then
- if [[ ${MARCH} == "i486" ]]; then
- elog "You enabled mmx with i486 set as march! You have
been warned!"
- fi
- OPTFLAGS="${OPTFLAGS} mmx"
- fi
- if use cpu_flags_x86_3dnow; then
- OPTFLAGS="${OPTFLAGS} 3dnow"
- fi
- sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some
place holders\"/' \
- -i "${S}"/wscript || die
- sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
- 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
- }
- plocale_for_each_disabled_locale my_lcmsg
-}
-
-src_configure() {
- # avoid bug https://bugs.gentoo.org/800067
- local -x AS="$(tc-getCC) -c"
-
- local backends="alsa,dummy"
- use jack && backends+=",jack"
- use pulseaudio && backends+=",pulseaudio"
-
- tc-export CC CXX
- mkdir -p "${D}"
- local myconf=(
- --configdir=/etc
- --freedesktop
- --noconfirm
- --optimize
- --with-backends=${backends}
- $({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } &&
echo "--fpu-optimization" || echo "--no-fpu-optimization")
- $(usex doc "--docs" '')
- $(usex nls "--nls" "--no-nls")
- $(usex phonehome "--phone-home" "--no-phone-home")
- # not possible right now --use-external-libs
- )
-
- waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
- waf-utils_src_compile
- use nls && waf-utils_src_compile i18n
-}
-
-src_install() {
- local s
-
- waf-utils_src_install
-
- mv ${PN}.1 ${PN}${SLOT}.1 || die
- doman ${PN}${SLOT}.1
-
- for s in 16 22 32 48 256 512; do
- newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png
ardour${SLOT}.png
- done
-
- # the build system still installs ardour6.png files so we get rid of
those to not conflict with ardour:6
- find "${D}/usr/share/icons/" -name ardour6.png -delete
-
- sed -i \
- -e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
- -e 's/;AudioEditing;/;X-AudioEditing;/' \
- build/gtk2_ardour/ardour${SLOT}.desktop || die
- domenu build/gtk2_ardour/ardour${SLOT}.desktop
-
- insinto /usr/share/mime/packages
- newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- elog "Please do _not_ report problems with the package to ${PN}
upstream."
- elog "If you think you've found a bug, check the upstream binary
package"
- elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-7.2.ebuild
b/media-sound/ardour/ardour-7.2.ebuild
deleted file mode 100644
index 2fb765891251..000000000000
--- a/media-sound/ardour/ardour-7.2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop
xdg
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/";
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git";
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
-
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2";
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="7"
-IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec
cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
- dev-cpp/glibmm:2
- dev-cpp/gtkmm:2.4
- dev-libs/boost:=
- dev-libs/glib:2
- dev-libs/libsigc++:2
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac:=
- media-libs/freetype:2
- media-libs/libart_lgpl
- media-libs/liblo
- media-libs/liblrdf
- media-libs/libsamplerate
- media-libs/libsndfile
- media-libs/libsoundtouch
- media-libs/raptor:2
- media-libs/rubberband
- media-libs/taglib
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sys-libs/readline:0=
- sci-libs/fftw:3.0[threads]
- virtual/libusb:1
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/pango
- jack? ( virtual/jack )
- pulseaudio? ( media-sound/pulseaudio )
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- media-libs/suil[gtk2]
- media-libs/lv2"
-# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to
be able to unbundle...
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/itstool
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )
- jack? ( virtual/jack )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.8-metadata.patch"
-)
-
-pkg_pretend() {
- [[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] ||
has_version sci-libs/fftw[threads]) && \
- ewarn "Linking with gold linker might produce broken
executable, see bug #733972"
-}
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- xdg_src_prepare
-
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\
\'\','/' -i "${S}"/wscript || die
- MARCH=$(get-flag march)
- OPTFLAGS=""
- if use cpu_flags_x86_sse; then
- if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
- elog "You enabled sse but use an march that does not
support sse!"
- elog "We add -msse to the flags now, but please
consider switching your march in make.conf!"
- fi
- OPTFLAGS="sse"
- fi
- if use cpu_flags_x86_mmx; then
- if [[ ${MARCH} == "i486" ]]; then
- elog "You enabled mmx with i486 set as march! You have
been warned!"
- fi
- OPTFLAGS="${OPTFLAGS} mmx"
- fi
- if use cpu_flags_x86_3dnow; then
- OPTFLAGS="${OPTFLAGS} 3dnow"
- fi
- sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some
place holders\"/' \
- -i "${S}"/wscript || die
- sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
- 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
- }
- plocale_for_each_disabled_locale my_lcmsg
-}
-
-src_configure() {
- # avoid bug https://bugs.gentoo.org/800067
- local -x AS="$(tc-getCC) -c"
-
- local backends="alsa,dummy"
- use jack && backends+=",jack"
- use pulseaudio && backends+=",pulseaudio"
-
- tc-export CC CXX
- mkdir -p "${D}"
- local myconf=(
- --configdir=/etc
- --freedesktop
- --noconfirm
- --optimize
- --with-backends=${backends}
- $({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } &&
echo "--fpu-optimization" || echo "--no-fpu-optimization")
- $(usex doc "--docs" '')
- $(usex nls "--nls" "--no-nls")
- $(usex phonehome "--phone-home" "--no-phone-home")
- # not possible right now --use-external-libs
- )
-
- waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
- waf-utils_src_compile
- use nls && waf-utils_src_compile i18n
-}
-
-src_install() {
- local s
-
- waf-utils_src_install
-
- mv ${PN}.1 ${PN}${SLOT}.1 || die
- doman ${PN}${SLOT}.1
-
- for s in 16 22 32 48 256 512; do
- newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png
ardour${SLOT}.png
- done
-
- # the build system still installs ardour6.png files so we get rid of
those to not conflict with ardour:6
- find "${D}/usr/share/icons/" -name ardour6.png -delete
-
- sed -i \
- -e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
- -e 's/;AudioEditing;/;X-AudioEditing;/' \
- build/gtk2_ardour/ardour${SLOT}.desktop || die
- domenu build/gtk2_ardour/ardour${SLOT}.desktop
-
- insinto /usr/share/mime/packages
- newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- elog "Please do _not_ report problems with the package to ${PN}
upstream."
- elog "If you think you've found a bug, check the upstream binary
package"
- elog "before you report anything to upstream."
-}
