gentoo resync : 18.11.2019

3 files changed, 55 insertions, 46 deletions

diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 53501fddb4aa..37f74117b91f 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,3 +1,3 @@
-DIST gigedit-0.2.0.tar.gz 810112 BLAKE2B 6979ba02f674517f3c4b8ea6f0dfc392b5c996376c0231e940e2f306d93425288d1ff34c0117c54dcd892d3b2a27d2de15c272a382cdb5dd358b33c13a712232 SHA512 084955bb851709c1c11dfb8257d4b3667fa61fcad59965de32bfe83edae3b42b1f1f4f03b5a7ec427f47f5fc2e2150b8c5c3908e5d0bb242db1163370289f912
-EBUILD gigedit-0.2.0-r1.ebuild 887 BLAKE2B 8e124033c3413a7c75fd96228f3b9d78dc04969fcbe52cc6d4a830c69311f1060db32bea330796bd80fa6db8bc4a4d573f18d345ca64094a7885f1e790212dcc SHA512 f1d535f0104f36f4600ac90a631d8805dc0f4eb60fd0a333ef935705f2a0b8ce402dfe38a4a4bc81645805d121833435ac48c11039c9865d5d68302968307f5b
+DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964
+EBUILD gigedit-1.1.1-r1.ebuild 1117 BLAKE2B c15ccf312b1c77059612918838603a991cdea09e288eb764a8665677d34b609e4bf90b7a19f8288f19f752608cd41192627a6d959abcace73ddb187a636f2b45 SHA512 36087dfed26f0c719cfc10ffad147eac8215f45001fde959366540c6adb1dc51e9ac355fadfe8ca5f22b9ab2a128cef0442f4e159bbe06174364c761a214a89e
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
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 db8af2e6436c..000000000000
--- 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-r1.ebuild b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..0a060c062b8d
--- /dev/null
+++ b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils desktop xdg
+
+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"
+
+	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
+}