From de9c3366dd7f95805538db7dea8121a0a35ffbd2 Mon Sep 17 00:00:00 2001
From: Pacho Ramos <pacho@gentoo.org>
Date: Thu, 4 Jan 2018 23:16:18 +0100
Subject: media-sound/terminatorx: Force building with X support (-X fails to
 build, bug #636832)

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---
 .../terminatorx/terminatorx-4.0.1-r1.ebuild        | 63 ++++++++++++++++++++++
 media-sound/terminatorx/terminatorx-4.0.1.ebuild   | 62 ---------------------
 2 files changed, 63 insertions(+), 62 deletions(-)
 create mode 100644 media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
 delete mode 100644 media-sound/terminatorx/terminatorx-4.0.1.ebuild

diff --git a/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild b/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..3ce3c4f5ac0c
--- /dev/null
+++ b/media-sound/terminatorx/terminatorx-4.0.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+MY_P=${P/terminatorx/terminatorX}
+
+DESCRIPTION="Realtime audio synthesizer allowing you to 'scratch' on sampled audio data"
+HOMEPAGE="http://www.terminatorx.org/"
+SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Making X optional fails when disabled: https://bugs.gentoo.org/636832
+IUSE="alsa debug mad pulseaudio vorbis sox"
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	mad? ( media-sound/madplay )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	sox? ( media-sound/sox
+		media-sound/mpg123 )
+	x11-libs/gtk+:3
+	>=dev-libs/glib-2.2:2
+
+	x11-libs/libXi
+	x11-libs/libXxf86dga
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/xf86dgaproto
+
+	dev-libs/libxml2:2
+	media-libs/audiofile:=
+	media-libs/ladspa-sdk
+	media-libs/ladspa-cmt
+	media-libs/liblrdf
+"
+DEPEND="${RDEPEND}
+	app-text/gnome-doc-utils
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Fails to build with USE="X vorbis -alsa -debug -mad -pulseaudio
+	# -sox", bug #604288
+	"${FILESDIR}"/${P}-gtkcombotext.patch
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-x11 \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable mad) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable vorbis) \
+		$(use_enable sox)
+}
diff --git a/media-sound/terminatorx/terminatorx-4.0.1.ebuild b/media-sound/terminatorx/terminatorx-4.0.1.ebuild
deleted file mode 100644
index 745580ace2d4..000000000000
--- a/media-sound/terminatorx/terminatorx-4.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-MY_P=${P/terminatorx/terminatorX}
-
-DESCRIPTION="Realtime audio synthesizer allowing you to 'scratch' on sampled audio data"
-HOMEPAGE="http://www.terminatorx.org/"
-SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X alsa debug mad pulseaudio vorbis sox"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	mad? ( media-sound/madplay )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	sox? ( media-sound/sox
-		media-sound/mpg123 )
-	x11-libs/gtk+:3
-	>=dev-libs/glib-2.2:2
-
-	X? (
-		x11-libs/libXi
-		x11-libs/libXxf86dga
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/xf86dgaproto )
-	dev-libs/libxml2:2
-	media-libs/audiofile:=
-	media-libs/ladspa-sdk
-	media-libs/ladspa-cmt
-	media-libs/liblrdf
-"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Fails to build with USE="X vorbis -alsa -debug -mad -pulseaudio
-	# -sox", bug #604288
-	"${FILESDIR}"/${P}-gtkcombotext.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable mad) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable vorbis) \
-		$(use_enable sox) \
-		$(use_enable X x11)
-}
-- 
cgit v1.2.3