gentoo resync : 15.01.2020

4 files changed, 4 insertions, 63 deletions

diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
index 70c78e85f7ef..f9d9756272e1 100644
--- a/media-sound/jaaa/Manifest
+++ b/media-sound/jaaa/Manifest
@@ -1,7 +1,4 @@
-AUX jaaa-0.8.4-makefile.patch 649 BLAKE2B 55eb43842ac70b21dd1028f643524daac61c90de94303da813129efb91d91c292aeae015556224b322997384fb8ada5cdbdb02c9eb1612debe7d58ef27d3657e SHA512 10576c2d2266eb5d793ac322784627b55fc4c2a3f72c11e5117b035215f5df2569717e0a1c20be33b8dd63874d257a51298dbba0e5741b0f654341f5b793a442
 AUX jaaa-0.9.2-Makefile.patch 536 BLAKE2B caafbb1842016a295787cf9682427c02ea68613b2445606f7550e7d7e8498eac3e07fa323f55f6ae242533deb54f61530a3a4049f8138bb4222cc32403e41cd0 SHA512 92bf2c8aa8e49eebdc5c379275d7c8a3a0a355e9b4990503735f6043fc7bf704a80c706a3afacd72583a7e83beb56a232935dab81b22c900dec4ce7939cfaa39
-DIST jaaa-0.8.4.tar.bz2 25282 BLAKE2B b42d5f21fcdcc522724bb609e4e0d2c151a23d10368d7db1ba7b4d34fb648b924a623ed1d21501733af236be1b73a819d2b4cdfe6075047e6f709b4ecdfa6416 SHA512 d83dad995d4d6919e719671e19610be9cc6b9c14d922eabc6892f3427584baaacc212b37f0466373a38f1fcc65838851c09bb2ae72d9dfdc9c52921b594cbe8d
 DIST jaaa-0.9.2.tar.bz2 23839 BLAKE2B bccf8fd7e4d25c0cc32ea999bd997c98cc57be01dd1f098b22c09310e29e38da2eb411f252ab1b1da41ce35aa57ec75d10984c3fbd2addca05d9a0b48f4d490a SHA512 bddc08774891e7cfda11a58b87b4150131577c8a4a200b7420e20937cb9fea264b9d3c335e56456d0040ec0d4ff0324821606dca85c96e43b4e3b0afe50ac83b
-EBUILD jaaa-0.8.4.ebuild 891 BLAKE2B e777b57b846021cb6a4d464363dd13484a93db111b4bf3c4de7b7b46a62b09dc25870d387a9df14a3fb0d30d1da1f6f1b85601ca00c1f756cf58293383019c49 SHA512 5edc2de6318abf7a54287c05506a87dc0efee81085ec0f46feedd05003afc9b286315a407a6d6daaaab7b5756e9903d7d060738eec1c428735a0af70403da721
-EBUILD jaaa-0.9.2.ebuild 837 BLAKE2B 5277f95029c5469ad4b7455310a7b8c65cf9600deedd17fedc497fe97c7176fcb8b4e1a985644c067b7035da836fae01aaba0d8898619c9fafc19cb6863e9ccd SHA512 9b8b0db318546eee5afd8d0d2d2e1a6e3c0c554fe46e6b7a4a74a0f804c967662b1f244fd7c1dee98c6a668127198ea5e5a259b744cf53c6828c551011886eff
+EBUILD jaaa-0.9.2.ebuild 831 BLAKE2B 1b09bbe4ec852e993dd30c5db500127c445606b5012e5361c03e13b203319fed59cddeccfbb8602d647e3c1163d49503f29769d72b0c1003d145892ddf84837e SHA512 ceb79376d24dc1bda8842c139261943250de9194f7d8bac2848b33e0c91e3631f2b562c12d4e9743d965fbbd6a7bdb2f7f080fcac89d4e450900064ebc14b15e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/jaaa/files/jaaa-0.8.4-makefile.patch b/media-sound/jaaa/files/jaaa-0.8.4-makefile.patch
deleted file mode 100644
index 8cb54698d488..000000000000
--- a/media-sound/jaaa/files/jaaa-0.8.4-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- jaaa-0.8.4/source/Makefile
-+++ jaaa-0.8.4/source/Makefile
-@@ -24,15 +24,14 @@
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.8.4
- CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
--CXXFLAGS += -O2 -Wall -MMD -MP
--CXXFLAGS += -march=native
-+CXXFLAGS += -Wall -MMD -MP
- LDFLAGS += -L/usr/X11R6/$(LIBDIR)
- LDLIBS += -lzita-alsa-pcmi -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
- 
- 
- JAAA_O = jaaa.o styles.o spectwin.o audio.o rngen.o
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o $@ $(JAAA_O) $(LDLIBS)
- 
- $(JAAA_O):
- -include $(JAAA_O:%.o=%.d)
diff --git a/media-sound/jaaa/jaaa-0.8.4.ebuild b/media-sound/jaaa/jaaa-0.8.4.ebuild
deleted file mode 100644
index c14055e896d3..000000000000
--- a/media-sound/jaaa/jaaa-0.8.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/zita-alsa-pcmi
-	media-sound/jack-audio-connection-kit
-	>=media-libs/libclalsadrv-2.0.0
-	>=media-libs/libclthreads-2.2.1
-	>=media-libs/libclxclient-3.3.2
-	sci-libs/fftw:3.0=
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.8.4-makefile.patch )
-
-src_compile() {
-	tc-export CC CXX
-	emake -C source PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake -C source PREFIX="${EPREFIX}"/usr DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/media-sound/jaaa/jaaa-0.9.2.ebuild b/media-sound/jaaa/jaaa-0.9.2.ebuild
index a7ac6d797963..b6575ea56713 100644
--- a/media-sound/jaaa/jaaa-0.9.2.ebuild
+++ b/media-sound/jaaa/jaaa-0.9.2.ebuild
@@ -11,16 +11,16 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 CDEPEND="
+	dev-libs/libclthreads
 	>=media-libs/zita-alsa-pcmi-0.3
-	media-libs/libclthreads
-	media-libs/libclxclient
 	sci-libs/fftw:3.0=
 	virtual/jack
 	x11-libs/gtk+:2
+	x11-libs/libclxclient
 "
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"