Bunch of cleanups, dependencies, restricts

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

4 files changed, 24 insertions, 20 deletions

diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 192722c8f0b2..469b248b2f81 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -416,6 +416,6 @@ DIST LibO_3.3.1_Linux_x86_langpack-rpm_xh.tar.gz 8407431 RMD160 c987aa66eeeaee49
 DIST LibO_3.3.1_Linux_x86_langpack-rpm_zh-CN.tar.gz 1980108 RMD160 849680b34cc974f7c5ede61e6a23c23984e3092b SHA1 943aa9c1536fe040fd3bfb7c13aacd12d45ade49 SHA256 6cc292b717e60e0dc689fb19ef3da7d1aa72cc70c2cabb84a93aa10740ce8f64
 DIST LibO_3.3.1_Linux_x86_langpack-rpm_zh-TW.tar.gz 1968034 RMD160 f39ee245750fcf995a19e679fd3cdfb23be22a2c SHA1 55ae4023c5948495d155b4c61c57739df11ceb5a SHA256 1b175bada7d334ae04bb6544c062fb0d5e127119809bafbe125d20dc4e51d7f1
 DIST LibO_3.3.1_Linux_x86_langpack-rpm_zu.tar.gz 1907400 RMD160 5a8e5d40601323339540371cd41c7c4193f1bde9 SHA1 6d11c3aa382efda130609fef23d6d6c04d90467c SHA256 a5f382dd804bc9d39a23b3c7f443398c6c041ddf56c8b836fa2bf37f8b8da0a7
-EBUILD libreoffice-bin-3.3.1.ebuild 7243 RMD160 90f8ef61c82da7acf7f6411bcd0c2905688e1b46 SHA1 ed78f1a2a08f0c68be5b5fce63556d8e91b23a2b SHA256 92c258c8093f062635d715a1cff2dbc82598e7a9e7632c1064d8abf0ed98e38c
-MISC ChangeLog 2716 RMD160 0175c9abdac94c2bab784ed81f88e040427e82e6 SHA1 ae0507018d9f7663f0d416a8d5b367c0d1ca9644 SHA256 13c1484d45da11ded8e7c6cfa68f0333409d12764e51f1b5f447d28eb7602b09
+EBUILD libreoffice-bin-3.3.1.ebuild 7153 RMD160 95dbbe3150d2f8cafd9ffc742d99f417f7e65ca8 SHA1 80751076177d0c9ab0af80be6c74686a68faabae SHA256 f05708e9663fe55d741f8c7d7e6d70bc59f81822910933fe0c0b53a78e007e31
+MISC ChangeLog 2846 RMD160 8395b1fe42b6ce5deb97f9a5acc24572a5535588 SHA1 30f3ddb273571eaa833489d7708f626656055efb SHA256 c2da1876975fc1cdcfff72931c7420d88b00792506e9cd3b3b21b920743c380e
 MISC metadata.xml 470 RMD160 252033a0fe2dea9ea521587808f2403870f961c0 SHA1 8dd15d8cb9fa113656a5f77de79d9fbee5fe58ed SHA256 d455809468711d16b0a1401b67b676876f5f7b6cc59affbc63c0a889a4ba103e
diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index a71e9eb37a62..79f4dd581645 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.239 2011/03/17 11:56:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.240 2011/03/17 13:04:03 suka Exp $
+
+  17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-3.3.0.ebuild:
+  Bunch of cleanups, dependencies, restricts
 
   17 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   openoffice-bin-3.3.0.ebuild:
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 8caefab0bfcd..41c182f39935 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -269,6 +269,6 @@ DIST OOo_3.3.0rc10_20110118_Linux_x86_langpack-rpm_vi.tar.gz 13722960 RMD160 cde
 DIST OOo_3.3.0rc10_20110118_Linux_x86_langpack-rpm_zh-CN.tar.gz 14161654 RMD160 59faa4b4924bbcb5846b91f2c570d40583ea85ac SHA1 5bd8a26f45eaad7ffffdfa08fff988ca8c0218c4 SHA256 f9ad9abc8d40a232ec84cdf43eec10b9990ebc37b2a1a3bf8fa171a63ef0c9da
 DIST OOo_3.3.0rc10_20110118_Linux_x86_langpack-rpm_zh-TW.tar.gz 14348835 RMD160 361a325775726f77a6a4ce68d001908376a5cae1 SHA1 bbd3d1cd5c8ac8d65dd4c56797c99f684c009171 SHA256 996d69480db9f657ccfbe332ef7b297ebb7f57ab871e49a77dbc1e5f09d4a06b
 EBUILD openoffice-bin-3.2.1.ebuild 6787 RMD160 5efd664179fce8efbea93b96a58701571ffc956b SHA1 845eba23d37da79cfd2639799a17a7d8cc1ad638 SHA256 f2d001bfb478f1230a60c84388c72d226403a820779cdd9bfef981e713f9608d
