gentoo resync : 02.02.2022

4 files changed, 11 insertions, 105 deletions

diff --git a/media-sound/streamtranscoder/Manifest b/media-sound/streamtranscoder/Manifest
index e23e8172a2ab..ddfa588b773d 100644
--- a/media-sound/streamtranscoder/Manifest
+++ b/media-sound/streamtranscoder/Manifest
@@ -1,6 +1,3 @@
-AUX streamtranscoder-1.2.4-build.patch 1732 BLAKE2B 5e7f85857fc59eac7f2fb94e2532ee4fa206e1ff664f7b0326bd4943bf196efea8cc599507f13420b48f173c3313f041b1d6ad47060683467b487db4f233f9be SHA512 84d8a20b1157a927bb25c38c9cb9cb493b8b7b425545b2ac4ffaa7da379314ab7e5a9b95bb0595e2a98481100947839d3f5dba94aa1e8b737f49f895b55814f6
-DIST streamtranscoder-1.2.4.tar.gz 352873 BLAKE2B ab6fa290469a68273eeb1acf1790ccdf00aab23862130e903a0c70594fa791766c9f09422de81feec39a1ce6be4e24e44d652bedf8ab9cd8e8bc63d7cb85d4f7 SHA512 c2a4d866e65628777a15ac301bbd06bdc5cab1558747c07d4b12d2b007989ab871ee0e5109f503779bf8554897a2ff11aab0ea9c522979bdee540235d2054071
 DIST streamtranscoderv3-3.1.11.tar.gz 480731 BLAKE2B 2b1adb68d8b92f392e6807cba5a92be6fb03b84ad649f717a4ed0cd3b69a32cbc870561eb1f67aade7c123f05194ad5589056ef337848d09adf2948d6511f12c SHA512 5682d8bc8f93a85bd84ba4bba37d1613f3b53afea9499d9417daa40806b4fb7e4fd77c209df2e68ea5e102a783ad8c2424468022e71366114006d041d4e20b99
