gentoo resync : 28.04.2021

3 files changed, 118 insertions, 3 deletions

diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 7d5fb4509627..4e91eb389b94 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,5 +1,7 @@
 AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d29bf9a7792a4b212124985367c8cf1c6ae5d71682e4474a3ebe1c8c9602565ba4b908156d4bdd4db2b2745c627903034a5f7f74cdecfad4b106b4685e8bddef SHA512 6fc4ece49940d0f4beaecd0c2f218516e0bac14979fbce1ad25454b5075fc5eb29873c93ff3930c7e6214643a47bbe55408ad258859f973a0b5717b67456340f
 AUX denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch 2103 BLAKE2B ebb91ff4df71ec412ff881cc2443c7a071ef105ba180ec72dcf61cdd5d5fb97070deb9b9a73e49a133e746a9c159a6ff8c93640784047a5792a97ceae674aed1 SHA512 74f02aa8801ded5bf1c33f7bfeb38db258ba924241e72be05c5e7784538f0eb4d72a88e0b810b5b8b1c96e95d27b135b6fcf3fea8f7a9ebcd9ee0652e3b6560f
 DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
-EBUILD denemo-2.3.0-r1.ebuild 2979 BLAKE2B ef184232adff0cc1119acc79244b8637a8ccc39953bb93018078595a286618e88f787c9e2ca69da31c81af9c310a602d12843b44cc04486e0a9c905106f64d99 SHA512 7ed1ef229552d8d279bee4207563446ab6915f7033565c6149ed92e9097ec81d89afcf0db6dfb77fc7372bd7eb9517126d8b0ed97c8e61ac82eae3d4352ae6f2
+DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f5709a70b7b7a2847264191fc1f66b62b312a85984a01d6a0c265fdc55492b9f1ce5d7680bfccd8ec44919bfa177f SHA512 9b9edaf02b243bc5ed9680ea998a6ee78e5167e395f4805ee8ceffad709c95eb964dcede69a039080fde4e9720e880a13f23c13bd4bd22266eb2352912f49c1e
+EBUILD denemo-2.3.0-r1.ebuild 2977 BLAKE2B 636fe2171f0047f4377ea349059e5222b47da692e18b10aab44ffa7f8c37218136f0b4654304284cb2e8f2de3d6234ba7a4ee626cc7afe277fb0b22880d209a3 SHA512 ba1f78313cf50f77cab4923dd11b160aae49d15de9295db7c185d2bab070a20e26ab48b6379aaaf6d121339d165edba9a7cb5c17d2032b43737e2c614221e4f6
+EBUILD denemo-2.5.0.ebuild 2878 BLAKE2B ca4fcff445b067bcd7aaefe778452077561a3668b337f065cd9e9eec4fa570a92c7fcef16983007f1b5c03912f30a485f48e4c65dd952b7f26717e941a511069 SHA512 388671d79d87fdea16da2760d71bfdf727178fdf3907c627aa8b52c39176017f4a042eea4f5fe3dd48760ef77049afa66e3b8d249578f62335b745bfbe71e4be
 MISC metadata.xml 1304 BLAKE2B c2d8fec0a0692500d9ca52e8380a3e0c81a3ee31505c06d648521a78d1bcdc2066d251f972c0e12c893439d0d3b093766c1954f2cc7c127edaf4dcfade79408b SHA512 67fecffa9ac7a3078447c7dd32a8caae6eb531e9c9c6b29d42802d72c2f2e5ca3de3bfd0d5a23eac3aff720b366377c1cff355da02672ddca448842b5aff8fe0
diff --git a/media-sound/denemo/denemo-2.3.0-r1.ebuild b/media-sound/denemo/denemo-2.3.0-r1.ebuild
index 4924eed28572..8c30d94ce54e 100644
--- a/media-sound/denemo/denemo-2.3.0-r1.ebuild
+++ b/media-sound/denemo/denemo-2.3.0-r1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # configure options currently not used:
 # --enable-mem(no) memory debugging: needs Electric fence (efence), which
diff --git a/media-sound/denemo/denemo-2.5.0.ebuild b/media-sound/denemo/denemo-2.5.0.ebuild
new file mode 100644
index 000000000000..12395aa35c66
--- /dev/null
+++ b/media-sound/denemo/denemo-2.5.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# configure options currently not used:
+# --enable-mem(no) memory debugging: needs Electric fence (efence), which
+#		is not available in portage. See https://github.com/boundarydevices/efence
+# --enable-gtk-doc-pdf(no) doesn't work
+IUSE="alsa +aubio debug jack +fluidsynth gtk-doc nls +portaudio +portmidi
+	+rubberband test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/evince-3.22.1-r1:=
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-2:12=
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	>=media-libs/libsndfile-1.0.28-r1
+	>=media-sound/lilypond-2.19.54
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0=
+	alsa? ( >=media-libs/alsa-lib-1.1.2 )
+	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= )
+	jack? ( virtual/jack )
+	portaudio? (
+		>=media-libs/portaudio-19_pre20140130
+		sci-libs/fftw:3.0=
+	)
+	portmidi? ( >=media-libs/portmidi-217-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/gtk-doc-am-1.25-r1
+	>=dev-util/intltool-0.51.0-r1
+	>=sys-devel/flex-2.6.1
+	virtual/pkgconfig
+	virtual/yacc
+	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	nls? ( >=sys-devel/gettext-0.19.8.1 )
+"
+
+DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die
+	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
+		-i Makefile.am || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--disable-gtk-doc-pdf
+		--disable-gtk2
+		--disable-installed-tests
+		--disable-mem
+		--disable-rpath
+		--disable-static
+		--enable-evince
+		--enable-gtk3
+		--enable-x11
+		$(use_enable alsa)
+		$(use_enable aubio)
+		$(use_enable debug)
+		# --enable-doc does nothing for itself
+		# basic html documentation is always being installed in the
+		# /usr/share/denemo/manual directory
+		$(use_enable gtk-doc doc)
+		$(use_enable gtk-doc gtk-doc)
+		$(use_enable gtk-doc gtk-doc-html)
+		$(use_enable fluidsynth)
+		$(use_enable jack)
+		$(use_enable nls)
+		$(use_enable portaudio)
+		$(use_enable portmidi)
+		$(use_enable rubberband)
+		$(use_enable test always-build-tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# make check fails if used with parallel builds
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	# link html documentation installed in /usr/share/denemo/manual
+	dodir /usr/share/doc/${PF}/html
+	local f
+	for f in denemo-manual.html denemo.css images; do
+		dosym ../../../denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
+	done
+}