gentoo resync : 25.08.2020

7 files changed, 114 insertions, 76 deletions

diff --git a/media-sound/jamin/Manifest b/media-sound/jamin/Manifest
index 359dd5029abc..4d4ddf7bdfeb 100644
--- a/media-sound/jamin/Manifest
+++ b/media-sound/jamin/Manifest
@@ -1,5 +1,6 @@
-AUX jamin-0.95.0-desktop.patch 308 BLAKE2B 0c7a0dcdc4d58229fc1d15d50bcbbe53721ae3fcae0bb6c0539a81e0c11b2fa8d3a8f6f5b5975a47bd8097540af3cb4cb6b4ce40e53d34b82656a83ba06ee303 SHA512 e8a5af5ab288af1f4dceb9db09dd42a4eafc1beee14437b5b017085b597d014b76df03320c3089398f24fca9fe95dc49d4bb9ec107d7776b5102b4518d652775
-AUX jamin-0.95.0-multilib-strict.patch 335 BLAKE2B c6cd90004e8ee7ec6191dd251d41ffb462e500dba5774c82dfb71b8e77455fd5f96008b5a8bfc094c138223afb734dd2bed00033d93d88eacc5b5ba342de6918 SHA512 14adfe893d4ea18efbb3a936df34f163689a0cf734ca391d80558d92c4ef82cb944f94d962ecba25fc358e2756b252302ac648d789a850fab608216588d5ed03
-DIST jamin-0.95.0.tar.gz 1007290 BLAKE2B 52e28f05170880307a5e50424fce3511ece30ea9e36e479c38efbbfe80c8c6a4116742c42e74a5ded717ad6d3f6b5c780e6b79c764ad280cba3538678b223866 SHA512 c57079b65e89623ee6b3f1e71d4ce1c2d995e4a14f8decd17b5d936e99469bb85089da063358e966fdc19a6fa419698c9ca586909d85d69b0525e929a3bd2555
-EBUILD jamin-0.95.0-r3.ebuild 886 BLAKE2B 889c50fe1315fccb050b756c0fabd7120e9c2423208128419366bac33aee45c50ec71ebff377718752aab75d13f31e013b80de78b975c9ac88bbcd3899e43012 SHA512 ce179b56433bf6737b1f1ad56b495e670ea0af623198df16eec1918bc6563d000e7b0f3ed398f94f9636d901110e17cec419a589baf9776fa5ee316f3a451bd7
+AUX jamin-0.98.9_pre20170111-desktop.patch 511 BLAKE2B a0f7a9ec3ae5da4bc47eef228054c3330b88869e93e14aeba6225513ec2158e43684cd96b6d44ba1d2ad07101c3a0e3c78c2f201238773e6a0932e8d7f60d790 SHA512 117d589f67bc3039918de90469fba0abdccfbd59562bcbbe345a2bf9c4799a8f00b1137d89df6b929ce5bffc264e9d938d9bb65d6b4514a4cfb0322b5ce3146e
+AUX jamin-0.98.9_pre20170111-gcc10.patch 762 BLAKE2B 0ad04265d62526e4652e1139cb424ed5d2cedb143b0cfd15858110aa4669bb6f1a00e22a88af0019960731f30515319c91553f5c3aea26a946e8e754a261b5c8 SHA512 5e007e149f98987739295ae952d07aa26afbb4777deff1d262b6ce3a5173ccfc15c0d8312f61603daab0b8e90e3280e7fa2fbbd36bd27d6bc552e057fd4eacdc
+DIST jamin_0.98.9~git20170111~199091~repack1-1.debian.tar.xz 12476 BLAKE2B d25f0a27b754a79da7146ec3c104792a20df0e4258ce01bff29011fa04e1d62057f7c11baac7991634f8161da847ced20e8a81b9d92a1f0cb8d035b32adc5ed1 SHA512 f1d2ddc0f1139ffc8ba9036cc385b08cb4c996bf776d909d56e687ead1eee9426e249c46f3eab5d4fde220c75a435a8e4cd9a726f01c9026d42b2208b79c7da7
+DIST jamin_0.98.9~git20170111~199091~repack1.orig.tar.bz2 679350 BLAKE2B fc111a4062c4c4ed43eb9a6ea3f8c1d44afbc63780586e8e3b260ec5f5a56781e1e74dd9ebfaac4fbdbaa487662f6b9d75983e02cdca142335d9cb5d3b666dce SHA512 5887bf1f7021d9730a0904afb532d99d9681aa50468e4cdd69c7a69ea7c248192be9a64de21e3be2d01ec6cc4535361470ebfcc4ca4fa4736fcaf5653293ccbe
+EBUILD jamin-0.98.9_pre20170111.ebuild 1448 BLAKE2B 2ed74f59040b9289d9fe285d852fd86553921c7993ee76d84462b9f1768941be0259e266895cac20c3a7e1af4289ed04e32965195317fcbc70e593fe238fd88d SHA512 658f43bb778fd8ebad5bd985c442d102291d424fdd8ac9e6139ee3b982b328a7b304a7f732ff44c9f528768f103577b4359721eeb545a1247b7460d6f070a688
 MISC metadata.xml 334 BLAKE2B 49b789d957dd730e2d74f25297b90b83357f29cb2ef4c9b8820a39841c334c566bf82752a1ab1d53d7925d9fad8fd1243f00bfbe0bb71ee5edd0999aff303a71 SHA512 4b263c4fc008cbc6e415426fa782c934c55ad5d5f7d7d257ca79e414234cc5284c0edc938d138dcadb670bfbe35857a6103ac0b990f099e694c69e7ae349656a
