Change lcdfilter useflag to more precise infinality useflag (bug #428548)

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

6 files changed, 19 insertions, 11 deletions

diff --git a/media-libs/fontconfig-infinality/ChangeLog b/media-libs/fontconfig-infinality/ChangeLog
index 8ef0898706f4..95448d5e3b7f 100644
--- a/media-libs/fontconfig-infinality/ChangeLog
+++ b/media-libs/fontconfig-infinality/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/fontconfig-infinality
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-infinality/ChangeLog,v 1.1 2012/07/29 15:59:47 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-infinality/ChangeLog,v 1.2 2012/07/30 05:37:57 yngwin Exp $
+
+  30 Jul 2012; Ben de Groot <yngwin@gentoo.org>
+  fontconfig-infinality-20120619.ebuild, metadata.xml:
+  Change lcdfilter useflag to more precise infinality useflag (bug #428548)
 
 *fontconfig-infinality-20120619 (29 Jul 2012)
 
diff --git a/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild b/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
index 43ed53661367..66bb15b9fed3 100644
--- a/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
+++ b/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild,v 1.1 2012/07/29 15:59:47 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig-infinality/fontconfig-infinality-20120619.ebuild,v 1.2 2012/07/30 05:37:57 yngwin Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ RDEPEND="app-admin/eselect-fontconfig
 	app-admin/eselect-lcdfilter
 	>=x11-libs/libXft-2.3.0
 	nyx? ( media-fonts/croscorefonts )"
-PDEPEND="media-libs/freetype:2[lcdfilter]"
+PDEPEND="media-libs/freetype:2[infinality]"
 
 src_configure() {
 	:
diff --git a/media-libs/fontconfig-infinality/metadata.xml b/media-libs/fontconfig-infinality/metadata.xml
index 6709f5bb7438..3d5889849e10 100644
--- a/media-libs/fontconfig-infinality/metadata.xml
+++ b/media-libs/fontconfig-infinality/metadata.xml
@@ -6,6 +6,6 @@
   </maintainer>
   <herd>fonts</herd>
   <use>
-    <flag name="nyx">Additional style by Ben de Groot using croscorefonts</flag>
+    <flag name="nyx">Additional style using croscorefonts</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 350e886ca378..0aa14ea4694c 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.344 2012/07/29 18:04:56 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.345 2012/07/30 05:35:32 yngwin Exp $
+
+  30 Jul 2012; Ben de Groot <yngwin@gentoo.org> freetype-2.4.10-r1.ebuild,
+  metadata.xml:
+  Change lcdfilter useflag to more precise infinality useflag (bug #428548)
 
 *freetype-2.4.10-r1 (29 Jul 2012)
 
diff --git a/media-libs/freetype/freetype-2.4.10-r1.ebuild b/media-libs/freetype/freetype-2.4.10-r1.ebuild
index 5ef4e2814b3c..5dbb55f8545e 100644
--- a/media-libs/freetype/freetype-2.4.10-r1.ebuild
+++ b/media-libs/freetype/freetype-2.4.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.10-r1.ebuild,v 1.1 2012/07/29 18:04:56 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.10-r1.ebuild,v 1.2 2012/07/30 05:35:32 yngwin Exp $
 
 EAPI="4"
 
@@ -11,12 +11,12 @@ HOMEPAGE="http://www.freetype.org/"
 SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 	utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 )
 	doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 )
-	lcdfilter? ( http://dev.gentoo.org/~yngwin/distfiles/${P}-infinality-patches.tar.xz )"
+	infinality? ( http://dev.gentoo.org/~yngwin/distfiles/${P}-infinality-patches.tar.xz )"
 
 LICENSE="FTL GPL-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="X auto-hinter bindist bzip2 debug doc fontforge lcdfilter static-libs utils"
+IUSE="X auto-hinter bindist bzip2 debug doc fontforge infinality static-libs utils"
 
 DEPEND="sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
@@ -24,7 +24,7 @@ DEPEND="sys-libs/zlib
 		  x11-libs/libXau
 		  x11-libs/libXdmcp )"
 RDEPEND="${DEPEND}
-	lcdfilter? ( media-libs/fontconfig-infinality )"
+	infinality? ( media-libs/fontconfig-infinality )"
 
 src_prepare() {
 	enable_option() {
@@ -57,7 +57,7 @@ src_prepare() {
 
 	disable_option FT_CONFIG_OPTION_OLD_INTERNALS
 
-	if use lcdfilter; then
+	if use infinality; then
 		epatch "${WORKDIR}"/patches/freetype-add-subpixel-hinting-infinality.patch
 		epatch "${WORKDIR}"/patches/freetype-entire-infinality-patchset.patch
 
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index 99860207e05e..1a9945334e56 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/metadata.xml
@@ -9,8 +9,8 @@
 	<flag name="fontforge">Install internal headers required for TrueType
 	debugger in <pkg>media-gfx/fontforge</pkg> (built with
 	USE=truetype-debugger)</flag>
+	<flag name="infinality">Enable infinality options for improved LCD filtering</flag>
     <flag name="kpathsea">Enable TeX support (ttf2pk and ttf2pfb)</flag>
-	<flag name="lcdfilter">Enable infinality LCD filtering support</flag>
     <flag name="utils">Install utilities and examples from ft2demos</flag>
   </use>
 </pkgmetadata>