[gentoo-commits] repo/gentoo:master commit in: media-sound/aeolus/, media-sound/aeolus/files/

[gentoo-commits] repo/gentoo:master commit in: media-sound/aeolus/, media-sound/aeolus/files/

[Miroslav Šulc]

commit:     b11c809675d56efce2d929a866d13347f8ce6e5d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 12:45:28 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 12:45:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11c8096

media-sound/aeolus-0.9.7: bump

1) updated to eapi 7 + updated
2) updated deps
3) updated changes to Makefile and moved them to patch file
4) added EPREFIX
5) added desktop file

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/aeolus/Manifest                        |  1 +
 media-sound/aeolus/aeolus-0.9.7.ebuild             | 59 ++++++++++++++++++++++
 .../aeolus/files/aeolus-0.9.7-fix-Makefile.patch   | 31 ++++++++++++
 3 files changed, 91 insertions(+)

diff --git a/media-sound/aeolus/Manifest b/media-sound/aeolus/Manifest
index dba17ac9144..1cec3a8655a 100644
--- a/media-sound/aeolus/Manifest
+++ b/media-sound/aeolus/Manifest
@@ -1 +1,2 @@
 DIST aeolus-0.9.5.tar.bz2 69139 BLAKE2B e8f1f768303938cc134d1c3bec7e15f4af03150a6c572b5a9502bae41ee1d2c750f7e3a40161554d5a15c68bb96928cb41a019fa77088f05dfed56f422eb550a SHA512 e80e7a861934b287afefe0186bd78c2d51662c29d3b7292469244c52b4949698c512dff72bebe1f76cf98e17e3f9183d3ce7a7da4856bf936dab091d3b9f4b0b
+DIST aeolus-0.9.7.tar.bz2 66532 BLAKE2B 611d48724b0b85afb8b82e5c2c9590a1da5d22154a5f8c228bdc4f83490113115132c08b79d07d0a5b9a2c66e0b5f9776504a3e919f00f75202ec43d0c7da193 SHA512 ea81b784a26441e93535c9e3cd7b8c9c6b4f9946bd8aac0b84adc89e986986fd7f45b9b45d70f211323a4c616de8b8d8d16508e9553c694a4a6a74aeaf833ec2

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 00000000000..a7d82f406ef
--- /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 00000000000..07619475eca
--- /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: