gentoo auto-resync : 14:07:2022 - 13:40:00

7 files changed, 184 insertions, 40 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 699594844aa0..4a57ef3938e4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 154a2a1d7168..96362631e11b 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,4 +1,7 @@
 AUX mup-6.6-makefile.patch 2563 BLAKE2B 32f32af677b83ef0889c073d0cde368c3119ef7b654531cf407a6d8796c374d78979e56095d7ce3f68ee037e0a3b3205147366b12909bac70a8d64a5c6b04ec8 SHA512 d6609bc8ee5d327bb1252d5d536b9bd5f67e58add6552fbc63456a9773eeff6c5fff2029ad754b48cc8539a001fdd6bffd74368e8e1e7085e83ea7247eb87251
+AUX mup-6.9-build-system.patch 6205 BLAKE2B f944b6dab3d206dc5fae2c5f08c36bc24310094c5cf9f7ab15098a2ace87d2bb5863eb08f254d0c2e34d0ec2e1c3eaf18f7e6e0161f6829b74fd56d1edbfd7bd SHA512 3a26e09748e89857a8f30c7b3d0fc567e46cb7494148467cac491cc0ccea4aaef25bc7364fe808931000321489a09101d357d996daa24b477c693b4e4b20a329
 DIST mup66src.tar.gz 2514430 BLAKE2B d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb SHA512 3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
+DIST mup69src.tar.gz 3062560 BLAKE2B cb7456fe52f85a122106675372a5ffabe9466086e730cbb15dbb590ea2485ecfc34e52d8b8c7c3a583d98e4e8e352be07a203e41da38cd145adf11cdf59bad92 SHA512 b3b49177e12b6a8dbd711e88a327826b60e4141a0720c1be4900af2124ac29592572d866d98f2a5b8318fb008fb035371ad83f152601bf22d98a3e7568ecfe95
 EBUILD mup-6.6.ebuild 905 BLAKE2B f3b807f60097085b05c04689fda392c2b1967ac604cd6884ead3a27356785f58ec78881191b02376af667b24f38cffeceb2e1a04036fdf2099dcf29d279bb68f SHA512 140c359ef8440ee3e88a25fb83f5004f3610abb4ee6bfbf5fcc2f9cca08e4ceb0fd3fdc27675571c34bf77789b0ea4c94d3a667dd09190130ccab7e579cdca02
