gentoo resync : 21.12.2017

3 files changed, 81 insertions, 17 deletions

diff --git a/media-plugins/calf/Manifest b/media-plugins/calf/Manifest
index 734857284acf..11c30024f55c 100644
--- a/media-plugins/calf/Manifest
+++ b/media-plugins/calf/Manifest
@@ -1,5 +1,7 @@
 AUX calf-0.0.60-cpp14.patch 3259 BLAKE2B 1a76d9170088bc6adf466c06d026f7e9adc11c36b8d8af35894a7f18eae4d428414f77024ab9849cdb0a465afb4803c3c1b3e2dc53eac76f5e24326fadc60adb SHA512 6f71feced0d2cb3799a337cf5dd32ee43e8d5f412ea144a6e65c293d0d7c7898f800b375757422adc15b42576b6a4c817fdb07bf1ccf59ce658754b702c58243
 DIST calf-0.0.60.tar.gz 5594386 BLAKE2B 2cba2618bc61e52c3f70bad1310670e1b11e3d03ddc2b98fc01edfa121d19229667c7494815a46ca9eaa57ec1dfd46f18c1c46514f67860758953a30b28e2930 SHA512 85a814b1210765bd16a60a4921c4518b1721c6b72aa9c902d1c0f8e4dcad285de2b52e3c2783bc221b575c61de9c859f40d589cf8a68efc260f393a864dfc360
+DIST calf-0.90.0.tar.gz 15876661 BLAKE2B 48f9ba5386b1253771947e16a3d88912f83f75873e50340ac8f68c7c9a79595ef4a549c3a7616a16949b3bbbca7a6892b6ed9276a891c7b47ae0a4f0541776ae SHA512 65dc1f7e6d83ca52ace25578d310b1806166a78a022d6509412ded44d3ac138a7e7909ebc91b93a3761a5ed3dff956809d6552bc70db6f25522132aa71f0b951
 EBUILD calf-0.0.60-r1.ebuild 1114 BLAKE2B f1e5f69121e7bb9c8c32a7fbd425b0d54884f4ab7bf99a51e705490a008426833470404866fba6d62fb5b60d5f5fdd4492ff6c8cceb9ebc3005c1332303cc867 SHA512 5dc27ad36ca4677882cfde392e8b89a09d7cb86ea8f804f4259ef8802f174612cd011f6644e14d2e5d15269e8a276d627ff37b803d8409d64dbbfdca7f6aac58
-EBUILD calf-9999.ebuild 1055 BLAKE2B 4abda2dc591fc4f35ca1b44953dd8473bf365bc3654fa174e68595b2d9494c0471eb955e046e312df271c03a8e6a97dc0ede7c89ed9b7e70b282606c558e7468 SHA512 f3021ad2d358af7ae6dd8148ff48dfc6fdcce5439d0c492d8032ddddfe6dc5f6a94fd75785398fde5a1e18c6dd9a23a012d8696fc1c92bde95d0a7669b3b516b
+EBUILD calf-0.90.0.ebuild 1213 BLAKE2B 1f7b88003301390c66fcd5fd29760eef2a4141e519e2b4da5e2c70579176e72d31211d6ad797adc1f02db0b4c8ab1ade7aa3bdc7ae20a8e1e31c03283372f856 SHA512 e6c7089af65b89dbed425afddda78da85152d4e5ed91f7eb840049ef4223a19adfb6b08e4c5bfe09b349b59532bccc603e586175b0270275b3a56e63831fff9f
+EBUILD calf-9999.ebuild 1213 BLAKE2B 1f7b88003301390c66fcd5fd29760eef2a4141e519e2b4da5e2c70579176e72d31211d6ad797adc1f02db0b4c8ab1ade7aa3bdc7ae20a8e1e31c03283372f856 SHA512 e6c7089af65b89dbed425afddda78da85152d4e5ed91f7eb840049ef4223a19adfb6b08e4c5bfe09b349b59532bccc603e586175b0270275b3a56e63831fff9f
 MISC metadata.xml 500 BLAKE2B 79be90120221b85a9bd6960b4245d17085b158e3653d1560998e0f5bcf154f9955af7fd1a5b04e54769189753c3b1ac176df45d838bf6c6a3b1dac5cbabb422f SHA512 a88cde96e4ca78145f3214ce16552d43ef974b5235829e51e98a5c7c8f60bcaa259ba7da166e5e4c59aade062fe16de915355c67ea7ded9ba9d83a04a98bb37b
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..2187ab626fd5
--- /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) \
+		$(usex lv2 "--with-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..2187ab626fd5 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) \
+		$(usex lv2 "--with-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
 }