gentoo resync : 18.03.2018

6 files changed, 2 insertions, 127 deletions

diff --git a/media-sound/jaaa/Manifest b/media-sound/jaaa/Manifest
index beba4c391b1e..4ba18604082c 100644
--- a/media-sound/jaaa/Manifest
+++ b/media-sound/jaaa/Manifest
@@ -1,10 +1,4 @@
-AUX jaaa-0.4.2-makefile.patch 725 BLAKE2B 531bae6e462ed083c0132593232f5feb911316f501fce2433791a465e04abfec9ab3ec6457229b5f666c433c3142131088c294f91b23572f4db434060e6a66b3 SHA512 17827e9b24813288eb53ac8a50d3183a10e7f0b7908b8d2f5b2b09ccff84d93e13d4d3423d248d04941b2abdee92c2abeed3ecbeff9907ffa03dab900f85fb1e
-AUX jaaa-0.6.0-makefile.patch 937 BLAKE2B 6440d6cf3632888398f10eff20f6041ec2b8ae8d281fb4a16e7d69f75228e31b4b7cf513fd82a78804ceca112e0547610a9c83240dfe34795144983046b652d8 SHA512 b1fe792967c1e34e20d991a3afbeeac46b2c4697c8622d8f929652945995f9056b1b0e3a49c64cbde5f8df7d9b7981b5ffcae44b0707367ff26003d0aa4fd84a
 AUX jaaa-0.8.4-makefile.patch 649 BLAKE2B 55eb43842ac70b21dd1028f643524daac61c90de94303da813129efb91d91c292aeae015556224b322997384fb8ada5cdbdb02c9eb1612debe7d58ef27d3657e SHA512 10576c2d2266eb5d793ac322784627b55fc4c2a3f72c11e5117b035215f5df2569717e0a1c20be33b8dd63874d257a51298dbba0e5741b0f654341f5b793a442
-DIST jaaa-0.4.2.tar.bz2 25307 BLAKE2B 81896c0a5030404c2f451ccf6f6fb3aa5ed9e69be9a4038a5771b85be517dba83d321e8b9fa00c225bc2cdcc41fca4ff8757b04401b7d124f20b07eaf765bdd7 SHA512 c587a616f5ed882c238bf8fc9673d9072fc63d7e345434348427f6c0f64e134685ad3dfbb4bd6abdbc992ba33c69fb96e44be7ef36c7dfcbe7561a53ed481292
-DIST jaaa-0.6.0.tar.bz2 25375 BLAKE2B 773183f25846a6a56a55c0fc2e9d72bd6bc4bea2e5416b0d2c3b768f133887c6d7b6a2afd829ae04a0d5623e0afb9e5ec8212eb5cd0856cc518ceed9bea6935e SHA512 a93ea4c8a5fe9b1589a5c47052eb56b74164a6baaee835f11c261dd8cfa1141354d52ec71519bff93ecce9d7787138b5d12ead10f44fa3f4d0d83ecc390f3538
 DIST jaaa-0.8.4.tar.bz2 25282 BLAKE2B b42d5f21fcdcc522724bb609e4e0d2c151a23d10368d7db1ba7b4d34fb648b924a623ed1d21501733af236be1b73a819d2b4cdfe6075047e6f709b4ecdfa6416 SHA512 d83dad995d4d6919e719671e19610be9cc6b9c14d922eabc6892f3427584baaacc212b37f0466373a38f1fcc65838851c09bb2ae72d9dfdc9c52921b594cbe8d
