Enhance REQUIRED_USE comment as nsplugins needs gtk too, so we are ready in eapi4...

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index d0c2582e3fd2c0d4aac536923adcff7d0c423037..c06719d10c07a5948e71c0eff96c5120f4a91546 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.61 2011/07/26 21:11:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.62 2011/07/26 22:36:46 scarabeus Exp $
+
+  26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.2.ebuild:
+  Enhance REQUIRED_USE comment as nsplugins needs gtk too, so we are ready in
+  eapi4 future.
 
   26 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.2.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 01a5881a286684d121b8890aa286cf4b21855cad..2d235a324686f4b74d983f04db8e61d6f827d07e 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -211,13 +211,13 @@ EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf
 EBUILD libreoffice-3.3.2.ebuild 18122 RMD160 c8f363b391004652a2a3c7b1c2660df9d604a475 SHA1 7578952923caf5ed05a54c5cc2c951b86d7acbee SHA256 ebadb43837677bbcec00992718f67c6610c4d049d441f06d15814276c9c11207
 EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
 EBUILD libreoffice-3.4.1.ebuild 19176 RMD160 9f22a8c93f185f56dfaa37a291f194bc8f1972c8 SHA1 91eb7e4e285643d5c8da3acf1bf952fb68916efe SHA256 0b895bc9569a3b3ca84fe8d54fb861a4570ba8ec57317c0fcd8cf3b03e010274
-EBUILD libreoffice-3.4.2.2.ebuild 18075 RMD160 dc32514ce87a37489413cb51e50ce30b0beadea7 SHA1 9191bb06e073ebe08b573cfb17548ab8d71cea9c SHA256 0f449811334f3bf72171bca157f1e2a6d6afa432a4886f51bc9619f0afd2ec89
-MISC ChangeLog 12751 RMD160 08dcbe14265605e2f1db11d7d88be8e1a975dab4 SHA1 0963ca9e9a81d6fdb684d9f6cbce81a38e701ac0 SHA256 a2ea8755a25f5492e6bffd52fef3b93ca31f8434d79f92f65cbd3b6ed6b1940a
+EBUILD libreoffice-3.4.2.2.ebuild 18095 RMD160 81e88c8b013d704a5062204dc671c4d1bf976c6e SHA1 92fb32ef85436d68c7f0e7c0464f4613f5c13755 SHA256 62bb12dc4278cc28427227bc0c4cb87c135e4c90e4457907e5ba6c9f8434c558
+MISC ChangeLog 12931 RMD160 92d52a395ba071a76a20b246b1bc95648b414b9e SHA1 3a5f71438eed9a2ba66ca0a9fe13ae9f83a89e70 SHA256 422dd01b44ad863143d05b417789cd1168f8984c5bfbc3607673ab36c6c54da3
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4vLQkACgkQHB6c3gNBRYf/ugCgpM2e6VrySbb77qdZfRNSCHLs
-p3UAnRoZ/FMpL08M9YSiHYajEmxKHpTG
-=Ppjy
+iEYEARECAAYFAk4vQQwACgkQHB6c3gNBRYeVGACgx1Hg1nJpsbizhtfcUi6o1CBo
+DpIAoI3K/+sV/Nls9lJb6CQK3hkYaZ2G
+=c/2u
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index c4cb8381139b708024ee56c89cada0dfc717ba73..0c4aaf7f7c4c32c0c0f49dafc030ac0c48f3af85 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.20 2011/07/26 21:11:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.2.ebuild,v 1.21 2011/07/26 22:36:46 scarabeus Exp $
 
 EAPI=3
 
@@ -228,6 +228,7 @@ PATCHES=(
 # REQUIRED_USE="
 #      || ( gtk gnome kde )
 #      gnome? ( gtk )
+#      nsplugin? ( gtk )
 #"
 
 S="${WORKDIR}/${PN}-bootstrap-${PV}"