Disable quickstarter feature as it is broken yet again. Wrt bug#408685. If anyone wants this feature contact upstream about rewritting it properly.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

4 files changed, 14 insertions, 23 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index f99348da1ada..60259956dae2 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.278 2012/04/03 16:07:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.279 2012/04/06 10:57:26 scarabeus Exp $
+
+  06 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.2.2.ebuild,
+  libreoffice-3.5.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Disable quickstarter feature as it is broken yet again. Wrt bug#408685. If
+  anyone wants this feature contact upstream about rewritting it properly.
 
   03 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/libreoffice-3.5.2-icu-49-part2.patch,
diff --git a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild
index 8f7ae560dda5..4a5e8791a8d2 100644
--- a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.9 2012/04/03 13:35:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.10 2012/04/06 10:57:26 scarabeus Exp $
 
 EAPI=4
 
@@ -246,11 +246,6 @@ pkg_setup() {
 		CHECKREQS_DISK_BUILD="6G"
 		check-reqs_pkg_pretend
 	fi
-	if ! use gtk; then
-		ewarn "If you want the LibreOffice systray quickstarter to work"
-		ewarn "activate the 'gtk' use flag."
-		ewarn
-	fi
 }
 
 src_unpack() {
@@ -415,6 +410,7 @@ src_configure() {
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
+		--disable-systray \
 		--disable-static-gtk \
 		--disable-strip-solver \
 		--disable-ugly \
@@ -450,7 +446,6 @@ src_configure() {
 		$(use_enable gstreamer) \
 		$(use_enable gtk) \
 		--disable-gtk3 \
-		$(use_enable gtk systray) \
 		$(use_enable java ext-scripting-beanshell) \
 		$(use_enable kde kde4) \
 		$(use_enable mysql ext-mysql-connector) \
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index a543f07ad650..59e882383c61 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.35 2012/04/03 12:53:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.36 2012/04/06 10:57:26 scarabeus Exp $
 
 EAPI=4
 
@@ -243,11 +243,6 @@ pkg_setup() {
 		CHECKREQS_DISK_BUILD="6G"
 		check-reqs_pkg_pretend
 	fi
-	if ! use gtk; then
-		ewarn "If you want the LibreOffice systray quickstarter to work"
-		ewarn "activate the 'gtk' use flag."
-		ewarn
-	fi
 }
 
 src_unpack() {
@@ -412,6 +407,7 @@ src_configure() {
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
+		--disable-systray \
 		--disable-static-gtk \
 		--disable-strip-solver \
 		--disable-ugly \
@@ -447,7 +443,6 @@ src_configure() {
 		$(use_enable gstreamer) \
 		$(use_enable gtk) \
 		--disable-gtk3 \
-		$(use_enable gtk systray) \
 		$(use_enable java ext-scripting-beanshell) \
 		$(use_enable kde kde4) \
 		$(use_enable mysql ext-mysql-connector) \
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index dd3440a03e5c..158694d500e4 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.44 2012/04/02 07:39:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.45 2012/04/06 10:57:26 scarabeus Exp $
 
 EAPI=4
 
@@ -244,12 +244,6 @@ pkg_setup() {
 	python_pkg_setup
 
 	[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_pretend
-
-	if ! use gtk; then
-		ewarn "If you want the LibreOffice systray quickstarter to work"
-		ewarn "activate the 'gtk' use flag."
-		ewarn
-	fi
 }
 
 src_unpack() {
@@ -376,6 +370,8 @@ src_configure() {
 	#   affecting the nsplugin that is always ON
 	# --disable-pch: precompiled headers cause build crashes
 	# --disable-rpath: relative runtime path is not desired
+	# --disable-systray: quickstarter does not actually work at all so do not
+	#   promote it
 	# --disable-zenity: disable build icon
 	# --enable-extension-integration: enable any extension integration support
 	# --with-{max-jobs,num-cpus}: ensuring parallel building
@@ -410,6 +406,7 @@ src_configure() {
 		--disable-online-update \
 		--disable-pch \
 		--disable-rpath \
+		--disable-systray \
 		--disable-strip-solver \
 		--disable-zenity \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
@@ -443,7 +440,6 @@ src_configure() {
 		$(use_enable gstreamer) \
 		$(use_enable gtk) \
 		$(use_enable gtk3) \
-		$(use_enable gtk systray) \
 		$(use_enable java ext-scripting-beanshell) \
 		$(use_enable kde kde4) \
 		$(use_enable mysql ext-mysql-connector) \