| 1 |
commit: a7fb3d0bedbbd070b77b473760fcae688a281312 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Oct 26 23:38:49 2015 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 29 22:09:10 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fb3d0b |
| 7 |
|
| 8 |
app-office/libreoffice: Drop gconf integration, python2_7 support |
| 9 |
|
| 10 |
gconf: see commit 3cf557c12d27f1b2250e69a543136da098112d80 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.23 |
| 13 |
|
| 14 |
app-office/libreoffice/libreoffice-9999.ebuild | 18 ++++++------------ |
| 15 |
1 file changed, 6 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 18 |
index 7528c3c..ede2028 100644 |
| 19 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 20 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 21 |
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4" |
| 22 |
KDE_SCM="git" |
| 23 |
CMAKE_REQUIRED="never" |
| 24 |
|
| 25 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
| 26 |
+PYTHON_COMPAT=( python{3_4,3_5} ) |
| 27 |
PYTHON_REQ_USE="threads,xml" |
| 28 |
|
| 29 |
# experimental ; release ; old |
| 30 |
@@ -161,7 +161,7 @@ COMMON_DEPEND=" |
| 31 |
eds? ( gnome-extra/evolution-data-server ) |
| 32 |
firebird? ( >=dev-db/firebird-2.5 ) |
| 33 |
gltf? ( media-libs/libgltf ) |
| 34 |
- gnome? ( gnome-base/gconf:2 ) |
| 35 |
+ gnome? ( dev-libs/glib:2 ) |
| 36 |
gtk? ( |
| 37 |
x11-libs/gdk-pixbuf[X] |
| 38 |
>=x11-libs/gtk+-2.24:2 |
| 39 |
@@ -180,11 +180,7 @@ COMMON_DEPEND=" |
| 40 |
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) |
| 41 |
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) |
| 42 |
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) |
| 43 |
- telepathy? ( |
| 44 |
- dev-libs/glib:2 |
| 45 |
- >=net-libs/telepathy-glib-0.18.0 |
| 46 |
- >=x11-libs/gtk+-2.24:2 |
| 47 |
- ) |
| 48 |
+ telepathy? ( >=net-libs/telepathy-glib-0.18.0 ) |
| 49 |
" |
| 50 |
|
| 51 |
RDEPEND="${COMMON_DEPEND} |
| 52 |
@@ -249,9 +245,9 @@ REQUIRED_USE=" |
| 53 |
${PYTHON_REQUIRED_USE} |
| 54 |
bluetooth? ( dbus ) |
| 55 |
collada? ( gltf ) |
| 56 |
- gnome? ( gtk ) |
| 57 |
eds? ( gnome ) |
| 58 |
- telepathy? ( gtk ) |
| 59 |
+ gnome? ( gtk ) |
| 60 |
+ telepathy? ( gnome ) |
| 61 |
libreoffice_extensions_nlpsolver? ( java ) |
| 62 |
libreoffice_extensions_scripting-beanshell? ( java ) |
| 63 |
libreoffice_extensions_scripting-javascript? ( java ) |
| 64 |
@@ -374,7 +370,7 @@ src_configure() { |
| 65 |
|
| 66 |
# optimization flags |
| 67 |
export GMAKE_OPTIONS="${MAKEOPTS}" |
| 68 |
- # System python 2.7 enablement: |
| 69 |
+ # System python enablement: |
| 70 |
export PYTHON_CFLAGS=$(python_get_CFLAGS) |
| 71 |
export PYTHON_LIBS=$(python_get_LIBS) |
| 72 |
|
| 73 |
@@ -481,9 +477,7 @@ src_configure() { |
| 74 |
$(use_enable eds evolution2) \ |
| 75 |
$(use_enable firebird firebird-sdbc) \ |
| 76 |
$(use_enable gltf) \ |
| 77 |
- $(use_enable gnome gconf) \ |
| 78 |
$(use_enable gnome gio) \ |
| 79 |
- $(use_enable gnome lockdown) \ |
| 80 |
$(use_enable gstreamer gstreamer-1-0) \ |
| 81 |
$(use_enable gtk) \ |
| 82 |
$(use_enable gtk3) \ |
Archives