* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild
@ 2011-09-08 16:31 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-09-08 16:31 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/09/08 16:31:23
Modified: libreoffice-9999-r1.ebuild ChangeLog
libreoffice-3.4.9999-r1.ebuild
Log:
Use bashcomp-r1 eclass instead of old one.
(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)
Revision Changes Path
1.7 app-office/libreoffice/libreoffice-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?r1=1.6&r2=1.7
Index: libreoffice-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libreoffice-9999-r1.ebuild 8 Sep 2011 12:33:26 -0000 1.6
+++ libreoffice-9999-r1.ebuild 8 Sep 2011 16:31:23 -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-9999-r1.ebuild,v 1.6 2011/09/08 12:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.7 2011/09/08 16:31:23 scarabeus Exp $
EAPI=3
@@ -25,7 +25,7 @@
BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
@@ -519,7 +519,7 @@
make DESTDIR="${D}" distro-pack-install || die
# Fix bash completion placement
- dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
rm -rf "${ED}"/etc/
# symlink the plugin to system location
1.131 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.131&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.131&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.130&r2=1.131
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- ChangeLog 8 Sep 2011 12:33:26 -0000 1.130
+++ ChangeLog 8 Sep 2011 16:31:23 -0000 1.131
@@ -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.130 2011/09/08 12:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.131 2011/09/08 16:31:23 scarabeus Exp $
+
+ 08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+ Use bashcomp-r1 eclass instead of old one.
08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
1.8 app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?r1=1.7&r2=1.8
Index: libreoffice-3.4.9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libreoffice-3.4.9999-r1.ebuild 8 Sep 2011 12:33:26 -0000 1.7
+++ libreoffice-3.4.9999-r1.ebuild 8 Sep 2011 16:31:23 -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.4.9999-r1.ebuild,v 1.7 2011/09/08 12:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.8 2011/09/08 16:31:23 scarabeus Exp $
EAPI=3
@@ -25,7 +25,7 @@
BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
@@ -529,7 +529,7 @@
make DESTDIR="${D}" distro-pack-install || die
# Fix bash completion placement
- dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
rm -rf "${ED}"/etc/
# symlink the plugin to system location
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild
@ 2011-09-08 16:50 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-09-08 16:50 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/09/08 16:50:54
Modified: libreoffice-9999-r1.ebuild ChangeLog
libreoffice-3.4.9999-r1.ebuild
Log:
Add missing die
(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)
Revision Changes Path
1.8 app-office/libreoffice/libreoffice-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?r1=1.7&r2=1.8
Index: libreoffice-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libreoffice-9999-r1.ebuild 8 Sep 2011 16:31:23 -0000 1.7
+++ libreoffice-9999-r1.ebuild 8 Sep 2011 16:50:54 -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-9999-r1.ebuild,v 1.7 2011/09/08 16:31:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.8 2011/09/08 16:50:54 scarabeus Exp $
EAPI=3
@@ -519,7 +519,7 @@
make DESTDIR="${D}" distro-pack-install || die
# Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die
rm -rf "${ED}"/etc/
# symlink the plugin to system location
1.132 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.131&r2=1.132
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ChangeLog 8 Sep 2011 16:31:23 -0000 1.131
+++ ChangeLog 8 Sep 2011 16:50:54 -0000 1.132
@@ -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.131 2011/09/08 16:31:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.132 2011/09/08 16:50:54 scarabeus Exp $
+
+ 08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+ Add missing die
08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
1.9 app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?r1=1.8&r2=1.9
Index: libreoffice-3.4.9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libreoffice-3.4.9999-r1.ebuild 8 Sep 2011 16:31:23 -0000 1.8
+++ libreoffice-3.4.9999-r1.ebuild 8 Sep 2011 16:50:54 -0000 1.9
@@ -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.4.9999-r1.ebuild,v 1.8 2011/09/08 16:31:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.9 2011/09/08 16:50:54 scarabeus Exp $
EAPI=3
@@ -529,7 +529,7 @@
make DESTDIR="${D}" distro-pack-install || die
# Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die
rm -rf "${ED}"/etc/
# symlink the plugin to system location
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild
@ 2011-10-16 18:01 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-10-16 18:01 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/10/16 18:01:45
Modified: libreoffice-9999-r1.ebuild ChangeLog
libreoffice-3.4.9999-r1.ebuild
Log:
Make the live build with +odk again. Fixes bug #387005.
(Portage version: 2.2.0_alpha67/cvs/Linux x86_64)
Revision Changes Path
1.43 app-office/libreoffice/libreoffice-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?r1=1.42&r2=1.43
Index: libreoffice-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- libreoffice-9999-r1.ebuild 16 Oct 2011 14:12:14 -0000 1.42
+++ libreoffice-9999-r1.ebuild 16 Oct 2011 18:01:45 -0000 1.43
@@ -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-9999-r1.ebuild,v 1.42 2011/10/16 14:12:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.43 2011/10/16 18:01:45 scarabeus Exp $
EAPI=3
@@ -59,6 +59,7 @@
ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
ADDONS_SRC+=" java? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
ADDONS_SRC+=" java? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
SRC_URI+=" ${ADDONS_SRC}"
TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
1.174 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.174&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.174&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.173&r2=1.174
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- ChangeLog 16 Oct 2011 14:12:14 -0000 1.173
+++ ChangeLog 16 Oct 2011 18:01:45 -0000 1.174
@@ -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.173 2011/10/16 14:12:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.174 2011/10/16 18:01:45 scarabeus Exp $
+
+ 16 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+ Make the live build with +odk again. Fixes bug #387005.
16 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
1.14 app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?r1=1.13&r2=1.14
Index: libreoffice-3.4.9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libreoffice-3.4.9999-r1.ebuild 16 Oct 2011 14:12:14 -0000 1.13
+++ libreoffice-3.4.9999-r1.ebuild 16 Oct 2011 18:01:45 -0000 1.14
@@ -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.4.9999-r1.ebuild,v 1.13 2011/10/16 14:12:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.14 2011/10/16 18:01:45 scarabeus Exp $
EAPI=3
@@ -58,6 +58,7 @@
ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
+ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
SRC_URI+=" ${ADDONS_SRC}"
TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild
@ 2011-10-18 7:33 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-10-18 7:33 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/10/18 07:33:46
Modified: libreoffice-9999-r1.ebuild ChangeLog
libreoffice-3.4.9999-r1.ebuild
Log:
Bump live versions to eapi4.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Revision Changes Path
1.44 app-office/libreoffice/libreoffice-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?r1=1.43&r2=1.44
Index: libreoffice-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- libreoffice-9999-r1.ebuild 16 Oct 2011 18:01:45 -0000 1.43
+++ libreoffice-9999-r1.ebuild 18 Oct 2011 07:33:46 -0000 1.44
@@ -1,8 +1,8 @@
# 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-9999-r1.ebuild,v 1.43 2011/10/16 18:01:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.44 2011/10/18 07:33:46 scarabeus Exp $
-EAPI=3
+EAPI=4
KDE_REQUIRED="optional"
KDE_SCM="git"
@@ -200,15 +200,20 @@
PATCHES=(
)
-# Uncoment me when updating to eapi4
-# REQUIRED_USE="
-# || ( gtk gnome kde )
-# gnome? ( gtk )
-# nsplugin? ( gtk )
-#"
+REQUIRED_USE="
+ || ( gtk gnome kde )
+ gnome? ( gtk )
+ nsplugin? ( gtk )
+"
S="${WORKDIR}/${PN}-core-${PV}"
+pkg_pretend() {
+ CHECKREQS_MEMORY="1G"
+ use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+ check-reqs_pkg_setup
+}
+
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
@@ -461,7 +466,7 @@
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
rm -rf "${ED}"/etc/
# symlink the plugin to system location
@@ -471,7 +476,7 @@
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc || die
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
fi
}
1.175 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.175&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.175&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.174&r2=1.175
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- ChangeLog 16 Oct 2011 18:01:45 -0000 1.174
+++ ChangeLog 18 Oct 2011 07:33:46 -0000 1.175
@@ -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.174 2011/10/16 18:01:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.175 2011/10/18 07:33:46 scarabeus Exp $
+
+ 18 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+ Bump live versions to eapi4.
16 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
1.15 app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?r1=1.14&r2=1.15
Index: libreoffice-3.4.9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libreoffice-3.4.9999-r1.ebuild 16 Oct 2011 18:01:45 -0000 1.14
+++ libreoffice-3.4.9999-r1.ebuild 18 Oct 2011 07:33:46 -0000 1.15
@@ -1,8 +1,8 @@
# 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.4.9999-r1.ebuild,v 1.14 2011/10/16 18:01:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.15 2011/10/18 07:33:46 scarabeus Exp $
-EAPI=3
+EAPI=4
KDE_REQUIRED="optional"
KDE_SCM="git"
@@ -206,12 +206,11 @@
"${FILESDIR}/${PN}-java.patch"
)
-# Uncoment me when updating to eapi4
-# REQUIRED_USE="
-# || ( gtk gnome kde )
-# gnome? ( gtk )
-# nsplugin? ( gtk )
-#"
+REQUIRED_USE="
+ || ( gtk gnome kde )
+ gnome? ( gtk )
+ nsplugin? ( gtk )
+"
# Needs lots and lots of work and compiling
RESTRICT="test"
@@ -505,7 +504,7 @@
make DESTDIR="${D}" distro-pack-install || die
# Fix bash completion placement
- newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
rm -rf "${ED}"/etc/
# symlink the plugin to system location
@@ -515,7 +514,7 @@
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
- newins "${WORKDIR}/branding-sofficerc" sofficerc || die
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
fi
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild
@ 2011-10-19 9:31 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 5+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-10-19 9:31 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/10/19 09:31:26
Modified: libreoffice-9999-r1.ebuild ChangeLog
libreoffice-3.4.9999-r1.ebuild
Log:
Move the checks to pkg pretend properly.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
Revision Changes Path
1.45 app-office/libreoffice/libreoffice-9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild?r1=1.44&r2=1.45
Index: libreoffice-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- libreoffice-9999-r1.ebuild 18 Oct 2011 07:33:46 -0000 1.44
+++ libreoffice-9999-r1.ebuild 19 Oct 2011 09:31:26 -0000 1.45
@@ -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-9999-r1.ebuild,v 1.44 2011/10/18 07:33:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.45 2011/10/19 09:31:26 scarabeus Exp $
EAPI=4
@@ -209,9 +209,16 @@
S="${WORKDIR}/${PN}-core-${PV}"
pkg_pretend() {
- CHECKREQS_MEMORY="1G"
- use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
- check-reqs_pkg_setup
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="1G"
+ use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ eerror "Compilation with gcc older than 4.0 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
}
pkg_setup() {
@@ -221,21 +228,11 @@
python_set_active_version 2
python_pkg_setup
- if [[ $(gcc-major-version) -lt 4 ]]; then
- eerror "Compilation with gcc older than 4.0 is not supported"
- die "Too old gcc found."
- fi
-
if ! use gtk; then
ewarn "If you want the LibreOffice systray quickstarter to work"
ewarn "activate the 'gtk' use flag."
ewarn
fi
-
- # Check if we have enough RAM and free diskspace to build this beast
- CHECKREQS_MEMORY="1G"
- use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
- check-reqs_pkg_setup
}
src_unpack() {
1.176 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.175&r2=1.176
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- ChangeLog 18 Oct 2011 07:33:46 -0000 1.175
+++ ChangeLog 19 Oct 2011 09:31:26 -0000 1.176
@@ -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.175 2011/10/18 07:33:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.176 2011/10/19 09:31:26 scarabeus Exp $
+
+ 19 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+ Move the checks to pkg pretend properly.
18 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
1.16 app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild?r1=1.15&r2=1.16
Index: libreoffice-3.4.9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libreoffice-3.4.9999-r1.ebuild 18 Oct 2011 07:33:46 -0000 1.15
+++ libreoffice-3.4.9999-r1.ebuild 19 Oct 2011 09:31:26 -0000 1.16
@@ -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.4.9999-r1.ebuild,v 1.15 2011/10/18 07:33:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.16 2011/10/19 09:31:26 scarabeus Exp $
EAPI=4
@@ -217,6 +217,19 @@
S="${WORKDIR}/${PN}-bootstrap-${PV}"
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ CHECKREQS_MEMORY="1G"
+ use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]]; then
+ eerror "Compilation with gcc older than 4.0 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+}
+
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
@@ -224,11 +237,6 @@
python_set_active_version 2
python_pkg_setup
- if [[ $(gcc-major-version) -lt 4 ]]; then
- eerror "Compilation with gcc older than 4.0 is not supported"
- die "Too old gcc found."
- fi
-
if use custom-cflags; then
ewarn "You are using custom CFLAGS, which is NOT supported and can cause"
ewarn "all sorts of build and runtime errors."
@@ -255,11 +263,6 @@
ewarn "activate the 'gtk' use flag."
ewarn
fi
-
- # Check if we have enough RAM and free diskspace to build this beast
- CHECKREQS_MEMORY="1G"
- use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
- check-reqs_pkg_setup
}
src_unpack() {
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-10-19 9:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-08 16:50 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r1.ebuild ChangeLog libreoffice-3.4.9999-r1.ebuild Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2011-10-19 9:31 Tomas Chvatal (scarabeus)
2011-10-18 7:33 Tomas Chvatal (scarabeus)
2011-10-16 18:01 Tomas Chvatal (scarabeus)
2011-09-08 16:31 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox