Use USE=iontruetype rather than USE=truetype to enable XFT support at request of upstream.

Package-Manager: portage-2.1_pre6-r4

4 files changed, 25 insertions, 20 deletions

diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index b6009360d07d..1cd3883082be 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/ion3
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.35 2006/03/17 22:28:57 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.36 2006/03/20 08:13:21 twp Exp $
+
+  20 Mar 2006; Tom Payne <twp@gentoo.org> ion3-20060305-r1.ebuild,
+  ion3-20060317.ebuild:
+  Use USE=iontruetype rather than USE=truetype to enable XFT support at
+  request of upstream.
 
 *ion3-20060317 (17 Mar 2006)
 
diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest
index d8228dca1627..8dda07ad353d 100644
--- a/x11-wm/ion3/Manifest
+++ b/x11-wm/ion3/Manifest
@@ -1,6 +1,6 @@
-MD5 321b16650450410ae281fe794c56550e ChangeLog 5184
-RMD160 cc6753a1d12a4fc9d6a16d355b61411ef88d3f4c ChangeLog 5184
-SHA256 571513d5ac5c2808f3e014d7045375aca4c39c12767d708a795577b28740af03 ChangeLog 5184
+MD5 f3fe7ca8a3d12eb4765cf505d741f859 ChangeLog 5371
+RMD160 c39925015dcddfc04cc6833e9cdd162ee9726a78 ChangeLog 5371
+SHA256 a729117d7ff3e1a9ea1b49b892172052dc63a6bf5bd8041cc154070f83dc741c ChangeLog 5371
 MD5 764299c135999d5a350831c69d4520d4 files/digest-ion3-20060305 250
 RMD160 3389ce92742818a91a3164fc2ee60fcf1fddd4b6 files/digest-ion3-20060305 250
 SHA256 8caabcf6d2560d47a391585597ef1ff7bf8518cdb458be2e88d4caf20d6d9021 files/digest-ion3-20060305 250
@@ -22,15 +22,15 @@ SHA256 4742797e200b956abf3d0b94d860aa7430c9f67a97f3640ef2c28168fa773bb9 files/io
 MD5 e5e408ab1f83116c2138a26b20c86653 files/pwm3.desktop 170
 RMD160 7a33137ccf3857cacd7ff693df2e8952e16e3a84 files/pwm3.desktop 170
 SHA256 e068670634d31e58db4f54e703707f7908d30ced7f765e30ab590615b3d5dccd files/pwm3.desktop 170
-MD5 a019d9148ee9b9663c12078a458318bc ion3-20060305-r1.ebuild 1859
-RMD160 a7c7ba8e188d6c8eb4a33eb263a9a037382095b0 ion3-20060305-r1.ebuild 1859
-SHA256 bfc8c02195e02b4fcfb37a8b5cf9be0201d99074ee9f1839eff36f62c19892cd ion3-20060305-r1.ebuild 1859
+MD5 312582a92060e6019faa3d4b4b131b0c ion3-20060305-r1.ebuild 1871
+RMD160 8c3a5cb9eb5a0642c61e1fa2dc0ac0e4d02cf605 ion3-20060305-r1.ebuild 1871
+SHA256 0ed84965ae37e837d6a149a8527e0a9f3277724461434a2439a4223fb588f6cb ion3-20060305-r1.ebuild 1871
 MD5 f1c24872e569d962f09eb1d704555e3a ion3-20060305.ebuild 1697
 RMD160 6a497732b75b5dee02e801816605cfecdf41645a ion3-20060305.ebuild 1697
 SHA256 a9d3c2f1ca87b782c61d140d418cc5163e6f493014e52002f1b63c5b83c9e8b0 ion3-20060305.ebuild 1697
