| 1 |
suka 11/02/05 10:45:17 |
| 2 |
|
| 3 |
Modified: ChangeLog openoffice-3.2.0.ebuild |
| 4 |
Log: |
| 5 |
Also fix pax stuff and bump EAPI in older ebuild |
| 6 |
|
| 7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.546 app-office/openoffice/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.546&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.546&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.545&r2=1.546 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v |
| 19 |
retrieving revision 1.545 |
| 20 |
retrieving revision 1.546 |
| 21 |
diff -u -r1.545 -r1.546 |
| 22 |
--- ChangeLog 5 Feb 2011 10:40:31 -0000 1.545 |
| 23 |
+++ ChangeLog 5 Feb 2011 10:45:17 -0000 1.546 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for app-office/openoffice |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.545 2011/02/05 10:40:31 suka Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.546 2011/02/05 10:45:17 suka Exp $ |
| 29 |
+ |
| 30 |
+ 05 Feb 2011; Andreas Proschofsky <suka@g.o> openoffice-3.2.0.ebuild: |
| 31 |
+ Also fix pax stuff and bump EAPI in older ebuild |
| 32 |
|
| 33 |
05 Feb 2011; Andreas Proschofsky <suka@g.o> |
| 34 |
+files/ooo-build-3.0.1.2-prefix.patch, openoffice-3.2.1-r1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.30 app-office/openoffice/openoffice-3.2.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild?rev=1.30&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild?rev=1.30&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild?r1=1.29&r2=1.30 |
| 43 |
|
| 44 |
Index: openoffice-3.2.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v |
| 47 |
retrieving revision 1.29 |
| 48 |
retrieving revision 1.30 |
| 49 |
diff -u -r1.29 -r1.30 |
| 50 |
--- openoffice-3.2.0.ebuild 7 Nov 2010 19:45:55 -0000 1.29 |
| 51 |
+++ openoffice-3.2.0.ebuild 5 Feb 2011 10:45:17 -0000 1.30 |
| 52 |
@@ -1,15 +1,15 @@ |
| 53 |
-# Copyright 1999-2010 Gentoo Foundation |
| 54 |
+# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.29 2010/11/07 19:45:55 anarchy Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.30 2011/02/05 10:45:17 suka Exp $ |
| 58 |
|
| 59 |
WANT_AUTOMAKE="1.9" |
| 60 |
-EAPI="2" |
| 61 |
+EAPI="3" |
| 62 |
KDE_REQUIRED="optional" |
| 63 |
CMAKE_REQUIRED="never" |
| 64 |
PYTHON_DEPEND="2" |
| 65 |
PYTHON_USE_WITH="threads" |
| 66 |
|
| 67 |
-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 |
| 68 |
+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 |
| 69 |
|
| 70 |
IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates" |
| 71 |
|
| 72 |
@@ -364,18 +364,18 @@ |
| 73 |
make DESTDIR="${D}" install || die "Installation failed!" |
| 74 |
|
| 75 |
# Fix the permissions for security reasons |
| 76 |
- chown -RP root:0 "${D}" |
| 77 |
+ chown -RP root:0 "${ED}" |
| 78 |
|
| 79 |
# record java libraries |
| 80 |
if use java; then |
| 81 |
- java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar |
| 82 |
- java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar |
| 83 |
+ java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar |
| 84 |
+ java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar |
| 85 |
fi |
| 86 |
|
| 87 |
# Upstream places the bash-completion module in /etc. Gentoo places them in |
| 88 |
# /usr/share/bash-completion. bug 226061 |
| 89 |
- dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice |
| 90 |
- rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed" |
| 91 |
+ dobashcompletion "${ED}"/etc/bash_completion.d/ooffice.sh ooffice |
| 92 |
+ rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed" |
| 93 |
|
| 94 |
} |
| 95 |
|
| 96 |
@@ -385,7 +385,7 @@ |
| 97 |
fdo-mime_mime_database_update |
| 98 |
BASHCOMPLETION_NAME=ooffice && bash-completion_pkg_postinst |
| 99 |
|
| 100 |
- ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/openoffice/program/soffice.bin |
| 101 |
+ pax-mark -m /usr/$(get_libdir)/openoffice/program/soffice.bin |
| 102 |
|
| 103 |
# Add available & useful jars to openoffice classpath |
| 104 |
use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null |
Archives