| 1 |
commit: 91bd1ac96387cbd0e738a5673e7b665e4df5d518 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 4 15:06:02 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 4 16:34:04 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bd1ac9 |
| 7 |
|
| 8 |
media-sound/sndfile-tools: Tarball respun, EAPI-7 bump |
| 9 |
|
| 10 |
Drop bogus slot ops. |
| 11 |
Block colliding media-libs/libsamplerate versions. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/645256 |
| 14 |
Closes: https://bugs.gentoo.org/736459 |
| 15 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
| 16 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 17 |
|
| 18 |
media-sound/sndfile-tools/Manifest | 1 + |
| 19 |
...ls-9999.ebuild => sndfile-tools-1.04-r1.ebuild} | 26 ++++++++++++---------- |
| 20 |
.../sndfile-tools/sndfile-tools-9999.ebuild | 24 +++++++++++--------- |
| 21 |
3 files changed, 28 insertions(+), 23 deletions(-) |
| 22 |
|
| 23 |
diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest |
| 24 |
index 98479ed7d61..eea453ac625 100644 |
| 25 |
--- a/media-sound/sndfile-tools/Manifest |
| 26 |
+++ b/media-sound/sndfile-tools/Manifest |
| 27 |
@@ -1,2 +1,3 @@ |
| 28 |
DIST sndfile-tools-1.03.tar.gz 474494 BLAKE2B 17c8f6782895a5e02bcd39e0e966a9196fe26b8fa192b3375a4f167cb554de168d4ce4e638d792720ee3e74483a88060ef9bf6d3713c91834acc9b39427185e2 SHA512 bc6ac7977a95ccf845c889db81452ae84b4f10a8f51c91ddd6fe4d926337a60cdbcb2859b0758816622554bf26a6e42b70f791f2c5158926c3f92ab2abbf14dc |
| 29 |
DIST sndfile-tools-1.04.tar.bz2 714880 BLAKE2B 14d8f9a8172e4e3d8fe320baf3e546c3998636c0de36e8b41e38e277c18f2af6c3ea944eb4cecdda0e225fa3d7adbcd3a5618e74a9d567c42eb0056f162703e3 SHA512 90b0121f4d0bf3ebf3962cc47bcd6a11e5a644d0567be137a8bcf5881944e03e3c9650c9813c982a58072154f62dd176c46cfe83e5661ff81205db30923b71d3 |
| 30 |
+DIST sndfile-tools-1.04a.tar.bz2 715692 BLAKE2B e65a222bfdd96803293f006c2c5704fd1037d81524559d86c8e3812b91bd90fa0b47d1f589adb303f68e1ffdbebfd8b4ec616c9f1d897ad993768981c83022e3 SHA512 b93fd74386960c986031fd1652335bc34243bd785ccf31480b82f4d76ef86760ca53173aace273a635db70db46c0c1c4066328aef9c21c01c6e76346dbe56390 |
| 31 |
|
| 32 |
diff --git a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild |
| 33 |
similarity index 63% |
| 34 |
copy from media-sound/sndfile-tools/sndfile-tools-9999.ebuild |
| 35 |
copy to media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild |
| 36 |
index 46defab3244..946196cd2f6 100644 |
| 37 |
--- a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild |
| 38 |
+++ b/media-sound/sndfile-tools/sndfile-tools-1.04-r1.ebuild |
| 39 |
@@ -1,16 +1,16 @@ |
| 40 |
-# Copyright 1999-2018 Gentoo Foundation |
| 41 |
+# Copyright 1999-2020 Gentoo Authors |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
-EAPI=6 |
| 45 |
+EAPI=7 |
| 46 |
|
| 47 |
-DESCRIPTION="A small collection of programs that use libsndfile" |
| 48 |
+DESCRIPTION="Small collection of programs that use libsndfile" |
| 49 |
HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/" |
| 50 |
|
| 51 |
if [[ ${PV} == *9999 ]]; then |
| 52 |
inherit autotools git-r3 |
| 53 |
EGIT_REPO_URI="https://github.com/erikd/sndfile-tools.git" |
| 54 |
else |
| 55 |
- SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2" |
| 56 |
+ SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2 -> ${P}a.tar.bz2" |
| 57 |
KEYWORDS="~amd64" |
| 58 |
fi |
| 59 |
|
| 60 |
@@ -18,15 +18,17 @@ LICENSE="GPL-2" |
| 61 |
SLOT="0" |
| 62 |
IUSE="jack" |
| 63 |
|
| 64 |
-RDEPEND=" |
| 65 |
- media-libs/libsndfile:= |
| 66 |
- media-libs/libsamplerate:= |
| 67 |
- x11-libs/cairo:= |
| 68 |
- sci-libs/fftw:3.0= |
| 69 |
- jack? ( media-sound/jack-audio-connection-kit:= )" |
| 70 |
DEPEND=" |
| 71 |
- virtual/pkgconfig |
| 72 |
- ${RDEPEND}" |
| 73 |
+ media-libs/libsamplerate |
| 74 |
+ media-libs/libsndfile |
| 75 |
+ x11-libs/cairo |
| 76 |
+ sci-libs/fftw:3.0= |
| 77 |
+ jack? ( virtual/jack ) |
| 78 |
+" |
| 79 |
+RDEPEND="${DEPEND} |
| 80 |
+ !<media-libs/libsamplerate-0.1.9-r1 |
| 81 |
+" |
| 82 |
+BDEPEND="virtual/pkgconfig" |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
default |
| 86 |
|
| 87 |
diff --git a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild |
| 88 |
index 46defab3244..6ed4dd5751d 100644 |
| 89 |
--- a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild |
| 90 |
+++ b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild |
| 91 |
@@ -1,9 +1,9 @@ |
| 92 |
-# Copyright 1999-2018 Gentoo Foundation |
| 93 |
+# Copyright 1999-2020 Gentoo Authors |
| 94 |
# Distributed under the terms of the GNU General Public License v2 |
| 95 |
|
| 96 |
-EAPI=6 |
| 97 |
+EAPI=7 |
| 98 |
|
| 99 |
-DESCRIPTION="A small collection of programs that use libsndfile" |
| 100 |
+DESCRIPTION="Small collection of programs that use libsndfile" |
| 101 |
HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/" |
| 102 |
|
| 103 |
if [[ ${PV} == *9999 ]]; then |
| 104 |
@@ -18,15 +18,17 @@ LICENSE="GPL-2" |
| 105 |
SLOT="0" |
| 106 |
IUSE="jack" |
| 107 |
|
| 108 |
-RDEPEND=" |
| 109 |
- media-libs/libsndfile:= |
| 110 |
- media-libs/libsamplerate:= |
| 111 |
- x11-libs/cairo:= |
| 112 |
- sci-libs/fftw:3.0= |
| 113 |
- jack? ( media-sound/jack-audio-connection-kit:= )" |
| 114 |
DEPEND=" |
| 115 |
- virtual/pkgconfig |
| 116 |
- ${RDEPEND}" |
| 117 |
+ media-libs/libsamplerate |
| 118 |
+ media-libs/libsndfile |
| 119 |
+ x11-libs/cairo |
| 120 |
+ sci-libs/fftw:3.0= |
| 121 |
+ jack? ( virtual/jack ) |
| 122 |
+" |
| 123 |
+RDEPEND="${DEPEND} |
| 124 |
+ !<media-libs/libsamplerate-0.1.9-r1 |
| 125 |
+" |
| 126 |
+BDEPEND="virtual/pkgconfig" |
| 127 |
|
| 128 |
src_prepare() { |
| 129 |
default |
Archives