EAPI3 and prefix fixes, bug #353035, also clean up pax-stuff, bug #353587

(Portage version: 2.1.9.35/cvs/Linux x86_64)

3 files changed, 73 insertions, 16 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 8f48f00be4a4..2357d5160d26 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.544 2010/11/17 14:40:23 maekke Exp $
+# 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 $
+
+  05 Feb 2011; Andreas Proschofsky <suka@gentoo.org>
+  +files/ooo-build-3.0.1.2-prefix.patch, openoffice-3.2.1-r1.ebuild:
+  EAPI3 and prefix fixes, bug #353035, also clean up pax-stuff, bug #353587
 
   17 Nov 2010; Markus Meier <maekke@gentoo.org> openoffice-3.2.1-r1.ebuild:
   x86 stable, bug #345309
diff --git a/app-office/openoffice/files/ooo-build-3.0.1.2-prefix.patch b/app-office/openoffice/files/ooo-build-3.0.1.2-prefix.patch
new file mode 100644
index 000000000000..6d00ac1f5a7e
--- /dev/null
+++ b/app-office/openoffice/files/ooo-build-3.0.1.2-prefix.patch
@@ -0,0 +1,48 @@
+--- ooo-build-3.0.1.2/bin/package-ooo.orig	2008-10-07 08:50:49.000000000 -0500
++++ ooo-build-3.0.1.2/bin/package-ooo	2008-11-11 14:47:21.000000000 -0600
+@@ -115,8 +115,8 @@
+ fi
+ 
+ # create bash completion
+-mkdir -p $OODESTDIR/etc/bash_completion.d
+-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
++mkdir -p $SYSCONFDIR/bash_completion.d
++$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/ooffice${BINSUFFIX}.sh
+ 
+ if test "z$VENDORNAME" != "zRedHat"; then
+ 	mkdir -p $MANDIR/man1
+@@ -176,11 +176,11 @@
+         # Icons and menu stuff is handled in actions.py
+         ;;
+   *)
+-	mkdir -p $OODESTDIR/usr/share/applications
++	mkdir -p $DATADIR/applications
+ 	cd $TOOLSDIR/desktop
+ 	for source in *.desktop ; do
+ 	    dest=`echo $source | sed "s|.desktop\$||"`
+-	    dest="$OODESTDIR/usr/share/applications/$dest$BINSUFFIX.desktop"
++	    dest="$DATADIR/applications/$dest$BINSUFFIX.desktop"
+ 	    add_version=
+ 	    test "z$VENDORNAME" = "zNovell" -a "z$BINSUFFIX" != "z" && add_version=" ($VERSION)" || :
+ 	    sed -e "s|\(^Name.*\)\$|\1$add_version|
+@@ -188,7 +188,7 @@
+ 	done
+ 
+ 	# icons
+-	icondir=/usr/share/icons/hicolor
++	icondir=$DATADIRBASE/icons/hicolor
+ 	for size in 16x16 22x22 24x24 32x32 48x48 scalable ; do
+ 	    mkdir -p $OODESTDIR/$icondir/$size/apps
+ 	    cd $TOOLSDIR/desktop/$size/
+@@ -210,9 +210,9 @@
+ 	done
+ 	
+ 	# shared MIME info
+-	mkdir -p $OODESTDIR/usr/share/mime/packages
++	mkdir -p $DATADIR/mime/packages
+ 	cd $TOOLSDIR/desktop
+-	cp openoffice.xml $OODESTDIR/usr/share/mime/packages
++	cp openoffice.xml $DATADIR/mime/packages
+ 	if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && 
+ 	   which update-mime-database >/dev/null 2>&1 ; then
+ 	    update-mime-database /usr/share/mime || :
diff --git a/app-office/openoffice/openoffice-3.2.1-r1.ebuild b/app-office/openoffice/openoffice-3.2.1-r1.ebuild
index 4201bfbdeefc..68580e07aad5 100644
--- a/app-office/openoffice/openoffice-3.2.1-r1.ebuild
+++ b/app-office/openoffice/openoffice-3.2.1-r1.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.1-r1.ebuild,v 1.4 2010/11/17 14:40:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1-r1.ebuild,v 1.5 2011/02/05 10:40:31 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 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"
 
@@ -63,7 +63,7 @@ HOMEPAGE="http://go-oo.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="!app-office/openoffice-bin
 	x11-libs/libXaw
@@ -227,6 +227,9 @@ src_prepare() {
 	cp -f "${FILESDIR}/neon-remove-SSPI-support.diff" "${S}/patches/hotfixes" || die
 	cp -f "${FILESDIR}/libX11-fix.diff" "${S}/patches/hotfixes" || die
 
+	# Prefix patch
+	epatch "${FILESDIR}/ooo-build-3.0.1.2-prefix.patch"
+
 	#Use flag checks
 	if use java ; then
 		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
@@ -319,6 +322,8 @@ src_configure() {
 
 	cd "${S}"
 	./configure --with-distro="Gentoo" \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
 		--with-arch="${ARCH}" \
 		--with-srcdir="${DISTDIR}" \
 		--with-lang="${LINGUAS_OOO}" \
@@ -343,8 +348,8 @@ src_configure() {
 		--enable-extensions \
 		--with-system-libwpd \
 		--with-system-libwpg \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		|| die "Configuration failed!"
 
 }
@@ -363,18 +368,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"
 
 }
 
@@ -384,10 +389,10 @@ 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
+	use java && "${EPREFIX}"/usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
 
 	elog " Some aditional functionality can be installed via Extension Manager: "
 	elog " *) PDF Import "