4 files changed, 93 insertions, 52 deletions
diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest
index 9269e65d61a6..872d34561080 100644
--- a/media-sound/aeolus/Manifest
+++ b/media-sound/aeolus/Manifest
@@ -1,5 +1,6 @@
-DIST aeolus-0.9.0.tar.bz2 69017 BLAKE2B 580130a5abb5323edee144e7d67052c037ff35369badf80e8efa479175f1e33c03666ca386ef60e2a3c23f5b3a4e5aeefa8294aaa30196e54154ca86ccbfabfc SHA512 b73ddcb3338dc2c30d11976c1cb7239fab455faf6b1cfc87582a1e48e8bdb90f163b467e93ed5e1c524900ecf59802f4012f83b2181cccad52186c99cfa2baf9
+AUX aeolus-0.9.7-fix-Makefile.patch 1102 BLAKE2B 9e8daec4fde583e3605ac9159bcd9e101f33b2fcb766f696a167ddef65e933d70ea1d93fd15f663f92b8861d529b3668c4673ffffbea7d713d96ab8bb282c89b SHA512 87c70d21dc104b64cbd7f52e73425de6d2a0671936e14afe21a28f9af8f5d9c1e9dc8164db1e702a78c335ce00097b0edd3b2626e54b68914c4baa562963c370
 DIST aeolus-0.9.5.tar.bz2 69139 BLAKE2B e8f1f768303938cc134d1c3bec7e15f4af03150a6c572b5a9502bae41ee1d2c750f7e3a40161554d5a15c68bb96928cb41a019fa77088f05dfed56f422eb550a SHA512 e80e7a861934b287afefe0186bd78c2d51662c29d3b7292469244c52b4949698c512dff72bebe1f76cf98e17e3f9183d3ce7a7da4856bf936dab091d3b9f4b0b
-EBUILD aeolus-0.9.0.ebuild 1410 BLAKE2B 0ab296a7c119e2645f27da0a996e00be5fef107c822262a9face03bea24edbea5719aa94f4a1c0c92b4fcd0eb52caf8bed2967a15960bbb429007e72173e9853 SHA512 6eb5f61f563eb6d181cabc391a4ebd160d502d8d1df0801049d91756951f44d5fb0ed3b2e4985135ad1a72b7243cdc6610b80636c52d1b729c0eacd7febdf004
+DIST aeolus-0.9.7.tar.bz2 66532 BLAKE2B 611d48724b0b85afb8b82e5c2c9590a1da5d22154a5f8c228bdc4f83490113115132c08b79d07d0a5b9a2c66e0b5f9776504a3e919f00f75202ec43d0c7da193 SHA512 ea81b784a26441e93535c9e3cd7b8c9c6b4f9946bd8aac0b84adc89e986986fd7f45b9b45d70f211323a4c616de8b8d8d16508e9553c694a4a6a74aeaf833ec2
 EBUILD aeolus-0.9.5.ebuild 1407 BLAKE2B 881cbcf1ffd733ff3ccd7f76433f13e54bb91f2ded2634213180f6bb079f3859e5a6fda740cbda8414e4fb4d613f8cecb35214f37df453823ff21c0b8f70fe1b SHA512 7fd6130db089fd24301ed4b5af3b29221d9de57d39f387f4399855eb2dda53e1b02c3528d25cf208763fc0b4bf2d7d7de59e49547fc616f4c160e87779ec96ff
+EBUILD aeolus-0.9.7.ebuild 1270 BLAKE2B e3248bdba66bc40b92598ce05db0737bf6863c383ead6e99716665e7fc7f394c1d276b0055fdb6fb99581867a8cf09d1b37a866bb4c259479631d6b96db2a7fa SHA512 47c4bd1c4d269fa793136166972c2b30dadf7ea94cd71c6cafa3aab799cb1823e9d6e33d8a7fc0d99afc48655ad51ad5efb290a40cfe0fd34e10abc4255d9329
 MISC metadata.xml 826 BLAKE2B 4862927f235f598d16eed170670412d275420eda966c7ae740cdc2c30201a277b8c46b9a67978ab32d28b8486dbcaa896a88eb2ab68b4ec3b442aa031fdc525e SHA512 2b7e3f8ca98741ea01169a8c901b75509be285edbefec13eec449cb59fb0548158aed46054aac2a9095098e123a6cced745bc74b07b105ad9909a66de4a05368
