From 26ad131c452c364eb96bff041358a414660a17e3 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Thu, 18 Jun 2020 11:25:18 +0200 Subject: media-sound/zyn-fusion: applied update from bug #700326 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Miroslav Šulc --- media-sound/zyn-fusion/Manifest | 3 +-- media-sound/zyn-fusion/zyn-fusion-9999.ebuild | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/media-sound/zyn-fusion/Manifest b/media-sound/zyn-fusion/Manifest index 3569b5e18..00280ae43 100644 --- a/media-sound/zyn-fusion/Manifest +++ b/media-sound/zyn-fusion/Manifest @@ -1,3 +1,2 @@ -DIST libuv-v1.9.1.tar.gz 1054443 BLAKE2B 2605838129acd457777cffba3396da08d8e6f653660aed2860d2f92642cc06a9bb01f7d5f5ec5d3c56518435339d9c4e840d783ce3d92a9bce595481553700f4 SHA512 d243e7b1282d2627cfb6958294d0c29ba51a8ea0bb85a50dafa0d762b8255fe280c6afd310f0898e022e15b2be97c10ac50e2bf140f23d6a49dd1a0a5dd6d546 -EBUILD zyn-fusion-9999.ebuild 991 BLAKE2B f34551322e8ffca607fba0ef56ec2ceafbcdcf5c33ca2521fdf16167db491eff1c58b4094babc97d4f3e0c579c78bbd5fc8a5f358b9a138653a87869d08cbe31 SHA512 0d514cbcaca92dcca58858d76dac9759237e0f7f24de562b48e552a6be489638108e15cf791d9d9a0c90b569d8ef42f2032e98456f7d58dcbdac575a23b40d54 +EBUILD zyn-fusion-9999.ebuild 1151 BLAKE2B a826682d5a264c0cfd0c97bfdf5a688c0cb3255a5ddc860a146d916701de2111bd41ee6c576898bbcf5853cec6fef9ac5551e14d84436dfb659d51901c0bc392 SHA512 2b6572756719c10d76fc6ac3980582d0c7bea1c3e9d73851392bad4e13d2f8fb7753318bc29d3f2b3fef46235e8350e42a653ee6ef527fb2adb59b3c6662435e MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25 diff --git a/media-sound/zyn-fusion/zyn-fusion-9999.ebuild b/media-sound/zyn-fusion/zyn-fusion-9999.ebuild index 313abb040..a7250a7ab 100644 --- a/media-sound/zyn-fusion/zyn-fusion-9999.ebuild +++ b/media-sound/zyn-fusion/zyn-fusion-9999.ebuild @@ -5,44 +5,40 @@ EAPI=7 inherit git-r3 -UV_PV="1.9.1" - DESCRIPTION="Zyn-Fusion User Interface" HOMEPAGE="https://github.com/mruby-zest/mruby-zest-build" EGIT_REPO_URI="https://github.com/mruby-zest/mruby-zest-build" -SRC_URI="https://dist.libuv.org/dist/v${UV_PV}/libuv-v${UV_PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" IUSE="" -DEPEND="" +DEPEND="dev-libs/libuv + x11-libs/libX11 + x11-libs/libxcb" RDEPEND="${DEPEND}" BDEPEND="" -# TODO use system libuv and as much libs as possible -# TODO Change /opt/ default (need to check whole source repository) - -src_unpack() { - git-r3_src_unpack - default_src_unpack -} +# TODO Use gentoo custom "FLAGS" (makefile and rake file) +# TODO allow binary, library and data installation in standard path src_prepare() { - ln -s "${WORKDIR}"/libuv-v${UV_PV} deps/ + # Unbundle libuv: makefile and rake file + sed -i -e "s%./deps/\$(UV_DIR)/.libs/libuv.a%`pkg-config --libs libuv`%" \ + -e 's%-I ../../deps/\$(UV_DIR)/include%-I /usr/include/uv/%' Makefile + sed -i -e "/deps\/libuv.a/s/<< .*/<< \"`pkg-config --libs libuv`\"/" \ + -e 's%../deps/libuv-v1.9.1/include/%usr/include/uv/%' build_config.rb eapply_user } src_compile() { - emake builddep default_src_compile emake pack } src_install() { cd package - touch qml/MainWindow.qml exeinto /opt/${PN} doexe zest -- cgit v1.2.3-65-gdbad