gentoo resync : 21.01.2018

3 files changed, 43 insertions, 4 deletions

diff --git a/media-sound/sndfile-tools/Manifest b/media-sound/sndfile-tools/Manifest
index d75961d55cc9..663e11ddd9cd 100644
--- a/media-sound/sndfile-tools/Manifest
+++ b/media-sound/sndfile-tools/Manifest
@@ -1,6 +1,8 @@
 AUX sndfile-tools-1.03-remove-Werror.patch 660 BLAKE2B 2f85751bff305926e47888b8da6b2a9bbf2ff21c85a56c76aa226770e79f20caaf5dfbcac0963c177b513865b3623eba86e7dd768d4f65da0dd497c09c189029 SHA512 e16c01184b118f7a412f50f05470da41b73fad9258e0c8108ab8cc0c2eaf70e09f4832d4b060b90e5e189535f83cf18d62180d9496b30910669385467c6fa919
 DIST sndfile-tools-1.03.tar.gz 474494 BLAKE2B 17c8f6782895a5e02bcd39e0e966a9196fe26b8fa192b3375a4f167cb554de168d4ce4e638d792720ee3e74483a88060ef9bf6d3713c91834acc9b39427185e2 SHA512 bc6ac7977a95ccf845c889db81452ae84b4f10a8f51c91ddd6fe4d926337a60cdbcb2859b0758816622554bf26a6e42b70f791f2c5158926c3f92ab2abbf14dc
+DIST sndfile-tools-1.04.tar.bz2 714880 BLAKE2B 14d8f9a8172e4e3d8fe320baf3e546c3998636c0de36e8b41e38e277c18f2af6c3ea944eb4cecdda0e225fa3d7adbcd3a5618e74a9d567c42eb0056f162703e3 SHA512 90b0121f4d0bf3ebf3962cc47bcd6a11e5a644d0567be137a8bcf5881944e03e3c9650c9813c982a58072154f62dd176c46cfe83e5661ff81205db30923b71d3
 EBUILD sndfile-tools-1.03-r1.ebuild 566 BLAKE2B 4ce23c6046c637aba54338e506ee85cf8833d0dea7d462e7f2bc489096ebbd7185fbf08e9a53fb2b3d9a22a62171920367d42c86eb60576ffff76421b47ce6ee SHA512 2608ff60cc47f06c37955cd85c76ebfb698a86cfdf24bad580262a73ee465b187e7bd479760c7a74ec7d7a09694c8fc2f68ddc3fc8c9fa4176099e6b3f459c24
 EBUILD sndfile-tools-1.03.ebuild 648 BLAKE2B 98ce9bcf1a69c4e9f29ca63b9e405ab737f3ce7b9bd2027b1d8f2dfcfe84abfd34372893d112161372424b6cfff8909a880116380cfabcb5b5771ed249357b00 SHA512 deb4e326d087cbae4ce5d1e7c725596321529e5b02cba885eacfee18eb01ca06c11f0dc4d1bac7d372f30a3ff28f63947fdeab1f6d2fb7d9a8dcd64cb3e67765
-EBUILD sndfile-tools-9999.ebuild 790 BLAKE2B f7f1c9d11f67d2a6dc1ac4ed1ef54792b1638d0a72f2554517993d473acffa3ef7720af77421f7d6728b33a68ae52c30e5663db2bc1e63f0f72ecbc3f05e4864 SHA512 45908c7c4a07342f045fddca47efabb5654d507af8d722df151cd8d5336be493ec64a3a51e153e470ef3e9304fd516fa795ed93f133db96729d8cba808949738
+EBUILD sndfile-tools-1.04.ebuild 790 BLAKE2B 88cf4dab199359745db0bf7221af87f1ef6f4697546c0e011b9c2f9963ed2735e32275c88559ba38a075c5b7789676018ed808c05ed27d420c9f6a22648f63e3 SHA512 15d27798bd10316f4bd94de55b4e2af78aacf7e622af92ab0a7bd8290b95ab81c0c064d730550b91e7852e0e89dddfa85621eacb36217ef49acc4458eb022c66
+EBUILD sndfile-tools-9999.ebuild 790 BLAKE2B 88cf4dab199359745db0bf7221af87f1ef6f4697546c0e011b9c2f9963ed2735e32275c88559ba38a075c5b7789676018ed808c05ed27d420c9f6a22648f63e3 SHA512 15d27798bd10316f4bd94de55b4e2af78aacf7e622af92ab0a7bd8290b95ab81c0c064d730550b91e7852e0e89dddfa85621eacb36217ef49acc4458eb022c66
 MISC metadata.xml 572 BLAKE2B 473449aba53817e0599e9135148ddf893d438fba7bac2325c923a180c3ef10fb63de920af5e1201117d1130647455e7f57f6e131cffd0ac9d5b82e6750ff014c SHA512 9d91c621d44f3a3bb70ac84f026d746db918ce6ba0c4b6b9b7e2c85811e10f4c7936cbb15368ae1d38bed6a593115ec7a63f6966aae30cc88140c6edf3527ec2
diff --git a/media-sound/sndfile-tools/sndfile-tools-1.04.ebuild b/media-sound/sndfile-tools/sndfile-tools-1.04.ebuild
new file mode 100644
index 000000000000..46defab32442
--- /dev/null
+++ b/media-sound/sndfile-tools/sndfile-tools-1.04.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A small collection of programs that use libsndfile"
+HOMEPAGE="http://www.mega-nerd.com/libsndfile/tools/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/erikd/sndfile-tools.git"
+else
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="jack"
+
+RDEPEND="
+	media-libs/libsndfile:=
+	media-libs/libsamplerate:=
+	x11-libs/cairo:=
+	sci-libs/fftw:3.0=
+	jack? ( media-sound/jack-audio-connection-kit:= )"
+DEPEND="
+	virtual/pkgconfig
+	${RDEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable jack)
+}
diff --git a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
index b09d2f4021f4..46defab32442 100644
--- a/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
+++ b/media-sound/sndfile-tools/sndfile-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/erikd/sndfile-tools.git"
 else
-	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.gz"
+	SRC_URI="http://www.mega-nerd.com/libsndfile/files/${P}.tar.bz2"
 	KEYWORDS="~amd64"
 fi
 
@@ -30,7 +30,6 @@ DEPEND="
 
 src_prepare() {
 	default
-
 	[[ ${PV} == *9999 ]] && eautoreconf
 }