Added a warning if emerging with incompatible USE flags. Bug #138135

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 47 insertions, 21 deletions

diff --git a/x11-libs/libmatchbox/ChangeLog b/x11-libs/libmatchbox/ChangeLog
index 917b2eff4077..4b5314411eeb 100644
--- a/x11-libs/libmatchbox/ChangeLog
+++ b/x11-libs/libmatchbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libmatchbox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.3 2006/06/04 20:32:23 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.4 2006/07/14 17:20:21 yvasilev Exp $
+
+  14 Jul 2006; <yvasilev@gentoo.org> libmatchbox-1.7.ebuild,
+  libmatchbox-1.8.ebuild:
+  Added a warning if emerging with incompatible USE flags. Bug #138135
 
 *libmatchbox-1.8 (04 Jun 2006)
 
diff --git a/x11-libs/libmatchbox/Manifest b/x11-libs/libmatchbox/Manifest
index 979a5083f7c1..c0468657693e 100644
--- a/x11-libs/libmatchbox/Manifest
+++ b/x11-libs/libmatchbox/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST libmatchbox-1.7.tar.bz2 250754 RMD160 fa6bea1e2489fd3feae452103f6a2aa619454305 SHA1 3e27b0525d7a10d777a49b8f59fb59b48f2b6d1b SHA256 f6e545e7e9bc35e1dd1b9a89ffd29d6cf1f2c975fc15ada4dbe0525871f6762e
 DIST libmatchbox-1.8.tar.bz2 303304 RMD160 420158db32bd1b5968645b12faa9f333bee9e61e SHA1 e0422b2e3722134334bd80b4e3e064507459e8bc SHA256 a675f7b5b10dabf4d2951b629dd8d638219ec91078acd497aac4fcf2008a1c5b
-EBUILD libmatchbox-1.7.ebuild 1268 RMD160 2f4fb23bad849d2ce992b10ac04425943568ad09 SHA1 80b7c9aa67d8b049d0545b203b35fb7212bec602 SHA256 bb217441888f0380647b3207f598d57eb355c9b4a252aa951c7d52b2c90b965f
-MD5 54bdf44caf54ab006eaf2e933c34973a libmatchbox-1.7.ebuild 1268
-RMD160 2f4fb23bad849d2ce992b10ac04425943568ad09 libmatchbox-1.7.ebuild 1268
-SHA256 bb217441888f0380647b3207f598d57eb355c9b4a252aa951c7d52b2c90b965f libmatchbox-1.7.ebuild 1268
-EBUILD libmatchbox-1.8.ebuild 1268 RMD160 5ce0fcb4b54f626dd9cc5dafdce95ddda6ad4f6a SHA1 d6acae95e16b783f9ad2976f17983855a49df78d SHA256 740c64e4cd6db7b3c60cb1caa8cd1f67d0d2ef0abdb67df509f275d0c3934043
-MD5 232f9857514bb07884d867f465fe6ef8 libmatchbox-1.8.ebuild 1268
-RMD160 5ce0fcb4b54f626dd9cc5dafdce95ddda6ad4f6a libmatchbox-1.8.ebuild 1268
-SHA256 740c64e4cd6db7b3c60cb1caa8cd1f67d0d2ef0abdb67df509f275d0c3934043 libmatchbox-1.8.ebuild 1268
-MISC ChangeLog 635 RMD160 9b7e2a31f027fe7c35d8d163b9839152ffe46711 SHA1 82854ee3d8a0ef57dfdb22b8ce723e8a7cbdc9f1 SHA256 9f34b3503004550fb6531b8bc57f6e425200df5bc6924e2237437919e0fec165
-MD5 eb9bfa190aade931399b36f135f13d23 ChangeLog 635
-RMD160 9b7e2a31f027fe7c35d8d163b9839152ffe46711 ChangeLog 635
-SHA256 9f34b3503004550fb6531b8bc57f6e425200df5bc6924e2237437919e0fec165 ChangeLog 635
+EBUILD libmatchbox-1.7.ebuild 1572 RMD160 05ce9a5f191bfccbd31c71c6e596b1eeb44fe205 SHA1 56c3dd9da966cf26d397b441aad39ad78d82e82e SHA256 8c938ee5b08be58e6d1e1ca10431d24a9411ced57740871cf26e52bc55cfb498
+MD5 5c72fa01b5a7e85d144c09acc21df98f libmatchbox-1.7.ebuild 1572
+RMD160 05ce9a5f191bfccbd31c71c6e596b1eeb44fe205 libmatchbox-1.7.ebuild 1572
+SHA256 8c938ee5b08be58e6d1e1ca10431d24a9411ced57740871cf26e52bc55cfb498 libmatchbox-1.7.ebuild 1572
+EBUILD libmatchbox-1.8.ebuild 1572 RMD160 83ea013b8ad2ba4314dbda52068e640abf4d787b SHA1 7454a8a696d0c4d89b3393c2dcb3109f8b037f9c SHA256 34c51c56f94ede8d4e95aac3bb09d25dc266b8a4fa3b1dc140b8f0348e1de818
+MD5 7c10b31e93ea032710b8185ba355d43a libmatchbox-1.8.ebuild 1572
+RMD160 83ea013b8ad2ba4314dbda52068e640abf4d787b libmatchbox-1.8.ebuild 1572
+SHA256 34c51c56f94ede8d4e95aac3bb09d25dc266b8a4fa3b1dc140b8f0348e1de818 libmatchbox-1.8.ebuild 1572
+MISC ChangeLog 794 RMD160 6c4251125abc42804a62a9aff39dc917d125ff43 SHA1 1c6266ac532b71f4e812bb97c729cf3a47f897a7 SHA256 31591382247ea23d100e3bc1f658298c7938d8e75b42e92ede876c1e6ed3cabb
+MD5 c0bc6609d66cc3ce14e446e843f8df95 ChangeLog 794
+RMD160 6c4251125abc42804a62a9aff39dc917d125ff43 ChangeLog 794
+SHA256 31591382247ea23d100e3bc1f658298c7938d8e75b42e92ede876c1e6ed3cabb ChangeLog 794
 MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55
 MD5 a80bc50cf196a9e5a2764d6f6081b56a metadata.xml 247
 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 metadata.xml 247
