gentoo auto-resync : 23:11:2022 - 13:08:35

5 files changed, 3 insertions, 196 deletions

diff --git a/media-sound/snd/Manifest b/media-sound/snd/Manifest
index 0f5fec476b68..862e66431be8 100644
--- a/media-sound/snd/Manifest
+++ b/media-sound/snd/Manifest
@@ -1,8 +1,4 @@
-AUX snd-17.4-portaudio.patch 2154 BLAKE2B 3d6d6edd400aef4bd809e49021f0d42523db263dc9bb0626074ae32c4c3172c66181caaab141c754b8d04436d920dc7e104300a11bccf29f251052571c52e462 SHA512 01f7d7f3bd315a8b372d81e2f5a96b9f1cd100eb4afe62a57c5b0422740892b80d504ab2774190814fde04849bc097817262f7bc96bda1f90a08f544caa439ce
-AUX snd-17.4-undefined-oss_sample_types.patch 372 BLAKE2B 5bd87e2e8c953ab4dd3799295b6a425d1775572605b66eb4fb7e2927e45e8b1b6780a08c370fab7c197e3354eea33d87b4503aca5dbfb92a1150f786fb0cd810 SHA512 3b6a64eea622d77389edf754450a6ef1a5036b1ef0c5e02f7c84c4aa150fd0c30dd3e7855126dbbce1582a9ff1e02ddc2abfb5e7636feb71713e08c7b1bc0478
 AUX snd-22.8-undefined-oss_sample_types.patch 1242 BLAKE2B 4431fdf43e467a117ef0efffe523fd481060458229dd1ecb5019f92010415884379e50241c3d2b35514715a0b8dbbd6c6acf9925c634f455e835c88cbc1c3dd5 SHA512 d8c19f7abc0350f1e0b7b336ef69e7ed478337373140051d9ce20a2493ba0b53547b26e3129e44b1f2cbb6e2fd20bbb4aa5de81b76364907da1310b9b3c0ac11
-DIST snd-17.4.tar.gz 15096338 BLAKE2B ca054977caacd2ea4c1b14f50c31d3b4cc6b206a58529ee5537ec80e51acb72c1b8baad6db9729270fe07067c097f16e630e1f7a81521ac0532f5b5689fb963c SHA512 cbbc546fe4a3ef758c5372edbdae4db29457c559eafa08854819917e153ce850f5ab302da68dee826f99c26f10769aae8c6df6ea8434614f084f21d0dbbc5c88
-DIST snd-22.8.tar.gz 14696217 BLAKE2B 6d90e1a51f862d17985831f676a01e61c9cce44f623c8db5d8a0a30cb3909823b5361a20ce5a19bfdb846c0d5237fcd9183be0a9970cfa6e9e02c69911090e6f SHA512 a6c007a1c17973f6bc4badcca72b310b4e53d3a8b1831f026fca230ae9925ab3c53eb6a97015220fd929b7ecb14c7922ba2113d6c7a6626406ec4d361b7b228d
-EBUILD snd-17.4-r2.ebuild 2575 BLAKE2B 7cb775c646d34cf086022a7027fec9ef3299c4e289d52fa5af9c1242bba87f39f50226ff68262bcc8586848b288e3f6869d96426eae3df07f07f4e26538a53c9 SHA512 74b28e050e6a764a3da658f67fd06fcf23867867180768bd102080e7430c51264a426ce8a8b17f57a1a97eb158c00b3da1ec120bbaaefb7a909d532f3c1b7ac5
-EBUILD snd-22.8.ebuild 2191 BLAKE2B 1ac923296ae9fd3ec2752352cdd6c4cb44de85444cfbea88b8e27fc4572d01e9860086059fe4f1070eed0ddf20d15f6b48ea630d0839403bc09734992de6617c SHA512 4fdf7ce4bc4e16ec094a6b3824873065e6a57a070778a68e2d5a82d3c98e11975b082103a371319dec1495b02d1514a5a2712c74c0220b8e99dfb5df2ae8f6f9
+DIST snd-22.9.tar.gz 14704873 BLAKE2B 788a0d77571b13cac0bb191bd88e0d18d5a6808fbee170c8cb3237a2bdc8b20a72cd3a4360cf0632c1746bec317b367ebf6344ac05d9a5485d54a77268ab96cf SHA512 641f49438dd71285249d2da6f36f30ca52ec8f8fc8189af7815abff054db7651d8da54798509c77d93d542d09bb11e3ad6662aec51e9ba1c7a6a1672bb0eba48
+EBUILD snd-22.9.ebuild 2185 BLAKE2B d6e3396c5b47e03ad376727c96f92d87954312b809e66bafdd4f959df11a484cdf491c9fe5b427f8799c978d1580fb301dd274b5621707e4234bac86094e7200 SHA512 dbb8d9b46a5ee1919f90500ea17b1cb8227545cd6db254c731a44bed9a6883fd4e99c2e3383d76bfe879a9e843621b7e94dad85702aa6c9e4217d8d0487ee185
 MISC metadata.xml 433 BLAKE2B 23952287911295ce3b2c3e199868b3fdc19d59c623ec597c94dbbe6b4c0692d4116750979ff1ef0664247e20e99a98214100fb2540564965bc43ca9aa6e4d042 SHA512 43147658b396bcc3cd0d335451b7c59f0c9ba5da4849eaed44115d58502076d1ebb56b169cea308183c31e3dc227c69f9c1076b5dad253a97f36a15fe6d09498
