Cleanup work: Prefix fixes, remove outated deps and config-flags, fix pax

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 28 insertions, 22 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index aa9761a5ffc9..a9f2ab41eb10 100644
--- 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.8 2011/02/02 09:11:56 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.9 2011/02/05 08:58:04 suka Exp $
+
+  05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild,
+  files/gentoo-3.3.0.diff:
+  Cleanup work: Prefix fixes, remove outated deps and config-flags, fix pax
+  stuff
 
   02 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
   Fix desktop files, thanks to Sanders Sweers <Sander.Sweers@gmail.com>, see
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 66161f6bc7f2..6fd9900ac9be 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,7 +1,7 @@
 AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
-AUX gentoo-3.3.0.diff 1349 RMD160 111132f6468bbef018f604e684278683b6659870 SHA1 d1a51451449345dc1fe868ecef6becc0f6a4f719 SHA256 391ebb354ddb889b59e3bd977e4e0a2a98f3a0b4fb2bb152f4f40c6341571f98
+AUX gentoo-3.3.0.diff 1555 RMD160 7a678be646cfc4a1a121a2b3a7ee23045c227f38 SHA1 3f13c570ac8ce446bf5b8d171e4e554b9d02095d SHA256 133d57446818e49c07945636c0018d062f2f50c1912f9efcd58bcd6a3d36846b
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
 AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
@@ -85,6 +85,6 @@ DIST libreoffice-testing-3.3.0.4.tar.bz2 50947353 RMD160 1ea2c0dc0a3bf4a0ddc9e5b
 DIST libreoffice-ure-3.3.0.4.tar.bz2 6163547 RMD160 f52347c5224afd29869030b466e05e722f0bdd64 SHA1 723af233415c9ed7611973e9b89df6a8cfeac911 SHA256 301a3d57f9c46f991298529af606dcb79999717b4e1c5ac6907d1e315dcc1bca
 DIST libreoffice-writer-3.3.0.4.tar.bz2 6775537 RMD160 aa4d0d35ed376bbf7903aa444c396973defbd709 SHA1 353cd9adad81428702bb7b8f22c0c9209799f036 SHA256 11e8656ca7e9761a8e2ea3d4526622be1fb1cdc4b2c7a72721e65e8444919bec
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.3.0.ebuild 18202 RMD160 35c502b6f8fe19a4ef67211ed0d8c65eaceddef9 SHA1 dc3062dbbd8379c81a2658d7fd500fb645598452 SHA256 03bcf51d44eed0221d269c517d842b736b4f50344e14633dfe14992c2651c5c4
-MISC ChangeLog 1903 RMD160 f2422d89b6794ec2f5e28d6e3b5e5c5a207e7927 SHA1 b6e46d27e3adffac3cd1b6422ee3fa24006e552e SHA256 c12e8e5f7edd80f4602d7135524c0e37109a9e5842db1e7d9c3d83dcdb6f5897
+EBUILD libreoffice-3.3.0.ebuild 17886 RMD160 fb059a4c4eee58d06116dc1586ae6045a1ca72b7 SHA1 b1cc9f9b18de2891c91ee0d96b96b145a84ced7e SHA256 6e8a29a48ec3c5639743bddd7a3066019058ce8ab13dbe17ee307fbaebd6f72f
+MISC ChangeLog 2094 RMD160 12c36fdd0e8461fcb228a81e283ddc2e6dbf3427 SHA1 1be73f81324256ce2f79960ce9761d3e8b274ba8 SHA256 4024aa9cb91541c70ea12cad997118fa4b97f080c98eb759b65aeb17121c2060
 MISC metadata.xml 693 RMD160 f538aa488c8ae05b34a37ea50c5fce9b9a85625e SHA1 85de4ea2ab18cfa53e8673430da6f2c15ce064b2 SHA256 ccbd40dc84f76608141535a48be034e0e24e96978d86ec4478a3efae4f4347b4
diff --git a/app-office/libreoffice/files/gentoo-3.3.0.diff b/app-office/libreoffice/files/gentoo-3.3.0.diff
index 600a51b7f03c..2382b3aa4605 100644
--- a/app-office/libreoffice/files/gentoo-3.3.0.diff
+++ b/app-office/libreoffice/files/gentoo-3.3.0.diff
@@ -1,3 +1,11 @@
+--- distro-configs/Gentoo.conf.in
++++ distro-configs/Gentoo.conf.in
+@@ -1,5 +1,3 @@
+---disable-fontooo
+---disable-qadevooo
+ --enable-neon
+ --enable-xrender-link
+ --with-external-dict-dir=/usr/share/myspell
 --- patches/dev300/apply 
 +++ patches/dev300/apply
 @@ -1687,16 +1687,8 @@
