gentoo resync : 13.11.2021

4 files changed, 16 insertions, 156 deletions

diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 43d1583d95fc..eb7b08913be1 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,7 +1,4 @@
-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
 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-r1.ebuild 3015 BLAKE2B ff38cc0a9fb149936c7291ed7cd6175acca20a5a0ddff1ad4a80b0b8074ad3a33eb87b3886dd333d230692c685848b68f2ebd7579d549482708bfe208f8e8bc2 SHA512 a4dcd5608ccc2ab5459bc9f6cb0c2f9b2e9362735de26a064ad0b0ab3daa4ddd403f3bc7a0374cf1c533fc18502576ea4835d22faf2f56043bc8a54eb265f7ee
 EBUILD denemo-2.5.0.ebuild 2876 BLAKE2B 00d1a90e577ba541e15a9a71b5f5c377ab065fefabec6e5d6078b7449e6c3ed39f4bdfaf61f1cdfdb4939717b61e8332327130cb0212f50a45411976fb28d731 SHA512 7bf2b042085591775e8accce5522827bfbd714ce776a27a6f94760a10bcf56fefba770e4f04d5bdde758d1f989e3d02c77c58aa3fac496d8f12ac84a58c6e2a8
 MISC metadata.xml 1305 BLAKE2B b6e58a60c832879cfe3fa5d8fe3af73fdcc698b43b139e1063f20170d051023a00c076d7b618fbc04eb88b4ea113cab5ab97d68df39d6a56a2d81b5490ddfdcd SHA512 301c335b2abd0abadfec0c9ca4904fd3e56ab71b1abb84b632e81591485ad9cabf8c5abcb68f4e106ee4e9f2769737f0d1ab67d7fe0331e83f96897c08f840bd
diff --git a/media-sound/denemo/denemo-2.3.0-r1.ebuild b/media-sound/denemo/denemo-2.5.0-r1.ebuild
index 8c30d94ce54e..11db5633d214 100644
--- a/media-sound/denemo/denemo-2.3.0-r1.ebuild
+++ b/media-sound/denemo/denemo-2.5.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools xdg
+inherit autotools font xdg
 
 DESCRIPTION="A music notation editor"
 HOMEPAGE="http://www.denemo.org/"
@@ -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
@@ -30,7 +30,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
 	x11-libs/gtk+:3
 	x11-libs/gtksourceview:3.0=
 	alsa? ( >=media-libs/alsa-lib-1.1.2 )
@@ -44,9 +44,7 @@ RDEPEND="
 	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
@@ -59,11 +57,6 @@ BDEPEND="
 
 DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
 
-PATCHES=(
-	"${FILESDIR}/${P}-0001-configure.ac-patch-to-find-guile-2.2.patch"
-	"${FILESDIR}/${P}-0002-Fix-issues-with-gcc10-fno-common-flag.patch"
-)
-
 src_prepare() {
 	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die
 	sed -e 's|appdatadir = \$(datarootdir)/appdata|appdatadir = \$(datarootdir)/metainfo|' \
@@ -85,6 +78,7 @@ src_configure() {
 		--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
@@ -97,6 +91,7 @@ src_configure() {
 		$(use_enable portaudio)
 		$(use_enable portmidi)
 		$(use_enable rubberband)
+		$(use_enable test always-build-tests)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -116,3 +111,13 @@ src_install() {
 		dosym ../../../denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
 	done
 }
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	font_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
deleted file mode 100644
index 982ccfade868..000000000000
--- a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 9a515060df9024ef64bce2055fd3f2ceada5efa8 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 14 Aug 2019 13:51:32 +0200
-Subject: [PATCH] configure.ac: patch to find guile-2.2
-
-The patch uses the GUILE_PKG command to find any installed
-version of guile instead of explicitly checking for guile-1.8
-and guile-2.0 but missing guile-2.2.
-This patch was already provided to upstream with denemo-2.2, but
-didn't yet get accepted due to not being able to compile the
-Windows version with this patch (cf. http://savannah.gnu.org/bugs/?54821)
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- configure.ac | 41 +++--------------------------------------
- 1 file changed, 3 insertions(+), 38 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f85b74e..1fc0af0 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
- 
-@@ -63,44 +66,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 >= 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"
--- 
-2.22.0
-
diff --git a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch b/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch
deleted file mode 100644
index 425662e042c9..000000000000
--- a/media-sound/denemo/files/denemo-2.3.0-0002-Fix-issues-with-gcc10-fno-common-flag.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 54075086a5b7acceef6dff41e19148778e285475 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 20 Mar 2020 21:03:02 +0100
-Subject: [PATCH] Fix issues with gcc10 -fno-common flag
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- include/denemo/denemo_types.h | 7 ++++---
- src/export/print.h            | 6 +++---
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/include/denemo/denemo_types.h b/include/denemo/denemo_types.h
-index 1d67827..936892b 100644
---- a/include/denemo/denemo_types.h
-+++ b/include/denemo/denemo_types.h
-@@ -430,7 +430,7 @@ typedef enum{
- } SCRIPT_TYPE;
- 
- //index of columns in the keymap command list store FIXME if you add columns you must add them in allocate_keymap !!!!
--enum
-+typedef enum
- {
-   COL_TYPE = 0,
-   COL_NAME,
-@@ -1167,7 +1167,7 @@ struct cs_callback
-  * The (singleton) root object for the program
-  *
-  */
--struct DenemoRoot
-+typedef struct DenemoRoot
- {
-   gboolean non_interactive; /* if TRUE denemo should not display project, receive or send sounds etc*/
-   gchar *scheme_file;/* filename for scheme code to run on startup */
-@@ -1258,6 +1258,7 @@ struct DenemoRoot
-   gboolean *silent; /** Don't log any message */
-   gboolean *verbose; /** Display every messages */
-   guint pending_layout_id;//Non zero when the current layout being created will be renamed to have this id 
--}  Denemo; /**< The root object. */
-+};
-+extern struct DenemoRoot Denemo; /**< The root object. */
- 
- #endif
-diff --git a/src/export/print.h b/src/export/print.h
-index db0c8f1..64a3a8d 100644
---- a/src/export/print.h
-+++ b/src/export/print.h
-@@ -108,9 +108,9 @@ typedef struct WysiwygInfo
-   GtkWidget *dialog;            //an info dialog to tell the user what to do next...
- } WysiwygInfo;
- 
--gint LilyPond_stderr;       //A file descriptor to pipe for LilyPond's stderr
--GError *lily_err;
--GPid previewerpid;
-+extern gint LilyPond_stderr;       //A file descriptor to pipe for LilyPond's stderr
-+extern GError *lily_err;
-+extern GPid previewerpid;
- 
- WysiwygInfo* get_wysiwyg_info();
- void initialize_print_status (void);
--- 
-2.25.1
-