media-plugins/calf: 0.90.0 bump

Package-Manager: Portage-2.3.14, Repoman-2.3.6

3 files changed, 79 insertions, 16 deletions

diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index 031fa835ab9d..d665e74d184e 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1 +1,2 @@
 DIST calf-0.0.60.tar.gz 5594386 BLAKE2B 2cba2618bc61e52c3f70bad1310670e1b11e3d03ddc2b98fc01edfa121d19229667c7494815a46ca9eaa57ec1dfd46f18c1c46514f67860758953a30b28e2930 SHA512 85a814b1210765bd16a60a4921c4518b1721c6b72aa9c902d1c0f8e4dcad285de2b52e3c2783bc221b575c61de9c859f40d589cf8a68efc260f393a864dfc360
+DIST calf-0.90.0.tar.gz 15876661 BLAKE2B 48f9ba5386b1253771947e16a3d88912f83f75873e50340ac8f68c7c9a79595ef4a549c3a7616a16949b3bbbca7a6892b6ed9276a891c7b47ae0a4f0541776ae SHA512 65dc1f7e6d83ca52ace25578d310b1806166a78a022d6509412ded44d3ac138a7e7909ebc91b93a3761a5ed3dff956809d6552bc70db6f25522132aa71f0b951
diff --git a/media-plugins/calf/calf-0.90.0.ebuild b/media-plugins/calf/calf-0.90.0.ebuild
new file mode 100644
index 000000000000..37d406d695bb
--- /dev/null
+++ b/media-plugins/calf/calf-0.90.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
+HOMEPAGE="http://calf-studio-gear.org/"
+
+if [[ "${PV}" = "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/calf-studio-gear/calf.git"
+else
+	SRC_URI="https://github.com/calf-studio-gear/calf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental"
+
+RDEPEND="dev-libs/atk
+	dev-libs/expat
+	dev-libs/glib:2
+	media-sound/fluidsynth
+	jack? ( virtual/jack )
+	gtk? (
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/gdk-pixbuf
+		x11-libs/pango
+	)
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# automagic...
+	#$(use_with gtk gui)
+	#$(use_with jack)
+	econf \
+		$(use_with lash) \
+		$(use_with lv2 lv2) \
+		$(use_with lv2 lv2-dir /usr/$(get_libdir)/lv2) \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable experimental)
+}
diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild
index 333c1172872f..37d406d695bb 100644
--- a/media-plugins/calf/calf-9999.ebuild
+++ b/media-plugins/calf/calf-9999.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-utils
+EAPI=6
+inherit autotools
 
 DESCRIPTION="A set of open source instruments and effects for digital audio workstations"
 HOMEPAGE="http://calf-studio-gear.org/"
@@ -18,29 +17,38 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="lash lv2 static-libs experimental"
+IUSE="cpu_flags_x86_sse gtk jack lash lv2 static-libs experimental"
 
 RDEPEND="dev-libs/atk
 	dev-libs/expat
 	dev-libs/glib:2
-	gnome-base/libglade:2.0
 	media-sound/fluidsynth
-	virtual/jack
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/pango
+	jack? ( virtual/jack )
+	gtk? (
+		x11-libs/cairo
+		x11-libs/gtk+:2
+		x11-libs/gdk-pixbuf
+		x11-libs/pango
+	)
 	lash? ( media-sound/lash )
 	lv2? ( media-libs/lv2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
-	myeconfargs=(
-		--with-lv2-dir=/usr/$(get_libdir)/lv2
-		$(use_with lash)
-		$(use_with lv2)
+	# automagic...
+	#$(use_with gtk gui)
+	#$(use_with jack)
+	econf \
+		$(use_with lash) \
+		$(use_with lv2 lv2) \
+		$(use_with lv2 lv2-dir /usr/$(get_libdir)/lv2) \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable experimental)
-	)
-	autotools-utils_src_configure
 }