gentoo resync : 02.02.2022

3 files changed, 3 insertions, 117 deletions

diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index eb7b08913be1..b039de4a03ac 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,4 +1,3 @@
 DIST denemo-2.5.0.tar.gz 17454004 BLAKE2B 66e2b35fc73819f40c0376150c42d135840f5709a70b7b7a2847264191fc1f66b62b312a85984a01d6a0c265fdc55492b9f1ce5d7680bfccd8ec44919bfa177f SHA512 9b9edaf02b243bc5ed9680ea998a6ee78e5167e395f4805ee8ceffad709c95eb964dcede69a039080fde4e9720e880a13f23c13bd4bd22266eb2352912f49c1e
-EBUILD denemo-2.5.0-r1.ebuild 3015 BLAKE2B ff38cc0a9fb149936c7291ed7cd6175acca20a5a0ddff1ad4a80b0b8074ad3a33eb87b3886dd333d230692c685848b68f2ebd7579d549482708bfe208f8e8bc2 SHA512 a4dcd5608ccc2ab5459bc9f6cb0c2f9b2e9362735de26a064ad0b0ab3daa4ddd403f3bc7a0374cf1c533fc18502576ea4835d22faf2f56043bc8a54eb265f7ee
-EBUILD denemo-2.5.0.ebuild 2876 BLAKE2B 00d1a90e577ba541e15a9a71b5f5c377ab065fefabec6e5d6078b7449e6c3ed39f4bdfaf61f1cdfdb4939717b61e8332327130cb0212f50a45411976fb28d731 SHA512 7bf2b042085591775e8accce5522827bfbd714ce776a27a6f94760a10bcf56fefba770e4f04d5bdde758d1f989e3d02c77c58aa3fac496d8f12ac84a58c6e2a8
+EBUILD denemo-2.5.0-r1.ebuild 3013 BLAKE2B 4b9ebe4683231ea9413273cd90b0d5d2e6bd83c0a64d1424105e5040a73edc0438222989e6efcebe2b5b91d876f24513129cadcb2e3885851ad82cba05b9a45f SHA512 83802cb91d236f0a2d032adff6dbd43f5602a3c0421f5284e5d3322cd0bb5c9daeae710bdaec8b20779aa490e433432d50c2981981d696a19d139cb65940dd13
 MISC metadata.xml 1305 BLAKE2B b6e58a60c832879cfe3fa5d8fe3af73fdcc698b43b139e1063f20170d051023a00c076d7b618fbc04eb88b4ea113cab5ab97d68df39d6a56a2d81b5490ddfdcd SHA512 301c335b2abd0abadfec0c9ca4904fd3e56ab71b1abb84b632e81591485ad9cabf8c5abcb68f4e106ee4e9f2769737f0d1ab67d7fe0331e83f96897c08f840bd
diff --git a/media-sound/denemo/denemo-2.5.0-r1.ebuild b/media-sound/denemo/denemo-2.5.0-r1.ebuild
index 11db5633d214..5809bf4bd0fa 100644
--- a/media-sound/denemo/denemo-2.5.0-r1.ebuild
+++ b/media-sound/denemo/denemo-2.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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
deleted file mode 100644
index 76409b2502ec..000000000000
--- a/media-sound/denemo/denemo-2.5.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# 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
-}