gentoo resync : 11.05.2021

4 files changed, 78 insertions, 47 deletions

diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 3b21f68bf369..a224bae8acbf 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,4 +1,6 @@
 DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964
-EBUILD gigedit-1.1.1-r1.ebuild 1109 BLAKE2B 211338b2f7fcfda81fbb1b5e0a387da6eb770a012904545a3ac40a2b1289e479aed65e225d65ca4149d765f6ae5dbd01da2fbf0f3c004312bc06424083d45014 SHA512 252d012c3e22d00c208858c61fded2e0699e502b5dd78d023e5e65b8247f587e6823a2e5de70adea00573a814aeadf937dc103af403212b57209f19f6cd1a769
-EBUILD gigedit-9999.ebuild 1108 BLAKE2B 9ccd9104a94171f655b9a8063b522586d8c946875b38fd367a2436d2e6b0ef271ca54c2f733f1abd3f7e23312afdd052a294e58dd39b1d9de797c2cd4411cbc0 SHA512 5262aaf1758b25adf5a5e18307bf2f2eaaf537be384d44c707620e04245a31ec01a7ce529f17041ada2e8786f260a7a09b137aeaffea6bab30ae1b7147962b7c
+DIST gigedit-1.2.0.tar.bz2 1174502 BLAKE2B 049e4c60b345c192255669a71588df1e2905590f95351d8a79134b210d03087ac9cc33f12cbf2e38208b95ad452f299c78877632989cd914d98a05c5967087d5 SHA512 b991a5193af34be70db6eb8c18fc58e01b822b6997bfc6c3ee06eca42f57375d341316e8abc594824668c7cb916b0643a1ee1b5c34426bf3ec5e202dfc565c8f
+EBUILD gigedit-1.1.1-r1.ebuild 965 BLAKE2B e1426f55ad36985ae38131dc1db9936e96b8736808e9fb1a3ebf54e8ce05a09e624c7faf998442307e7d949f24afdec6848bf1dcc08f332feda94d7eedbf3239 SHA512 65b7981f73005785ae58383c83162f4f21e301f194d90d3bb488db4ab1ff86ed29bf85586418149df20555509df9764ad000e83d2777723a1eebca14f3639432
+EBUILD gigedit-1.2.0.ebuild 1026 BLAKE2B 497454e945acca12e7c65615d6e6b93d2473b7a6ea8010e5a835ccb4e422901c69f95396300ae50c92d36b45a2033acc877cf43a64942a0e3fd0396eb4a2e532 SHA512 e9aa456753499df0363eba63b016667b2922041297eb98f39137788d82880d13bacccb54fca1546d597f423e1561fdd818d82e1468f792f3e6b4ed6df8430f7d
+EBUILD gigedit-9999.ebuild 1012 BLAKE2B fec2f13b93378b6f01f76e8ffdb2c66cc94b8e5b5a489d17da5bff57dc1816e07bcdb152944ae200f6677027d95d569f62d4928befcdf9fa9f2e6d70cf10cd45 SHA512 820026ae8c6914b7ea4eb90354c87e707027fc61e0fedcaafc3410a747149ccc636289b49ea48de37c674cfbb204b4d4e8eede2a286b2fcb72b98197c6e09bc0
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
index e8c0ba9adca2..8c8ab2c48999 100644
--- a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
+++ b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop xdg
+
+inherit autotools desktop flag-o-matic xdg
 
 DESCRIPTION="An instrument editor for gig files"
 HOMEPAGE="http://www.linuxsampler.org/"
@@ -11,43 +12,33 @@ 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="
+RDEPEND="
 	dev-cpp/gtkmm:2.4
 	>=media-libs/libgig-3.3.0
 	>=media-libs/libsndfile-1.0.2
-	>=media-sound/linuxsampler-0.5.1
-"
+	>=media-sound/linuxsampler-0.5.1"
 DEPEND="${RDEPEND}"
-RDEPEND="${CDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
 
 src_prepare() {
 	default
-
 	# docdir is not propagated there
-	sed -i "s%\$(datadir)/doc/\$(PACKAGE)%\$(datadir)/doc/${P}%g" doc/quickstart/Makefile.am || die
+	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
 	eautoreconf
 }
 
 src_configure() {
+	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
 	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"
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/gigedit/gigedit-1.2.0.ebuild b/media-sound/gigedit/gigedit-1.2.0.ebuild
new file mode 100644
index 000000000000..4d2a0ef9057a
--- /dev/null
+++ b/media-sound/gigedit/gigedit-1.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic 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"
+
+RDEPEND="
+	dev-cpp/gtkmm:2.4
+	media-libs/libgig
+	media-libs/libsndfile
+	media-sound/linuxsampler"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# docdir is not propagated there
+	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
+	# file missing in pot file
+	echo src/gigedit/ScriptPatchVars.cpp >> "po/POTFILES.in" || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
+	econf --disable-static
+}
+
+src_install() {
+	default
+	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/gigedit/gigedit-9999.ebuild b/media-sound/gigedit/gigedit-9999.ebuild
index 6aee05e17e9a..aaef3a74634e 100644
--- a/media-sound/gigedit/gigedit-9999.ebuild
+++ b/media-sound/gigedit/gigedit-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop xdg subversion
+
+inherit autotools desktop flag-o-matic xdg subversion
 
 DESCRIPTION="An instrument editor for gig files"
 HOMEPAGE="http://www.linuxsampler.org/"
@@ -10,44 +11,35 @@ ESVN_REPO_URI="https://svn.linuxsampler.org/svn/gigedit/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
-BDEPEND="
-	sys-devel/gettext
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-CDEPEND="
+RDEPEND="
 	dev-cpp/gtkmm:2.4
-	>=media-libs/libgig-3.3.0
-	>=media-libs/libsndfile-1.0.2
-	>=media-sound/linuxsampler-0.5.1
-"
+	media-libs/libgig
+	media-libs/libsndfile
+	media-sound/linuxsampler"
 DEPEND="${RDEPEND}"
-RDEPEND="${CDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
 
 src_prepare() {
 	default
-
 	# docdir is not propagated there
-	sed -i "s%\$(datadir)/doc/\$(PACKAGE)%\$(datadir)/doc/${P}%g" doc/quickstart/Makefile.am || die
+	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
+	# file missing in pot file
+	echo src/gigedit/ScriptPatchVars.cpp >> "po/POTFILES.in" || die
 	eautoreconf
 }
 
 src_configure() {
+	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
 	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"
+
+	find "${ED}" -name '*.la' -delete || die
 }