Also fix pax stuff and bump EAPI in older ebuild

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

3 files changed, 16 insertions, 13 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 2357d5160d26..5fcdcaeb1da6 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.545 2011/02/05 10:40:31 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.546 2011/02/05 10:45:17 suka Exp $
+
+  05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> openoffice-3.2.0.ebuild:
+  Also fix pax stuff and bump EAPI in older ebuild
 
   05 Feb 2011; Andreas Proschofsky <suka@gentoo.org>
   +files/ooo-build-3.0.1.2-prefix.patch, openoffice-3.2.1-r1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 3df201e750a8..dd5cc9fa00b5 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -38,7 +38,7 @@ DIST ooo-build-3.2.1.6.tar.gz 14547953 RMD160 2fbb9a5dfcee854b18584cdd5b49f4801a
 DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-3.2.0.ebuild 13523 RMD160 6f345170a473ee282a709c96596e0888eba86a3d SHA1 db61af77548107be1b3fa8c80696b4a0fc08a801 SHA256 f904363bea2e48deb579e062a5a21fafee8906299f106af6c80d16f552cad371
+EBUILD openoffice-3.2.0.ebuild 13419 RMD160 ba61f28f990e3b8648c1dba73c327757441c2197 SHA1 73030a57a301e557f1fe803174cd0e1cbca55c23 SHA256 f301abe1ccbca31cdc3052a970b005449db3ba9b7b5eaac8aa55a5cd55be4d4a
 EBUILD openoffice-3.2.1-r1.ebuild 13487 RMD160 4f8e73ac7ee2e6420381fcc6ed781c039da26bf7 SHA1 794c5e1c37c57664516d459559ff1a1a906e7aed SHA256 d9deb45950aeee39c519d2216413817df9b92c71adfa33a7ffe65f02a9733fff
-MISC ChangeLog 111200 RMD160 ef225786ca715a35d269b971ab3153f21d2cf21f SHA1 2ef30c3e64ccc104c5e09a7523d899f18de9339a SHA256 a9fca3a87f05d1c5838fa14ca3389dd540c3ffa5d92926cf117e29344b3d3fa5
+MISC ChangeLog 111330 RMD160 72dd6aee2bc08f9c5d36833dd9a0ff0ccb846364 SHA1 85f76928b50f57affcb93338f17d7e9b1e25b3b6 SHA256 9a55ff9e88ea77a7edfeb5257edf7541e7bbcedca7a8bebbeca6d9281934d4a0
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild
index 2243c5879cb2..6f4d379b43c3 100644
--- a/app-office/openoffice/openoffice-3.2.0.ebuild
+++ b/app-office/openoffice/openoffice-3.2.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.29 2010/11/07 19:45:55 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.30 2011/02/05 10:45:17 suka Exp $
 
 WANT_AUTOMAKE="1.9"
-EAPI="2"
+EAPI="3"
 KDE_REQUIRED="optional"
 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 mono multilib python toolchain-funcs
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib pax-utils python toolchain-funcs
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
@@ -364,18 +364,18 @@ src_install() {
 	make DESTDIR="${D}" install || die "Installation failed!"
 
 	# Fix the permissions for security reasons
-	chown -RP root:0 "${D}"
+	chown -RP root:0 "${ED}"
 
 	# record java libraries
 	if use java; then
-			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
-			java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
+			java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
+			java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
 	fi
 
 	# Upstream places the bash-completion module in /etc. Gentoo places them in
 	# /usr/share/bash-completion. bug 226061
-	dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice
-	rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
+	dobashcompletion "${ED}"/etc/bash_completion.d/ooffice.sh ooffice
+	rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed"
 
 }
 
@@ -385,7 +385,7 @@ pkg_postinst() {
 	fdo-mime_mime_database_update
 	BASHCOMPLETION_NAME=ooffice && bash-completion_pkg_postinst
 
-	( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/openoffice/program/soffice.bin
+	pax-mark -m /usr/$(get_libdir)/openoffice/program/soffice.bin
 
 	# Add available & useful jars to openoffice classpath
 	use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null