[patch] ebuild patch (second variant)

tightvnc-1.3.10-r1-ebuild-var2.patch (text/plain), 1.05 KB, created by Jan Zahornadsky on 2014-03-20 13:30:44 UTC

--- tightvnc-1.3.10-r1.ebuild.orig	2013-09-26 08:33:38.000000000 +0800
+++ tightvnc-1.3.10-r1.ebuild	2014-03-20 20:54:02.675909567 +0800
@@ -5,7 +5,7 @@
 EAPI=3
 inherit eutils toolchain-funcs java-pkg-opt-2
 
-IUSE="java tcpd server"
+IUSE="java nls tcpd server"
 
 S="${WORKDIR}/vnc_unixsrc"
 DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
@@ -18,7 +18,7 @@ KEYWORDS="alpha amd64 arm ~mips ppc sh s
 LICENSE="GPL-2"
 SLOT="0"
 
-CDEPEND="media-fonts/font-misc-misc
+CDEPEND="media-fonts/font-misc-misc[nls=]
 	virtual/jpeg
 	server? (
 		media-fonts/font-cursor-misc
@@ -74,6 +74,12 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PV}-sparc.patch
 	sed -e "s:\\(/etc/\\|/usr/share/\\):${EPREFIX}\\1:g" -i vncserver || die
 
+	# when nls is not set, media-fonts/fonts-misc-misc won't provide the required default font,
+	# use fixed instead
+	if ! use nls; then
+		epatch "${FILESDIR}/${PN}-1.3.10-fixed-font.patch"
+	fi
+
 	if use java; then
 		cd "${WORKDIR}"
 		epatch "${FILESDIR}/${PN}-1.3.10-java-build.patch"