media-libs/libsndfile: Use fixed upstream tarball

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: David Seifert <soap@gentoo.org>

3 files changed, 1 insertions, 126 deletions

diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index c3b5434221e3..757175707100 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,4 +1,4 @@
 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f
 DIST libsndfile-1.0.29.tar.bz2 831090 BLAKE2B 0bdf20a0abe22f628434e80c61c6b7d31e62c40dd881f462d8e12eb4488f0bcb1c0c7712fbff4902bbbea86e08763a01f7d85b875166c5c9214ab9d8aa10a1c1 SHA512 72cf038b26c66e6e085d97ef1954bd3aa76315527f632649707c76128953bfbb2c9b52527d309720ca1107a9e04e033722995911dad43b4adda46bf4a05354d7
 DIST libsndfile-1.0.29_pre2_p20191024.tar.gz 720981 BLAKE2B 9f1dcf3d3669b66d8582d50b62ff863facd7125432a84a3e1e3fb0f817554f260f42948b4479371fb0967dcc75bedc6c49afffc6bee3f973a875d72d2e508210 SHA512 e37b385b90cadc97348db03b6c5ae7a8fcee17ded60f54d1508adddb8e2dc604ea44b60a0fe08627e81c0faa83997cdafb0b0ecf8574f901bf5e8a1819a63998
-DIST libsndfile-1.0.30.tar.bz2 849559 BLAKE2B 28a0191b0882a0e6546c496c8670ee44c9f34befeeb876d2156ffcb8772a2c419672329f25e532dc611ebeb3197ad3a2f70fe2c1e287d94e3d5b512c9f1d4052 SHA512 ff1e533e0480ae9d0ba08f68eb82fdbad186c65f93c74f956f2fc5a7264cd31f2610c3f8b72a93e24704cac2b05e7a00e6a43dba70391dcbd1d1c9344bd88df0
+DIST libsndfile-1.0.30.tar.bz2 852320 BLAKE2B 00bd558a3d8645f4ad03fba38c31fcea25d30bea4b6f1a785b4b31b0da61bfa6a6f7df1bd7907c95c543cce8ee6766032d2e614eb285f2fc529146cb1d319517 SHA512 c4be4bc57df880da81570889a80256ba4567f2c7d6bdfb38f3803c55f616278160e962544bfac32e53b613b8fdf2a2644d8da9ee778747c32cb681a0fd5aab00
diff --git a/media-libs/libsndfile/files/libsndfile-1.0.30-fix-nl.patch b/media-libs/libsndfile/files/libsndfile-1.0.30-fix-nl.patch
deleted file mode 100644
index 7fa3c47d9385..000000000000
--- a/media-libs/libsndfile/files/libsndfile-1.0.30-fix-nl.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff --git a/tests/pedantic-header-test.sh.in b/tests/pedantic-header-test.sh.in
-index 5ba9b4c..283af64 100755
---- a/tests/pedantic-header-test.sh.in
-+++ b/tests/pedantic-header-test.sh.in
-@@ -1,58 +1,58 @@
--#!/bin/bash

--

--# Copyright (C) 2010-2017 Erik de Castro Lopo <erikd@mega-nerd.com>

--#

--# All rights reserved.

--#

--# Redistribution and use in source and binary forms, with or without

--# modification, are permitted provided that the following conditions are

--# met:

--#

--#     * Redistributions of source code must retain the above copyright

--#       notice, this list of conditions and the following disclaimer.

--#     * Redistributions in binary form must reproduce the above copyright

--#       notice, this list of conditions and the following disclaimer in

--#       the documentation and/or other materials provided with the

--#       distribution.

--#     * Neither the author nor the names of any contributors may be used

--#       to endorse or promote products derived from this software without

--#       specific prior written permission.

--#

--# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

--# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

--# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

--# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

--# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

--# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

--# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;

--# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

--# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

--# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF

--# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--

--

--if test ! -f @top_srcdir@/tests/sfversion.c ; then

--	exit 0

--	fi

--

--echo -n "    Pedantic header test           : "

--

--# Only do this if the compiler is GCC.

--if test -n "@GCC_MAJOR_VERSION@" ; then

--

--	CC=`echo "@CC@" | sed "s/.*shave cc //"`

--	# Compile with -Werror and -pedantic.

--	$CC -std=c99 -Werror -pedantic -I@top_srcdir@/src -I@abs_top_builddir@/src -I@abs_top_builddir@/include -c @top_srcdir@/tests/sfversion.c -o /dev/null

--

--	# Check compiler return status.

--	if test $? -ne 0 ; then

--		echo

--		exit 1

--		fi

--

--	echo "ok"

--else

--	echo "n/a"

--	fi

--

--exit 0

-+#!/bin/bash
-+
-+# Copyright (C) 2010-2017 Erik de Castro Lopo <erikd@mega-nerd.com>
-+#
-+# All rights reserved.
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions are
-+# met:
-+#
-+#     * Redistributions of source code must retain the above copyright
-+#       notice, this list of conditions and the following disclaimer.
-+#     * Redistributions in binary form must reproduce the above copyright
-+#       notice, this list of conditions and the following disclaimer in
-+#       the documentation and/or other materials provided with the
-+#       distribution.
-+#     * Neither the author nor the names of any contributors may be used
-+#       to endorse or promote products derived from this software without
-+#       specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+
-+if test ! -f @top_srcdir@/tests/sfversion.c ; then
-+	exit 0
-+	fi
-+
-+echo -n "    Pedantic header test           : "
-+
-+# Only do this if the compiler is GCC.
-+if test -n "@GCC_MAJOR_VERSION@" ; then
-+
-+	CC=`echo "@CC@" | sed "s/.*shave cc //"`
-+	# Compile with -Werror and -pedantic.
-+	$CC -std=c99 -Werror -pedantic -I@top_srcdir@/src -I@abs_top_builddir@/src -I@abs_top_builddir@/include -c @top_srcdir@/tests/sfversion.c -o /dev/null
-+
-+	# Check compiler return status.
-+	if test $? -ne 0 ; then
-+		echo
-+		exit 1
-+		fi
-+
-+	echo "ok"
-+else
-+	echo "n/a"
-+	fi
-+
-+exit 0
diff --git a/media-libs/libsndfile/libsndfile-1.0.30.ebuild b/media-libs/libsndfile/libsndfile-1.0.30.ebuild
index 1888607bd266..4c56a90eda78 100644
--- a/media-libs/libsndfile/libsndfile-1.0.30.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.30.ebuild
@@ -42,10 +42,6 @@ if [[ ${PV} == *9999 ]]; then
 	"
 fi
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.30-fix-nl.patch"
-)
-
 pkg_setup() {
 	if use test || [[ ${PV} == *9999 ]]; then
 		python-any-r1_pkg_setup