-EBUILD jaaa-0.4.2.ebuild 828 BLAKE2B 09d40349e6be32a57dd6f8a4cb04df27d2a35e8946243465776da8e2c1faa5a5a964c882a6a64eb9fdb66b37bd4bc2127c25db4885e1c7d871a717b1f16e3866 SHA512 8bf0eea950e5a1bd775c6ab36045217e5180452fe90c76f6d7e13213b90a842c677feb1d3f29b7682234d7589cb785fd822bd4dd4f72cead99fbb34ce6e74ba0
-EBUILD jaaa-0.6.0.ebuild 853 BLAKE2B f2d5402d07be9d730918375827c69354a36ae79ae812c3724a054dcbadaa3411f8b40bbf8c2a97268e4c4024c2559d479636c60838c23ec6d6edaacf90546e43 SHA512 5ee1a764c3599480d826e475daec4700355ac331cc8e5d540b8efc90118e6abc2348a9d320430599e3ae463f27ccba651e8591a52db9ec3bf9405a1aad63ca55
-EBUILD jaaa-0.8.4.ebuild 892 BLAKE2B a07b2ae80caa8f6042d63f698f4633158889e46348970938f98c143840c458b1f970716c032c9004f7ea349871fc45e6abc3e212a5d231ec6333c8abdb49f8bb SHA512 7c3fcf3e17d82c6a8aa6334a085195f5ad86dc3ad8f9dad7cd0fc77e42275745455f0f35dd51336303b2346fe4ea17dcce3e64c546978868673124b7fc257911
+EBUILD jaaa-0.8.4.ebuild 891 BLAKE2B e777b57b846021cb6a4d464363dd13484a93db111b4bf3c4de7b7b46a62b09dc25870d387a9df14a3fb0d30d1da1f6f1b85601ca00c1f756cf58293383019c49 SHA512 5edc2de6318abf7a54287c05506a87dc0efee81085ec0f46feedd05003afc9b286315a407a6d6daaaab7b5756e9903d7d060738eec1c428735a0af70403da721
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch b/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch
deleted file mode 100644
index 1b483c0de2d3..000000000000
--- a/media-sound/jaaa/files/jaaa-0.4.2-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: jaaa/Makefile
-===================================================================
---- jaaa.orig/Makefile
-+++ jaaa/Makefile
-@@ -20,7 +20,7 @@ SUFFIX := $(shell uname -m | sed -e 's/^
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.4.2
- DISTDIR = jaaa-$(VERSION)
--CPPFLAGS += -O3 -Wall -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
-+CPPFLAGS += -Wall -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
- #CPPFLAGS += -march=pentium4
- 
- LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
-@@ -31,7 +31,7 @@ JAAA_O = jaaa.o styles.o spectwin.o audi
- 
- 
- jaaa:	$(JAAA_O)
--	g++ $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
-+	$(CXX) $(LDFLAGS) -o jaaa $(JAAA_O) $(LDLIBS)
- 
- 
- install:	jaaa
diff --git a/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch b/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch
deleted file mode 100644
index cfbe5be6b175..000000000000
--- a/media-sound/jaaa/files/jaaa-0.6.0-makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: jaaa-0.6.0/Makefile
-===================================================================
---- jaaa-0.6.0.orig/Makefile
-+++ jaaa-0.6.0/Makefile
-@@ -24,8 +24,7 @@ SUFFIX := $(shell uname -m | sed -e 's/^
- LIBDIR = lib$(SUFFIX)
- VERSION = 0.6.0
- DISTDIR = jaaa-$(VERSION)
--CPPFLAGS += -O2 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
--CPPFLAGS += -march=native
-+CPPFLAGS += -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
- 
- LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
- LDLIBS += -lclalsadrv -lclthreads -lclxclient -lpthread -lfftw3f -ljack -lasound -lpthread -lXft -lX11 -lrt
-@@ -33,7 +32,7 @@ LDLIBS += -lclalsadrv -lclthreads -lclxc
- 
- 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.4.2.ebuild b/media-sound/jaaa/jaaa-0.4.2.ebuild
deleted file mode 100644
index b1a2f3947a31..000000000000
--- a/media-sound/jaaa/jaaa-0.4.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="JACK and ALSA Audio Analyser is an audio signal generator and spectrum analyser"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio"
-SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="media-sound/jack-audio-connection-kit
-	>=media-libs/libclalsadrv-1.2.1
-	>=media-libs/libclthreads-2.2.1
-	>=media-libs/libclxclient-3.3.2
-	>=sci-libs/fftw-3.0.0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake || die
-}
-
-src_install() {
-	dobin jaaa || die
-	dodoc AUTHORS README
-}
diff --git a/media-sound/jaaa/jaaa-0.6.0.ebuild b/media-sound/jaaa/jaaa-0.6.0.ebuild
deleted file mode 100644
index 6a3b2345d6b7..000000000000
--- a/media-sound/jaaa/jaaa-0.6.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="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.0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake PREFIX=/usr
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc AUTHORS README
-}
diff --git a/media-sound/jaaa/jaaa-0.8.4.ebuild b/media-sound/jaaa/jaaa-0.8.4.ebuild
index adabb85a3275..c14055e896d3 100644
--- a/media-sound/jaaa/jaaa-0.8.4.ebuild
+++ b/media-sound/jaaa/jaaa-0.8.4.ebuild
@@ -11,7 +11,7 @@ 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=""
 
 RDEPEND="media-libs/zita-alsa-pcmi