Readd seamonkey-support

Package-Manager: portage-2.1.2_rc4-r9

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 8af13e63dcd2ad29da495f1fb9247817bb6f72c9..6ab9b22848b07073bf4619e51502cec263f3ddb2 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.296 2007/01/14 12:52:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.297 2007/01/14 16:31:41 suka Exp $
+
+  14 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
+  files/2.1.0/gentoo-2.1.0.diff, +files/2.1.0/config_with-seamonkey.diff,
+  openoffice-2.1.0.ebuild:
+  Readd seamonkey-support, thanks to Hanno Meyer-Thurow <h.mth@web.de> for
+  fixing this
 
   14 Jan 2007; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.1.0.ebuild:

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 954ed81a9a6c164990b5ebd7b9f347baf42b996c..8c332b23dbea1ba5ad7d36838541ad17dbc87393 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -14,14 +14,18 @@ AUX 2.0.4/regcompapply.diff 319 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752
 MD5 cb8c7bad3c931b6b7990cffd484a4cae files/2.0.4/regcompapply.diff 319
 RMD160 c46130cf0c466dc7c4b82f7235b0009b39476752 files/2.0.4/regcompapply.diff 319
 SHA256 6886083c9de0493f0b3a68b8d1f329ed3927360d989ff1d15916f12c7842cadd files/2.0.4/regcompapply.diff 319
+AUX 2.1.0/config_with-seamonkey.diff 1055 RMD160 faa7d8f8213a2ab547698d6c67791669b10d03d1 SHA1 f0d90029714746b86ef3e23b638cb92984eae994 SHA256 44239e248d3b9c654a263ec50127252ea6b4f3589ae8675f2a1ac83fa87fb48e
+MD5 1b5cbbd6cbf4231e8df1ec3aed9c2213 files/2.1.0/config_with-seamonkey.diff 1055
+RMD160 faa7d8f8213a2ab547698d6c67791669b10d03d1 files/2.1.0/config_with-seamonkey.diff 1055
+SHA256 44239e248d3b9c654a263ec50127252ea6b4f3589ae8675f2a1ac83fa87fb48e files/2.1.0/config_with-seamonkey.diff 1055
 AUX 2.1.0/disable_cxxhelplinker.diff 552 RMD160 0e1bab8bf25da2ef5ed89b792fce1cddbad870ad SHA1 b879b5f1537ee221cf75fe24315d9ff5dd2ea990 SHA256 e90cc8cf380296f69bc517b461926d8d8f4a44867085a16744ab482314f14a0b
 MD5 15e8fd7a42092e321e2a01903014d050 files/2.1.0/disable_cxxhelplinker.diff 552
 RMD160 0e1bab8bf25da2ef5ed89b792fce1cddbad870ad files/2.1.0/disable_cxxhelplinker.diff 552
 SHA256 e90cc8cf380296f69bc517b461926d8d8f4a44867085a16744ab482314f14a0b files/2.1.0/disable_cxxhelplinker.diff 552
-AUX 2.1.0/gentoo-2.1.0.diff 182 RMD160 2cf5750a040b0711f4cef05882a1d403d41927af SHA1 92b1de167a32a5b9f71f124eec75917c46c0ebb9 SHA256 c441bb2a3e291ca19bd839b6f544151195779f38df4a3cf3a8f92f337057f7ee
-MD5 0f5ab709306b362f1787d578510b0838 files/2.1.0/gentoo-2.1.0.diff 182
-RMD160 2cf5750a040b0711f4cef05882a1d403d41927af files/2.1.0/gentoo-2.1.0.diff 182
-SHA256 c441bb2a3e291ca19bd839b6f544151195779f38df4a3cf3a8f92f337057f7ee files/2.1.0/gentoo-2.1.0.diff 182
+AUX 2.1.0/gentoo-2.1.0.diff 539 RMD160 892e94a33bd0c67709a40027509965bb4805d093 SHA1 eec6ec1a5b38e4529be7dde88cf68bdb29892b0d SHA256 b7a7c11fccd04b88af8d4a161358829f5667499a783a784bdb376f2c280f11f4
+MD5 30b46fd232dc210a15a31bf9735be002 files/2.1.0/gentoo-2.1.0.diff 539
+RMD160 892e94a33bd0c67709a40027509965bb4805d093 files/2.1.0/gentoo-2.1.0.diff 539
+SHA256 b7a7c11fccd04b88af8d4a161358829f5667499a783a784bdb376f2c280f11f4 files/2.1.0/gentoo-2.1.0.diff 539
 AUX 2.1.0/ooo-wrapper.in 2650 RMD160 081f34f44be85f13224b59c7199fa27265563760 SHA1 77654213fbc2f1ef20e2a76b4bc87230865036c8 SHA256 ec974e0323c7cf89bea75f56ccc6db2fd90b2be45e676851ea62d7130defcdce
 MD5 3998f6afdb1e322b138d3d1c65449866 files/2.1.0/ooo-wrapper.in 2650
 RMD160 081f34f44be85f13224b59c7199fa27265563760 files/2.1.0/ooo-wrapper.in 2650