diff --git a/media-sound/aeolus/aeolus-0.9.0.ebuild b/media-sound/aeolus/aeolus-0.9.0.ebuild
deleted file mode 100644
index 151f8c188ec4..000000000000
--- a/media-sound/aeolus/aeolus-0.9.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator toolchain-funcs multilib flag-o-matic
-
-MY_P=${PN}-$(replace_version_separator 3 '-')
-
-DESCRIPTION="A synthesised pipe organ emulator"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	media-libs/zita-alsa-pcmi
-	>=media-libs/libclthreads-2.4.0
-	>=media-libs/libclxclient-3.6.1
-	x11-libs/libXft
-	x11-libs/libX11
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	media-libs/alsa-lib
-	sys-libs/readline:0"
-
-RDEPEND="${DEPEND}
-	media-libs/stops"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)/source
-
-src_compile() {
-	tc-export CXX
-	append-cppflags $($(tc-getPKG_CONFIG) --cflags xft)
-	sed -i -e "s/-O3//" Makefile || die "Failed to remove forced CFLAGS"
-	sed -i -e "s:ldconfig:true:" Makefile || die "Failed to remove ldconfig call"
-	sed -i -e "s/g++/$(tc-getCXX)/" Makefile || die "Failed to set correct compiler"
-	sed -i -e "s/-lXft/`$(tc-getPKG_CONFIG) --libs xft`/" Makefile || die
-	emake PREFIX="/usr" LIBDIR=$(get_libdir)
-}
-
-src_install() {
-	emake PREFIX="${D}/usr" install
-	dodoc ../README ../AUTHORS
-	echo "-S /usr/share/stops" > "${T}/aeolus.conf"
-	insinto /etc
-	doins "${T}/aeolus.conf"
-}
diff --git a/media-sound/aeolus/aeolus-0.9.7.ebuild b/media-sound/aeolus/aeolus-0.9.7.ebuild
new file mode 100644
index 000000000000..a7d82f406ef9
--- /dev/null
+++ b/media-sound/aeolus/aeolus-0.9.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib desktop xdg
+
+DESCRIPTION="A synthesised pipe organ emulator"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	media-libs/alsa-lib
+	media-libs/libclthreads
+	media-libs/libclxclient
+	>=media-libs/zita-alsa-pcmi-0.3
+	sys-libs/readline:0
+	virtual/jack
+	x11-libs/libX11
+	x11-libs/libXft
+"
+DEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	media-libs/stops
+"
+
+DOCS=( README COPYING AUTHORS )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-Makefile.patch
+)
+
+src_compile() {
+	cd "${S}"/source || die "Failed to cd to source dir"
+	tc-export CXX
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags xft)
+	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EXPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+
+	cd "${S}"/source || die "Failed to cd to source dir"
+	emake PREFIX="${D}/usr" install
+	echo "-S ${EPREFIX}/usr/share/stops" > "${T}/aeolus.conf"
+	insinto /etc
+	doins "${T}/aeolus.conf"
+
+	make_desktop_entry aeolus Aeolus "" "AudioVideo"
+}
diff --git a/media-sound/aeolus/files/aeolus-0.9.7-fix-Makefile.patch b/media-sound/aeolus/files/aeolus-0.9.7-fix-Makefile.patch
new file mode 100644
index 000000000000..07619475eca1
--- /dev/null
+++ b/media-sound/aeolus/files/aeolus-0.9.7-fix-Makefile.patch
@@ -0,0 +1,31 @@
+diff --git a/source/Makefile b/source/Makefile
+index f9e75bd..8390bd2 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -24,7 +24,7 @@ LIBDIR ?= $(PREFIX)/lib$(SUFFIX)
+ 
+ VERSION = 0.9.7
+ CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\"
+-CXXFLAGS += -O2 -Wall
++CXXFLAGS += -Wall
+ CXXFLAGS += -march=native
+ 
+ 
+@@ -45,7 +45,7 @@ $(AEOLUS_O):
+ XIFACE_O =	styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o \
+ 	midimatrix.o multislider.o functionwin.o xiface.o addsynth.o
+ aeolus_x11.so:	CPPFLAGS += -D_REENTRANT
+-aeolus_x11.so:	CPPFLAGS += $(shell pkgconf --cflags freetype2)
++aeolus_x11.so:	CPPFLAGS += $(shell pkg-config --cflags freetype2)
+ aeolus_x11.so:	CXXFLAGS += -shared -fPIC
+ aeolus_x11.so:	LDFLAGS += -shared
+ aeolus_x11.so:	LDLIBS += -lclthreads -lclxclient -lpthread -lXft -lX11
+@@ -74,7 +74,7 @@ install:	aeolus aeolus_x11.so aeolus_txt.so
+ 	install -m 755 aeolus $(DESTDIR)$(BINDIR)
+ 	install -m 755 aeolus_x11.so $(DESTDIR)$(LIBDIR)
+ 	install -m 755 aeolus_txt.so $(DESTDIR)$(LIBDIR)
+-	ldconfig $(PREFIX)/$(LIBDIR)
++	true $(PREFIX)/$(LIBDIR)
+ 
+ 
+ clean: