summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-03-13 12:19:44 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-03-13 12:19:44 +0000
commiteeb86033abf275e8e6700e080ed0bb61d9742763 (patch)
tree76f4922722ddbb343d476aa251e115575272da34 /app-office/libreoffice
parentapp-office/texmaker: DRop old (diff)
downloadgentoo-2-eeb86033abf275e8e6700e080ed0bb61d9742763.tar.gz
gentoo-2-eeb86033abf275e8e6700e080ed0bb61d9742763.tar.bz2
gentoo-2-eeb86033abf275e8e6700e080ed0bb61d9742763.zip
Rename mysql connector to mariadb per upstream and do not define python var as it is not needed.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild5
2 files changed, 7 insertions, 4 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index f5841d5b890b..81b8b6609061 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.448 2013/03/13 10:08:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.449 2013/03/13 12:19:44 scarabeus Exp $
+
+ 13 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+ Rename mysql connector to mariadb per upstream and do not define python var as
+ it is not needed.
13 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
Add dependency over libmwaw.
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index a2745b47fc5a..de2fa3b89eba 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.163 2013/03/13 10:08:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.164 2013/03/13 12:19:44 scarabeus Exp $
EAPI=5
@@ -408,7 +408,6 @@ src_configure() {
fi
# System python 2.7 enablement:
- export PYTHON="${PYTHON}"
export PYTHON_CFLAGS=`pkg-config --cflags ${EPYTHON}`
export PYTHON_LIBS=`pkg-config --libs ${EPYTHON}`
@@ -487,7 +486,7 @@ src_configure() {
$(use_enable gtk) \
$(use_enable gtk3) \
$(use_enable kde kde4) \
- $(use_enable mysql ext-mysql-connector) \
+ $(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable opengl) \
$(use_enable postgres postgresql-sdbc) \