package.use.mask mono on ppc instead of disabling it in the ebuild (bug #202361)

Package-Manager: portage-2.1.4

3 files changed, 25 insertions, 14 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 0f4937593dc8..25b5e3f1d4ac 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.362 2008/01/12 16:35:31 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.363 2008/01/19 03:16:46 halcy0n Exp $
+
+  19 Jan 2008; Mark Loeser <halcy0n@gentoo.org> openoffice-2.3.1.ebuild:
+  package.use.mask mono on ppc instead of disabling it in the ebuild (bug
+  #202361)
 
   12 Jan 2008; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.3.1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 0c9b8319f116..ba6fb1f8bda9 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.3.1/config_office-fix-system-icu-check.diff 740 RMD160 96fb3ddce67ff9a377cc57d29307eb69d396da18 SHA1 c2ef5dd0d90e2e78e07ee2b0b68d9fe792258836 SHA256 f2b3020bc3e2032ea3ffb9b96fe70c21e305c4db58ab85944b0b32e0a8f83df7
 MD5 5d80c93c2e4ddccb51e859e3da124296 files/2.3.1/config_office-fix-system-icu-check.diff 740
 RMD160 96fb3ddce67ff9a377cc57d29307eb69d396da18 files/2.3.1/config_office-fix-system-icu-check.diff 740
@@ -43,14 +46,14 @@ DIST ooo-build-2.3.1.2.tar.gz 8919121 RMD160 bbf48c05b9bfbd4633bc798b2e92c45c464
 DIST oox.2007-09-05.tar.bz2 357665 RMD160 7c098136d35b4e6bc9ffa6c26ed0aa7cbd9fef13 SHA1 88336ac37450db579246212026c5b2c7745bd47a SHA256 29014ae9c3a69161933dae63133568d5b34d3d7ce734673a63c8c01c70d14769
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST xt-20051206-src-only.zip 423516 RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d SHA1 edaba936383f5e1d6d245b4c826c6207825a8297 SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e
-EBUILD openoffice-2.3.1.ebuild 12496 RMD160 e15fe28da456dd087eedbb267f10296412def69f SHA1 d95e0b582a9bb5293adf2a576f373f7a1f04e51a SHA256 9345c8f00b865fafdcb0a506dabb8e0186c94c2bccd176e1012c9a86e5b9355d
-MD5 db3abf4f0e82259b697d1b51901977b8 openoffice-2.3.1.ebuild 12496
-RMD160 e15fe28da456dd087eedbb267f10296412def69f openoffice-2.3.1.ebuild 12496
-SHA256 9345c8f00b865fafdcb0a506dabb8e0186c94c2bccd176e1012c9a86e5b9355d openoffice-2.3.1.ebuild 12496
-MISC ChangeLog 76254 RMD160 15c30ed771b91b9669ee2f58439eeefb5f9e223f SHA1 19960c766daa507efee65e0c86fc0da57c22f00a SHA256 82427aa94ba7b4a3d3652b259b1cb97ae654c982cabdc29134374b43df1bc9fa
-MD5 ec178588c00524ca37c7e4132cd12c82 ChangeLog 76254
-RMD160 15c30ed771b91b9669ee2f58439eeefb5f9e223f ChangeLog 76254
-SHA256 82427aa94ba7b4a3d3652b259b1cb97ae654c982cabdc29134374b43df1bc9fa ChangeLog 76254
+EBUILD openoffice-2.3.1.ebuild 12325 RMD160 280affb4f271cb4fc46292247e082cdc79532459 SHA1 4e1375dee062b78fd537559cf8d1cacc7a32df2e SHA256 e0aa4c67c47950da2c56595e4919934d400d52ccf7925cae2670348f26aa4a38
+MD5 246cd9b6601a465293af872208ce3a4d openoffice-2.3.1.ebuild 12325
+RMD160 280affb4f271cb4fc46292247e082cdc79532459 openoffice-2.3.1.ebuild 12325
+SHA256 e0aa4c67c47950da2c56595e4919934d400d52ccf7925cae2670348f26aa4a38 openoffice-2.3.1.ebuild 12325
+MISC ChangeLog 76416 RMD160 1d431cfe6e98def756954e9e6797ec8f38526e5e SHA1 663e4e9d3b00b9a179a99173b69608a49227e397 SHA256 edd1a6da53d7fdf641aa4b467b8ee27a6028fb2c09fd6c9c8a3d3232e1f19fc0
+MD5 09f6967ddf9f25c40f51733a8f77ca33 ChangeLog 76416
+RMD160 1d431cfe6e98def756954e9e6797ec8f38526e5e ChangeLog 76416
+SHA256 edd1a6da53d7fdf641aa4b467b8ee27a6028fb2c09fd6c9c8a3d3232e1f19fc0 ChangeLog 76416
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461
@@ -58,3 +61,10 @@ SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata
 MD5 dd8ce8d6aa04dd51db53c615db78d45c files/digest-openoffice-2.3.1 3235
 RMD160 31e6dafe726efdee5b895b721e6e943197cbcbd4 files/digest-openoffice-2.3.1 3235
 SHA256 558c1e670bf5b20e1c6be03b0a151911b16f3c96ebe21980e1e089699d81beae files/digest-openoffice-2.3.1 3235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHkWumCRZPokWLroQRAo/1AJ9AnL4BF48gndv76XP2/wcv+qzA2gCbBS9g
+znbiQ+v/JT14EI4nGU6po8w=
+=okNV
+-----END PGP SIGNATURE-----
diff --git a/app-office/openoffice/openoffice-2.3.1.ebuild b/app-office/openoffice/openoffice-2.3.1.ebuild
index 7d6650d83c18..0dd3c1bef7e5 100644
--- a/app-office/openoffice/openoffice-2.3.1.ebuild
+++ b/app-office/openoffice/openoffice-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1.ebuild,v 1.7 2008/01/12 16:35:31 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.3.1.ebuild,v 1.8 2008/01/19 03:16:46 halcy0n Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -301,10 +301,6 @@ src_compile() {
 	# Make sure gnome-users get gtk-support
 	export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
 
-	# We have to disable mono-support for ppc, it's broken
-	export MYCONF="`use_enable mono`"
-	use ppc && MYCONF="--disable-mono" && ewarn "Mono support is currently broken on ppc, so disabling it"
-
 	cd ${S}
 	./configure ${MYCONF} \
 		--with-distro="Gentoo" \
@@ -317,6 +313,7 @@ src_compile() {
 		--with-installed-ooo-dirname="openoffice" \
 		--with-tag="OOG680_m9" \
 		"${GTKFLAG}" \
+		`use_enable mono` \
 		`use_enable kde` \
 		`use_enable cairo` \
 		`use_with cairo system-cairo` \