-MD5 412e0c72e25feda3b3cc7bf186b14969 ion3-20060317.ebuild 1856
-RMD160 408b26380554ca0d6cfc051a1f79e2bfb2f09ad5 ion3-20060317.ebuild 1856
-SHA256 7f09702c29f787dd627f408946e95013575becd7e0de273dd84dabda524ef783 ion3-20060317.ebuild 1856
+MD5 f0bca3659e0d2a85fbce6d75a67b06c9 ion3-20060317.ebuild 1868
+RMD160 e5c5fa6f2d124d525b750a1f82d30a5b7adf795a ion3-20060317.ebuild 1868
+SHA256 fafc012d1fe3ee582b0f6836664a570c84c90b6584db7020a0a0975c49151690 ion3-20060317.ebuild 1868
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244
 SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1 metadata.xml 244
diff --git a/x11-wm/ion3/ion3-20060305-r1.ebuild b/x11-wm/ion3/ion3-20060305-r1.ebuild
index b9962b0914d1..4a402f680c99 100644
--- a/x11-wm/ion3/ion3-20060305-r1.ebuild
+++ b/x11-wm/ion3/ion3-20060305-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20060305-r1.ebuild,v 1.1 2006/03/14 19:33:21 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20060305-r1.ebuild,v 1.2 2006/03/20 08:13:21 twp Exp $
 
 inherit eutils
 
@@ -12,13 +12,13 @@ SRC_URI="http://modeemi.cs.tut.fi/~tuomov/ion/dl/${MY_PN}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype xinerama"
+IUSE="iontruetype xinerama"
 DEPEND="
 	|| (
 		(
 			x11-libs/libICE
 			x11-libs/libXext
-			truetype? ( x11-libs/libXft )
+			iontruetype? ( x11-libs/libXft )
 			xinerama? ( x11-libs/libXinerama )
 		)
 		virtual/x11
@@ -29,7 +29,7 @@ S=${WORKDIR}/${MY_PN}
 
 src_unpack() {
 	unpack ${A}
-	use truetype && epatch ${FILESDIR}/${P}-truetype.patch
+	use iontruetype && epatch ${FILESDIR}/${P}-truetype.patch
 }
 
 src_compile() {
@@ -46,7 +46,7 @@ src_compile() {
 
 	econf \
 		--sysconfdir=/etc/X11 \
-		`use_enable truetype xft` \
+		`use_enable iontruetype xft` \
 		`use_enable xinerama` \
 		${myconf} || die
 
diff --git a/x11-wm/ion3/ion3-20060317.ebuild b/x11-wm/ion3/ion3-20060317.ebuild
index 41f521f3a89f..8aefcf959372 100644
--- a/x11-wm/ion3/ion3-20060317.ebuild
+++ b/x11-wm/ion3/ion3-20060317.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20060317.ebuild,v 1.1 2006/03/17 22:28:57 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20060317.ebuild,v 1.2 2006/03/20 08:13:21 twp Exp $
 
 inherit eutils
 
@@ -12,13 +12,13 @@ SRC_URI="http://modeemi.cs.tut.fi/~tuomov/ion/dl/${MY_PN}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="truetype xinerama"
+IUSE="iontruetype xinerama"
 DEPEND="
 	|| (
 		(
 			x11-libs/libICE
 			x11-libs/libXext
-			truetype? ( x11-libs/libXft )
+			iontruetype? ( x11-libs/libXft )
 			xinerama? ( x11-libs/libXinerama )
 		)
 		virtual/x11
@@ -29,7 +29,7 @@ S=${WORKDIR}/${MY_PN}
 
 src_unpack() {
 	unpack ${A}
-	use truetype && epatch ${FILESDIR}/${P}-truetype.patch
+	use iontruetype && epatch ${FILESDIR}/${P}-truetype.patch
 }
 
 src_compile() {
@@ -46,7 +46,7 @@ src_compile() {
 
 	econf \
 		--sysconfdir=/etc/X11 \
-		`use_enable truetype xft` \
+		`use_enable iontruetype xft` \
 		`use_enable xinerama` \
 		${myconf} || die