diff --git a/media-sound/snd/files/snd-17.4-portaudio.patch b/media-sound/snd/files/snd-17.4-portaudio.patch
deleted file mode 100644
index 8bdb1af01e8a..000000000000
--- a/media-sound/snd/files/snd-17.4-portaudio.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -521,8 +521,9 @@
-   
-   if test "$with_portaudio" = yes ; then
-     AC_DEFINE(MUS_PORTAUDIO)
-+    PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0])
-     AUDIO_SYSTEM=portaudio
--    AUDIO_LIB="-lportaudio"
-+    AUDIO_LIB="${PORTAUDIO_LIBS}"
-   fi
- 
-   if test "$with_jack" = yes ; then
---- a/makefile.in
-+++ b/makefile.in
-@@ -11,6 +11,7 @@
- GL_FLAGS = @GL_FLAGS@
- GSL_FLAGS = @GSL_CFLAGS@
- JACK_FLAGS = @JACK_FLAGS@
-+PORTAUDIO_CFLAGS = @PORTAUDIO_CFLAGS@
- 
- ORIGINAL_LDFLAGS = @ORIGINAL_LDFLAGS@
- LDFLAGS = @LDFLAGS@
-@@ -28,6 +29,7 @@
- WEBSERVER_FILES = @WEBSERVER_FILES@
- JACK_LIBS = @JACK_LIBS@
- GMP_LIBS = @GMP_LIBS@
-+PORTAUDIO_LIBS = @PORTAUDIO_LIBS@
- 
- LDSO_FLAGS = @LDSO_FLAGS@
- SO_FLAGS = @SO_FLAGS@
-@@ -53,7 +55,7 @@
- .SUFFIXES: .c .o
- 
- .c.o:
--	$(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $<
-+	$(CC) -c $(DEFS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(GL_FLAGS) $(JACK_FLAGS) $(FFTW_CFLAGS) $(PORTAUDIO_CFLAGS) $<
- 
- SND_SCRIPTS = *.scm *.fs *.rb *.fsm
- SNDLIB_HEADERS = mus-config.h sndlib.h _sndlib.h sndlib-strings.h clm.h vct.h sndlib2xen.h clm2xen.h xen.h clm-strings.h
-@@ -84,7 +86,7 @@
- main_target: @MAKE_TARGET@
- 
- snd: $(SNDLIB_HEADERS) $(SND_HEADERS) $(GX_HEADERS) $(S7_HEADERS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES) $(WEBSERVER_FILES)
--	$(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES)  $(WEBSERVER_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(WEBSERVER_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(LIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(S7_O_FILES) $(SNDLIB_O_FILES) $(O_FILES) $(GX_FILES) $(GL_FILES)  $(WEBSERVER_FILES) -o snd $(SNDLIB_LIB) $(XEN_LIBS) $(GTK_LIBS) $(GL_LIBS) $(WEBSERVER_LIBS) $(JACK_LIBS) $(AUDIO_LIB) $(FFTW_LIBS) $(GSL_LIBS) $(GMP_LIBS) $(PORTAUDIO_LIBS) $(LIBS)
- 
- xm: 	xen.h mus-config.h $(S7_HEADERS)
- 	$(CC) -c xm.c -DUSE_SND=0 $(DEFS) $(SO_FLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(CFLAGS) $(XEN_CFLAGS) $(GSL_FLAGS) $(JACK_FLAGS) $(GL_FLAGS)
diff --git a/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch b/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch
deleted file mode 100644
index 6199a7b183fd..000000000000
--- a/media-sound/snd/files/snd-17.4-undefined-oss_sample_types.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Always compile the `oss_sample_types` function
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=621758
-
---- a/audio.c
-+++ b/audio.c
-@@ -743,7 +743,6 @@
- }
- 
- 
--#if (!HAVE_ALSA)
- static int oss_sample_types(int ur_dev, mus_sample_t *val)
- {
-   int fd, samp_types = 0, sys, ind;
-@@ -774,7 +773,6 @@
-   val[0] = (mus_sample_t)(ind - 1);
-   return(MUS_NO_ERROR);
- }
--#endif
- 
- 
- 
diff --git a/media-sound/snd/snd-17.4-r2.ebuild b/media-sound/snd/snd-17.4-r2.ebuild
deleted file mode 100644
index acf4ba3b8c91..000000000000
--- a/media-sound/snd/snd-17.4-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Snd is a sound editor"
-HOMEPAGE="https://ccrma.stanford.edu/software/snd/"
-SRC_URI="ftp://ccrma-ftp.stanford.edu/pub/Lisp/${P}.tar.gz"
-
-LICENSE="Snd BSD-2 HPND GPL-2+ LGPL-2.1+ LGPL-3+ ruby? ( free-noncomm ) s7? ( free-noncomm )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="alsa doc fftw gmp gsl gtk jack ladspa motif opengl oss portaudio pulseaudio readline ruby +s7"
-
-RDEPEND="
-	media-libs/audiofile
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0= )
-	gmp? (
-		dev-libs/gmp:0=
-		dev-libs/mpc
-		dev-libs/mpfr:0=
-	)
-	gsl? ( sci-libs/gsl:= )
-	gtk? (
-		x11-libs/cairo
-		x11-libs/gtk+:3
-		x11-libs/pango
-	)
-	jack? ( virtual/jack )
-	ladspa? ( media-libs/ladspa-sdk )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	opengl? ( virtual/opengl )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	readline? ( sys-libs/readline:= )
-	ruby? ( dev-lang/ruby:* )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="
-	?? ( portaudio pulseaudio )
-	?? ( ruby s7 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-17.4-portaudio.patch
-	"${FILESDIR}"/${PN}-17.4-undefined-oss_sample_types.patch
-)
-
-pkg_setup() {
-	if ! use gtk && ! use motif ; then
-		ewarn "Warning: no graphic toolkit selected (gtk or motif)."
-		ewarn "Upstream suggests to enable one of the toolkits (or both)"
-		ewarn "or only the command line utilities will be helpful."
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:-O2 ::" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# Workaround executable sections QA warning (bug #348754)
-	append-ldflags -Wl,-z,noexecstack
-
-	local myconf
-	if ! use ruby && ! use s7 ; then
-		myconf+=" --without-extension-language"
-	fi
-
-	econf \
-		$(use_with alsa) \
-		$(use_with fftw) \
-		$(use_with gmp) \
-		$(use_with gsl) \
-		$(use_with gtk) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with motif) \
-		$(use_with oss) \
-		$(use_with portaudio) \
-		$(use_with pulseaudio) \
-		$(use_with ruby) \
-		$(use_with s7) \
-		${myconf}
-}
-
-src_compile() {
-	emake snd
-
-	# Do not compile ruby extensions for command line programs since they fail
-	sed -i -e "s:HAVE_RUBY 1:HAVE_RUBY 0:" mus-config.h || die
-
-	local i
-	for i in sndplay sndinfo; do
-	   emake ${i}
-	done
-}
-
-src_install() {
-	dobin snd sndplay sndinfo
-
-	if use ruby ; then
-		insinto /usr/share/snd
-		doins *.rb
-	fi
-
-	if use s7 ; then
-		insinto /usr/share/snd
-		doins *.scm
-	fi
-
-	use doc && HTML_DOCS=( *.html pix/*.png )
-	einstalldocs
-	dodoc HISTORY.Snd
-}
diff --git a/media-sound/snd/snd-22.8.ebuild b/media-sound/snd/snd-22.9.ebuild
index 04c60c009588..cf4a5df234b2 100644
--- a/media-sound/snd/snd-22.8.ebuild
+++ b/media-sound/snd/snd-22.9.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 		dev-libs/mpfr:=
 	)
 	gsl? ( sci-libs/gsl:= )
-	gui? ( >=x11-libs/motif-2.3:0 )
+	gui? ( x11-libs/motif:0 )
 	jack? ( virtual/jack )
 	ladspa? ( media-libs/ladspa-sdk )
 	notcurses? ( dev-cpp/notcurses )