* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild
@ 2011-01-25 11:13 Andreas Proschofsky (suka)
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-01-25 11:13 UTC (permalink / raw
To: gentoo-commits
suka 11/01/25 11:13:06
Modified: ChangeLog libreoffice-3.3.0.ebuild
Log:
Fix bash_completion installation, bug #352656
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Revision Changes Path
1.5 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.4&r2=1.5
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog 25 Jan 2011 10:59:58 -0000 1.4
+++ ChangeLog 25 Jan 2011 11:13:06 -0000 1.5
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.4 2011/01/25 10:59:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.5 2011/01/25 11:13:06 suka Exp $
+
+ 25 Jan 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
+ Fix bash_completion installation, bug #352656
*libreoffice-3.3.0 (25 Jan 2011)
1.2 app-office/libreoffice/libreoffice-3.3.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?r1=1.1&r2=1.2
Index: libreoffice-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libreoffice-3.3.0.ebuild 25 Jan 2011 10:59:58 -0000 1.1
+++ libreoffice-3.3.0.ebuild 25 Jan 2011 11:13:06 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.1 2011/01/25 10:59:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.2 2011/01/25 11:13:06 suka Exp $
EAPI="3"
@@ -424,7 +424,7 @@
# 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
+ dobashcompletion "${D}"/etc/bash_completion.d/libreoffice.sh libreoffice
rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild
@ 2011-01-25 12:35 Andreas Proschofsky (suka)
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-01-25 12:35 UTC (permalink / raw
To: gentoo-commits
suka 11/01/25 12:35:53
Modified: ChangeLog libreoffice-3.3.0.ebuild
Log:
Ooops, another little fix for bash-completion
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Revision Changes Path
1.6 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.5&r2=1.6
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog 25 Jan 2011 11:13:06 -0000 1.5
+++ ChangeLog 25 Jan 2011 12:35:53 -0000 1.6
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.5 2011/01/25 11:13:06 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.6 2011/01/25 12:35:53 suka Exp $
+
+ 25 Jan 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
+ Ooops, another little fix for bash-completion
25 Jan 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
Fix bash_completion installation, bug #352656
1.3 app-office/libreoffice/libreoffice-3.3.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?r1=1.2&r2=1.3
Index: libreoffice-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libreoffice-3.3.0.ebuild 25 Jan 2011 11:13:06 -0000 1.2
+++ libreoffice-3.3.0.ebuild 25 Jan 2011 12:35:53 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.2 2011/01/25 11:13:06 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.3 2011/01/25 12:35:53 suka Exp $
EAPI="3"
@@ -433,7 +433,7 @@
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
- BASHCOMPLETION_NAME=ooffice && bash-completion_pkg_postinst
+ BASHCOMPLETION_NAME=libreoffice && bash-completion_pkg_postinst
( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/${PN}/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/${PN}/program/soffice.bin
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild
@ 2011-01-25 22:22 Andreas Proschofsky (suka)
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-01-25 22:22 UTC (permalink / raw
To: gentoo-commits
suka 11/01/25 22:22:07
Modified: ChangeLog libreoffice-3.3.0.ebuild
Log:
Fix jpeg-dep and some ebuild cleanups
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Revision Changes Path
1.7 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.6&r2=1.7
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 25 Jan 2011 12:35:53 -0000 1.6
+++ ChangeLog 25 Jan 2011 22:22:07 -0000 1.7
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.6 2011/01/25 12:35:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.7 2011/01/25 22:22:07 suka Exp $
+
+ 25 Jan 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
+ Fix jpeg-dep and some ebuild cleanups
25 Jan 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
Ooops, another little fix for bash-completion
1.4 app-office/libreoffice/libreoffice-3.3.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?r1=1.3&r2=1.4
Index: libreoffice-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libreoffice-3.3.0.ebuild 25 Jan 2011 12:35:53 -0000 1.3
+++ libreoffice-3.3.0.ebuild 25 Jan 2011 22:22:07 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.3 2011/01/25 12:35:53 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.4 2011/01/25 22:22:07 suka Exp $
EAPI="3"
@@ -152,7 +152,7 @@
>=media-libs/fontconfig-2.3.0
cups? ( net-print/cups )
dev-libs/redland[ssl]
- media-libs/jpeg
+ virtual/jpeg
media-libs/libpng
app-arch/zip
app-arch/unzip
@@ -414,18 +414,18 @@
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)/${PN}/${BASIS}/program/classes/*.jar
- java-pkg_regjar "${D}"/usr/$(get_libdir)/${PN}/ure/share/java/*.jar
+ java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/${BASIS}/program/classes/*.jar
+ java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/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/libreoffice.sh libreoffice
- rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed"
+ dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh libreoffice
+ rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed"
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild
@ 2011-02-02 9:11 Andreas Proschofsky (suka)
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-02-02 9:11 UTC (permalink / raw
To: gentoo-commits
suka 11/02/02 09:11:56
Modified: ChangeLog libreoffice-3.3.0.ebuild
Log:
Fix desktop files, closes bug #352955
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Revision Changes Path
1.8 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.7&r2=1.8
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog 25 Jan 2011 22:22:07 -0000 1.7
+++ ChangeLog 2 Feb 2011 09:11:56 -0000 1.8
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.7 2011/01/25 22:22:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.8 2011/02/02 09:11:56 suka Exp $
+
+ 02 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
+ Fix desktop files, thanks to Sanders Sweers <Sander.Sweers@gmail.com>, see
+ bug #352955
25 Jan 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
Fix jpeg-dep and some ebuild cleanups
1.5 app-office/libreoffice/libreoffice-3.3.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?r1=1.4&r2=1.5
Index: libreoffice-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libreoffice-3.3.0.ebuild 25 Jan 2011 22:22:07 -0000 1.4
+++ libreoffice-3.3.0.ebuild 2 Feb 2011 09:11:56 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.4 2011/01/25 22:22:07 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.5 2011/02/02 09:11:56 suka Exp $
EAPI="3"
@@ -329,6 +329,9 @@
echo "--without-writer2latex" >> ${CONFFILE}
echo "--without-junit" >> ${CONFFILE}
+ #fix desktop files bug #352955
+ sed -i 's/Exec=oo/Exec=lo/g' "${S}"/desktop/*.desktop.in.in || die "Could not fix desktop files"
+
# needed for sun-templates patch
eautoreconf
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild
@ 2011-02-05 8:58 Andreas Proschofsky (suka)
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-02-05 8:58 UTC (permalink / raw
To: gentoo-commits
suka 11/02/05 08:58:04
Modified: ChangeLog libreoffice-3.3.0.ebuild
Log:
Cleanup work: Prefix fixes, remove outated deps and config-flags, fix pax
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Revision Changes Path
1.9 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.8&r2=1.9
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog 2 Feb 2011 09:11:56 -0000 1.8
+++ ChangeLog 5 Feb 2011 08:58:04 -0000 1.9
@@ -1,6 +1,11 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.8 2011/02/02 09:11:56 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.9 2011/02/05 08:58:04 suka Exp $
+
+ 05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild,
+ files/gentoo-3.3.0.diff:
+ Cleanup work: Prefix fixes, remove outated deps and config-flags, fix pax
+ stuff
02 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
Fix desktop files, thanks to Sanders Sweers <Sander.Sweers@gmail.com>, see
1.6 app-office/libreoffice/libreoffice-3.3.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?r1=1.5&r2=1.6
Index: libreoffice-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libreoffice-3.3.0.ebuild 2 Feb 2011 09:11:56 -0000 1.5
+++ libreoffice-3.3.0.ebuild 5 Feb 2011 08:58:04 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.5 2011/02/02 09:11:56 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.6 2011/02/05 08:58:04 suka Exp $
EAPI="3"
@@ -12,9 +12,9 @@
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"
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
MY_PV=3.3.0.4
MY_P="${PN}-build-${MY_PV}"
@@ -140,8 +140,7 @@
>=media-libs/gst-plugins-base-0.10 )
java? ( >=dev-java/bsh-2.0_beta4
dev-java/lucene:2.3
- dev-java/lucene-analyzers:2.3
- dev-java/rhino:1.5 )
+ dev-java/lucene-analyzers:2.3 )
nsplugin? ( net-libs/xulrunner:1.9
>=dev-libs/nspr-4.6.6
>=dev-libs/nss-3.11-r1 )
@@ -188,8 +187,6 @@
sys-libs/zlib
sys-apps/coreutils
dev-util/cppunit
- pam? ( sys-libs/pam
- sys-apps/shadow[pam] )
java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
>=dev-java/ant-core-1.7 )
ldap? ( net-nds/openldap )"
@@ -211,7 +208,7 @@
# Check if we have enough RAM and free diskspace to build this beast
CHECKREQS_MEMORY="512"
- use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="6144"
+ use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144"
check_reqs
strip-linguas ${LANGS}
@@ -287,11 +284,9 @@
echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
echo "--with-system-beanshell" >> ${CONFFILE}
echo "--with-system-lucene" >> ${CONFFILE}
- echo "--with-system-rhino" >> ${CONFFILE}
echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
- echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
fi
echo $(use_enable nsplugin mozilla) >> ${CONFFILE}
@@ -319,14 +314,12 @@
echo "--enable-minimizer" >> ${CONFFILE}
echo "--enable-presenter-console" >> ${CONFFILE}
echo "--enable-presenter-extra-ui" >> ${CONFFILE}
- echo "--enable-presenter-screen" >> ${CONFFILE}
# Misc stuff
echo "--disable-graphite" >> ${CONFFILE}
echo "--with-system-cppunit" >> ${CONFFILE}
echo "--with-system-openssl" >> ${CONFFILE}
echo "--with-system-redland" >> ${CONFFILE}
- echo "--without-writer2latex" >> ${CONFFILE}
echo "--without-junit" >> ${CONFFILE}
#fix desktop files bug #352955
@@ -373,13 +366,14 @@
cd "${S}"
./configure --with-distro="Gentoo" \
+ --prefix="${EPREFIX}"/usr \
+ --sysconfdir="${EPREFIX}"/etc \
--with-arch="${ARCH}" \
--with-srcdir="${DISTDIR}" \
--with-lang="${LINGUAS_OOO}" \
--with-num-cpus="${JOBS}" \
--without-binsuffix \
--with-installed-ooo-dirname="libreoffice" \
- --with-tag="${MST}" \
--with-drink="True Blood" \
--without-git \
--with-split \
@@ -389,7 +383,6 @@
$(use_enable kde kde4) \
$(use_enable !debug strip) \
$(use_enable odk) \
- $(use_enable pam) \
$(use_with java) \
$(use_with templates sun-templates) \
--disable-access \
@@ -397,8 +390,8 @@
--enable-extensions \
--without-system-libwpd \
--without-system-libwpg \
- --mandir=/usr/share/man \
- --libdir=/usr/$(get_libdir) \
+ --mandir="${EPREFIX}"/usr/share/man \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
|| die "Configuration failed!"
}
@@ -438,10 +431,10 @@
fdo-mime_mime_database_update
BASHCOMPLETION_NAME=libreoffice && bash-completion_pkg_postinst
- ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/${PN}/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/${PN}/program/soffice.bin
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
# Add available & useful jars to LibreOffice classpath
- use java && /usr/$(get_libdir)/${PN}/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
+ use java && "${EPREFIX}"/usr/$(get_libdir)/${PN}/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
kde4-base_pkg_postinst
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild
@ 2011-02-05 21:35 Andreas Proschofsky (suka)
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-02-05 21:35 UTC (permalink / raw
To: gentoo-commits
suka 11/02/05 21:35:16
Modified: ChangeLog libreoffice-3.3.0.ebuild
Log:
Another bunch of prefix fixes
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Revision Changes Path
1.10 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.9&r2=1.10
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog 5 Feb 2011 08:58:04 -0000 1.9
+++ ChangeLog 5 Feb 2011 21:35:16 -0000 1.10
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.9 2011/02/05 08:58:04 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.10 2011/02/05 21:35:16 suka Exp $
+
+ 05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild,
+ +files/libreoffice-3.3-prefix.patch:
+ Another bunch of prefix fixes
05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild,
files/gentoo-3.3.0.diff:
1.7 app-office/libreoffice/libreoffice-3.3.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?r1=1.6&r2=1.7
Index: libreoffice-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libreoffice-3.3.0.ebuild 5 Feb 2011 08:58:04 -0000 1.6
+++ libreoffice-3.3.0.ebuild 5 Feb 2011 21:35:16 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.6 2011/02/05 08:58:04 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.7 2011/02/05 21:35:16 suka Exp $
EAPI="3"
@@ -119,7 +119,7 @@
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="!app-office/libreoffice-bin
!app-office/openoffice-bin
@@ -274,6 +274,7 @@
epatch "${FILESDIR}/fix-ooo-collision.diff"
epatch "${FILESDIR}/scrap-pixmap-links.diff"
epatch "${FILESDIR}/enable-startup-notification.diff"
+ epatch "${FILESDIR}/libreoffice-3.3-prefix.patch"
cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes" || die
#Use flag checks
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild
@ 2011-02-08 21:12 Andreas Proschofsky (suka)
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Proschofsky (suka) @ 2011-02-08 21:12 UTC (permalink / raw
To: gentoo-commits
suka 11/02/08 21:12:02
Modified: ChangeLog libreoffice-3.3.0.ebuild
Log:
Until we have a better fix, disable extensions for -java build, preventing breakage, bug #352812
(Portage version: 2.1.9.37/cvs/Linux x86_64)
Revision Changes Path
1.11 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.10&r2=1.11
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 5 Feb 2011 21:35:16 -0000 1.10
+++ ChangeLog 8 Feb 2011 21:12:02 -0000 1.11
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.10 2011/02/05 21:35:16 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.11 2011/02/08 21:12:02 suka Exp $
+
+ 08 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild:
+ Until we have a better fix, disable extensions for -java build, preventing
+ breakage, bug #352812
05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild,
+files/libreoffice-3.3-prefix.patch:
1.8 app-office/libreoffice/libreoffice-3.3.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?r1=1.7&r2=1.8
Index: libreoffice-3.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libreoffice-3.3.0.ebuild 5 Feb 2011 21:35:16 -0000 1.7
+++ libreoffice-3.3.0.ebuild 8 Feb 2011 21:12:02 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.7 2011/02/05 21:35:16 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.8 2011/02/08 21:12:02 suka Exp $
EAPI="3"
@@ -275,7 +275,7 @@
epatch "${FILESDIR}/scrap-pixmap-links.diff"
epatch "${FILESDIR}/enable-startup-notification.diff"
epatch "${FILESDIR}/libreoffice-3.3-prefix.patch"
- cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes" || die
+ use java && cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes"
#Use flag checks
if use java ; then
@@ -309,12 +309,16 @@
echo $(use_enable debug crashdump) >> ${CONFFILE}
echo $(use_enable debug strip-solver) >> ${CONFFILE}
- # Extension stuff
- echo "--with-extension-integration" >> ${CONFFILE}
- echo "--enable-pdfimport" >> ${CONFFILE}
- echo "--enable-minimizer" >> ${CONFFILE}
- echo "--enable-presenter-console" >> ${CONFFILE}
- echo "--enable-presenter-extra-ui" >> ${CONFFILE}
+ # Extension stuff, disabled when building without java for bug #352812
+ if use java; then
+ echo "--with-extension-integration" >> ${CONFFILE}
+ echo "--enable-pdfimport" >> ${CONFFILE}
+ echo "--enable-minimizer" >> ${CONFFILE}
+ echo "--enable-presenter-console" >> ${CONFFILE}
+ echo "--enable-presenter-extra-ui" >> ${CONFFILE}
+ #still necessary
+ echo "--enable-presenter-screen" >> ${CONFFILE}
+ fi
# Misc stuff
echo "--disable-graphite" >> ${CONFFILE}
@@ -388,7 +392,7 @@
$(use_with templates sun-templates) \
--disable-access \
--disable-post-install-scripts \
- --enable-extensions \
+ $(use_enable java extensions) \
--without-system-libwpd \
--without-system-libwpg \
--mandir="${EPREFIX}"/usr/share/man \
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-02-08 21:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-08 21:12 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild Andreas Proschofsky (suka)
-- strict thread matches above, loose matches on Subject: below --
2011-02-05 21:35 Andreas Proschofsky (suka)
2011-02-05 8:58 Andreas Proschofsky (suka)
2011-02-02 9:11 Andreas Proschofsky (suka)
2011-01-25 22:22 Andreas Proschofsky (suka)
2011-01-25 12:35 Andreas Proschofsky (suka)
2011-01-25 11:13 Andreas Proschofsky (suka)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox