| 1 |
commit: 7394bff875c12fd058d5b1545de8e765dd56f51e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 23 20:54:59 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 23 22:52:12 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7394bff8 |
| 7 |
|
| 8 |
app-office/libreoffice: 6.2.0.3 version bump (still no keywords) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/Manifest | 2 ++ |
| 14 |
...office-6.2.9999.ebuild => libreoffice-6.2.0.3.ebuild} | 16 +++++++--------- |
| 15 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 6 +++--- |
| 16 |
app-office/libreoffice/libreoffice-9999.ebuild | 6 +++--- |
| 17 |
4 files changed, 15 insertions(+), 15 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest |
| 20 |
index b7c8d733d9f..15390722f85 100644 |
| 21 |
--- a/app-office/libreoffice/Manifest |
| 22 |
+++ b/app-office/libreoffice/Manifest |
| 23 |
@@ -6,7 +6,9 @@ DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd9058 |
| 24 |
DIST libreoffice-6.1.4.2.tar.xz 207710664 BLAKE2B 52bab412094c1ff7e184ea65c588360c18b061c3e14b7be07171f6b5831261766e2ac7d7373f5f789d125671da41e8b67d34360d4b7014dcb98df01828aeb094 SHA512 ba81b7744b908f9fe67a83e72c17c08b3b2e99599a5fd4f9cc1f2d81b3fd0ddb8065ae466205f85185ab9420350cea0b2d60108df3e583b74bd1fcd9e4eb0c3c |
| 25 |
DIST libreoffice-6.1.5.1.tar.xz 207920688 BLAKE2B 7e435a62b880839c752ba90693918242ec29807acb73a22d6101d74f8c8d712a5a26a85cea334a6e66811b7a4f8e016b87932390f2746da4effcb74a416ca973 SHA512 fab7f0bb6fb113c0bfa8bbc0424568c37a04f301d6e44f5755dcbb21cc6df964819a2e143b10f5c6352bfbea438df0b136ba55caf7be3bbbb83bcebba4ceadae |
| 26 |
DIST libreoffice-6.2.0.2.tar.xz 213471412 BLAKE2B 61c07f0b6e2c12d197d93346ae4b9f583189a093f9fe49156c5f6ccee4309a77b4a6f6a133a61764d11dd56e7e36734ed4ebf3abab035021c0692477d556acf7 SHA512 6c8e039548b50071e50eea6719a92c11c85da2c7ae73bc70bddc5eb32859823fc5f5ab5867ec0b76d8a094cd21a228d6b0d3a7fa834e8005a2d7a82c7ecdb278 |
| 27 |
+DIST libreoffice-6.2.0.3.tar.xz 213476336 BLAKE2B e0a44098aa46c86d5fb7d26366d57d4bf395f642cf228a426446067a7037b5199715a7d34a2b28664123f814cc23da7e299da4f93ed8b65c29ae90056cc40399 SHA512 991cab829c88010b5df0c40e6422fd725f7854d256cfa7ffcf595549ccc49aeebe135513b56c5ccdc810ea07b8df186004a3d9e5d84b5d69992996158166d0c1 |
| 28 |
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f |
| 29 |
DIST libreoffice-help-6.1.4.2.tar.xz 15757700 BLAKE2B 53c398efb3b839740a9146ea1b0f70f019936c914f7aedf38b7da69faf532ab139a8847d6eb251b2850511e0e7bd169c74fafedd0926dc987659aa27878cf740 SHA512 e24f2f6795856da62f77ebfdcfedc8190b8ecef74e395fc263f0cab4a27c0fe3d95f37665747a590fc7a6a93c6c3473a2a4501c50d415cc602f85838955fe9ab |
| 30 |
DIST libreoffice-help-6.1.5.1.tar.xz 15756964 BLAKE2B 0d7b32488e2e0ccab0ff067ba19dbbcdcc57f80280c74c6aa0f2e0f6cd49f2eeb67adb1d8f0e88459636d6301329fed3c5837b246571cecfa27a1e334d9b8579 SHA512 f9ae9134eb322f7cfc1cb2a18d23edfaed880925c289d49136d9e7ce026bfa2fbbf148b14a88e8f68d6f5bd8a04a97265c5c15d1eb92ef6fef50a899388617a3 |
| 31 |
DIST libreoffice-help-6.2.0.2.tar.xz 16186468 BLAKE2B 3846172642023633420ba83f3c65430dd7c1e5b4fc652e758081175d6b52c412822acd2af1dc31ebcc5344bd4f4b5ba6d49beb4f43f997fd99cbe1ecd69a9f96 SHA512 43c99f3db3d773d3f724600a875b964a65ae3dcab4ab7348289828cf860475a036cd6ba2d54d57cfec4ca259c085932fa479d465475591919e86108c56ed5feb |
| 32 |
+DIST libreoffice-help-6.2.0.3.tar.xz 16186548 BLAKE2B 95d7fbdaac774032f5ddac121eec5ace9f7964a112f8137d8cf3b999e4ba6685048c027b5635283de9913547c2776ba9b9ab7e28b97cf94fac536decc12fda98 SHA512 7b1c7949ede3fdd6dcc09fd38b62f17d68c5f79e75fb72cedb9d55889d8d8cf261d6614aa5e2e3eae3e26764b2cdb0e4344bef25851daef6041ac3935ad64fb1 |
| 33 |
|
| 34 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild |
| 35 |
similarity index 97% |
| 36 |
copy from app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 37 |
copy to app-office/libreoffice/libreoffice-6.2.0.3.ebuild |
| 38 |
index 55ece7a7600..1855739d749 100644 |
| 39 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 40 |
+++ b/app-office/libreoffice/libreoffice-6.2.0.3.ebuild |
| 41 |
@@ -63,7 +63,7 @@ unset ADDONS_SRC |
| 42 |
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" |
| 43 |
|
| 44 |
IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird |
| 45 |
-googledrive gstreamer +gtk gtk2 kde +mariadb odk pdfimport postgres test vlc |
| 46 |
+googledrive gstreamer +gtk gtk2 kde odk pdfimport postgres test vlc |
| 47 |
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" |
| 48 |
|
| 49 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 50 |
@@ -77,7 +77,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 51 |
LICENSE="|| ( LGPL-3 MPL-1.1 )" |
| 52 |
SLOT="0" |
| 53 |
[[ ${MY_PV} == *9999* ]] || \ |
| 54 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
| 55 |
+KEYWORDS="" |
| 56 |
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" |
| 57 |
|
| 58 |
COMMON_DEPEND="${PYTHON_DEPS} |
| 59 |
app-arch/unzip |
| 60 |
@@ -102,6 +103,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 61 |
app-text/mythes |
| 62 |
>=dev-cpp/clucene-2.3.3.4-r2 |
| 63 |
=dev-cpp/libcmis-0.5* |
| 64 |
+ dev-db/mysql-connector-c |
| 65 |
dev-db/unixODBC |
| 66 |
dev-lang/perl |
| 67 |
dev-libs/boost:=[nls] |
| 68 |
@@ -187,8 +189,6 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 69 |
) |
| 70 |
libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) |
| 71 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
| 72 |
- mariadb? ( dev-db/mariadb-connector-c ) |
| 73 |
- !mariadb? ( dev-db/mysql-connector-c ) |
| 74 |
pdfimport? ( app-text/poppler:=[cxx] ) |
| 75 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
| 76 |
" |
| 77 |
@@ -402,7 +402,6 @@ src_configure() { |
| 78 |
--enable-randr |
| 79 |
--enable-release-build |
| 80 |
--disable-breakpad |
| 81 |
- --disable-bundle-mariadb |
| 82 |
--disable-ccache |
| 83 |
--disable-dependency-tracking |
| 84 |
--disable-epm |
| 85 |
@@ -492,7 +491,6 @@ src_configure() { |
| 86 |
|
| 87 |
is-flagq "-flto*" && myeconfargs+=( --enable-lto ) |
| 88 |
|
| 89 |
- MARIADBCONFIG="$(type -p $(usex mariadb mariadb mysql)_config)" \ |
| 90 |
econf "${myeconfargs[@]}" |
| 91 |
} |
| 92 |
|
| 93 |
@@ -552,7 +550,7 @@ src_install() { |
| 94 |
insinto /usr/$(get_libdir)/${PN}/program |
| 95 |
newins "${WORKDIR}/branding-sofficerc" sofficerc |
| 96 |
dodir /etc/env.d |
| 97 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die |
| 98 |
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die |
| 99 |
fi |
| 100 |
|
| 101 |
# Hack for offlinehelp, this needs fixing upstream at some point. |
| 102 |
@@ -561,8 +559,8 @@ src_install() { |
| 103 |
insinto /usr/$(get_libdir)/libreoffice/help |
| 104 |
doins xmlhelp/util/*.xsl |
| 105 |
|
| 106 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 107 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 108 |
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 109 |
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 110 |
} |
| 111 |
|
| 112 |
pkg_postinst() { |
| 113 |
|
| 114 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 115 |
index 55ece7a7600..6536b71f535 100644 |
| 116 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 117 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 118 |
@@ -552,7 +552,7 @@ src_install() { |
| 119 |
insinto /usr/$(get_libdir)/${PN}/program |
| 120 |
newins "${WORKDIR}/branding-sofficerc" sofficerc |
| 121 |
dodir /etc/env.d |
| 122 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die |
| 123 |
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die |
| 124 |
fi |
| 125 |
|
| 126 |
# Hack for offlinehelp, this needs fixing upstream at some point. |
| 127 |
@@ -561,8 +561,8 @@ src_install() { |
| 128 |
insinto /usr/$(get_libdir)/libreoffice/help |
| 129 |
doins xmlhelp/util/*.xsl |
| 130 |
|
| 131 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 132 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 133 |
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 134 |
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 135 |
} |
| 136 |
|
| 137 |
pkg_postinst() { |
| 138 |
|
| 139 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 140 |
index 55ece7a7600..6536b71f535 100644 |
| 141 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 142 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 143 |
@@ -552,7 +552,7 @@ src_install() { |
| 144 |
insinto /usr/$(get_libdir)/${PN}/program |
| 145 |
newins "${WORKDIR}/branding-sofficerc" sofficerc |
| 146 |
dodir /etc/env.d |
| 147 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die |
| 148 |
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die |
| 149 |
fi |
| 150 |
|
| 151 |
# Hack for offlinehelp, this needs fixing upstream at some point. |
| 152 |
@@ -561,8 +561,8 @@ src_install() { |
| 153 |
insinto /usr/$(get_libdir)/libreoffice/help |
| 154 |
doins xmlhelp/util/*.xsl |
| 155 |
|
| 156 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 157 |
- pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 158 |
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 159 |
+ pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 160 |
} |
| 161 |
|
| 162 |
pkg_postinst() { |
Archives