diff --git a/media-sound/jamin/files/jamin-0.95.0-desktop.patch b/media-sound/jamin/files/jamin-0.95.0-desktop.patch
deleted file mode 100644
index 87cad61a0d0c..000000000000
--- a/media-sound/jamin/files/jamin-0.95.0-desktop.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/data/jamin.desktop.in
-+++ b/data/jamin.desktop.in
-@@ -3,9 +3,9 @@
- _Name=JAMin
- _GenericName=
- _Comment=JACK Audio Mastering interface
--Categories=Application;AudioVideo;
-+Categories=AudioVideo;
- Exec=jamin
--Icon=jamin.svg
-+Icon=jamin
- MimeType=application/x-jamin;
- StartupNotify=true
- Terminal=false
diff --git a/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch b/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch
deleted file mode 100644
index e2e13ce6f452..000000000000
--- a/media-sound/jamin/files/jamin-0.95.0-multilib-strict.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/controller/Makefile.am
-+++ b/controller/Makefile.am
-@@ -1,5 +1,5 @@
- plugin_LTLIBRARIES = jamincont_1912.la
--plugindir = @prefix@/lib/ladspa
-+plugindir = @libdir@/ladspa
- jamincont_1912_la_CFLAGS = @OSC_CFLAGS@ -I../src
- jamincont_1912_la_LIBADD = @OSC_LIBS@
- jamincont_1912_la_LDFLAGS = -module -avoid-version -Wc,-nostartfiles
diff --git a/media-sound/jamin/files/jamin-0.98.9_pre20170111-desktop.patch b/media-sound/jamin/files/jamin-0.98.9_pre20170111-desktop.patch
new file mode 100644
index 000000000000..bb5d8fd91582
--- /dev/null
+++ b/media-sound/jamin/files/jamin-0.98.9_pre20170111-desktop.patch
@@ -0,0 +1,19 @@
+--- a/data/jamin.desktop.in	2015-01-14 10:10:12.000000000 +0100
++++ b/data/jamin.desktop.in	2020-08-07 21:23:02.617171359 +0200
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+-_Name=JAMin
+-_GenericName=
+-_Comment=JACK Audio Mastering interface
+-Categories=Application;AudioVideo;
++Name=JAMin
++Comment=JACK Audio Mastering interface
++Categories=AudioVideo;Audio
++Keywords=audio;sound;mastering;ladspa
+ Exec=jamin
+-Icon=jamin.svg
++Icon=jamin
+ MimeType=application/x-jamin;
+ StartupNotify=true
+ Terminal=false
diff --git a/media-sound/jamin/files/jamin-0.98.9_pre20170111-gcc10.patch b/media-sound/jamin/files/jamin-0.98.9_pre20170111-gcc10.patch
new file mode 100644
index 000000000000..f070267bf90f
--- /dev/null
+++ b/media-sound/jamin/files/jamin-0.98.9_pre20170111-gcc10.patch
@@ -0,0 +1,24 @@
+diff -rup jamin-0.97.16-orig/src/hdeq.c jamin-0.97.16/src/hdeq.c
+--- jamin-0.97.16-orig/src/hdeq.c	2007-07-01 17:33:18.000000000 +0200
++++ jamin-0.97.16/src/hdeq.c	2020-02-01 21:09:18.306430243 +0100
+@@ -122,6 +122,8 @@ void interpolate (float, int, float, flo
+ 
+ /* vi:set ts=8 sts=4 sw=4: */
+ 
++/* Defined once here */
++GtkNotebook *l_notebook1;
+ 
+ /*  HDEQ right-click popup menu.  */
+ 
+diff -rup jamin-0.97.16-orig/src/hdeq.h jamin-0.97.16/src/hdeq.h
+--- jamin-0.97.16-orig/src/hdeq.h	2007-06-13 04:20:08.000000000 +0200
++++ jamin-0.97.16/src/hdeq.h	2020-02-01 21:04:13.562907137 +0100
+@@ -62,7 +62,7 @@ void hdeq_notebook1_set_page (guint page
+ int get_current_notebook1_page ();
+ 
+ 
+-GtkNotebook *l_notebook1;
++extern GtkNotebook *l_notebook1;
+ 
+ 
+ #endif
diff --git a/media-sound/jamin/jamin-0.95.0-r3.ebuild b/media-sound/jamin/jamin-0.95.0-r3.ebuild
deleted file mode 100644
index 6592e96b1cb1..000000000000
--- a/media-sound/jamin/jamin-0.95.0-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface"
-HOMEPAGE="http://jamin.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="osc"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.5
-	>=media-plugins/swh-plugins-0.4.6
-	>=media-sound/jack-audio-connection-kit-0.80.0
-	>=sci-libs/fftw-3.0.1
-	>=x11-libs/gtk+-2:2
-	media-libs/alsa-lib
-	media-libs/ladspa-sdk
-	media-libs/libsndfile
-	osc? ( >=media-libs/liblo-0.5 )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-DOCS=(
-	AUTHORS ChangeLog NEWS README TODO
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib-strict.patch
-	"${FILESDIR}"/${P}-desktop.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable osc)
-}
diff --git a/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild b/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild
new file mode 100644
index 000000000000..6cf9723e2421
--- /dev/null
+++ b/media-sound/jamin/jamin-0.98.9_pre20170111.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Audio mastering interface for JACK Audio Connection Kit (JACK)"
+HOMEPAGE="http://jamin.sourceforge.net/en/about.html https://salsa.debian.org/multimedia-team/jamin"
+SRC_URI="http://deb.debian.org/debian/pool/main/j/${PN}/${PN}_${PV/_pre/~git}~199091~repack1.orig.tar.bz2
+http://deb.debian.org/debian/pool/main/j/${PN}/${PN}_${PV/_pre/~git}~199091~repack1-1.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="osc"
+
+RDEPEND="
+	dev-libs/atk
+	dev-libs/glib
+	dev-libs/libxml2
+	media-libs/libsndfile
+	>=media-plugins/swh-plugins-0.4.6
+	sci-libs/fftw:3.0=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango
+	virtual/jack
+	osc? ( >=media-libs/liblo-0.26 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches/1003_add_dynamic_linking.patch
+	"${WORKDIR}"/debian/patches/fix_typos.patch
+	"${WORKDIR}"/debian/patches/NEWS.patch
+	"${FILESDIR}"/${P}-gcc10.patch # thanks Fedora
+	"${FILESDIR}"/${P}-desktop.patch
+)
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	# bug 632470
+	cat <<-EOF > po/POTFILES.skip
+jam-ui.glade
+src/limiter-ui.c
+EOF
+
+	sed -e "/^AC_INIT/s/.in/.ac/" -i configure.in || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable osc)
+}