diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-14 13:05:23 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-01-14 13:05:23 +0000 |
| commit | f73747a5ff7496c554b4f0e79653c96541d71e59 (patch) | |
| tree | 1b4c98f468410a3ca5242cb32719b10650ee71e9 /app-office/libreoffice | |
| parent | Move patching to src_prepare(). (diff) | |
| download | gentoo-2-f73747a5ff7496c554b4f0e79653c96541d71e59.tar.gz gentoo-2-f73747a5ff7496c554b4f0e79653c96541d71e59.tar.bz2 gentoo-2-f73747a5ff7496c554b4f0e79653c96541d71e59.zip | |
Fix git build as we moved the main folder.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-4.0.9999.ebuild | 5 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999-r2.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 9359e9a1175c..2e9ba3f144d8 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.431 2013/01/13 10:52:53 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.432 2013/01/14 13:05:23 scarabeus Exp $ + + 14 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild, + libreoffice-9999-r2.ebuild: + Fix git build as we moved the main folder. 13 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-4.0.9999.ebuild, libreoffice-9999-r2.ebuild: diff --git a/app-office/libreoffice/libreoffice-4.0.9999.ebuild b/app-office/libreoffice/libreoffice-4.0.9999.ebuild index 86dac56f26d3..108ab7e6e663 100644 --- a/app-office/libreoffice/libreoffice-4.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-4.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.12 2013/01/13 10:52:53 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.13 2013/01/14 13:05:23 scarabeus Exp $ EAPI=5 @@ -290,7 +290,8 @@ src_unpack() { mypv=${PV/.9999} [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" EGIT_PROJECT="${PN}/${mod}" - EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" + EGIT_SOURCEDIR="${WORKDIR}/${P}" + [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" EGIT_NOUNPACK="true" git-2_src_unpack diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild index 2669d8e64bfb..85e7ca970ae4 100644 --- a/app-office/libreoffice/libreoffice-9999-r2.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.150 2013/01/13 10:52:53 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.151 2013/01/14 13:05:23 scarabeus Exp $ EAPI=5 @@ -289,7 +289,8 @@ src_unpack() { mypv=${PV/.9999} [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}" EGIT_PROJECT="${PN}/${mod}" - EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" + EGIT_SOURCEDIR="${WORKDIR}/${P}" + [[ ${mod} != core ]] && EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}" EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}" EGIT_NOUNPACK="true" git-2_src_unpack |