gentoo resync : 29.01.2021

4 files changed, 72 insertions, 7 deletions

diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 9217db18d2fc..005cce1a992a 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -1,5 +1,6 @@
-AUX CVE-2017-15185.patch 1132 BLAKE2B ae218573443dc724c4136cd5602c14965a146479212c769929e1a60be2f2056b2703351adb8dcee92851666557db71d8303347921343d94a4db96848da827086 SHA512 5336c71917c34b84c882b2afd01d31141db816c1a6293ab1cbc87138b4d7a8288d4ebea8fc7cf882d907c0c07f5b827d9293dda082d6c8ecf3aafd002e540951
-AUX libmp3splt-0.7-libltdl.patch 672 BLAKE2B adca950fbde7d41e6c657711964b8db2ce0b607750aa1227eeb1f620c3cc47306ea1f5c064a297e563bc9ef83e99e2d5a658b6292b301ff4d3d12fb3906a7d32 SHA512 8707dcf0a23f6466c0f8d0bfcce8ecfd8840ffec09f3c7a66f039be5f707b0b561d5462ad9b170e2bca9dc4872a61114a8d515f702b9e7e79af2deddbce6385f
+AUX CVE-2017-15185.patch 1088 BLAKE2B e823a30ec18735deb5ba22592165e7828266888d4cdb435ddb88b606b6312c18444e2b3395c3f155fb12d6749a3371baa9b18d7972086c19e750deb253b17162 SHA512 d5ef327e47681bd74ef7488965805727d8e905f65ee46698b06f88d971003c65c309fc8b6714e07c7a12803657db302b15522d6e4f4a75c0dce1217deaa07439
+AUX libmp3splt-0.7-libltdl.patch 676 BLAKE2B 144528812f340517d4da52eeefb35054b31363d5c24eb0fc1fa74be7c39008a9d27fd61a9c412aeddf5698df1469975101fec74de5f65b17bdc2a9d727017cf0 SHA512 50e9c6472b79b2dfcb43764828e26ddacc3b1b747a6264291385d6173de51608188d4fd865ac20dd2ad63ddb9d3191eb62f872ddead15564d7400b31dc5bca66
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
 EBUILD libmp3splt-0.9.2-r1.ebuild 1252 BLAKE2B 7743cafa4f00af8ac3ad23691e18b74b0314a017d433bfea07bc045d1ac67fa079b358701881fc6866a674ebcfa4a5a185ea26f72e0480cf90206aa39e534469 SHA512 94668060ca959377fdda7d65f179141b5b6e29f30e4ada17e4af18c3e3a569ea3681671c99bc8a1db82ff2b56614f232999f33a156acab44f1e2c4e166d34bf0
+EBUILD libmp3splt-0.9.2-r2.ebuild 1296 BLAKE2B 651cf7b1e2a36045b5c510b22c2a8e9b2075e7e53ba6de173a7ab3bc6954e86071a4bb257bb05e43e43566756eb9c866a2e5b0badaca14521079c77a08f75b55 SHA512 0445bee289b3eecaeaaa732059b28ac57af86e29bcce2897593fe0a45d60d41674f748b5b79ac68c14b784477d898b0613efdc6eb9aaf2ffe5e3f94493c966f7
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/files/CVE-2017-15185.patch b/media-libs/libmp3splt/files/CVE-2017-15185.patch
index b31a92d0c452..82090f430069 100644
--- a/media-libs/libmp3splt/files/CVE-2017-15185.patch
+++ b/media-libs/libmp3splt/files/CVE-2017-15185.patch
@@ -1,7 +1,7 @@
-diff --git a/libmp3splt/plugins/ogg.c b/libmp3splt/plugins/ogg.c
+diff --git a/plugins/ogg.c b/plugins/ogg.c
 index 50cc495..57745f1 100644
---- a/libmp3splt/plugins/ogg.c
-+++ b/libmp3splt/plugins/ogg.c
+--- a/plugins/ogg.c
++++ b/plugins/ogg.c
 @@ -212,26 +212,36 @@ static splt_ogg_state *splt_ogg_v_new(int *error)
      goto error;
    }
diff --git a/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch b/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
index 95650f87a078..0755fe79af92 100644
--- a/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
+++ b/media-libs/libmp3splt/files/libmp3splt-0.7-libltdl.patch
@@ -1,5 +1,5 @@
---- configure.ac	2011-08-07 00:14:06.723806363 +0200
-+++ configure.ac	2011-08-07 00:14:02.405860340 +0200
+--- 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@
  #################################################################
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
new file mode 100644
index 000000000000..32c19c64fdbc
--- /dev/null
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r2.ebuild
@@ -0,0 +1,64 @@
+# 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
+}