Add qt4 use flag to make GUI install optional

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 29 insertions, 30 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/Manifest b/media-video/makemkv/Manifest
index 982796973396..f7cd8d07ce16 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX makemkv-1.8.10-makefile.linux.patch 348 SHA256 b60e13131f64c60d51b7c044ab42528f07d9179815d7b4e83d27a87c859229f9 SHA512 521f20110929d0b84f63b50ed82286132797d8181f86f00dbae6cb76e502ae1d31990d672048371c7cb89c12768d69ab2af34537aa4eedc8ba93adde2d3559f7 WHIRLPOOL 85658159c4954b2807f264cc13405eb9a9bbb18060fdf875dffced2602db0bda0c959cdcc022bba6069cd9a24dadee9ca1ca87ca8d901ee2cc9943d56576a746
 AUX makemkv-1.8.11-makefile.linux.patch 348 SHA256 838f70e496ab00c53b7caa9d5ef2ed0573dee761dc3e94e54e47a019ef8e3dcb SHA512 2b20075e634d113b9097a5ffb09713750cb2b9a95c1761e3449763ff7aee1115e6800dfa8cc1f7138b22283f814c5abe7db03c3d6fc3bb1bfef91b8ab6a9f3bd WHIRLPOOL fd593c23986dd49b91aa7d0bc1d8e3b2247c1711868a0ff63592cb7e54291ac7307efa6da7e1290b2b3b24f04d87441e9d7f1f906971dff8adca11c09c1829d7
 AUX makemkv-1.8.12-makefile.linux.patch 348 SHA256 63987f7e7f7b74269a4b141572ec00830221154c045e6145d259a822caa49b6c SHA512 430c6615bd96ba0594f491a20f819efb98a061fe015b23bb56a9d310dab37de0726866af92a9968941644d3d05faff6253bc28ffb22e993b0ff189feda7df8bf WHIRLPOOL 3411f74fe114b6a7400d67277c9b5f9a7cd657b65385b0db43afbea0fb40712957159905265abf09eaec667dec17270d62fad7517be42a2025236f1187dd2587
@@ -12,17 +9,6 @@ DIST makemkv-bin-1.8.12.tar.gz 12228591 SHA256 54af3d514dfcbf73ef5095b62e962f44e
 DIST makemkv-oss-1.8.10.tar.gz 4215868 SHA256 e6dd93cb0cfa144e94c110b02b7fcbbc9945cf3fb4cf3398e1babd7b698b959d SHA512 5bba3ad68987d3ec085a14b9db4f25b0e77bf439e4c589f43c823de0a18bd2da41daee45335761bcbf8edb53c64702f8faaffd1d62ce906ea81cf7f63fb29778 WHIRLPOOL 8758acc6ea12b872c1873ab2f0aec8ea175493786cdc517da256b4480c0643b9caa7fd679eb2251698b9749381676a0d99309ab9f35c247ab60aec39706edb95
 DIST makemkv-oss-1.8.12.tar.gz 4215876 SHA256 0f45a1413d705ca4359404d6911fd166cdc67cd3b3bcd8aebbdc3e6970fbfeaf SHA512 10870dbecf5924946e633ac1958abf7572cdc65191398b2e2e297233274f65e547d9f5cef243de434cf8d8b31fe5240ff02e8c67f7fc135ee1c7150fee30116c WHIRLPOOL 11d0248587009d31cb03493fc2110f55a99e7109aaa89db7d989059cdfdcce3ac5c6eee24b20ab343b96afa77806e06343fa7900d4c1d71635252b7a2e3d6ae1
 EBUILD makemkv-1.8.10.ebuild 3081 SHA256 8b4d0be357c6f1f603bf0e484822d3f68484b97b948801c8e894c5f31a648cfe SHA512 796fc6928d4796dfea86de4ffe560360b457f923bf03579725e8bb9d9eaec8cf98c49fe45437f9269593982a60f61d9e8f1737299a16e88cad2ebadbb3af2643 WHIRLPOOL 9930310e36ee1eb2c0d232de603ca4f6acec6dbcb39cc79b577cad0bb8a3639cde21f78cc95e7bc4d68bd6be141b9b2a99a94f5914ed63552e0108081357f114
