Check for USE truetype and png in fox wrt #198932. amd64 stable.

Package-Manager: portage-2.1.3.19

3 files changed, 28 insertions, 21 deletions

diff --git a/x11-misc/xfe/ChangeLog b/x11-misc/xfe/ChangeLog
index c95fb0c73015..a01c775d3bf3 100644
--- a/x11-misc/xfe/ChangeLog
+++ b/x11-misc/xfe/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xfe
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.43 2007/10/18 13:37:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.44 2007/11/18 18:39:34 drac Exp $
+
+  18 Nov 2007; Samuli Suominen <drac@gentoo.org> xfe-1.04.ebuild:
+  Check for USE truetype and png in fox wrt #198932. amd64 stable.
 
   18 Oct 2007; Christoph Mende <angelos@gentoo.org> xfe-1.00.ebuild:
   Stable on amd64 wrt bug #194892
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 972adc530fb6..7d2ffb14ab34 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST xfe-0.88.tar.gz 973761 RMD160 c208f1dd6e34710e1306394bdae96e9d37f0c739 SHA1 85ea89fcb967f4d566ab68cbb80e49c7ea1e4c46 SHA256 23d80193a6eccca779e30f01f93cd628890f8beff446da966e68591229db325b
 DIST xfe-1.00.tar.gz 2828942 RMD160 eecc306f623e53dc480c989437f6a85fd37ff53b SHA1 864dc02f7e8c4bed410d61872f71833636fc33e1 SHA256 47e425c234179394957d95ab03fb42b3bd4850bbc172d203948b96243f7463ed
 DIST xfe-1.04.tar.gz 1663117 RMD160 beb1226548152406ac5b7031597590926886ef4c SHA1 0a81c0a98312f48ba7c1fd208edf53516e743511 SHA256 9cacd18f4071becda343db02b779f6c36273d6f3bd34749271ef0eae3c179c2b
@@ -12,14 +9,14 @@ EBUILD xfe-1.00.ebuild 1056 RMD160 ee30840e2a9ac0c33c8bb473ef367aa3f8827974 SHA1
 MD5 41fa8913bae95a994da9e9cc5e4a59dd xfe-1.00.ebuild 1056
 RMD160 ee30840e2a9ac0c33c8bb473ef367aa3f8827974 xfe-1.00.ebuild 1056
 SHA256 7ce956c2280366e3a1d2ff1667b4f14d1a2e39b74463953c4b39e4285eb7ed42 xfe-1.00.ebuild 1056
-EBUILD xfe-1.04.ebuild 1058 RMD160 6fbe3863b64ae160abe61d2757a0f102cbbc5ec8 SHA1 9ebc33eb342110c21e1ded53ba0981e5d393a14e SHA256 3b36a5950f73408362d36eb4f6b076cc8ac541b86711dd53064b0e72de4aeb48
-MD5 ca25d5d09e3ed6b93a4e402ada61171e xfe-1.04.ebuild 1058
-RMD160 6fbe3863b64ae160abe61d2757a0f102cbbc5ec8 xfe-1.04.ebuild 1058
-SHA256 3b36a5950f73408362d36eb4f6b076cc8ac541b86711dd53064b0e72de4aeb48 xfe-1.04.ebuild 1058
-MISC ChangeLog 5159 RMD160 f54b91a71f589f8086f1e8c036e6c78c238240d1 SHA1 4190f1e01cd568a712584cb876c73b9a2b5059c9 SHA256 3aeef85c6d618b884f86e28f65d949d91d1b4771658787e631ae6056ed8cfc4f
-MD5 f6c60669ddd294d98ed925bb37f168b5 ChangeLog 5159
-RMD160 f54b91a71f589f8086f1e8c036e6c78c238240d1 ChangeLog 5159
-SHA256 3aeef85c6d618b884f86e28f65d949d91d1b4771658787e631ae6056ed8cfc4f ChangeLog 5159
+EBUILD xfe-1.04.ebuild 1385 RMD160 96ac0a0e0410424e7ce48e46998ced34cf4a34fc SHA1 f937aa5e32fb30e04fee71ba4defa01f9ed8b631 SHA256 37cbec2d0d756d26a68dad6021dca7ded193af5901bdc1ab3314f303d3b47dc1
+MD5 81b29874d19d5bb52c55482a1da9a240 xfe-1.04.ebuild 1385
+RMD160 96ac0a0e0410424e7ce48e46998ced34cf4a34fc xfe-1.04.ebuild 1385
+SHA256 37cbec2d0d756d26a68dad6021dca7ded193af5901bdc1ab3314f303d3b47dc1 xfe-1.04.ebuild 1385
+MISC ChangeLog 5290 RMD160 c3fb9b4d7e7730f93c789bc85b9e8bd448ce2c33 SHA1 41ad037af272d6aa41a954dd2ee11bfcbaba4a6f SHA256 c866e321358d5f3788d474a45798ff485b7c47eab9da9f1bb54d43ff6e46bf37
+MD5 1ca3b3879822fde3d9e944f8e028a424 ChangeLog 5290
+RMD160 c3fb9b4d7e7730f93c789bc85b9e8bd448ce2c33 ChangeLog 5290
+SHA256 c866e321358d5f3788d474a45798ff485b7c47eab9da9f1bb54d43ff6e46bf37 ChangeLog 5290
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -33,10 +30,3 @@ SHA256 1cfa1f61059082e9e7e9560c28687f235dde38ef4bed280ed1483613e5fc0ec4 files/di
 MD5 e85d0db270ea55c9b85483b865bbdaf5 files/digest-xfe-1.04 229
 RMD160 b2a892a3e62f925f181828d13d6e562ec22d9f9a files/digest-xfe-1.04 229
 SHA256 6bdbeb447a560b84d9bd896806c88be172a20604b791bfba424d8ecddb58151b files/digest-xfe-1.04 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHF2GrKhnDs22gwa8RAiC8AJ4wgwbI38JfCYGqbVSEKSpNH4uEOQCfSq6w
-UtomPflbTsgNUC+xUzIipq8=
-=EgU7
------END PGP SIGNATURE-----
diff --git a/x11-misc/xfe/xfe-1.04.ebuild b/x11-misc/xfe/xfe-1.04.ebuild
index 440de9c57ad6..02a44a7ff3d1 100644
--- a/x11-misc/xfe/xfe-1.04.ebuild
+++ b/x11-misc/xfe/xfe-1.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.04.ebuild,v 1.1 2007/10/07 05:49:45 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.04.ebuild,v 1.2 2007/11/18 18:39:34 drac Exp $
 
 inherit eutils
 
@@ -10,12 +10,26 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug nls"
 
 DEPEND="=x11-libs/fox-1.6*
 	nls? ( sys-devel/gettext )"
 
+pkg_setup() {
+	local use_check="Re-emerge =x11-libs/fox-1.6* with USE truetype."
+
+	if ! built_with_use "=x11-libs/fox-1.6*" truetype; then
+		eerror "${use_check}"
+		die "${use_check}"
+	fi
+
+	if ! built_with_use "=x11-libs/fox-1.6*" png; then
+		ewarn "Re-emerge =x11-libs/fox-1.6* with USE png for image support."
+		epause
+	fi
+}
+
 src_compile() {
 	econf $(use_enable nls) $(use_enable debug)
 	emake || die "emake failed."