From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E3195138010 for ; Sun, 28 Oct 2012 10:11:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F1A121C005; Sun, 28 Oct 2012 10:11:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A1E2021C005 for ; Sun, 28 Oct 2012 10:11:19 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 922AC33D824 for ; Sun, 28 Oct 2012 10:11:18 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 5B26521600; Sun, 28 Oct 2012 10:11:17 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: libreoffice-9999-r2.ebuild ChangeLog X-VCS-Directories: app-office/libreoffice X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20121028101117.5B26521600@flycatcher.gentoo.org> Date: Sun, 28 Oct 2012 10:11:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 28f09ac3-8272-4a7f-9e39-89f07de25f9f X-Archives-Hash: 6233cf4e13304c584ba73a5c1f4eda2a 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 libreoffice-9999-r2.ebuild: + Update the unpack code and wipe saxon. 25 Oct 2012; Tomáš Chvátal libreoffice-9999-r2.ebuild: Fix the move to the submodules stuff.