From 197c1ed592969f7682590cebe27c9ea80bcf18a0 Mon Sep 17 00:00:00 2001
From: Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Date: Fri, 26 Oct 2012 14:06:51 +0000
Subject: Make bzip2 and freetype optional, bug #439704.

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
---
 x11-libs/libXfont/ChangeLog                |  8 +++++-
 x11-libs/libXfont/libXfont-1.4.5-r1.ebuild | 40 ++++++++++++++++++++++++++++++
 x11-libs/libXfont/metadata.xml             |  6 ++++-
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 x11-libs/libXfont/libXfont-1.4.5-r1.ebuild

(limited to 'x11-libs')

diff --git a/x11-libs/libXfont/ChangeLog b/x11-libs/libXfont/ChangeLog
index 7151d611e689..f996f376ec18 100644
--- a/x11-libs/libXfont/ChangeLog
+++ b/x11-libs/libXfont/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXfont
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.165 2012/08/26 17:44:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.166 2012/10/26 14:06:51 chithanh Exp $
+
+*libXfont-1.4.5-r1 (26 Oct 2012)
+
+  26 Oct 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +libXfont-1.4.5-r1.ebuild, metadata.xml:
+  Make bzip2 and freetype optional, bug #439704.
 
   26 Aug 2012; Raúl Porcel <armin76@gentoo.org> libXfont-1.4.5.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #419473
diff --git a/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild b/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..b73d2093bd4c
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.5-r1.ebuild,v 1.1 2012/10/26 14:06:51 chithanh Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 ipv6 truetype"
+
+RDEPEND="x11-libs/xtrans
+	x11-libs/libfontenc
+	truetype? ( >=media-libs/freetype-2 )
+	bzip2? ( app-arch/bzip2 )
+	x11-proto/xproto
+	x11-proto/fontsproto"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable doc devel-docs)
+		$(use_with doc xmlto)
+		$(use_with bzip2)
+		$(use_enable truetype freetype)
+		--without-fop
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if ! use truetype; then
+		elog "truetype support is disabled, non-Xft applications might not display truetype fonts."
+	fi
+}
diff --git a/x11-libs/libXfont/metadata.xml b/x11-libs/libXfont/metadata.xml
index 01c4c004e735..3d1375624d7e 100644
--- a/x11-libs/libXfont/metadata.xml
+++ b/x11-libs/libXfont/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+	<herd>x11</herd>
+	<use>
+		<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
+		<flag name="truetype">Use media-libs/freetype for font rasterization.</flag>
+	</use>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad