From: "Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild ChangeLog
Date: Sun, 28 Oct 2012 10:11:17 +0000 (UTC) [thread overview]
Message-ID: <20121028101117.5B26521600@flycatcher.gentoo.org> (raw)
scarabeus 12/10/28 10:11:17
Modified: libreoffice-9999-r2.ebuild ChangeLog
Log:
Update the unpack code and wipe saxon.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Revision Changes Path
1.120 app-office/libreoffice/libreoffice-9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.119&r2=1.120
Index: libreoffice-9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- libreoffice-9999-r2.ebuild 25 Oct 2012 10:40:55 -0000 1.119
+++ libreoffice-9999-r2.ebuild 28 Oct 2012 10:11:17 -0000 1.120
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.119 2012/10/25 10:40:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.120 2012/10/28 10:11:17 scarabeus Exp $
EAPI=4
@@ -280,7 +280,7 @@
}
src_unpack() {
- local mod dest tmplfile tmplname mypv
+ local mod mod2 dest tmplfile tmplname mypv
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
if use branding; then
@@ -294,9 +294,11 @@
fi
unpack "${PN}-${mod}-${PV}.tar.xz"
if [[ ${mod} != core ]]; then
- [[ ${mod} == help ]] && mod="helpcontent2"
- mkdir "${S}/${mod}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}" || die
+ mod2=${mod}
+ # mapping does not match on help
+ [[ ${mod} == help ]] && mod2="helpcontent2"
+ mkdir -p "${S}/${mod2}/" || die
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
@@ -313,10 +315,11 @@
EGIT_NOUNPACK="true"
git-2_src_unpack
if [[ ${mod} != core ]]; then
+ mod2=${mod}
# mapping does not match on help
- [[ ${mod} == help ]] && mod="helpcontent2"
- mkdir "${S}/${mod}/" || die
- mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod}" || die
+ [[ ${mod} == help ]] && mod2="helpcontent2"
+ mkdir -p "${S}/${mod2}/" || die
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
fi
done
@@ -384,10 +387,8 @@
if use java; then
# hsqldb: system one is too new
- # saxon: system one does not work properly
java_opts="
--without-system-hsqldb
- --without-system-saxon
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
--with-java-target-version=$(java-pkg_get-target)
1.381 app-office/libreoffice/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.381&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.381&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.380&r2=1.381
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- ChangeLog 25 Oct 2012 10:40:55 -0000 1.380
+++ ChangeLog 28 Oct 2012 10:11:17 -0000 1.381
@@ -1,6 +1,9 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.380 2012/10/25 10:40:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.381 2012/10/28 10:11:17 scarabeus Exp $
+
+ 28 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+ Update the unpack code and wipe saxon.
25 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
Fix the move to the submodules stuff.
next reply other threads:[~2012-10-28 10:11 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-28 10:11 Tomas Chvatal (scarabeus) [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-09-07 12:01 [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild ChangeLog Tomas Chvatal (scarabeus)
2014-03-25 10:28 Tomas Chvatal (scarabeus)
2014-03-25 10:05 Tomas Chvatal (scarabeus)
2014-03-25 9:57 Tomas Chvatal (scarabeus)
2014-01-27 15:17 Tomas Chvatal (scarabeus)
2013-11-15 14:15 Tomas Chvatal (scarabeus)
2013-11-15 9:19 Tomas Chvatal (scarabeus)
2013-11-08 9:15 Tomas Chvatal (scarabeus)
2013-11-01 10:04 Tomas Chvatal (scarabeus)
2013-11-01 8:54 Tomas Chvatal (scarabeus)
2013-09-03 7:05 Tomas Chvatal (scarabeus)
2013-08-09 8:55 Tomas Chvatal (scarabeus)
2013-07-29 13:26 Tomas Chvatal (scarabeus)
2013-07-16 16:43 Tomas Chvatal (scarabeus)
2013-07-09 13:12 Tomas Chvatal (scarabeus)
2013-07-08 9:29 Tomas Chvatal (scarabeus)
2013-06-24 21:03 Tomas Chvatal (scarabeus)
2013-06-04 10:32 Tomas Chvatal (scarabeus)
2013-05-21 8:08 Tomas Chvatal (scarabeus)
2013-05-09 20:31 Tomas Chvatal (scarabeus)
2013-05-08 18:28 Tomas Chvatal (scarabeus)
2013-05-06 12:08 Tomas Chvatal (scarabeus)
2013-04-24 12:40 Tomas Chvatal (scarabeus)
2013-03-18 18:59 Tomas Chvatal (scarabeus)
2013-03-13 14:03 Tomas Chvatal (scarabeus)
2013-03-13 12:19 Tomas Chvatal (scarabeus)
2013-03-13 10:08 Tomas Chvatal (scarabeus)
2013-03-05 14:21 Tomas Chvatal (scarabeus)
2013-03-04 20:53 Tomas Chvatal (scarabeus)
2013-01-10 10:13 Tomas Chvatal (scarabeus)
2012-12-09 9:38 Tomas Chvatal (scarabeus)
2012-11-30 20:53 Tomas Chvatal (scarabeus)
2012-11-28 13:44 Tomas Chvatal (scarabeus)
2012-11-28 10:42 Tomas Chvatal (scarabeus)
2012-11-26 12:55 Tomas Chvatal (scarabeus)
2012-11-21 15:45 Tomas Chvatal (scarabeus)
2012-11-18 11:39 Andreas HAttel (dilfridge)
2012-11-17 11:03 Tomas Chvatal (scarabeus)
2012-11-14 10:13 Tomas Chvatal (scarabeus)
2012-11-12 19:40 Tomas Chvatal (scarabeus)
2012-11-09 9:50 Tomas Chvatal (scarabeus)
2012-11-09 9:45 Tomas Chvatal (scarabeus)
2012-10-30 21:00 Tomas Chvatal (scarabeus)
2012-10-29 10:21 Tomas Chvatal (scarabeus)
2012-10-25 10:40 Tomas Chvatal (scarabeus)
2012-10-25 10:17 Tomas Chvatal (scarabeus)
2012-10-08 11:38 Tomas Chvatal (scarabeus)
2012-09-28 9:34 Tomas Chvatal (scarabeus)
2012-09-25 9:53 Tomas Chvatal (scarabeus)
2012-09-24 13:36 Tomas Chvatal (scarabeus)
2012-09-20 8:19 Tomas Chvatal (scarabeus)
2012-09-10 9:19 Tomas Chvatal (scarabeus)
2012-08-14 11:56 Tomas Chvatal (scarabeus)
2012-08-10 8:32 Tomas Chvatal (scarabeus)
2012-08-07 11:44 Tomas Chvatal (scarabeus)
2012-08-01 9:34 Tomas Chvatal (scarabeus)
2012-06-07 11:45 Tomas Chvatal (scarabeus)
2012-06-04 16:35 Tomas Chvatal (scarabeus)
2012-06-04 16:14 Tomas Chvatal (scarabeus)
2012-06-01 17:39 Tomas Chvatal (scarabeus)
2012-05-10 18:08 Tomas Chvatal (scarabeus)
2012-05-09 18:06 Tomas Chvatal (scarabeus)
2012-05-09 15:43 Tomas Chvatal (scarabeus)
2012-05-06 10:55 Tomas Chvatal (scarabeus)
2012-05-05 16:12 Tomas Chvatal (scarabeus)
2012-05-05 15:16 Tomas Chvatal (scarabeus)
2012-05-05 10:30 Tomas Chvatal (scarabeus)
2012-05-05 8:31 Tomas Chvatal (scarabeus)
2012-05-04 20:56 Tomas Chvatal (scarabeus)
2012-05-04 20:47 Tomas Chvatal (scarabeus)
2012-04-29 9:34 Tomas Chvatal (scarabeus)
2012-04-26 13:19 Tomas Chvatal (scarabeus)
2012-04-24 7:16 Tomas Chvatal (scarabeus)
2012-04-23 16:44 Tomas Chvatal (scarabeus)
2012-04-19 9:10 Tomas Chvatal (scarabeus)
2012-04-18 9:03 Tomas Chvatal (scarabeus)
2012-04-17 11:26 Tomas Chvatal (scarabeus)
2012-04-17 8:39 Tomas Chvatal (scarabeus)
2012-04-17 8:03 Tomas Chvatal (scarabeus)
2012-03-21 10:35 Tomas Chvatal (scarabeus)
2012-03-09 11:07 Tomas Chvatal (scarabeus)
2012-02-27 21:44 Tomas Chvatal (scarabeus)
2012-02-17 16:22 Tomas Chvatal (scarabeus)
2011-12-11 12:34 Tomas Chvatal (scarabeus)
2011-11-23 16:16 Tomas Chvatal (scarabeus)
2011-11-23 16:00 Tomas Chvatal (scarabeus)
2011-11-23 15:47 Tomas Chvatal (scarabeus)
2011-11-18 23:11 Tomas Chvatal (scarabeus)
2011-11-14 9:06 Tomas Chvatal (scarabeus)
2011-11-12 14:40 Tomas Chvatal (scarabeus)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121028101117.5B26521600@flycatcher.gentoo.org \
--to=scarabeus@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox