Silence well known QA-messages, also fix the desktop files for 2.1_rc1

Package-Manager: portage-2.1.2_rc2-r5

4 files changed, 36 insertions, 21 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 1aeee2f22d05..fba25c107fa6 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.146 2006/12/04 01:48:24 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.147 2006/12/04 13:02:51 suka Exp $
+
+  04 Dec 2006; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-2.1.0_rc1.ebuild:
+  Silence well known QA-messages, also fix the desktop files for 2.1_rc1,
+  closes bug #156533
 
   04 Dec 2006; <solar@gentoo.org> openoffice-bin-2.0.4.ebuild,
   openoffice-bin-2.1.0_rc1.ebuild:
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 504865bfb821..7b48eb91aaf4 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -217,18 +217,18 @@ EBUILD openoffice-bin-2.0.3.ebuild 5201 RMD160 3ec8064d5ab859e6b45adf68ee0721b2d
 MD5 7fd075665d3203b59dff2f8f5c3324b4 openoffice-bin-2.0.3.ebuild 5201
 RMD160 3ec8064d5ab859e6b45adf68ee0721b2df86e8ea openoffice-bin-2.0.3.ebuild 5201
 SHA256 4bea770094f5a42e8b4f1af766619d53215b21166c536996b4046a597c2ca345 openoffice-bin-2.0.3.ebuild 5201
-EBUILD openoffice-bin-2.0.4.ebuild 5277 RMD160 c91089dd10df5e598da7f42b6393e3811192b0e9 SHA1 c165a75d07ab429b783a9424849d06d771188b8e SHA256 17d7769f8485594e57599a8865c3df28f14781173fffe00c75aceae2774a0422
-MD5 b1cc4b72fb1a7f29c411ddd0d1fc06e5 openoffice-bin-2.0.4.ebuild 5277
-RMD160 c91089dd10df5e598da7f42b6393e3811192b0e9 openoffice-bin-2.0.4.ebuild 5277
-SHA256 17d7769f8485594e57599a8865c3df28f14781173fffe00c75aceae2774a0422 openoffice-bin-2.0.4.ebuild 5277
-EBUILD openoffice-bin-2.1.0_rc1.ebuild 5298 RMD160 48c0e43ddac2aff932a34156d84e20d7b754996a SHA1 f5e402267735af743e74aac169ad4b3f3e477fb8 SHA256 24ee9549770ed0cdd5d50ed795df584a960c370a2edae9aad7226c1620530872
-MD5 edfe75efa9a6ecb61c6b6a59298c00cb openoffice-bin-2.1.0_rc1.ebuild 5298
-RMD160 48c0e43ddac2aff932a34156d84e20d7b754996a openoffice-bin-2.1.0_rc1.ebuild 5298
-SHA256 24ee9549770ed0cdd5d50ed795df584a960c370a2edae9aad7226c1620530872 openoffice-bin-2.1.0_rc1.ebuild 5298
-MISC ChangeLog 27457 RMD160 5cd9ed87c20c3fe868aa442e42d36c8bf906ed1a SHA1 7239ee26a50f93a1af15585028b2f7c87672cf0a SHA256 67fd4ad3eb28f2b745c7bbec6793f8bf77119e2212788f2e5541f611bcd5a5cc
-MD5 7902a77f1b7ea23e88dd1b0a5199b550 ChangeLog 27457
-RMD160 5cd9ed87c20c3fe868aa442e42d36c8bf906ed1a ChangeLog 27457
-SHA256 67fd4ad3eb28f2b745c7bbec6793f8bf77119e2212788f2e5541f611bcd5a5cc ChangeLog 27457
+EBUILD openoffice-bin-2.0.4.ebuild 5545 RMD160 363c6aa70e400886d6a3cc5fc993b4652d248b6d SHA1 3c50bd1992d05b31de7de3ae32abf759c4db589b SHA256 062c9173c0dc4d9a2241737a0620e5326e30a7fb5b23dcb41c5284755277fe81
+MD5 82526d13deae9c528cfdef352ce9977d openoffice-bin-2.0.4.ebuild 5545
+RMD160 363c6aa70e400886d6a3cc5fc993b4652d248b6d openoffice-bin-2.0.4.ebuild 5545
+SHA256 062c9173c0dc4d9a2241737a0620e5326e30a7fb5b23dcb41c5284755277fe81 openoffice-bin-2.0.4.ebuild 5545
+EBUILD openoffice-bin-2.1.0_rc1.ebuild 5566 RMD160 96632ca4d131110cb351d3a5586e218ffff211ec SHA1 8527a1ba6f70ae53fb484f29c275f71f60a55001 SHA256 47d9d7643665b42f5f582cd22f1a6f9344d9f4fc3d86a89718d4b77b40bf78a0
+MD5 b8f173694d1af9324979a121fd4d0e2b openoffice-bin-2.1.0_rc1.ebuild 5566
+RMD160 96632ca4d131110cb351d3a5586e218ffff211ec openoffice-bin-2.1.0_rc1.ebuild 5566
+SHA256 47d9d7643665b42f5f582cd22f1a6f9344d9f4fc3d86a89718d4b77b40bf78a0 openoffice-bin-2.1.0_rc1.ebuild 5566
+MISC ChangeLog 27640 RMD160 a75b0f9800bad8e2e9a4008ca79dfbab30092edc SHA1 3f9e9d2dd41c8e70e34187125a74c5e819fb5f93 SHA256 18184ba663bdf471a9df4c93ea8aa41063adeceb9ad359732a1462824a2feb3c
+MD5 33e1950a4573e6eaa571384489044276 ChangeLog 27640
+RMD160 a75b0f9800bad8e2e9a4008ca79dfbab30092edc ChangeLog 27640
+SHA256 18184ba663bdf471a9df4c93ea8aa41063adeceb9ad359732a1462824a2feb3c ChangeLog 27640
 MISC metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 SHA1 09559b952ad283bf009bb78cca9bc125c644a977 SHA256 9160d9de32e063130943805fe72d9bb196700524a54a54cf1769a740ecd9183d
 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 metadata.xml 460
