gentoo resync : 28.04.2021

4 files changed, 2 insertions, 89 deletions

diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index b063a183fac2..dc08e1edae22 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,8 +1,6 @@
 AUX CVE-2017-15185.patch 1088 BLAKE2B e823a30ec18735deb5ba22592165e7828266888d4cdb435ddb88b606b6312c18444e2b3395c3f155fb12d6749a3371baa9b18d7972086c19e750deb253b17162 SHA512 d5ef327e47681bd74ef7488965805727d8e905f65ee46698b06f88d971003c65c309fc8b6714e07c7a12803657db302b15522d6e4f4a75c0dce1217deaa07439
-AUX libmp3splt-0.7-libltdl.patch 676 BLAKE2B 144528812f340517d4da52eeefb35054b31363d5c24eb0fc1fa74be7c39008a9d27fd61a9c412aeddf5698df1469975101fec74de5f65b17bdc2a9d727017cf0 SHA512 50e9c6472b79b2dfcb43764828e26ddacc3b1b747a6264291385d6173de51608188d4fd865ac20dd2ad63ddb9d3191eb62f872ddead15564d7400b31dc5bca66
 AUX libmp3splt-0.9.2-drop-libltdl.patch 7164 BLAKE2B 29332a97ffa8b4acd6580e1c10ae73b3038c2c56b3e01eaaea10da8379c1c157624a7577e4b4bda5de279f07db326e4f48b48a815c52ad9266c78f48aa98809c SHA512 b527eda408df9123ef254ab28be850535042eb9b28de910fda6852b78287a55ea26d03326dc08d8c35b9c08ee2ef47797a6be14883c945bac7e051e7e0664fdd
 AUX libmp3splt-0.9.2-fix-implicit-decl.patch 5820 BLAKE2B b7ed33d91c7fe26a528ed678e8d174208cb4415bdb573d415c0523241672b6ecd5280e28c28314a17249187ce36af589336ea2669b461c03f03b4fee9e3775be SHA512 8fcc35dd7c1c6110b302bd67d07d2023bf5c1bd428b5387782ea5b9a4b233739b9544b4814b3a3db780d2c275bacc53ea37378c004c5029984cecb21867775e5
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
-EBUILD libmp3splt-0.9.2-r2.ebuild 1293 BLAKE2B d841d43e3703728e26bd7034a84669eb9fe925e1208f7ae7f22d86f4d98833a428056e0b28eab11001c82f45e1ccd8d576dab6cb197e0ec37fef6d9251ec4e66 SHA512 4a4d5eef497cb2572e186c62c12fd8466b8a3405ef1c41259ffe6e7fd7b928e607f205aefc74dfbb9a9d2dc873e6c17e29cdd6a225ab0c684157180f302ec21f
-EBUILD libmp3splt-0.9.2-r4.ebuild 1442 BLAKE2B 57b6340087d90c44f4084f4506a7bc1b95bf715ddf335c85a5c83e0cc3854fbb3d266dcc8be2ec13f549e6b3356dc68680cd29c323eef1f8c143262425a4dc6b SHA512 fe175c01ad47c1bf7b3a619c3ead47bef3d9502523e02b44d99ab2d2af47f82c6a51d077d041abd4fabcbe88c7183b2b4dc622eda85d84a8daa0e001235bd872
+EBUILD libmp3splt-0.9.2-r4.ebuild 1439 BLAKE2B 87255bebb946490569d71448fb10d0b46ee6a4ff15202fcc7a596353f8bbfeab9b366d54b579e28eab100614fcfb3546cc28be0612046de1a0f4da669e53c10f SHA512 87335f2d814001754030cc5d6a022af6ece6da8639bc1f3604582847a7288c997f6a9dec91b1c070a0df369bc11a491fca429dc68cfd68271cf28716e9bf6031
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch b/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
deleted file mode 100644
index 0755fe79af92..000000000000
--- a/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac	2011-08-07 00:14:06.723806363 +0200
-+++ b/configure.ac	2011-08-07 00:14:02.405860340 +0200
-@@ -68,16 +68,13 @@
- # Enable libtool, check for libltdl and define @LIBLTDL@ and @INCLTDL@
- #################################################################
- 
--ifdef([LT_CONFIG_LTDL_DIR],
--      [ LT_CONFIG_LTDL_DIR([libltdl]) ],
--      [])
-+AC_SUBST([INCLTDL], [])
-+AC_SUBST([LIBLTDL], [-lltdl])
- 
- ifdef([LT_INIT],
-       [ LT_INIT([win32-dll]) ],
-       [ AC_PROG_LIBTOOL ])
- 
--AC_WITH_LTDL
--
- #################################################################
- # Check for the type of the host
- #################################################################
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
deleted file mode 100644
index dec4b03a7c8d..000000000000
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Library for mp3splt to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net/mp3splt_page/home.php"
-SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="doc flac pcre"
-
-RDEPEND="
-	dev-libs/libltdl
-	media-libs/libmad
-	media-libs/libid3tag
-	media-libs/libogg
-	media-libs/libvorbis
-	flac? ( media-libs/flac )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/findutils
-	doc? (
-		>=app-doc/doxygen-1.8.3.1
-		media-gfx/graphviz
-	)
-"
-
-DOCS=( AUTHORS ChangeLog LIMITS NEWS README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7-libltdl.patch
-	"${FILESDIR}"/CVE-2017-15185.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cutter # TODO package cutter <http://cutter.sourceforge.net/>
-		--disable-optimise
-		--disable-static
-		$(use_enable doc doxygen_doc)
-		$(use_enable flac)
-		$(use_enable pcre)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	use doc && docompress -x /usr/share/doc/${PF}/doxygen/${PN}_ico.svg
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r4.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r4.ebuild
index 1a3609c270c4..86737e29997a 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r4.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="doc flac pcre"
 
 RDEPEND="