| 1 |
scarabeus 13/01/01 10:56:53 |
| 2 |
|
| 3 |
Modified: libreoffice-9999-r2.ebuild |
| 4 |
libreoffice-4.0.9999.ebuild |
| 5 |
libreoffice-3.6.9999.ebuild ChangeLog |
| 6 |
Removed: libreoffice-3.5.7.2.ebuild |
| 7 |
Log: |
| 8 |
Use python-r1 eclass. Drop 3.5 series as 3.6 seem fine wrt regressions for now. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.146 app-office/libreoffice/libreoffice-9999-r2.ebuild |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.146&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.146&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.145&r2=1.146 |
| 18 |
|
| 19 |
Index: libreoffice-9999-r2.ebuild |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v |
| 22 |
retrieving revision 1.145 |
| 23 |
retrieving revision 1.146 |
| 24 |
diff -u -r1.145 -r1.146 |
| 25 |
--- libreoffice-9999-r2.ebuild 18 Dec 2012 21:52:42 -0000 1.145 |
| 26 |
+++ libreoffice-9999-r2.ebuild 1 Jan 2013 10:56:53 -0000 1.146 |
| 27 |
@@ -1,16 +1,16 @@ |
| 28 |
-# Copyright 1999-2012 Gentoo Foundation |
| 29 |
+# Copyright 1999-2013 Gentoo Foundation |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.145 2012/12/18 21:52:42 scarabeus Exp $ |
| 32 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.146 2013/01/01 10:56:53 scarabeus Exp $ |
| 33 |
|
| 34 |
-EAPI=4 |
| 35 |
+EAPI=5 |
| 36 |
|
| 37 |
KDE_REQUIRED="optional" |
| 38 |
QT_MINIMAL="4.7.4" |
| 39 |
KDE_SCM="git" |
| 40 |
CMAKE_REQUIRED="never" |
| 41 |
|
| 42 |
-PYTHON_DEPEND="3:3.3" |
| 43 |
-PYTHON_USE_WITH="threads,xml" |
| 44 |
+PYTHON_COMPAT=( python3_3 ) |
| 45 |
+PYTHON_REQ_USE="threads,xml" |
| 46 |
|
| 47 |
# experimental ; release ; old |
| 48 |
# Usually the tarballs are moved a lot so this should make |
| 49 |
@@ -27,7 +27,7 @@ |
| 50 |
# PATCHSET="${P}-patchset-01.tar.xz" |
| 51 |
|
| 52 |
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" |
| 53 |
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} |
| 54 |
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} |
| 55 |
unset SCM_ECLASS |
| 56 |
|
| 57 |
DESCRIPTION="LibreOffice, a full office productivity suite." |
| 58 |
@@ -89,6 +89,7 @@ |
| 59 |
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 60 |
|
| 61 |
COMMON_DEPEND=" |
| 62 |
+ ${PYTHON_DEPS} |
| 63 |
app-arch/zip |
| 64 |
app-arch/unzip |
| 65 |
>=app-text/hunspell-1.3.2-r3 |
| 66 |
@@ -266,9 +267,7 @@ |
| 67 |
pkg_setup() { |
| 68 |
java-pkg-opt-2_pkg_setup |
| 69 |
kde4-base_pkg_setup |
| 70 |
- |
| 71 |
- python_set_active_version 3 |
| 72 |
- python_pkg_setup |
| 73 |
+ python-single-r1_pkg_setup |
| 74 |
|
| 75 |
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup |
| 76 |
} |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.9 app-office/libreoffice/libreoffice-4.0.9999.ebuild |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.9&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?rev=1.9&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild?r1=1.8&r2=1.9 |
| 85 |
|
| 86 |
Index: libreoffice-4.0.9999.ebuild |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v |
| 89 |
retrieving revision 1.8 |
| 90 |
retrieving revision 1.9 |
| 91 |
diff -u -r1.8 -r1.9 |
| 92 |
--- libreoffice-4.0.9999.ebuild 18 Dec 2012 21:52:42 -0000 1.8 |
| 93 |
+++ libreoffice-4.0.9999.ebuild 1 Jan 2013 10:56:53 -0000 1.9 |
| 94 |
@@ -1,16 +1,16 @@ |
| 95 |
-# Copyright 1999-2012 Gentoo Foundation |
| 96 |
+# Copyright 1999-2013 Gentoo Foundation |
| 97 |
# Distributed under the terms of the GNU General Public License v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.8 2012/12/18 21:52:42 scarabeus Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.0.9999.ebuild,v 1.9 2013/01/01 10:56:53 scarabeus Exp $ |
| 100 |
|
| 101 |
-EAPI=4 |
| 102 |
+EAPI=5 |
| 103 |
|
| 104 |
KDE_REQUIRED="optional" |
| 105 |
QT_MINIMAL="4.7.4" |
| 106 |
KDE_SCM="git" |
| 107 |
CMAKE_REQUIRED="never" |
| 108 |
|
| 109 |
-PYTHON_DEPEND="3:3.3" |
| 110 |
-PYTHON_USE_WITH="threads,xml" |
| 111 |
+PYTHON_COMPAT=( python3_3 ) |
| 112 |
+PYTHON_REQ_USE="threads,xml" |
| 113 |
|
| 114 |
# experimental ; release ; old |
| 115 |
# Usually the tarballs are moved a lot so this should make |
| 116 |
@@ -27,7 +27,7 @@ |
| 117 |
# PATCHSET="${P}-patchset-01.tar.xz" |
| 118 |
|
| 119 |
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" |
| 120 |
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} |
| 121 |
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} |
| 122 |
unset SCM_ECLASS |
| 123 |
|
| 124 |
DESCRIPTION="LibreOffice, a full office productivity suite." |
| 125 |
@@ -89,6 +89,7 @@ |
| 126 |
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 127 |
|
| 128 |
COMMON_DEPEND=" |
| 129 |
+ ${PYTHON_DEPS} |
| 130 |
app-arch/zip |
| 131 |
app-arch/unzip |
| 132 |
>=app-text/hunspell-1.3.2-r3 |
| 133 |
@@ -266,9 +267,7 @@ |
| 134 |
pkg_setup() { |
| 135 |
java-pkg-opt-2_pkg_setup |
| 136 |
kde4-base_pkg_setup |
| 137 |
- |
| 138 |
- python_set_active_version 3 |
| 139 |
- python_pkg_setup |
| 140 |
+ python-single-r1_pkg_setup |
| 141 |
|
| 142 |
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup |
| 143 |
} |
| 144 |
|
| 145 |
|
| 146 |
|
| 147 |
1.39 app-office/libreoffice/libreoffice-3.6.9999.ebuild |
| 148 |
|
| 149 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?rev=1.39&view=markup |
| 150 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?rev=1.39&content-type=text/plain |
| 151 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?r1=1.38&r2=1.39 |
| 152 |
|
| 153 |
Index: libreoffice-3.6.9999.ebuild |
| 154 |
=================================================================== |
| 155 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v |
| 156 |
retrieving revision 1.38 |
| 157 |
retrieving revision 1.39 |
| 158 |
diff -u -r1.38 -r1.39 |
| 159 |
--- libreoffice-3.6.9999.ebuild 19 Dec 2012 20:22:04 -0000 1.38 |
| 160 |
+++ libreoffice-3.6.9999.ebuild 1 Jan 2013 10:56:53 -0000 1.39 |
| 161 |
@@ -1,16 +1,16 @@ |
| 162 |
-# Copyright 1999-2012 Gentoo Foundation |
| 163 |
+# Copyright 1999-2013 Gentoo Foundation |
| 164 |
# Distributed under the terms of the GNU General Public License v2 |
| 165 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.38 2012/12/19 20:22:04 scarabeus Exp $ |
| 166 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.39 2013/01/01 10:56:53 scarabeus Exp $ |
| 167 |
|
| 168 |
-EAPI=4 |
| 169 |
+EAPI=5 |
| 170 |
|
| 171 |
KDE_REQUIRED="optional" |
| 172 |
QT_MINIMAL="4.7.4" |
| 173 |
KDE_SCM="git" |
| 174 |
CMAKE_REQUIRED="never" |
| 175 |
|
| 176 |
-PYTHON_DEPEND="2" |
| 177 |
-PYTHON_USE_WITH="threads,xml" |
| 178 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7} ) |
| 179 |
+PYTHON_REQ_USE="threads,xml" |
| 180 |
|
| 181 |
# experimental ; release ; old |
| 182 |
# Usually the tarballs are moved a lot so this should make |
| 183 |
@@ -27,7 +27,7 @@ |
| 184 |
# PATCHSET="${P}-patchset-01.tar.xz" |
| 185 |
|
| 186 |
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" |
| 187 |
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} |
| 188 |
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic ${SCM_ECLASS} |
| 189 |
unset SCM_ECLASS |
| 190 |
|
| 191 |
DESCRIPTION="LibreOffice, a full office productivity suite." |
| 192 |
@@ -93,6 +93,7 @@ |
| 193 |
[[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" |
| 194 |
|
| 195 |
COMMON_DEPEND=" |
| 196 |
+ ${PYTHON_DEPS} |
| 197 |
app-arch/zip |
| 198 |
app-arch/unzip |
| 199 |
>=app-text/hunspell-1.3.2-r3 |
| 200 |
@@ -259,9 +260,7 @@ |
| 201 |
pkg_setup() { |
| 202 |
java-pkg-opt-2_pkg_setup |
| 203 |
kde4-base_pkg_setup |
| 204 |
- |
| 205 |
- python_set_active_version 2 |
| 206 |
- python_pkg_setup |
| 207 |
+ python-single-r1_pkg_setup |
| 208 |
|
| 209 |
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup |
| 210 |
} |
| 211 |
|
| 212 |
|
| 213 |
|
| 214 |
1.425 app-office/libreoffice/ChangeLog |
| 215 |
|
| 216 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.425&view=markup |
| 217 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.425&content-type=text/plain |
| 218 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.424&r2=1.425 |
| 219 |
|
| 220 |
Index: ChangeLog |
| 221 |
=================================================================== |
| 222 |
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v |
| 223 |
retrieving revision 1.424 |
| 224 |
retrieving revision 1.425 |
| 225 |
diff -u -r1.424 -r1.425 |
| 226 |
--- ChangeLog 19 Dec 2012 20:22:04 -0000 1.424 |
| 227 |
+++ ChangeLog 1 Jan 2013 10:56:53 -0000 1.425 |
| 228 |
@@ -1,6 +1,18 @@ |
| 229 |
# ChangeLog for app-office/libreoffice |
| 230 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 231 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.424 2012/12/19 20:22:04 scarabeus Exp $ |
| 232 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 233 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.425 2013/01/01 10:56:53 scarabeus Exp $ |
| 234 |
+ |
| 235 |
+ 01 Jan 2013; Tomáš Chvátal <scarabeus@g.o> |
| 236 |
+ -files/libreoffice-3.5-doublebuild.patch, |
| 237 |
+ -files/libreoffice-3.5-hebrew-icu49.patch, |
| 238 |
+ -files/libreoffice-3.5-propagate-gb_FULLDEPS.patch, |
| 239 |
+ -files/libreoffice-3.5.4-libexttextcat.patch, |
| 240 |
+ -files/libreoffice-3.6.3.2-fix-poppler.patch, |
| 241 |
+ -files/libreoffice-system-pyuno.patch, -libreoffice-3.5.7.2.ebuild, |
| 242 |
+ libreoffice-3.6.9999.ebuild, libreoffice-4.0.9999.ebuild, |
| 243 |
+ libreoffice-9999-r2.ebuild: |
| 244 |
+ Use python-r1 eclass. Drop 3.5 series as 3.6 seem fine wrt regressions for |
| 245 |
+ now. |
| 246 |
|
| 247 |
19 Dec 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-3.6.4.3.ebuild, |
| 248 |
libreoffice-3.6.9999.ebuild: |
Archives