diff --git a/app-office/openoffice-bin/openoffice-bin-2.0.4.ebuild b/app-office/openoffice-bin/openoffice-bin-2.0.4.ebuild
index c59772bb530c..d4a7c5a09fc2 100644
--- a/app-office/openoffice-bin/openoffice-bin-2.0.4.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-2.0.4.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/app-office/openoffice-bin/openoffice-bin-2.0.4.ebuild,v 1.2 2006/12/04 01:48:24 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.0.4.ebuild,v 1.3 2006/12/04 13:02:51 suka Exp $
 
 inherit eutils fdo-mime rpm multilib
 
@@ -50,6 +50,11 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/ooo"
 RESTRICT="nostrip"
 
+QA_EXECSTACK="usr/lib/openoffice/program/*"
+QA_TEXTRELS="usr/lib/openoffice/program/libvclplug_gen680li.so.1.1 \
+	usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/_curses_panel.so \
+	usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/_curses.so"
+
 src_unpack() {
 
 	unpack ${A}
diff --git a/app-office/openoffice-bin/openoffice-bin-2.1.0_rc1.ebuild b/app-office/openoffice-bin/openoffice-bin-2.1.0_rc1.ebuild
index ee2b6c40e380..8b1a77966a23 100644
--- a/app-office/openoffice-bin/openoffice-bin-2.1.0_rc1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-2.1.0_rc1.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/app-office/openoffice-bin/openoffice-bin-2.1.0_rc1.ebuild,v 1.2 2006/12/04 01:48:24 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.1.0_rc1.ebuild,v 1.3 2006/12/04 13:02:51 suka Exp $
 
 inherit eutils fdo-mime rpm multilib
 
@@ -50,6 +50,11 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/ooo"
 RESTRICT="nostrip"
 
+QA_EXECSTACK="usr/lib/openoffice/program/*"
+QA_TEXTRELS="usr/lib/openoffice/program/libvclplug_gen680li.so.1.1 \
+	usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/_curses_panel.so \
+	usr/lib/openoffice/program/python-core-2.3.4/lib/lib-dynload/_curses.so"
+
 src_unpack() {
 
 	unpack ${A}
@@ -90,15 +95,15 @@ src_install () {
 
 	#Menu entries, icons and mime-types
 	cd ${D}${INSTDIR}/share/xdg/
-	sed -i -e s/'Exec=openoffice.org-2.0-printeradmin'/'Exec=oopadmin2'/g printeradmin.desktop || die
+	sed -i -e s/'Exec=openoffice.org-2.1-printeradmin'/'Exec=oopadmin2'/g printeradmin.desktop || die
 
 	for desk in base calc draw impress math printeradmin writer; do
-		mv ${desk}.desktop openoffice.org-2.0-${desk}.desktop
-		sed -i -e s/openoffice.org-2.0/ooffice2/g openoffice.org-2.0-${desk}.desktop || die
-		sed -i -e s/openofficeorg-20-${desk}/ooo-${desk}2/g openoffice.org-2.0-${desk}.desktop || die
-		domenu openoffice.org-2.0-${desk}.desktop
+		mv ${desk}.desktop openoffice.org-2.1-${desk}.desktop
+		sed -i -e s/openoffice.org-2.1/ooffice2/g openoffice.org-2.1-${desk}.desktop || die
+		sed -i -e s/openofficeorg-21-${desk}/ooo-${desk}2/g openoffice.org-2.1-${desk}.desktop || die
+		domenu openoffice.org-2.1-${desk}.desktop
 		insinto /usr/share/pixmaps
-		newins ${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg-20-${desk}.png ooo-${desk}2.png
+		newins ${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg-21-${desk}.png ooo-${desk}2.png
 	done
 
 	insinto /usr/share/mime/packages