--- /var/portage/media-video/makemkv/makemkv-1.8.9.ebuild	2014-03-08 21:44:18.000000000 -0500
+++ makemkv-1.8.9.ebuild	2014-03-12 09:24:48.213132941 -0400
@@ -16,7 +16,7 @@
 LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="multilib"
+IUSE="multilib X"
 
 QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
 RESTRICT="mirror"
@@ -24,10 +24,10 @@
 RDEPEND="dev-libs/expat
 	dev-libs/openssl:0
 	sys-libs/zlib
-	virtual/opengl
+	X? ( virtual/opengl
 	dev-qt/qtcore:4
 	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
+	dev-qt/qtgui:4 )
 	|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
 	amd64? ( multilib? ( app-emulation/emul-linux-x86-baselibs ) )"
 DEPEND="${RDEPEND}"
@@ -41,7 +41,7 @@
 src_configure() {
 	replace-flags -O* -Os
 	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
-		econf
+		econf $(use_enable X gui)
 	fi
 }
 
@@ -61,14 +61,16 @@
 	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
+	if use X ; then
+		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
+		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'
+		make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
+	fi
 
 	# install bin package
 	pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null