From 4e14521c09a396a9af32d303fc9fe342fb82eb74 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sun, 12 Jun 2016 21:00:24 +0200
Subject: [PATCH] app-office/libreoffice: Old crashdump option removed in
 master

Package-Manager: portage-2.2.28
---
 app-office/libreoffice/libreoffice-5.2.9999.ebuild |  8 ++++----
 app-office/libreoffice/libreoffice-9999.ebuild     | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 9b090c026610..09797cc333a5 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -406,10 +406,10 @@ src_configure() {
 	#   not linked or anything else, worthless to depend on
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-dicts \
 		--with-system-headers \
-		--with-system-libs \
 		--with-system-jars \
-		--with-system-dicts \
+		--with-system-libs \
 		--enable-cairo-canvas \
 		--enable-graphite \
 		--enable-largefile \
@@ -418,15 +418,15 @@ src_configure() {
 		--enable-python=system \
 		--enable-randr \
 		--enable-release-build \
-		--disable-hardlink-deliver \
 		--disable-ccache \
 		--disable-crashdump \
 		--disable-dependency-tracking \
 		--disable-epm \
 		--disable-fetch-external \
 		--disable-gstreamer-0-10 \
-		--disable-report-builder \
+		--disable-hardlink-deliver \
 		--disable-online-update \
+		--disable-report-builder \
 		--disable-systray \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
 		--with-build-version="Gentoo official package" \
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9b090c026610..a1000beb78c4 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -392,6 +392,7 @@ src_configure() {
 	fi
 
 	# system headers/libs/...: enforce using system packages
+	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
 	# --enable-cairo: ensure that cairo is always required
 	# --enable-graphite: disabling causes build breakages
 	# --enable-*-link: link to the library rather than just dlopen on runtime
@@ -406,10 +407,10 @@ src_configure() {
 	#   not linked or anything else, worthless to depend on
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+		--with-system-dicts \
 		--with-system-headers \
-		--with-system-libs \
 		--with-system-jars \
-		--with-system-dicts \
+		--with-system-libs \
 		--enable-cairo-canvas \
 		--enable-graphite \
 		--enable-largefile \
@@ -418,15 +419,15 @@ src_configure() {
 		--enable-python=system \
 		--enable-randr \
 		--enable-release-build \
-		--disable-hardlink-deliver \
+		--disable-breakpad \
 		--disable-ccache \
-		--disable-crashdump \
 		--disable-dependency-tracking \
 		--disable-epm \
 		--disable-fetch-external \
 		--disable-gstreamer-0-10 \
-		--disable-report-builder \
+		--disable-hardlink-deliver \
 		--disable-online-update \
+		--disable-report-builder \
 		--disable-systray \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
 		--with-build-version="Gentoo official package" \
-- 
2.26.2