Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-bin-debug/
Date: Thu, 03 Mar 2016 00:41:53
Message-Id: 1456965683.ec4e028db754e7698efdcccd1194b19246881d18.dilfridge@gentoo
1 commit: ec4e028db754e7698efdcccd1194b19246881d18
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 3 00:41:23 2016 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 3 00:41:23 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4e028d
7
8 app-office/libreoffice-bin-debug: Revbump to relax graphite2 dependencies
9
10 Package-Manager: portage-2.2.27
11
12 ...ild => libreoffice-bin-debug-5.0.5.2-r1.ebuild} | 38 +++++++++++-----------
13 1 file changed, 19 insertions(+), 19 deletions(-)
14
15 diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.0.5.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.0.5.2-r1.ebuild
16 similarity index 59%
17 rename from app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.0.5.2.ebuild
18 rename to app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.0.5.2-r1.ebuild
19 index 4d54b26..7b97ca3 100644
20 --- a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.0.5.2.ebuild
21 +++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-5.0.5.2-r1.ebuild
22 @@ -11,31 +11,31 @@ BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x8
23 DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
24 HOMEPAGE="http://www.libreoffice.org"
25 SRC_URI_AMD64="
26 - ${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
27 + ${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
28 kde? (
29 - !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
30 - java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
31 + !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
32 + java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
33 )
34 gnome? (
35 - !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
36 - java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
37 + !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
38 + java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
39 )
40 !kde? ( !gnome? (
41 - java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
42 + java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
43 ) )
44 "
45 SRC_URI_X86="
46 - ${BASE_X86_URI}libreoffice-${PVR}.tar.xz
47 + ${BASE_X86_URI}libreoffice-${PV}.tar.xz
48 kde? (
49 - !java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
50 - java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
51 + !java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
52 + java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
53 )
54 gnome? (
55 - !java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
56 - java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
57 + !java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
58 + java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
59 )
60 !kde? ( !gnome? (
61 - java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
62 + java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
63 ) )
64 "
65
66 @@ -60,8 +60,8 @@ S="${WORKDIR}"
67 QA_PREBUILT="/usr/*"
68
69 src_unpack() {
70 - einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
71 - xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
72 + einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
73 + xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
74
75 local patchname
76 use kde && patchname="-kde"
77 @@ -69,13 +69,13 @@ src_unpack() {
78 use java && patchname="${patchname}-java"
79
80 if [ -n "${patchname}" ]; then
81 - einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
82 - xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
83 - mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
84 + einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
85 + xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
86 + mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
87 fi
88
89 - einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
90 - unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
91 + einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
92 + unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
93 }
94
95 src_configure() { :; }