Add gtk use-flag for all the people wanting gtk-style but not all the other gnome...

Package-Manager: portage-2.0.53_rc6

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index c27184c44510fce688fa06cb55ab5671a818099f..99d9d245e865bcb8c25955746eb05e65d1418c32 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.139 2005/10/21 21:27:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.140 2005/10/22 18:55:11 suka Exp $
+
+  22 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-2.0.0.ebuild:
+  Add gtk use-flag for all the people wanting gtk-style (and the industrial
+  icons) but not all the other gnome-stuff (gnome-vfs, lockdown). If using the
+  gnome use-flag the gtk use-flag setting is overridden. Closes bug #110155
 
   21 Oct 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.0.0.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 483f33281abb7d8b01132eb4d7db3deef406d5da..552873feabbb4a46fbc19f7d42d586a643101f5e 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 eb0d277e4164b68963b56ee3f8401246 ChangeLog 30542
+MD5 05554956771766941de625657670178b ChangeLog 30854
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
@@ -37,4 +37,4 @@ MD5 c45a70a1b4109bc275d7e55083b85d44 files/digest-openoffice-2.0.0 476
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
-MD5 d7a9850b36561d3078c5dab7143db42c openoffice-2.0.0.ebuild 6743
+MD5 5b7d6605d3a41fbc9fc9c4c24bfea988 openoffice-2.0.0.ebuild 6883

diff --git a/app-office/openoffice/openoffice-2.0.0.ebuild b/app-office/openoffice/openoffice-2.0.0.ebuild
index 4a68e5dc1abef2c7decf7a71cf33395e4a284453..a3f8582bbac775b0210ce376da27ed1bc44b83d3 100644 (file)
--- a/app-office/openoffice/openoffice-2.0.0.ebuild
+++ b/app-office/openoffice/openoffice-2.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.3 2005/10/21 21:27:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0.ebuild,v 1.4 2005/10/22 18:55:11 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
-IUSE="curl eds gnome java kde ldap mozilla nas zlib xml2"
+IUSE="curl eds gnome gtk java kde ldap mozilla nas zlib xml2"
 
 PATCHLEVEL="OOO680"
 PATCHDIR="${WORKDIR}/ooo-build-${PV}"
@@ -36,6 +36,7 @@ RDEPEND="!app-office/openoffice-bin
        gnome? ( >=x11-libs/gtk+-2.4
                >=gnome-base/gnome-vfs-2.6
                >=gnome-base/gconf-2.0 )
+       gtk? ( >=x11-libs/gtk+-2.4 )
        eds? ( >=gnome-extra/evolution-data-server-1.2 )
        kde? ( kde-base/kdelibs )
        mozilla? ( >=www-client/mozilla-1.7.10 )
@@ -150,6 +151,9 @@ src_compile() {
                export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` && [ ${JOBS} -gt 10 ] && export JOBS="10"
        fi
 
+       # Make sure gnome-users get gtk-support
+       export GTKFLAG="`use_enable gtk`" && use gnome && GTKFLAG="--enable-gtk"
+
        cd ${PATCHDIR}
        autoconf || die
        ./configure ${MYCONF} \
@@ -161,7 +165,7 @@ src_compile() {
                --with-num-cpus="${JOBS}" \
                --with-binsuffix="2" \
                --with-installed-ooo-dirname="openoffice" \
-               `use_enable gnome gtk` \
+               "${GTKFLAG}" \
                `use_enable kde` \
                --disable-access \
                --disable-mono \