[gentoo-commits] repo/gentoo:master commit in: media-sound/gigedit/

[Miroslav Šulc]

commit:     9f6749af6b2d7204962926bd368ae30dff5d3ae4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 16:55:34 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 16:55:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6749af

media-sound/gigedit-1.1.1: bump (removed 0.2.0-r1)

updated the ebuild

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

 media-sound/gigedit/Manifest                |  2 +-
 media-sound/gigedit/gigedit-0.2.0-r1.ebuild | 44 -------------------------
 media-sound/gigedit/gigedit-1.1.1.ebuild    | 51 +++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 4c8c589093b..792c3d0bc99 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1 +1 @@
-DIST gigedit-0.2.0.tar.gz 810112 BLAKE2B 6979ba02f674517f3c4b8ea6f0dfc392b5c996376c0231e940e2f306d93425288d1ff34c0117c54dcd892d3b2a27d2de15c272a382cdb5dd358b33c13a712232 SHA512 084955bb851709c1c11dfb8257d4b3667fa61fcad59965de32bfe83edae3b42b1f1f4f03b5a7ec427f47f5fc2e2150b8c5c3908e5d0bb242db1163370289f912
+DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964

diff --git a/media-sound/gigedit/gigedit-0.2.0-r1.ebuild b/media-sound/gigedit/gigedit-0.2.0-r1.ebuild
deleted file mode 100644
index db8af2e6436..00000000000
--- a/media-sound/gigedit/gigedit-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="An instrument editor for gig files"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	>=media-libs/libgig-3.3.0
-	>=media-libs/libsndfile-1.0.2
-	>=media-sound/linuxsampler-0.5.1"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Fix linking, bug #540674
-	sed -i -e 's/@LIBS@/@LIBS@ -lsigc-2.0/g' src/gigedit/Makefile.in
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf --disable-static
-}
-
-src_compile() {
-	# fails with parallel jobs
-	emake -j1
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}

diff --git a/media-sound/gigedit/gigedit-1.1.1.ebuild b/media-sound/gigedit/gigedit-1.1.1.ebuild
new file mode 100644
index 00000000000..b04a0ce5ac2
--- /dev/null
+++ b/media-sound/gigedit/gigedit-1.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="An instrument editor for gig files"
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-devel/gettext
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
+CDEPEND="
+	dev-cpp/gtkmm:2.4
+	>=media-libs/libgig-3.3.0
+	>=media-libs/libsndfile-1.0.2
+	>=media-sound/linuxsampler-0.5.1
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	default
+
+	# docdir is not propagated there
+	sed -i "s%\$(datadir)/doc/\$(PACKAGE)%\$(datadir)/doc/${P}%g" doc/quickstart/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/linuxsampler"
+}
+
+src_install() {
+	default
+
+	einfo "Removing static libs..."
+	find "${D}" -name "*.la" -delete || die "Failed to remove static libs"
+}