gentoo resync : 17.02.2020

6 files changed, 5 insertions, 227 deletions

diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 9110f33a218b..e5eda3c19498 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,8 +1,4 @@
-AUX denemo-2.2.0-find-guile-2.2.patch 1667 BLAKE2B e8a3de848748888c2534d5515ad08945489d482365690b346568b79c1553f04eaf12990bcc32e1c6a955fe342bcd7dec6bd00b906448f1cb8d18c59c2f69bd22 SHA512 09f999ccd4b0729029ba95644c7c9070cbf94dde87b6c85d8c96e5db5f37d248936b9f0d682cf6bd0479b8b869d45ef5b2b91e83203fedc66f4896dc389cccd6
-AUX denemo-2.2.0-no-portaudio-fix.patch 842 BLAKE2B f832666fe59970efee9e8fee090ec8e4d7be20c17d83a6c5143d5e0153b2eb458d7467e4d41b29fb0681480b9261e6cfae62bbaa870c15e1988de00e5bb1c484 SHA512 5327119813e734308e874392297fdf6d9b462be13d34df01f4e97c529c0c4140c3b3ae7ee06c53c2adadf307d4c60e14417a154226176b664fc26bba12028c4c
 AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d29bf9a7792a4b212124985367c8cf1c6ae5d71682e4474a3ebe1c8c9602565ba4b908156d4bdd4db2b2745c627903034a5f7f74cdecfad4b106b4685e8bddef SHA512 6fc4ece49940d0f4beaecd0c2f218516e0bac14979fbce1ad25454b5075fc5eb29873c93ff3930c7e6214643a47bbe55408ad258859f973a0b5717b67456340f
-DIST denemo-2.2.0.tar.gz 17032009 BLAKE2B 66732fcdaa5d5119ca2a45e5a8c6829e05092a4f0e18e3c8a991bddaaf863ea05889654af47150650d2c67397afa957de0fc3ce0ada86a22be00ae91d4add993 SHA512 74bef7b888abd86db42cee7ecb404e1b9211f9965207366c99980137194acd2afa6ec8b1c18da8a12fe4c6951d8a1bb873b313f5749ea629bb7eaeedf12368ef
 DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
