Gentoo Archives: gentoo-commits

From: "Andreas Proschofsky (suka)" <suka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/openoffice: openoffice-3.2.1-r1.ebuild ChangeLog
Date: Sat, 05 Feb 2011 10:40:41
Message-Id: 20110205104031.DC08B20054@flycatcher.gentoo.org
1 suka 11/02/05 10:40:31
2
3 Modified: openoffice-3.2.1-r1.ebuild ChangeLog
4 Log:
5 EAPI3 and prefix fixes, bug #353035, also clean up pax-stuff, bug #353587
6
7 (Portage version: 2.1.9.35/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.5 app-office/openoffice/openoffice-3.2.1-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/openoffice-3.2.1-r1.ebuild?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/openoffice-3.2.1-r1.ebuild?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/openoffice-3.2.1-r1.ebuild?r1=1.4&r2=1.5
15
16 Index: openoffice-3.2.1-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1-r1.ebuild,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- openoffice-3.2.1-r1.ebuild 17 Nov 2010 14:40:23 -0000 1.4
23 +++ openoffice-3.2.1-r1.ebuild 5 Feb 2011 10:40:31 -0000 1.5
24 @@ -1,15 +1,15 @@
25 -# Copyright 1999-2010 Gentoo Foundation
26 +# Copyright 1999-2011 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $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 $
29 +# $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 $
30
31 WANT_AUTOMAKE="1.9"
32 -EAPI="2"
33 +EAPI="3"
34 KDE_REQUIRED="optional"
35 CMAKE_REQUIRED="never"
36 PYTHON_DEPEND="2"
37 PYTHON_USE_WITH="threads"
38
39 -inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib python toolchain-funcs
40 +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
41
42 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl pam templates"
43
44 @@ -63,7 +63,7 @@
45
46 LICENSE="LGPL-2"
47 SLOT="0"
48 -KEYWORDS="amd64 ~ppc ~sparc x86"
49 +KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
50
51 COMMON_DEPEND="!app-office/openoffice-bin
52 x11-libs/libXaw
53 @@ -227,6 +227,9 @@
54 cp -f "${FILESDIR}/neon-remove-SSPI-support.diff" "${S}/patches/hotfixes" || die
55 cp -f "${FILESDIR}/libX11-fix.diff" "${S}/patches/hotfixes" || die
56
57 + # Prefix patch
58 + epatch "${FILESDIR}/ooo-build-3.0.1.2-prefix.patch"
59 +
60 #Use flag checks
61 if use java ; then
62 echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
63 @@ -319,6 +322,8 @@
64
65 cd "${S}"
66 ./configure --with-distro="Gentoo" \
67 + --prefix="${EPREFIX}"/usr \
68 + --sysconfdir="${EPREFIX}"/etc \
69 --with-arch="${ARCH}" \
70 --with-srcdir="${DISTDIR}" \
71 --with-lang="${LINGUAS_OOO}" \
72 @@ -343,8 +348,8 @@
73 --enable-extensions \
74 --with-system-libwpd \
75 --with-system-libwpg \
76 - --mandir=/usr/share/man \
77 - --libdir=/usr/$(get_libdir) \
78 + --mandir="${EPREFIX}"/usr/share/man \
79 + --libdir="${EPREFIX}"/usr/$(get_libdir) \
80 || die "Configuration failed!"
81
82 }
83 @@ -363,18 +368,18 @@
84 make DESTDIR="${D}" install || die "Installation failed!"
85
86 # Fix the permissions for security reasons
87 - chown -RP root:0 "${D}"
88 + chown -RP root:0 "${ED}"
89
90 # record java libraries
91 if use java; then
92 - java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
93 - java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
94 + java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/${BASIS}/program/classes/*.jar
95 + java-pkg_regjar "${ED}"/usr/$(get_libdir)/openoffice/ure/share/java/*.jar
96 fi
97
98 # Upstream places the bash-completion module in /etc. Gentoo places them in
99 # /usr/share/bash-completion. bug 226061
100 - dobashcompletion "${D}"/etc/bash_completion.d/ooffice.sh ooffice
101 - rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
102 + dobashcompletion "${ED}"/etc/bash_completion.d/ooffice.sh ooffice
103 + rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed"
104
105 }
106
107 @@ -384,10 +389,10 @@
108 fdo-mime_mime_database_update
109 BASHCOMPLETION_NAME=ooffice && bash-completion_pkg_postinst
110
111 - ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/openoffice/program/soffice.bin
112 + pax-mark -m /usr/$(get_libdir)/openoffice/program/soffice.bin
113
114 # Add available & useful jars to openoffice classpath
115 - use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
116 + use java && "${EPREFIX}"/usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
117
118 elog " Some aditional functionality can be installed via Extension Manager: "
119 elog " *) PDF Import "
120
121
122
123 1.545 app-office/openoffice/ChangeLog
124
125 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.545&view=markup
126 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.545&content-type=text/plain
127 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.544&r2=1.545
128
129 Index: ChangeLog
130 ===================================================================
131 RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v
132 retrieving revision 1.544
133 retrieving revision 1.545
134 diff -u -r1.544 -r1.545
135 --- ChangeLog 17 Nov 2010 14:40:23 -0000 1.544
136 +++ ChangeLog 5 Feb 2011 10:40:31 -0000 1.545
137 @@ -1,6 +1,10 @@
138 # ChangeLog for app-office/openoffice
139 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
140 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.544 2010/11/17 14:40:23 maekke Exp $
141 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
142 +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.545 2011/02/05 10:40:31 suka Exp $
143 +
144 + 05 Feb 2011; Andreas Proschofsky <suka@g.o>
145 + +files/ooo-build-3.0.1.2-prefix.patch, openoffice-3.2.1-r1.ebuild:
146 + EAPI3 and prefix fixes, bug #353035, also clean up pax-stuff, bug #353587
147
148 17 Nov 2010; Markus Meier <maekke@g.o> openoffice-3.2.1-r1.ebuild:
149 x86 stable, bug #345309