@@ -26,9 +26,9 @@ MD5 8a762cbefe3d91a7ebc53347681c8d4f files/digest-libmatchbox-1.8 250
 RMD160 db07f23f91d8796e0539f53ab505f63b1493a922 files/digest-libmatchbox-1.8 250
 SHA256 bdbebb8e7a5bfe62ee498d7937b1b1793d66c404fb1eb62b1092993931a4b462 files/digest-libmatchbox-1.8 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEg0MeyZl4piiTjjYRAluzAJ9vs+sgO7wFEenpfCFTbvw+tPpghACgwYvN
-1pZYvE5/eFLeTShanch3k+o=
-=8iq2
+iD8DBQFEt9JUyZl4piiTjjYRAs5kAJ9C/oFs6b4PcSDpaT894FtSQKNTwwCfdQPp
+qjyW9wjoame71W2hvOrjyVw=
+=xZUj
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libmatchbox/libmatchbox-1.7.ebuild b/x11-libs/libmatchbox/libmatchbox-1.7.ebuild
index 0826c6d3bfff..78ddcc9023cb 100644
--- a/x11-libs/libmatchbox/libmatchbox-1.7.ebuild
+++ b/x11-libs/libmatchbox/libmatchbox-1.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2006-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.7.ebuild,v 1.1 2006/03/12 20:12:18 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.7.ebuild,v 1.2 2006/07/14 17:20:21 yvasilev Exp $
 
-inherit libtool
+inherit eutils libtool
 
 DESCRIPTION="The Matchbox Library."
 HOMEPAGE="http://projects.o-hand.com/matchbox/"
@@ -24,6 +24,17 @@ RDEPEND="|| ( (	x11-libs/libXext
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
+pkg_setup() {
+	# Bug #138135
+	if use truetype && use pango; then
+		ewarn "You have both the truetype and pango USE flags set, pango"
+		ewarn "overrides and disables the XFT support truetype enables."
+		ewarn "If this isn't what you intended you should stop the build!"
+		ebeep 3
+		epause 3
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/x11-libs/libmatchbox/libmatchbox-1.8.ebuild b/x11-libs/libmatchbox/libmatchbox-1.8.ebuild
index b70d80ab2615..17b978b6f6fd 100644
--- a/x11-libs/libmatchbox/libmatchbox-1.8.ebuild
+++ b/x11-libs/libmatchbox/libmatchbox-1.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 2006-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.8.ebuild,v 1.1 2006/06/04 20:32:23 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.8.ebuild,v 1.2 2006/07/14 17:20:21 yvasilev Exp $
 
-inherit libtool
+inherit eutils libtool
 
 DESCRIPTION="The Matchbox Library."
 HOMEPAGE="http://projects.o-hand.com/matchbox/"
@@ -24,6 +24,17 @@ RDEPEND="|| ( (	x11-libs/libXext
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
+pkg_setup() {
+	# Bug #138135
+	if use truetype && use pango; then
+		ewarn "You have both the truetype and pango USE flags set, pango"
+		ewarn "overrides and disables the XFT support truetype enables."
+		ewarn "If this isn't what you intended you should stop the build!"
+		ebeep 3
+		epause 3
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}