gentoo resync : 15.01.2020

6 files changed, 135 insertions, 45 deletions

diff --git a/media-plugins/ir_lv2/Manifest b/media-plugins/ir_lv2/Manifest
index 407566218a12..15fadb5fb5bb 100644
--- a/media-plugins/ir_lv2/Manifest
+++ b/media-plugins/ir_lv2/Manifest
@@ -1,3 +1,6 @@
-DIST ir.lv2-1.3.2.tar.gz 48698 BLAKE2B 2587fb8cae6d71c8a2e3586eaddba43f27282db2469a64f2441832c52f9f27ff9d0852acfce248b890ed4845281f4ef676581128321102e0fc655d0a91bb1266 SHA512 06443aeab05eaa0b1ff5c12fd479c3f1c874976a6d1f5874f6d150aa97c96a8a0b2c3abbc7d6db4882f5674aad8e53ab32bbe7da3873746d5a1e581d010bbae2
-EBUILD ir_lv2-1.3.2.ebuild 1025 BLAKE2B 2923c8bc17980855b39cc697b6798fb075ca9a04341ada61c367b943782a1cc6f20d58b6353d9a3e481fbf15a6ac674407a6b115534804d133255c6f86b883f1 SHA512 fe21c0a90dc294af89c3e26cb4916cb010f718bbe3287734620780f5c7e258dcc8554a973f19f533cea74d3e2e9f6c1d28142d8bc683aaede44de9af630c9f35
-MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
+AUX ir_lv2-1.3.4-respect-flags.patch 1139 BLAKE2B f5e7d891e443c32c21b5db7360479b9d4ac80013805a10a6bd714ab6db5d64cc5d673571894b103db3bea12e5baa2d9f7c4a1053e6d6df517058935d7f799f06 SHA512 a9021b12c6663bf6bb20e87db01981f21afd9ceeeaaedce584389f69abd87c713c937250eea87f12a03610885cd02ab3cea6e756503b1987d1b678acd9e55b14
+DIST ir_lv2-1.2.4.tar.gz 126123 BLAKE2B fab75bf18b642ad59bcb53041462a0d37c84554f0cf6e78c5cdff69ee42a21812a5176083e325018454f6a0a990ce309abed1eea71eb6022ec5981186bf6f29c SHA512 28aac050352380719512efe3346ffddeddb75972e749dc9433cea92973e1ae838c65c6d7196646199218ff3362b24fa9a5e1a3578e74a0b9e268d21083874977
+DIST ir_lv2-1.3.4.tar.gz 126552 BLAKE2B 52f5b236c4680a759c0621ed0f9a394e6e82bdb9aaf4110b325902ae382d2f640a079c53d89c662a192a97d0e79349082cf100636c1a7d6c00738602ca652962 SHA512 6a9c8f906a07c6ed0daa53d8dc3693d535ec4cf63f07b5fcc62ab6638c66992ff7951918b0ce2ef8c65289b19988363be49bba9bb75a20b0463fa972b07ff58c
+EBUILD ir_lv2-1.2.4.ebuild 954 BLAKE2B ee73b1e5fd1edf5430fff325cd91010bd2884e728b217dab858f228084bf70992dd240f806d61ebf3cc9b011f430f9d453feb5c4a7ab1a830ec07192aa89e844 SHA512 e8691ea49d2e8fc94d6e90d8b5eb496a840812eac7a4b627bdb23bd5d5792cc80ff58b4a68f92821dcaf2c3e73c9504f8a2ccdf605f88b11808937072c5e4d09
+EBUILD ir_lv2-1.3.4.ebuild 1381 BLAKE2B 4db1d9acfc6077c24783281d559ecb096a2b3f1732e5aefcb6e1ed269ed230f9e5065042516d810095f1be913f4261e1e078d88d32f3c78c14891033681c9a84 SHA512 721b773e8051a772919092f1162422cd7a2f305d0661740aed164759d2aa8e2eef16ececab691f400a3cf6a64e8fe16f56557edf34e0dc212f510c68bcef52a4
+MISC metadata.xml 319 BLAKE2B de7f0ee9cfe123a77f79cce2ade2dce0e5c3e5243ce13611bf6e9b613f04b7b2824bb70185796ed81d8fdbfc023722c1a45f9cecca16a35f8bf8cfb376dcc322 SHA512 d01e35b0d4b6fac4baefdac78473637585ae45a47f486c114f6fbaaa0c781ccc4d5f55e143c67dfe5fa074fe60cb60dcf5e6f5fd59b6dcd3e582c3e5dac68064
diff --git a/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
new file mode 100644
index 000000000000..cd664a6728a2
--- /dev/null
+++ b/media-plugins/ir_lv2/files/ir_lv2-1.3.4-respect-flags.patch
@@ -0,0 +1,21 @@
+diff -urpN ir.lv2-1.3.4.orig/Makefile ir.lv2-1.3.4/Makefile
+--- ir.lv2-1.3.4.orig/Makefile	2018-06-21 11:14:03.000000000 +0300
++++ ir.lv2-1.3.4/Makefile	2019-12-24 16:26:06.102495896 +0300
+@@ -20,7 +20,7 @@ CC ?= gcc
+ CXX ?= g++
+ 
+ # change "-O2 -ffast-math" to "-g -O0" below if you want to debug the plugin
+-CPPFLAGS += -Wall -I. -I/usr/include `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gthread-2.0` -D__STDC_FORMAT_MACROS -O2 -ffast-math
++CPPFLAGS += -Wall -I. -I/usr/include `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gthread-2.0` -D__STDC_FORMAT_MACROS -ffast-math
+ LIBS += -lc -lm -lzita-convolver -lsamplerate -lsndfile `pkg-config --libs gthread-2.0` `pkg-config --libs gtk+-2.0`
+ 
+ ifeq ($(shell pkg-config --atleast-version='2.16' gtk+-2.0; echo $$?), 1)
+@@ -31,7 +31,7 @@ ifeq ($(shell pkg-config --atleast-versi
+    CPPFLAGS += -D_HAVE_GTK_ATLEAST_2_20
+ endif
+ 
+-C4CFLAGS = -Wall -I. -I/usr/include `pkg-config --cflags gthread-2.0` -O2 -ffast-math
++C4CFLAGS = -Wall -I. -I/usr/include `pkg-config --cflags gthread-2.0` -ffast-math
+ C4LIBS = -lsndfile `pkg-config --libs gthread-2.0`
+ 
+ all: ir.so ir_gui.so
diff --git a/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
new file mode 100644
index 000000000000..8fadc5cead93
--- /dev/null
+++ b/media-plugins/ir_lv2/ir_lv2-1.2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+DESCRIPTION="LV2 convolver plugin especially for creating reverb effects"
+HOMEPAGE="https://tomszilagyi.github.io/plugins/ir.lv2/"
+SRC_URI="https://github.com/tomszilagyi/ir.lv2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN/_/.}-${PV}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="tools"
+
+RDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/lv2
+	>=media-libs/zita-convolver-3:=
+	>=x11-libs/gtk+-2.16:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-respect-flags.patch
+)
+
+DOCS=( README.md sshot.png ChangeLog )
+
+src_compile() {
+	tc-export CC CXX
+	emake
+	use tools && emake convert4chan
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr/$(get_libdir)/lv2" install
+	use tools && newbin convert4chan ir_convert4chan
+	einstalldocs
+}
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild
deleted file mode 100644
index 56c7f8b6a29f..000000000000
--- a/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic multilib
-
-MY_P="${P/_/.}"
-DESCRIPTION="LV2 convolver plugin especially for creating reverb effects"
-HOMEPAGE="http://factorial.hu/plugins/lv2/ir"
-SRC_URI="http://factorial.hu/system/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=media-libs/zita-convolver-3
-	>=x11-libs/gtk+-2.16:2
-	media-libs/lv2
-	media-libs/libsndfile
-	media-libs/libsamplerate"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN/_/.}-${PV}
-
-src_prepare() {
-	sed -i -e 's/g++/$(CXX)/' -e 's/gcc/$(CC)/' Makefile || die #respect CC/CXX
-	sed -i -e 's/\(^C4CFLAGS =.*\) -O2.*/\1 $(CFLAGS)/' Makefile || die #respect CFLAGS
-	sed -i -e 's/\(^CPPFLAGS +=.*\) -O2.*/\1 $(CXXFLAGS)/' Makefile || die #respect CXXFLAGS
-}
-
-src_compile() {
-	tc-export CC CXX
-	emake
-}
-
-src_install() {
-	emake INSTDIR="${D}/usr/$(get_libdir)/lv2/ir.lv2" install
-	dodoc README ChangeLog
-}
diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
new file mode 100644
index 000000000000..84fbbef3f1c6
--- /dev/null
+++ b/media-plugins/ir_lv2/ir_lv2-1.3.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+DESCRIPTION="LV2 convolver plugin especially for creating reverb effects"
+HOMEPAGE="https://tomszilagyi.github.io/plugins/ir.lv2/"
+SRC_URI="https://github.com/tomszilagyi/ir.lv2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN/_/.}-${PV}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="tools"
+
+RDEPEND="media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/lv2
+	>=media-libs/zita-convolver-3:=
+	>=x11-libs/gtk+-2.16:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.4-respect-flags.patch
+)
+
+DOCS=( README.md sshot.png ChangeLog )
+
+src_compile() {
+	tc-export CC CXX
+	emake
+	use tools && emake convert4chan
+}
+
+src_install() {
+	emake INSTDIR="${D}/usr/$(get_libdir)/lv2" install
+	use tools && newbin convert4chan ir_convert4chan
+	einstalldocs
+}
+
+pkg_postinst() {
+	local latency_warn=0
+	local ver
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		latency_warn=1
+	else
+		for ver in ${REPLACING_VERSIONS}; do
+			if ver_test ${ver} -lt 1.3.0; then
+				latency_warn=1
+				break
+			fi
+		done
+	fi
+
+	if [[ ${latency_warn} -eq 1 ]]; then
+		elog "This version works with automation at the expense of introducing extra buffering."
+		elog "For zero latency use 1.2* version instead."
+	fi
+}
diff --git a/media-plugins/ir_lv2/metadata.xml b/media-plugins/ir_lv2/metadata.xml
index f79bb67acbd9..8632ae7d47f4 100644
--- a/media-plugins/ir_lv2/metadata.xml
+++ b/media-plugins/ir_lv2/metadata.xml
@@ -5,4 +5,7 @@
 	<email>proaudio@gentoo.org</email>
 	<name>Gentoo ProAudio Project</name>
 </maintainer>
+<use>
+	<flag name="tools">Build convert4chan tool</flag>
+</use>
 </pkgmetadata>