@@ -50,14 +54,14 @@ EBUILD openoffice-2.0.4.ebuild 9992 RMD160 c22b6f7169f61187731cd215ad8013875cd9d
 MD5 ae7ccc1a160003a2f290036b79af9076 openoffice-2.0.4.ebuild 9992
 RMD160 c22b6f7169f61187731cd215ad8013875cd9d939 openoffice-2.0.4.ebuild 9992
 SHA256 20aacdfc804f5458abc42d521b07068485ba648481266cc8eceb892ad19d869a openoffice-2.0.4.ebuild 9992
-EBUILD openoffice-2.1.0.ebuild 11180 RMD160 8c2fb4e65fbea38cb26fa93eec93f76f590507b8 SHA1 7c605c4b0d585b9ac8c99fc2de17adc9ddcd7b3f SHA256 de65d4457f1795d4e5744fdbcde2a9edad6b5fd7a72b773f131f58efeb890c4b
-MD5 949286c9ba977614e41a8777b4a34465 openoffice-2.1.0.ebuild 11180
-RMD160 8c2fb4e65fbea38cb26fa93eec93f76f590507b8 openoffice-2.1.0.ebuild 11180
-SHA256 de65d4457f1795d4e5744fdbcde2a9edad6b5fd7a72b773f131f58efeb890c4b openoffice-2.1.0.ebuild 11180
-MISC ChangeLog 61767 RMD160 cab953a658ba2f58d5e19ecd43df7b097db94512 SHA1 e2bff03dc252b3a825d1db7347cce7520f610675 SHA256 abd8e9bc0da1e7dd6fbe743d915534db2af9aa27f37b7a481e9f4e40a534fdf4
-MD5 244cec5b25d1d661e21924796deb38b0 ChangeLog 61767
-RMD160 cab953a658ba2f58d5e19ecd43df7b097db94512 ChangeLog 61767
-SHA256 abd8e9bc0da1e7dd6fbe743d915534db2af9aa27f37b7a481e9f4e40a534fdf4 ChangeLog 61767
+EBUILD openoffice-2.1.0.ebuild 11535 RMD160 2ba48e6a8eeda222f18c202480fb460922d345df SHA1 81b790bc4eb60dc07b84e626c60ed884c9834bab SHA256 f17150f2d555ab37cbab8ae0ffe825ecaeee7e5afaee8abe071de9cdf2a4be53
+MD5 5f4d4205a8d2905e696627029430c55a openoffice-2.1.0.ebuild 11535
+RMD160 2ba48e6a8eeda222f18c202480fb460922d345df openoffice-2.1.0.ebuild 11535
+SHA256 f17150f2d555ab37cbab8ae0ffe825ecaeee7e5afaee8abe071de9cdf2a4be53 openoffice-2.1.0.ebuild 11535
+MISC ChangeLog 62011 RMD160 e11a30bd57845337c709558d83fcb7d456ec5bc9 SHA1 df9dd05c2b03b52590e632fab05e4c1df93b6b46 SHA256 26ebb6e9d8924f8385f03e20507b5499c3e4ddf66f36026774ca0d0e867bbbf6
+MD5 72fa1bd5caa903a26ea3a27c061371b4 ChangeLog 62011
+RMD160 e11a30bd57845337c709558d83fcb7d456ec5bc9 ChangeLog 62011
+SHA256 26ebb6e9d8924f8385f03e20507b5499c3e4ddf66f36026774ca0d0e867bbbf6 ChangeLog 62011
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461

