Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
Date: Thu, 18 Jul 2019 20:58:25
Message-Id: 1563483482.122f33d3d416692e223663dca0fa3ffdc55205d0.asturm@gentoo
1 commit: 122f33d3d416692e223663dca0fa3ffdc55205d0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 18 18:47:33 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 18 20:58:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122f33d3
7
8 app-office/libreoffice: Drop USE vlc
9
10 Does not work, is not maintained.
11
12 Bug: https://bugs.gentoo.org/686958
13 Package-Manager: Portage-2.3.69, Repoman-2.3.16
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 app-office/libreoffice/libreoffice-6.2.9999.ebuild | 5 ++---
17 app-office/libreoffice/libreoffice-9999.ebuild | 5 ++---
18 2 files changed, 4 insertions(+), 6 deletions(-)
19
20 diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
21 index 64438bc0c90..fc96b41d6be 100644
22 --- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild
23 +++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild
24 @@ -63,7 +63,7 @@ unset ADDONS_SRC
25 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
26
27 IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
28 -googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
29 +googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
30 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
31
32 REQUIRED_USE="${PYTHON_REQUIRED_USE}
33 @@ -234,7 +234,6 @@ RDEPEND="${COMMON_DEPEND}
34 || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
35 java? ( >=virtual/jre-1.6 )
36 kde? ( kde-frameworks/breeze-icons:* )
37 - vlc? ( media-video/vlc )
38 "
39 if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
40 PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
41 @@ -413,6 +412,7 @@ src_configure() {
42 --disable-openssl
43 --disable-pdfium
44 --disable-report-builder
45 + --disable-vlc
46 --with-build-version="${gentoo_buildid}"
47 --enable-extension-integration
48 --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
49 @@ -447,7 +447,6 @@ src_configure() {
50 $(use_enable odk)
51 $(use_enable pdfimport)
52 $(use_enable postgres postgresql-sdbc)
53 - $(use_enable vlc)
54 $(use_with accessibility lxml)
55 $(use_with coinmp system-coinmp)
56 $(use_with googledrive gdrive-client-id ${google_default_client_id})
57
58 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
59 index 2a035a036e8..647dba7af7a 100644
60 --- a/app-office/libreoffice/libreoffice-9999.ebuild
61 +++ b/app-office/libreoffice/libreoffice-9999.ebuild
62 @@ -63,7 +63,7 @@ unset ADDONS_SRC
63 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
64
65 IUSE="accessibility bluetooth +branding coinmp +cups dbus debug eds firebird
66 -googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test vlc
67 +googledrive gstreamer +gtk gtk2 kde ldap +mariadb odk pdfimport postgres test
68 $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
69
70 REQUIRED_USE="${PYTHON_REQUIRED_USE}
71 @@ -234,7 +234,6 @@ RDEPEND="${COMMON_DEPEND}
72 || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
73 java? ( >=virtual/jre-1.6 )
74 kde? ( kde-frameworks/breeze-icons:* )
75 - vlc? ( media-video/vlc )
76 "
77 if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then
78 PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*"
79 @@ -411,6 +410,7 @@ src_configure() {
80 --disable-openssl
81 --disable-pdfium
82 --disable-report-builder
83 + --disable-vlc
84 --with-build-version="${gentoo_buildid}"
85 --enable-extension-integration
86 --with-external-dict-dir="${EPREFIX}/usr/share/myspell"
87 @@ -445,7 +445,6 @@ src_configure() {
88 $(use_enable odk)
89 $(use_enable pdfimport)
90 $(use_enable postgres postgresql-sdbc)
91 - $(use_enable vlc)
92 $(use_with accessibility lxml)
93 $(use_with coinmp system-coinmp)
94 $(use_with googledrive gdrive-client-id ${google_default_client_id})