-EBUILD streamtranscoder-1.2.4.ebuild 696 BLAKE2B ba9d279bb19d3710aa2a758e57559672cd8f340659d0aff858260bf57b052e4bb4c1c89f952ed224c621875763b8c36dc56c254bb032f8a27035118fcb77b1ea SHA512 29c58d989fb2a6afc584002d69c8e17db66aa12e6448eacad80ee112855cdb04e9f243479fdce98a9092c9d69a1904944191e7e6233947b6dba308201f092c54
-EBUILD streamtranscoder-3.1.11.ebuild 618 BLAKE2B 6b954e34029d76208fbd7e72c34713548ed22b4715a46970545f26c6ace2340f503b380ed163be01d376b98993f38eb12d1ab39c54c4f19eeb043dcd2d7faf8c SHA512 a4b29964d0c4dc03fc5bb395d6b9c28a2b683013b408b5ac24e91fcf42939b1f353adbc8a880dff45e11c78dd8d5a086429552dfeddbc2797f216d9d15e8d99b
+EBUILD streamtranscoder-3.1.11-r1.ebuild 567 BLAKE2B f57e9945d84e4c9d53f4bcf26d45c0528950ad54e7ef8cb17fef0896802e68efc8a99bf7f1062d5068d4922b0001ee9612a170a6a03605a73cb4cd9b3e7c9ef6 SHA512 6c0ed4bb54aaf76a77e50a115f031e0f6f021a01050823c5d38305adeecc3056ec1a13cde174f17743065e493671a38d38c241b33ddecb5bcb55c9976b819ff5
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch b/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch
deleted file mode 100644
index d79b074abd9d..000000000000
--- a/media-sound/streamtranscoder/files/streamtranscoder-1.2.4-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -83,22 +83,29 @@
- 
- dnl -- configure options --
- 
--XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!(Perhaps you need --with-ogg-prefix=/usr/local)))
--XIPH_PATH_VORBIS(, AC_MSG_ERROR(must have Vorbis installed!(Perhaps you need --with-vorbis-prefix=/usr/local)))
--AM_PATH_CURL(,,AC_MSG_ERROR(must have libcurl installed!))
--AM_PATH_MAD(, AC_MSG_ERROR(must have libmad installed!))
--AM_PATH_LAME(, AC_MSG_ERROR(must have libmp3lame installed!))
-+PKG_CHECK_MODULES([OGG],[ogg])
-+PKG_CHECK_MODULES([VORBIS],[vorbis])
-+PKG_CHECK_MODULES([VORBISENC],[vorbisenc])
-+PKG_CHECK_MODULES([VORBISFILE],[vorbisfile])
-+PKG_CHECK_MODULES([CURL],[libcurl])
-+PKG_CHECK_MODULES([MAD],[mad])
-+
-+AC_PATH_PROG([LAME],[lame])
- 
- dnl Make substitutions
- 
- AC_SUBST(MAD_CFLAGS)
- AC_SUBST(MAD_LIBS)
- AC_SUBST(LAME_CFLAGS)
--AC_SUBST(LAME_LIBS)
-+AC_SUBST([LAME_LIBS],[-lmp3lame])
- AC_SUBST(OGG_CFLAGS)
- AC_SUBST(VORBIS_CFLAGS)
-+AC_SUBST(VORBISENC_CFLAGS)
-+AC_SUBST(VORBISFILE_CFLAGS)
- AC_SUBST(OGG_LIBS)
- AC_SUBST(VORBIS_LIBS)
-+AC_SUBST(VORBISENC_LIBS)
-+AC_SUBST(VORBISFILE_LIBS)
- AC_SUBST(LIBTOOL_DEPS)
- AC_SUBST(OPT)
- AC_SUBST(LIBS)
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -17,5 +17,6 @@
-  
- INCLUDES = -I$(srcdir)/liboddcast -I$(srcdir)/libtranscoder
- 
--install-hook:
--	cp transcoder.cfg $(DESTDIR)$(sysconfdir)/transcoder.cfg
-+install-data-hook:
-+	$(INSTALL) -d $(DESTDIR)$(sysconfdir)
-+	$(INSTALL) -m644 transcoder.cfg $(DESTDIR)$(sysconfdir)/transcoder.cfg
---- a/src/libtranscoder/transcurl.cpp
-+++ b/src/libtranscoder/transcurl.cpp
-@@ -18,7 +18,6 @@
- #include <winsock2.h>
- #endif
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #include "transcurl.h"
- #include "cbuffer.h"
diff --git a/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild b/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
deleted file mode 100644
index 3ad59e039eb8..000000000000
--- a/media-sound/streamtranscoder/streamtranscoder-1.2.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Commandline program to transcode shoutcast/icecast streams to different bitrates"
-HOMEPAGE="http://www.oddsock.org"
-SRC_URI="http://www.oddsock.org/tools/streamTranscoder/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libogg-1.1
-	>=media-libs/libvorbis-1.0.1-r2
-	>=media-sound/lame-3.96
-	>=media-libs/libmad-0.15.1b
-	>=net-misc/curl-7.11.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
diff --git a/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild b/media-sound/streamtranscoder/streamtranscoder-3.1.11-r1.ebuild
index 8e03e14c0175..f763307a9203 100644
--- a/media-sound/streamtranscoder/streamtranscoder-3.1.11.ebuild
+++ b/media-sound/streamtranscoder/streamtranscoder-3.1.11-r1.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-MY_P=${PN}v3-${PV}
+MY_P="${PN}v3-${PV}"
 
 DESCRIPTION="Commandline program to transcode shoutcast/icecast streams to different bitrates"
 HOMEPAGE="http://www.oddsock.org/tools/streamTranscoderV3"
 SRC_URI="http://www.oddsock.org/tools/streamTranscoderV3/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
-RDEPEND=">=media-libs/libogg-1.1
-	>=media-libs/libvorbis-1.0.1-r2
-	>=media-sound/lame-3.96
-	>=media-libs/libmad-0.15.1b
-	>=net-misc/curl-7.11.0"
+RDEPEND="
+	media-libs/libogg
+	media-libs/libvorbis
+	media-sound/lame
+	media-libs/libmad
+	net-misc/curl"
 DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}