-EBUILD openoffice-bin-3.3.0.ebuild 6868 RMD160 3a66c02d37c362b11cd12461f731b62422031913 SHA1 9936f0c96388475ac3da0d18837ec2824ed028cb SHA256 1b250cffe4c4dfa7b4500d9aabdae2d888f7884bd56a5ee2ede0ade21f348a23
-MISC ChangeLog 42796 RMD160 a9d4222631a3f69f82566c7613645bff8c86e3ff SHA1 3c22994445d39eea3514e64a461e13eceb5e71ee SHA256 4f4e7b5b58cb16a279c9e59bc265c8e4c2a940b9fd46467b26de32edc4f34477
+EBUILD openoffice-bin-3.3.0.ebuild 6802 RMD160 11831da003e42ddbf827b60852c66bae0b87cea7 SHA1 3659a2b17b6224d1618485dbfdc24add3672de2e SHA256 dcbe7c92eb7f41a6cdc11e70d09e634b5b07b66be440a653740ae6048554aaf6
+MISC ChangeLog 42926 RMD160 c684ad9268a65306837230474c8d1c288c89b87c SHA1 1518b59fa5e67e66dc1565b26f61d1048a4fe803 SHA256 92938910031114356dcbb0f348a04e9c4917a3adc015a50c81ba7fe29d22326f
 MISC metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 SHA1 09559b952ad283bf009bb78cca9bc125c644a977 SHA256 9160d9de32e063130943805fe72d9bb196700524a54a54cf1769a740ecd9183d
diff --git a/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild b/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild
index a98c84ea7b56..2bc9e73adc14 100644
--- a/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-3.3.0.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/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.3 2011/03/17 11:56:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.3.0.ebuild,v 1.4 2011/03/17 13:04:03 suka Exp $
 
 EAPI="3"
 
@@ -50,38 +50,38 @@ LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="!app-office/openoffice
+RDEPEND="!app-office/libreoffice
+	!app-office/openoffice
+	!app-office/libreoffice-bin
 	x11-libs/libXaw
 	!prefix? ( sys-libs/glibc )
 	>=dev-lang/perl-5.0
 	app-arch/zip
 	app-arch/unzip
-	>=media-libs/freetype-2.1.10-r2
-	java? ( >=virtual/jre-1.5 )
-	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
-	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
-	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
+	x11-libs/libXinerama
+	>=media-libs/freetype-2.1.10-r2"
 
 DEPEND="${RDEPEND}
 	sys-apps/findutils"
 
-RESTRICT="strip"
+PDEPEND="java? ( >=virtual/jre-1.5 )"
 
-QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.2/program/*
+RESTRICT="strip binchecks"
+
+QA_EXECSTACK="usr/$(get_libdir)/openoffice/basis3.3/program/*
 	usr/$(get_libdir)/openoffice/ure/lib/*"
-QA_TEXTRELS="usr/$(get_libdir)/openoffice/basis3.2/program/libvclplug_genli.so \
-	usr/$(get_libdir)/openoffice/basis3.2/program/python-core-2.3.4/lib/lib-dynload/_curses_panel.so \
-	usr/$(get_libdir)/openoffice/basis3.2/program/python-core-2.3.4/lib/lib-dynload/_curses.so \
+QA_TEXTRELS="usr/$(get_libdir)/openoffice/basis3.3/program/libvclplug_genli.so \
+	usr/$(get_libdir)/openoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/_curses_panel.so \
+	usr/$(get_libdir)/openoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/_curses.so \
 	usr/$(get_libdir)/openoffice/ure/lib/*"
 
 src_unpack() {
 
 	unpack ${A}
+
 	cp "${FILESDIR}"/{50-openoffice-bin,wrapper.in} "${T}"
 	eprefixify "${T}"/{50-openoffice-bin,wrapper.in}
 
-	cd "${S}"
-
 	for i in base binfilter calc core01 core02 core03 core04 core05 core06 core07 draw graphicfilter images impress math ooofonts oooimprovement ooolinguistic pyuno testtool writer xsltfilter ; do
 		rpm_unpack "./${UP}/${BASIS}-${i}-${MY_PV3}.${OOARCH}.rpm"
 	done
@@ -103,8 +103,8 @@ src_unpack() {
 	rpm_unpack "./${UP}/openoffice.org3-dict-es-${MY_PV3}.${OOARCH}.rpm"
 	rpm_unpack "./${UP}/openoffice.org3-dict-fr-${MY_PV3}.${OOARCH}.rpm"
 
+	# Localization
 	strip-linguas ${LANGS}
-
 	if [[ -z "${LINGUAS}" ]]; then
 		export LINGUAS="en"
 	fi