[gentoo-commits] gentoo-x86 commit in eclass: font-ebdftopcf.eclass

[gentoo-commits] gentoo-x86 commit in eclass: font-ebdftopcf.eclass

[Ryan Hill (dirtyepic)]

dirtyepic    07/09/16 02:56:20

  Modified:             font-ebdftopcf.eclass
  Log:
  Only pull in and run bdftopcf if USE=X.  Automatically set FONT_SUFFIX accordingly.

Revision  Changes    Path
1.5                  eclass/font-ebdftopcf.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/font-ebdftopcf.eclass?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/font-ebdftopcf.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/font-ebdftopcf.eclass?r1=1.4&r2=1.5

Index: font-ebdftopcf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/font-ebdftopcf.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- font-ebdftopcf.eclass	2 Apr 2006 00:24:51 -0000	1.4
+++ font-ebdftopcf.eclass	16 Sep 2007 02:56:19 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/font-ebdftopcf.eclass,v 1.4 2006/04/02 00:24:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/font-ebdftopcf.eclass,v 1.5 2007/09/16 02:56:19 dirtyepic Exp $
 
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
@@ -8,10 +8,18 @@
 # Eclass to make PCF font generator from BDF uniform and optimal
 # The manpage for this eclass is in media-gfx/ebdftopcf.
 
+# inherit this eclass after font.eclass
+
+# if USE="-X", this eclass is basically a no-op, since bdftopcf requires Xorg.
+IUSE="X"
+
 # Variable declarations
-DEPEND="media-gfx/ebdftopcf"
+DEPEND="X? ( media-gfx/ebdftopcf )"
 RDEPEND=""
 
+use X && FONT_SUFFIX="pcf.gz"
+use X || FONT_SUFFIX="bdf"
+
 #
 # Public functions
 #
@@ -29,8 +37,10 @@
 # Public inheritable functions
 #
 font-ebdftopcf_src_compile() {
-	[ -z "${BDFFILES}" ] && BDFFILES="$(find . -name '*.bdf')"
-	ebdftopcf ${BDFFILES}
+	if use X; then
+		[ -z "${BDFFILES}" ] && BDFFILES="$(find . -name '*.bdf')"
+		ebdftopcf ${BDFFILES}
+	fi
 }
 
 EXPORT_FUNCTIONS src_compile



-- 
gentoo-commits@gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in eclass: font-ebdftopcf.eclass

[Fabian Groffen (grobian)]

grobian     10/09/30 11:12:03

  Modified:             font-ebdftopcf.eclass
  Log:
  Fix for Prefix, bug #334057.  Since this is always on top of font.eclass, can rely on it's pkg_setup for EPREFIX

Revision  Changes    Path
1.6                  eclass/font-ebdftopcf.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/font-ebdftopcf.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/font-ebdftopcf.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/font-ebdftopcf.eclass?r1=1.5&r2=1.6

Index: font-ebdftopcf.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/font-ebdftopcf.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- font-ebdftopcf.eclass	16 Sep 2007 02:56:19 -0000	1.5
+++ font-ebdftopcf.eclass	30 Sep 2010 11:12:03 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/font-ebdftopcf.eclass,v 1.5 2007/09/16 02:56:19 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/font-ebdftopcf.eclass,v 1.6 2010/09/30 11:12:03 grobian Exp $
 
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
@@ -27,7 +27,7 @@
 	local bdffiles
 	bdffiles="$@"
 	[ -z "$bdffiles" ] && die "No BDF files specified."
-	emake -f /usr/share/ebdftopcf/Makefile.ebdftopcf \
+	emake -f "${EPREFIX}"/usr/share/ebdftopcf/Makefile.ebdftopcf \
 		BDFFILES="${bdffiles}" \
 		BDFTOPCF_PARAMS="${BDFTOPCF_PARAMS}" \
 		|| die "Failed to build PCF files"