-EBUILD denemo-2.2.0.ebuild 2930 BLAKE2B 65c16eb446dbeb906ce8fa5f3190bf3f62c0e4b8647a76937720fb5251028d66d34399cb6b759742895f6979e46ec97703eaedc5d6ee027469886b4487b7b39a SHA512 73ac587a3c715b27bbe04ad2ee6e66c538ec08f6a64c860adb9a102d6fc3627a22184fae20453530b2ea8e5c9a191a97bcdc6a403ad8ca6f5b82280d6b6bc172
-EBUILD denemo-2.3.0.ebuild 2958 BLAKE2B e45c620cc93f7d1123a506bbb516ac7f844388b28db04aa9094ec98c654df9f9b231e0fff1a2fc146682a6aa216e2bfc8cf3b5e34ea8f60d90220a5208c97a05 SHA512 44922d8c7b25fc889b69d7222e827baffe589ca3782e82bf574a9608dc1a15578ec771ab5e571dc422dd1c9f370ed2d6c95d6a968dba6719efd81d1e656f0a55
-MISC metadata.xml 1587 BLAKE2B b20d6c43ea998e867ac1fbb84faab58cf3901b40700b36485d9de57336b8616117bae28e712b061dc49a80c9b27637b43a6b08d01535597ad7cf4d5a935dc72d SHA512 f14e3e591bc4824b8a9a872e3574a2e5e73a70451a02d85c021ff77eddc9034c6eac1238c968ee637fa5bb9fc4f98d71486be379faede67b462818534b392ecd
+EBUILD denemo-2.3.0.ebuild 2962 BLAKE2B b3cab27ecbb001c35a93fe9225a1d778125a18cf4b82787d17959370fa0d2e234dc20eb12f9f2aa544a9d099eb600eb8bbffee55d5cdc2f72cb71071a1fe792e SHA512 2daf481bcbac2735522e1cf5fbe268d907966e9bde112f0796b9aeea7ea544cd1ce3991db893bfcea2a377e7571c4ff7e2c552277bd96adbf3175d7cd3a93cf9
+MISC metadata.xml 1487 BLAKE2B 96c335a8a2e921a46b17865102aac97d3535e1e282817ab28acfaf2708547ca16fbf31fa197930212be7acd81da8db292f808178318ee8ee54a9613a671eb080 SHA512 59a4a47df129dcd13b2694e737492f64abfb8fdc056ac0cd284d9e023ca40ac17e80552324fe784d9adcad82b1ac057b78f525593bd1601fdabcbdbed3556d3c
diff --git a/media-sound/denemo/denemo-2.2.0.ebuild b/media-sound/denemo/denemo-2.2.0.ebuild
deleted file mode 100644
index be5092be45e3..000000000000
--- a/media-sound/denemo/denemo-2.2.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools xdg-utils
-
-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 +evince doc jack +fluidsynth +gtk3 nls +portaudio
-	+portmidi +rubberband static test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	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[guile2]
-	alsa? ( >=media-libs/alsa-lib-1.1.2 )
-	aubio? ( >=media-libs/aubio-0.4.1-r1 )
-	evince? ( >=app-text/evince-3.22.1-r1:= )
-	fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1 )
-	gtk3? (
-		x11-libs/gtk+:3
-		x11-libs/gtksourceview:3.0=
-	)
-	!gtk3? (
-		x11-libs/gtk+:2
-		x11-libs/gtksourceview:2.0
-	)
-	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}
-	>=dev-util/intltool-0.51.0-r1
-	>=sys-devel/flex-2.6.1
-	virtual/pkgconfig
-	virtual/yacc
-	doc? ( >=dev-util/gtk-doc-1.25-r1 )
-	nls? ( >=sys-devel/gettext-0.19.8.1 )"
-
-REQUIRED_USE="
-	evince? ( gtk3 )
-"
-
-DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
-
-PATCHES=(
-	"${FILESDIR}/${P}-no-portaudio-fix.patch"
-	"${FILESDIR}/${P}-find-guile-2.2.patch"
-)
-
-src_prepare() {
-	sed -i -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' pixmaps/denemo.desktop || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		--disable-gtk-doc-pdf
-		--disable-installed-tests
-		--disable-mem
-		--disable-rpath
-		--enable-x11
-		$(use_enable alsa)
-		$(use_enable aubio)
-		# --enable-doc does nothing for itself
-		$(use_enable doc)
-		$(use_enable doc gtk-doc)
-		$(use_enable doc gtk-doc-html)
-		$(use_enable evince)
-		$(use_enable fluidsynth)
-		$(use_enable jack)
-		$(use_enable nls)
-		$(use_enable portaudio)
-		$(use_enable portmidi)
-		$(use_enable rubberband)
-		$(use_enable static)
-		$(usex gtk3 --enable-gtk3 --enable-gtk2)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# make check fails if used with parallel builds
-	emake -j1 check
-}
-
-src_install() {
-	DESTDIR="${D}" emake install
-	einstalldocs
-
-	# link html documentation installed in /usr/share/denemo
-	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
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/denemo/denemo-2.3.0.ebuild b/media-sound/denemo/denemo-2.3.0.ebuild
index 08918be3f6da..fd5f1f3e4df7 100644
--- a/media-sound/denemo/denemo-2.3.0.ebuild
+++ b/media-sound/denemo/denemo-2.3.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools xdg
 
 DESCRIPTION="A music notation editor"
@@ -28,7 +29,7 @@ RDEPEND="
 	media-libs/fontconfig:1.0
 	>=media-libs/libsmf-1.3
 	>=media-libs/libsndfile-1.0.28-r1
-	>=media-sound/lilypond-2.19.54[guile2]
+	>=media-sound/lilypond-2.19.54[guile2(+)]
 	alsa? ( >=media-libs/alsa-lib-1.1.2 )
 	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
 	evince? ( >=app-text/evince-3.22.1-r1:= )
diff --git a/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch
deleted file mode 100644
index d69edb0173d5..000000000000
--- a/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 4bb3afa..9c146ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,10 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_YACC
- AM_PROG_LEX
-+GUILE_PKG
- GUILE_FLAGS
-+CFLAGS="$CFLAGS $GUILE_CFLAGS"
-+LIBS="$LIBS $GUILE_LIBS"
- 
- AC_PROG_LIBTOOL
- 
-@@ -40,44 +43,6 @@ AS_COMPILER_FLAG([-fdiagnostics-color=auto],
- 
- AM_CONDITIONAL(ENABLE_GLIB_TEST, [test "x$enable_glibtest" = "xyes"])
- 
--AC_ARG_ENABLE(
--  guile_1_8,
--  AS_HELP_STRING([--enable-guile_1_8], [use GUILE_1_8 @<:@default=no@:>@]),
--  [
--    if test "x$enableval" != "xno"; then
--      useguile_1_8=yes
--      PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
--      LIBS="$LIBS $GUILE_1_8_LIBS"
--      CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
--    fi
--  ], [ useguile_1_8=no ])
--
--AC_ARG_ENABLE(
--  guile_2_0,
--  AS_HELP_STRING([--enable-guile_2_0], [use GUILE_2_0 @<:@default=no@:>@]),
--  [
--    if test "x$enableval" != "xno"; then
--      useguile_2_0=yes
--      PKG_CHECK_MODULES([GUILE_2], [guile-2.0])
--      LIBS="$LIBS $GUILE_2_LIBS"
--      CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
--    fi
--  ], [ useguile_2_0=no ])
--
--if [test "x$useguile_1_8" = "xno"] && [test "x$useguile_2_0" = "xno"]; then
--  PKG_CHECK_MODULES([GUILE_2], [guile-2.0], useguile_2_0=yes, useguile_2_0=no)
--  LIBS="$LIBS $GUILE_2_LIBS"
--  CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
--  if test "x$useguile_2_0" = "xno"; then
--    PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
--    LIBS="$LIBS $GUILE_1_8_LIBS"
--    CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
--    useguile_1_8=yes
--  else
--    useguile_2_0=yes
--  fi
--fi
--
- PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30])
- CFLAGS="$CFLAGS $GLIB_CFLAGS"
- LIBS="$LIBS $GLIB_LIBS"
diff --git a/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch b/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch
deleted file mode 100644
index a4aa60909de2..000000000000
--- a/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2e3c3b974e3e27873841c0ad9a05537a682e85f5 Mon Sep 17 00:00:00 2001 
-From: Richard Shann <richard@rshann.plus.com> 
-Date: Sat, 30 Dec 2017 15:32:35 +0000 
-Subject: [PATCH 1/2] Fix bug #52741: Can't build with --disable-portaudio 
-
---- 
-src/audio/midi.c | 7 +++++++ 
-1 file changed, 7 insertions(+) 
-
-diff --git a/src/audio/midi.c b/src/audio/midi.c 
-index 55683cfe3..71c5df2cd 100644 
---- a/src/audio/midi.c 
-+++ b/src/audio/midi.c 
-@@ -29,6 +29,13 @@ 
- 
- #define SHAVING (0.01) //seconds to shave off a note start time to ensure stopping before noteon is sent, and starting with noteon first note may depend of speed of machine??? FIXME 
- 
-+#ifndef _HAVE_PORTAUDIO_ 
-+gdouble get_playback_speed (void) 
-+{ 
-+ return 1.0; 
-+} 
-+void set_playback_speed (double speed) {} 
-+#endif 
- 
- static volatile gboolean playing = FALSE; 
- 
--- 
-2.11.0
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index ef9a91fa02d7..b94e07a77366 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/metadata.xml
@@ -20,9 +20,6 @@
 	<flag name="aubio">
 		Enable <pkg>media-libs/aubio</pkg> support
 	</flag>
-	<flag name="doc">
-		Use <pkg>dev-util/gtk-doc</pkg> to build documentation in html format
-	</flag>
 	<flag name="evince">
 		Use <pkg>app-text/evince</pkg> document viewer
 	</flag>