diff --git a/app-office/openoffice/files/2.1.0/config_with-seamonkey.diff b/app-office/openoffice/files/2.1.0/config_with-seamonkey.diff
new file mode 100644 (file)
index 0000000..423e49e
--- /dev/null
+++ b/app-office/openoffice/files/2.1.0/config_with-seamonkey.diff
@@ -0,0 +1,22 @@
+--- config_office/configure.in.orig    2007-01-13 14:18:26.000000000 +0100
++++ config_office/configure.in 2007-01-13 14:20:11.000000000 +0100
+@@ -58,6 +58,10 @@
+ [  --with-firefox          Use Firefox instead of Mozilla Suite for building.
+                           Only honoured with --with-system-mozilla
+ ],,)
++AC_ARG_WITH(seamonkey,
++[  --with-seamonkey        Use Seamonkey instead of Mozilla Suite for building.
++                          Only honoured with --with-system-mozilla
++],,)
+ AC_ARG_WITH(xulrunner,
+ [  --with-xulrunner        Use XULRunner instead of Mozilla Suite for building.
+                           Only honoured with --with-system-mozilla
+@@ -3714,6 +3718,8 @@
+     AC_MSG_CHECKING([which Mozilla flavour to use])
+     if test -n "$with_firefox" && test "$with_firefox" != "no"; then
+       MOZ_FLAVOUR=firefox
++    elif test -n "$with_seamonkey" && test "$with_seamonkey" != "no"; then
++      MOZ_FLAVOUR=seamonkey
+     elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then
+       MOZ_FLAVOUR=xulrunner
+     else

diff --git a/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff b/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
index 85f600e317800358a289618c35e51f53a883c64a..d4f624b7c7ab9c4ed655134e0f3b98dda736f170 100644 (file)
--- a/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
+++ b/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
@@ -8,4 +8,14 @@
  EOT
      chmod 755 $1
  }
-
+--- patches/src680/apply 
++++ patches/src680/apply 
+@@ -812,6 +816,8 @@
+ # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken, n#195272
+ libxmlsec-system-nss.diff, i#69368, pmladek
+ 
++# add --with-seamonkey configure flag to link with seamonkey-*.pc
++config_with-seamonkey.diff, i#73440, hmth
+ 
+ [ MandrivaOnly ]
+ SectionOwner => gghibo

diff --git a/app-office/openoffice/openoffice-2.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild
index a7f00236f40a0bac75a77ae305fa409cfde8f0bf..8824c6e8979cb46bdbf386aa34debe878d3bda3e 100644 (file)
--- a/app-office/openoffice/openoffice-2.1.0.ebuild
+++ b/app-office/openoffice/openoffice-2.1.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.9 2007/01/14 12:52:55 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.10 2007/01/14 16:31:41 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
 
 inherit check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions multilib toolchain-funcs
 
-IUSE="binfilter branding cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap sound odk pam webdav"
+IUSE="binfilter branding cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap sound odk pam seamonkey webdav"
 
 MY_PV="2.1"
 PATCHLEVEL="OOE680"
@@ -71,6 +71,9 @@ COMMON_DEPEND="!app-office/openoffice-bin
        firefox? ( >=www-client/mozilla-firefox-1.5-r9
                >=dev-libs/nspr-4.6.2
                >=dev-libs/nss-3.11-r1 )
+       !firefox? ( seamonkey? ( www-client/seamonkey
+               >=dev-libs/nspr-4.6.2
+               >=dev-libs/nss-3.11-r1 ) )
        sound? ( >=media-libs/portaudio-18.1-r5
                        >=media-libs/libsndfile-1.0.9 )
        webdav? ( >=net-misc/neon-0.24.7 )
@@ -197,6 +200,7 @@ src_unpack() {
        epatch ${FILESDIR}/${PV}/wrapper-readd.diff
        use !java && epatch ${FILESDIR}/${PV}/disable_cxxhelplinker.diff
        cp -f ${FILESDIR}/${PV}/ooo-wrapper.in ${S}/bin || die
+       cp -f ${FILESDIR}/${PV}/config_with-seamonkey.diff ${S}/patches/src680 || die
 
        #Use flag checks
        if use java ; then
@@ -218,9 +222,15 @@ src_unpack() {
 
        echo "`use_enable binfilter`" >> ${CONFFILE}
 
-       echo "`use_enable firefox mozilla`" >> ${CONFFILE}
-       echo "`use_with firefox system-mozilla`" >> ${CONFFILE}
-       echo "`use_with firefox`" >> ${CONFFILE}
+       if use firefox || use seamonkey ; then
+               echo "--enable-mozilla" >> ${CONFFILE}
+               echo "--with-system-mozilla" >> ${CONFFILE}
+               echo "`use_with firefox`" >> ${CONFFILE}
+               echo "`use_with seamonkey`" >> ${CONFFILE}
+       else
+               echo "--disable-mozilla" >> ${CONFFILE}
+               echo "--without-system-mozilla" >> ${CONFFILE}
+       fi
 
        echo "`use_enable cups`" >> ${CONFFILE}
        echo "`use_enable ldap`" >> ${CONFFILE}