+EBUILD mup-6.9.ebuild 950 BLAKE2B 8bef011a1927b72ab08c19bee523ed7367d7e85b5341ca81c4ab26750a46453825e6777ca791576bf6f03a9312745a87078e448224b9a1c167a8f6be65aa24fe SHA512 b884343f448468de498ac966e6e072e280534fa9bcb867ba4a1be00e00d1c14042a857cff6eeb82dbf06c1ce3e76b80c7756081db908337c1089b01aac633bac
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/mup/files/mup-6.9-build-system.patch b/media-sound/mup/files/mup-6.9-build-system.patch
new file mode 100644
index 000000000000..07a7dba237bf
--- /dev/null
+++ b/media-sound/mup/files/mup-6.9-build-system.patch
@@ -0,0 +1,125 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,2 @@
+ SUBDIRS = lib tools src doc mup-input packaging
+-EXTRA_DIST = LICENSE simple.makefile
+-mup_doc_dir = $(datadir)/doc/packages/$(PACKAGE)
+-mup_doc__DATA = LICENSE
++EXTRA_DIST = simple.makefile
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@
+ 
+ AC_PREREQ([2.69])
+ AC_INIT([mup], [6.9], [support@arkkra.com])
+-AM_INIT_AUTOMAKE([-Wall -Werror])
++AM_INIT_AUTOMAKE([-Wall])
+ 
+ # Checks for programs.
+ AC_PROG_CXX
+@@ -16,21 +16,21 @@ AC_PROG_SED
+ AC_PROG_MKDIR_P
+ 
+ AC_PATH_PROGS(GS, [gs gs386], [none])
+-test "$GS" == "none" && AC_MSG_ERROR([required ghostscript program 'gs' is missing])
++test "$GS" = "none" && AC_MSG_ERROR([required ghostscript program 'gs' is missing])
+ AC_PATH_PROG(GROFF, [groff], [none])
+-test "$GROFF" == "none" && AC_MSG_ERROR([required program 'groff' is missing])
++test "$GROFF" = "none" && AC_MSG_ERROR([required program 'groff' is missing])
+ AC_PATH_PROG(BISON, [bison], [none])
+-test "$BISON" == "none" && AC_MSG_ERROR([required program 'bison' is missing])
++test "$BISON" = "none" && AC_MSG_ERROR([required program 'bison' is missing])
+ AC_PATH_PROG(PPMTOGIF, [ppmtogif], [none])
+-test "$PPMTOGIF" == "none" && AC_MSG_ERROR([required program 'ppmtogif' is missing])
++test "$PPMTOGIF" = "none" && AC_MSG_ERROR([required program 'ppmtogif' is missing])
+ AC_PATH_PROG(EXPR, [expr], [none])
+-test "$EXPR" == "none" && AC_MSG_ERROR([required program 'expr' is missing])
++test "$EXPR" = "none" && AC_MSG_ERROR([required program 'expr' is missing])
+ AC_PATH_PROG(SORT, [sort], [none])
+-test "$SORT" == "none" && AC_MSG_ERROR([required program 'sort' is missing])
++test "$SORT" = "none" && AC_MSG_ERROR([required program 'sort' is missing])
+ AC_PATH_PROG(CAT, [cat], [none])
+-test "$CAT" == "none" && AC_MSG_ERROR([required program 'cat' is missing])
++test "$CAT" = "none" && AC_MSG_ERROR([required program 'cat' is missing])
+ AC_PATH_PROG(EGREP, [egrep], [none])
+-test "$EGREP" == "none" && AC_MSG_ERROR([required program 'egrep' is missing])
++test "$EGREP" = "none" && AC_MSG_ERROR([required program 'egrep' is missing])
+ 
+ # Need to know if on Windows to install mupprnt.bat rather than shell script
+ AC_CANONICAL_HOST
+@@ -70,7 +70,7 @@ AS_IF([test "x$enable_mupmate" != xno],
+ 	# Find fltk-config program
+ 	PATH="$fltk_prefix/bin:$PATH"
+ 	AC_PATH_PROG(FLTK_CONFIG, fltk-config, none, $PATH)
+-	test "$FLTK_CONFIG" == "none" && AC_MSG_ERROR([required program 'fltk-config' is missing])
++	test "$FLTK_CONFIG" = "none" && AC_MSG_ERROR([required program 'fltk-config' is missing])
+ 	# Make sure it is the 1.x API, not 2.x
+ 	fltk_api_version="`$FLTK_CONFIG --api-version`"
+ 	fltk_api_major=`echo $fltk_api_version | sed -e 's/\..*//'`
+@@ -79,13 +79,13 @@ AS_IF([test "x$enable_mupmate" != xno],
+ 	AC_SUBST([FLTK_CXXFLAGS], [`$FLTK_CONFIG --cxxflags`])
+ 	# Red Hat/CentOS 7 version of fltk-config doesn't include -lfltk when using --use_image --ldflags, so fix that
+ 	fltk_ldflags="`$FLTK_CONFIG --use-images --ldflags`"
+-	if test "$fltk_ldflags" == "-lfltk_images"
++	if test "$fltk_ldflags" = "-lfltk_images"
+ 	then
+ 		AC_SUBST([FLTK_LDFLAGS], ["-lfltk -lfltk_images"])
+ 	else
+ 		AC_SUBST([FLTK_LDFLAGS], [`$FLTK_CONFIG --use-images --ldflags`])
+ 	fi
+-	test "$build_mac" == "yes" && AC_SUBST([EXTRA_CFLAGS], [-Dunix])
++	test "$build_mac" = "yes" && AC_SUBST([EXTRA_CFLAGS], [-Dunix])
+ 	# Check that libraries that Mupmate needs exist
+ 	AC_CHECK_LIB([fltk], [fl_alphasort], [ ])
+ 	AC_CHECK_LIB([fltk_images], [main], [ ])
+@@ -100,13 +100,13 @@ AS_IF([test "x$enable_mupmate" != xno],
+ 	AC_CHECK_LIB([z], [gzgets], [ ])
+ 
+ 	# Programs for Windows icons for Mupmate
+-	test "$build_windows" == "yes" && test "$PAMTOWINICON" == "none" && test "$PPMWINICON" == "none" && AC_MSG_ERROR([Need either pamtowinicon or ppmtowinicon])
++	test "$build_windows" = "yes" && test "$PAMTOWINICON" = "none" && test "$PPMWINICON" = "none" && AC_MSG_ERROR([Need either pamtowinicon or ppmtowinicon])
+ 	AC_PATH_PROG(XPMTOPPM, xpmtoppm, none, $PATH)
+-	test "$build_windows" == "yes" && test "$XPMTOPPM" == "none" && AC_MSG_ERROR([Need xpmtoppm])
++	test "$build_windows" = "yes" && test "$XPMTOPPM" = "none" && AC_MSG_ERROR([Need xpmtoppm])
+ 	AC_PATH_PROG(PPMTOPGM, ppmtopgm, none, $PATH)
+-	test "$build_windows" == "yes" && test "$PPMTOPGM" == "none" && test "$PAMTOWINICON" == "none" && AC_MSG_ERROR([Need ppmtopgm])
++	test "$build_windows" = "yes" && test "$PPMTOPGM" = "none" && test "$PAMTOWINICON" = "none" && AC_MSG_ERROR([Need ppmtopgm])
+ 	AC_PATH_PROG(WINDRES, i386-mingw32msvc-windres, none, $PATH)
+-	test "$build_windows" == "yes" && test "$WINDRES" == "none" && AC_MSG_ERROR([Need i386-mingw32msvc-windres])
++	test "$build_windows" = "yes" && test "$WINDRES" = "none" && AC_MSG_ERROR([Need i386-mingw32msvc-windres])
+ 	]
+ )
+ 
+@@ -122,7 +122,7 @@ AC_FUNC_MALLOC
+ AC_FUNC_MMAP
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([access alarm atan cos getcwd isascii isspace memcmp memmove memset munmap pow putenv select setenv sin sqrt strcasecmp strchr strcmp strcpy strcspn strdup strerror strncasecmp strncpy strpbrk strrchr strspn strstr strtol tan unlink])
+-test "$build_linux" == "yes" && AC_CHECK_FUNCS([kill sleep waitpid])
++test "$build_linux" = "yes" && AC_CHECK_FUNCS([kill sleep waitpid])
+ 
+ AS_IF([test "x$enable_mupdisp" != xno],
+ 	[
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -208,10 +208,9 @@ uguide_files = \
+ 
+ ps_files = quickref.ps uguide.ps
+ EXTRA_DIST = uguide.t quickref.t charlist $(uguide_files) $(ps_files)
+-mup_doc_dir = $(datadir)/doc/packages/$(PACKAGE)
+-mup_doc__DATA = $(ps_files)
+-mup_uguide_dir = $(mup_doc_dir)/uguide
+-mup_uguide__DATA = $(uguide_files)
++dist_doc_DATA = $(ps_files)
++mup_uguidedir = $(docdir)/uguide
++mup_uguide_DATA = $(uguide_files)
+ 
+ muschar.ps: ../src/include/muschar.h ../tools/doc/mkmuscharps.sh
+ 	../tools/doc/mkmuscharps.sh < ../src/include/muschar.h
+--- a/doc/htmldocs/Makefile.am
++++ b/doc/htmldocs/Makefile.am
+@@ -1,4 +1,4 @@
+ mup_html_docs = blind.html faq.html Macinst.html mupfeat.html overview.html usercomm.html whatsnew.html winrun.html
+-mup_htmldoc_dir = $(datadir)/doc/packages/$(PACKAGE)
++mup_htmldoc_dir = $(htmldir)
+ mup_htmldoc__DATA = $(mup_html_docs)
+ EXTRA_DIST = $(mup_html_docs)
diff --git a/media-sound/mup/mup-6.9.ebuild b/media-sound/mup/mup-6.9.ebuild
new file mode 100644
index 000000000000..9284b6f85709
--- /dev/null
+++ b/media-sound/mup/mup-6.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Program for printing music scores"
+HOMEPAGE="http://www.arkkra.com/"
+SRC_URI="http://www.arkkra.com/ftp/pub/unix/mup${PV//.}src.tar.gz
+	ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
+
+LICENSE="Arkkra"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	x11-libs/libX11
+	x11-libs/libXext
+	>=x11-libs/fltk-1.3:1
+	x11-libs/libXpm
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-text/ghostscript-gpl
+	media-libs/netpbm
+	sys-apps/groff
+	sys-devel/bison
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.9-build-system.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_compile() {
+	emake -j1 CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+
+	dodoc README
+}
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index 389d35873ea2..c739ac214942 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -1,5 +1,3 @@
-DIST wavpack-5.4.0.tar.xz 769764 BLAKE2B d35eefccf3402388d88d370daae41dc0e4f21808474e668f92a9dcee978ae71b96ae167de098a0924fcbaaa75f9b07270280e7c3b16cc8699ffaa7d2eddd0de5 SHA512 de4e75539c9b949d22f39ab73721c8a4ee7c38ff08835aa28b1d56bea08c332bcb601a54998efe520f3653a2e29c73dcfd716ad19707bb2815403786d9ed9c11
 DIST wavpack-5.5.0.tar.xz 797996 BLAKE2B e2a00052ce887c4ac4e767a1852f0b94c7d23071f5974cb15f33700acaf5b6ae9e5e08a7dee8c66520d2178a4f9e3cc2139da78f040803d55d504b949000c8c9 SHA512 9758e8079618e45e585330cd472f8ddae6e0ffd9a79032e7ec60251fff331390a619855dcdcf92942f5192d6ae12e05b6feca36394d30f0fe7e65222ee2696fc
-EBUILD wavpack-5.4.0.ebuild 846 BLAKE2B 94ced432ab59947059e929f939a2a2ff4d7d06221dbbeb5ba5c6c6c5c2d01864d43647f3bf716c30b179518f4fb01d2cee74283791a2dcf7475e558180ce13a6 SHA512 4b0bdeadd930ba09dcfb105a1fb74fddee021038c980fab742525af8d2e5b22260e88d06a1d69558611b51f46935a64c0171ce28483e6f8c9bf17965129eed82
-EBUILD wavpack-5.5.0.ebuild 680 BLAKE2B d3be3f1d9b812a7bd5ecf815c17c30ab2a9df97703edb65b7ff5af6ac0f346258d8d43b2acecdf5d9c083853388333f095f410c9d7596de5ea9a96df3384689f SHA512 e7e61670ebecf00e76d2202fa91462fd840db2a89ac5473c237474f47d8653e250eba423caf939fd6d5b61592754a30709863d3f5a5b21c421cfd22282b17bfb
+EBUILD wavpack-5.5.0.ebuild 678 BLAKE2B 18f421f76ffa98923cd0ec998a86a12b4665f52ebc20aeaa7554e073c91d30051093714cfa11804667a372bf883bc792dcfe057e6b376ad7aadaa5db8d779e03 SHA512 a65fc69c41558ea616ae268e5f1d2e3091548f683d471c262a24e2092b5de3672dd2b43c839a046af1b78c9be1288c2b83a56c3b281152923e96d2c75e758fea
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/wavpack/wavpack-5.4.0.ebuild b/media-sound/wavpack/wavpack-5.4.0.ebuild
deleted file mode 100644
index 7734a2145702..000000000000
--- a/media-sound/wavpack/wavpack-5.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Hybrid lossless audio compression tools"
-HOMEPAGE="https://www.wavpack.com/"
-SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/libiconv-0-r1"
-DEPEND="${RDEPEND}"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-static \
-		$(use_enable test tests) \
-		$(multilib_native_enable apps)
-}
-
-multilib_src_test() {
-	emake -C cli wvtest
-	cli/wvtest --default || die
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/wavpack/wavpack-5.5.0.ebuild b/media-sound/wavpack/wavpack-5.5.0.ebuild
index 6f95a8507add..ce7f2196be26 100644
--- a/media-sound/wavpack/wavpack-5.5.0.ebuild
+++ b/media-sound/wavpack/wavpack-5.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbry/WavPack/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=virtual/libiconv-0-r1"
 DEPEND="${RDEPEND}"