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

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

4 files changed, 76 insertions, 28 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/Manifest b/app-office/openoffice/Manifest
index e038284b7ffa..3df201e750a8 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX enable-startup-notification.diff 6396 RMD160 e444175640eaa2fac7cbc9a425c58e5c51c857f0 SHA1 0d8d51ae8de4d13b884bb2cd065807c75e1c3dc3 SHA256 e27eb3682c5cf8153caff674ec5964f20c54ced5faa47f129e3a806a5e95f5bb
 AUX gcc45-buildfix.diff 840 RMD160 fcb6c08ee67b61f60641d641daa329d5fd17772b SHA1 6344952a2d0d9690d4f864b3273713f95068eabd SHA256 2d5b95e94f9b9e95c97876db669aabe523d01194c9f7ce2f0a3ccb9bde9221bc
@@ -10,6 +7,7 @@ AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 S
 AUX libX11-fix.diff 304 RMD160 ce2d10b7c71301ec7944e185cab4afb20c7a6338 SHA1 e30094b51314d022dfda318fc27027d5a0da1af3 SHA256 9e62f06912f089043bd688a911678d609ddcce79a4e9b89427cba4198d00411e
 AUX neon-remove-SSPI-support.diff 1091 RMD160 5dee3324b22b9c8d9f14b0e7998695a212c046a8 SHA1 e8541e791a03836d986d8e0db0d488570bb6ab36 SHA256 90d88d2fb96a0e82afe6b55e77c478ee9b1925e14dfbc998c2af0ef05edfd508
 AUX npwrap-fix-nogtk.diff 382 RMD160 557fe38a19d9a0e4505af34bed4033884f1075ab SHA1 209f73c706adabb1e2b2b3e4bc706f9afbbee172 SHA256 ad64cea66e4e4d9b351a44b3ed2774484baaaebe5e37ebea3121f4a0981d231f
+AUX ooo-build-3.0.1.2-prefix.patch 1887 RMD160 b301f1bf5f753727f52a2a0540b4bd49f2d4fbd9 SHA1 7cde97117d314b904d1ef44c1224496d9728cd55 SHA256 c51409a5a1d3b951497f0ca6fcb8be2a345776f133b2d18c07ed534eaa5099eb
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX qt-use-native-backend.diff 391 RMD160 602d444e9768c1bb0a8f2ad36567c8ab571bc569 SHA1 148a3431222e7405eb16c42330da7f0a2f01e1eb SHA256 f3ba5e9390f47d42acb955c04f5ef62a5b62a5776bd9d5d3226d5034fafe6be9
 AUX scrap-pixmap-links.diff 1082 RMD160 2d5dd83fbae0317186263d38b1f05433011670b0 SHA1 9c126e8f7fde6ad1dbb5095302926dd0ce9c7df7 SHA256 d5f64aaa8004cb38dae8259bcee8ec5b35e985a401b3253d5f3e3a83fc3ee4b7
@@ -41,13 +39,6 @@ DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6c
 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.1-r1.ebuild 13396 RMD160 23c245ac170a984c88d6ac45602328e1c24962e1 SHA1 ca0690a9f6aa6fc83126c5aba08d31ad9acd60b4 SHA256 b20a5aca381f6913e22490e0c34e6fce7290936c525c630fe52e09ef34a1ef6b
-MISC ChangeLog 111003 RMD160 ef4eddaedc59b7960f3a1dc2411963c35de5f600 SHA1 a4d4ee24823ec24554811bd94eb6d7bb6743a62b SHA256 edf92e29957936677b935c608ad6fe354097cf1906b246811b611054dc886711
+EBUILD openoffice-3.2.1-r1.ebuild 13487 RMD160 4f8e73ac7ee2e6420381fcc6ed781c039da26bf7 SHA1 794c5e1c37c57664516d459559ff1a1a906e7aed SHA256 d9deb45950aeee39c519d2216413817df9b92c71adfa33a7ffe65f02a9733fff
+MISC ChangeLog 111200 RMD160 ef225786ca715a35d269b971ab3153f21d2cf21f SHA1 2ef30c3e64ccc104c5e09a7523d899f18de9339a SHA256 a9fca3a87f05d1c5838fa14ca3389dd540c3ffa5d92926cf117e29344b3d3fa5
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzj6VUACgkQkKaRLQcq0GIv/ACgih74XFz9hOPdv2q7ER8xFq3e
-tfcAoKzKlLI+CoTfdCidQihZ6lTmoJzs
-=JMcO
------END PGP SIGNATURE-----
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 "