-EBUILD makemkv-1.8.12-r1.ebuild 3101 SHA256 7f060c7b79b258025da8995a1fc9bd80bd1afcdc519671645a4cda510debfc5e SHA512 001e147aca40e5f5809179261f0a8623e593b93dd7977195135dbebcaac856e59158faa06ed172184b520c972924c4af2d5cb2287a80e4effe89f8469a30184f WHIRLPOOL 521655aa5185ae5608e5cec95aab19bb9b50de6ff97669ebe576b925792638e1515eb920d95527bd4eac0ce2479410828d11582687e2db3ec5e2270f11094b3d
-MISC ChangeLog 9240 SHA256 c10577ba411eb9c8edbd19c464280e22d04e231e8840aee52130931e9006a5d3 SHA512 06731a9e44f1cc9cddc97505e9c2ac9a754061d27368700e180ae65b1ef5ead7f56d006796763e9aa30382f9df7bb3388cb20f6ee2c534b919f7e5ae7b7969b7 WHIRLPOOL 8cda8c4365b73e08499c0daf20b7ec86bf26f2c1e177dbb1dcc911961c6c1fae2da8f166ceea4d1fd8a554488c12854e44709dff7a899a55180d53b40f5cebba
+EBUILD makemkv-1.8.12-r2.ebuild 3205 SHA256 09a720c674bba6f00b2d87bcff30a38e11faadf18fa50062c3208029c15971f0 SHA512 766bf6d2c8307a387b221c86cdcbef1578aed7d8aab9f9bff1acb3139512b0dcf508b52cb73df63b82d4cd3aba667d0d345ed80e3f8c6a8d35c81f6ef19dab96 WHIRLPOOL 01a49c83dc7667d06a90dd155bc9c2ef41e6c15d43bc95c72533a959d2990c4dfeca7d9485396cb2a63426fe7878cf9b9ca3344803c0fe3101be1d0ebae9ef97
+MISC ChangeLog 9428 SHA256 1b3e9cb70adc885ef8614e79b3c7dd3223db89e3f7ea8d62a6e26590b88402ea SHA512 90dca7dadbdf820ad03bd8388c0e5fbf8e997ad10183541ba5120c16f3d71424122cb9db282b26006c51bea87c97fb5fb9d45447ef3a076fe05a9e5cd155da5f WHIRLPOOL bdc6c0dd8d6d82a0bfac66a16028df9315b7e9e10ec52f3f7fa944ae6ade2b6df99974ba778132b1537a58409110c8ada5f52b78030a9831c6475ddbadaaf5e0
 MISC metadata.xml 260 SHA256 fa1167a5441cabeb411561da356fac4524c470df05240c1f3d38034afb76ead5 SHA512 1a2e8743a75f495fb6bfaf731b3d6e3d2b39f9b20119c2bcd9edef13434d31bf46b56652ce77c5c3e5fb86e21a65ff3a3a5429fb74f8166cc7f4b5bbd84eb146 WHIRLPOOL 412c81eb8ce82f93a682b7ca8a9f566e6a8df4c22bcbb7863bf17a8e69ffd90dcb8fe338b5eb021f02a2fac140a56063d235bb07b73b644f288a203cff1e9316
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQEcBAEBCAAGBQJT8+3VAAoJEC1LWXx4YDenPjwIAIAh7Yi9TNqW69pqk+uFEUqL
-sRR+WFmaaa098PKkW+QhdzqAxI8K/F5cfbvX9jtxHIgdWPBG9W+9CyEh6qW75u1n
-DixyhBJsAXvXdKWo4S+vTX03lNprdG8YLwRcpngenT6QFGlz4tevLxInDpnEcGjG
-we4qHO4e+6Dx/byiD/j+An0U8jl6Z4PcYfcOqaEP3RqtRViF27WgN0+4kHCt2uTX
-KQx8DKIZ11iDW9f0lw45BjZ+1vMpSQNhmqVkKRfWZ2lEDhmWxEdbuQDtzU23LkBe
-N3VOYN23BhG2xI/dT1RkC+F6ax8tPk2Llj+YWRebzO1QwYEP55dTCGBNffLnn/Y=
-=p5o0
------END PGP SIGNATURE-----
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