diff --git a/app-office/libreoffice/libreoffice-3.3.0.ebuild b/app-office/libreoffice/libreoffice-3.3.0.ebuild
index b933818d5c80..a0453c721a98 100644
--- a/app-office/libreoffice/libreoffice-3.3.0.ebuild
+++ b/app-office/libreoffice/libreoffice-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/libreoffice/libreoffice-3.3.0.ebuild,v 1.5 2011/02/02 09:11:56 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.6 2011/02/05 08:58:04 suka Exp $
 
 EAPI="3"
 
@@ -12,9 +12,9 @@ CMAKE_REQUIRED="never"
 PYTHON_DEPEND="2"
 PYTHON_USE_WITH="threads"
 
-inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib python toolchain-funcs
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib pax-utils python toolchain-funcs
 
-IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl pam templates"
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
 
 MY_PV=3.3.0.4
 MY_P="${PN}-build-${MY_PV}"
@@ -140,8 +140,7 @@ COMMON_DEPEND="!app-office/libreoffice-bin
 			>=media-libs/gst-plugins-base-0.10 )
 	java? ( >=dev-java/bsh-2.0_beta4
 		dev-java/lucene:2.3
-		dev-java/lucene-analyzers:2.3
-		dev-java/rhino:1.5 )
+		dev-java/lucene-analyzers:2.3 )
 	nsplugin? ( net-libs/xulrunner:1.9
 		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 )
@@ -188,8 +187,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-libs/zlib
 	sys-apps/coreutils
 	dev-util/cppunit
-	pam? ( sys-libs/pam
-		sys-apps/shadow[pam] )
 	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
 		>=dev-java/ant-core-1.7 )
 	ldap? ( net-nds/openldap )"
@@ -211,7 +208,7 @@ pkg_setup() {
 
 	# Check if we have enough RAM and free diskspace to build this beast
 	CHECKREQS_MEMORY="512"
-	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="6144"
+	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144"
 	check_reqs
 
 	strip-linguas ${LANGS}
@@ -287,11 +284,9 @@ src_prepare() {
 		echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
 		echo "--with-system-beanshell" >> ${CONFFILE}
 		echo "--with-system-lucene" >> ${CONFFILE}
-		echo "--with-system-rhino" >> ${CONFFILE}
 		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
 		echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
 		echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
-		echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
 	fi
 
 	echo $(use_enable nsplugin mozilla) >> ${CONFFILE}
@@ -319,14 +314,12 @@ src_prepare() {
 	echo "--enable-minimizer" >> ${CONFFILE}
 	echo "--enable-presenter-console" >> ${CONFFILE}
 	echo "--enable-presenter-extra-ui" >> ${CONFFILE}
-	echo "--enable-presenter-screen" >> ${CONFFILE}
 
 	# Misc stuff
 	echo "--disable-graphite" >> ${CONFFILE}
 	echo "--with-system-cppunit" >> ${CONFFILE}
 	echo "--with-system-openssl" >> ${CONFFILE}
 	echo "--with-system-redland" >> ${CONFFILE}
-	echo "--without-writer2latex" >> ${CONFFILE}
 	echo "--without-junit" >> ${CONFFILE}
 
 	#fix desktop files bug #352955
@@ -373,13 +366,14 @@ src_configure() {
 
 	cd "${S}"
 	./configure --with-distro="Gentoo" \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
 		--with-arch="${ARCH}" \
 		--with-srcdir="${DISTDIR}" \
 		--with-lang="${LINGUAS_OOO}" \
 		--with-num-cpus="${JOBS}" \
 		--without-binsuffix \
 		--with-installed-ooo-dirname="libreoffice" \
-		--with-tag="${MST}" \
 		--with-drink="True Blood" \
 		--without-git \
 		--with-split \
@@ -389,7 +383,6 @@ src_configure() {
 		$(use_enable kde kde4) \
 		$(use_enable !debug strip) \
 		$(use_enable odk) \
-		$(use_enable pam) \
 		$(use_with java) \
 		$(use_with templates sun-templates) \
 		--disable-access \
@@ -397,8 +390,8 @@ src_configure() {
 		--enable-extensions \
 		--without-system-libwpd \
 		--without-system-libwpg \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		|| die "Configuration failed!"
 
 }
@@ -438,10 +431,10 @@ pkg_postinst() {
 	fdo-mime_mime_database_update
 	BASHCOMPLETION_NAME=libreoffice && bash-completion_pkg_postinst
 
-	( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/${PN}/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/${PN}/program/soffice.bin
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
 
 	# Add available & useful jars to LibreOffice classpath
-	use java && /usr/$(get_libdir)/${PN}/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+	use java && "${EPREFIX}"/usr/$(get_libdir)/${PN}/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
 
 	kde4-base_pkg_postinst