Add qt4 use flag to make GUI install optional

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 27 insertions, 14 deletions

diff --git a/media-video/makemkv/ChangeLog b/media-video/makemkv/ChangeLog
index 9bed01b90194..8fbb97e7269d 100644
--- a/media-video/makemkv/ChangeLog
+++ b/media-video/makemkv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/makemkv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.43 2014/08/20 00:37:34 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/ChangeLog,v 1.44 2014/08/22 23:06:31 beandog Exp $
+
+*makemkv-1.8.12-r2 (22 Aug 2014)
+
+  22 Aug 2014; Steve Dibb <beandog@gentoo.org> -makemkv-1.8.12-r1.ebuild,
+  +makemkv-1.8.12-r2.ebuild:
+  Add qt4 use flag to make GUI install optional
 
 *makemkv-1.8.12-r1 (20 Aug 2014)
 
diff --git a/media-video/makemkv/makemkv-1.8.12-r1.ebuild b/media-video/makemkv/makemkv-1.8.12-r2.ebuild
index bfe9df9ea918..c6b75e5db3a9 100644
--- a/media-video/makemkv/makemkv-1.8.12-r1.ebuild
+++ b/media-video/makemkv/makemkv-1.8.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.12-r1.ebuild,v 1.1 2014/08/20 00:37:34 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.12-r2.ebuild,v 1.1 2014/08/22 23:06:31 beandog Exp $
 
 EAPI=5
 inherit eutils gnome2-utils multilib flag-o-matic
@@ -16,17 +16,19 @@ SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
 LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="multilib"
+IUSE="multilib qt4"
 
 QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
 
 RDEPEND="dev-libs/expat
 	dev-libs/openssl:0
 	sys-libs/zlib
-	virtual/opengl
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
+	qt4? (
+		virtual/opengl
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	)
 	>=sys-libs/glibc-2.12.0
 	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
 	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
@@ -40,8 +42,10 @@ src_prepare() {
 
 src_configure() {
 	replace-flags -O* -Os
+	local args=""
+	use qt4 || args="--disable-gui"
 	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf
+		econf $args
 	fi
 }
 
@@ -61,14 +65,17 @@ src_install() {
 	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so
 	dosym libmmbd.so.0    /usr/$(get_libdir)/libmmbd.so.0.${PV}
 	into /opt
-	dobin out/makemkv
 
-	local res
-	for res in 16 22 32 64 128; do
-		newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
-	done
+	if use qt4; then
+		dobin out/makemkv
 
-	make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
+		local res
+		for res in 16 22 32 64 128; do
+			newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
+		done
+
+		make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
+	fi
 
 	# install bin package
 	pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null