From f445be01877f4c32d27ee4e9ad9f94805f4d3f94 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Fri, 12 Jan 2007 17:11:48 +0000 Subject: [PATCH] Removing seamonkey-support (doesn't work) for now, should come back with a proper fix Package-Manager: portage-2.1.2_rc4-r8 --- app-office/openoffice/ChangeLog | 7 ++++++- app-office/openoffice/Manifest | 16 ++++++++-------- app-office/openoffice/openoffice-2.1.0.ebuild | 18 +++++------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index eaeb69c18895..875657a6a02c 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,11 @@ # 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.289 2007/01/12 14:41:03 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.290 2007/01/12 17:11:48 suka Exp $ + + 12 Jan 2007; Andreas Proschofsky + openoffice-2.1.0.ebuild: + Removing seamonkey-support (doesn't work) for now, should come back with a + proper fix 12 Jan 2007; Andreas Proschofsky files/2.1.0/disable_cxxhelplinker.diff: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 725e7595d5f3..3724dd02b3bd 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -42,14 +42,14 @@ EBUILD openoffice-2.0.4.ebuild 9998 RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5 MD5 7387216086e33c7907d1450fe64bb965 openoffice-2.0.4.ebuild 9998 RMD160 ad4132d73c383ccbfdfdc4d0b89a9d87eeda5c9c openoffice-2.0.4.ebuild 9998 SHA256 64895490bbc4c12cf6f552ffb37d847c79f37e8563fa8a115b50c1865a2bdc10 openoffice-2.0.4.ebuild 9998 -EBUILD openoffice-2.1.0.ebuild 11258 RMD160 3ca6bef79c66480fb7be2972ba06b7575ea0eeeb SHA1 c40fd41005ff111a4c8c0473daf55fdcd6ed19d7 SHA256 44253486a8a47aa07303c2eeaa6631b5ab9567f6d4b6e73dfc61e3e25a9c81b8 -MD5 7e2189c60308014930487ee77403e251 openoffice-2.1.0.ebuild 11258 -RMD160 3ca6bef79c66480fb7be2972ba06b7575ea0eeeb openoffice-2.1.0.ebuild 11258 -SHA256 44253486a8a47aa07303c2eeaa6631b5ab9567f6d4b6e73dfc61e3e25a9c81b8 openoffice-2.1.0.ebuild 11258 -MISC ChangeLog 60400 RMD160 dfa41da652e990c36ae08acc13bb33f3c5fb2d8e SHA1 0d7fc6df864264cc2b23ae3b55bd6339c369a578 SHA256 ca6b731eb458c5cddf4c7db5c96e393792a49bbac34d09b9a67d607a960bd813 -MD5 5b9e05620de50df5553ca740a6f56467 ChangeLog 60400 -RMD160 dfa41da652e990c36ae08acc13bb33f3c5fb2d8e ChangeLog 60400 -SHA256 ca6b731eb458c5cddf4c7db5c96e393792a49bbac34d09b9a67d607a960bd813 ChangeLog 60400 +EBUILD openoffice-2.1.0.ebuild 11028 RMD160 cb872a110326f5c96eb30d900de03804b21f24fe SHA1 229825a0133ef7d1343aa53889455e4e80a780c5 SHA256 91b5f28cdc820e025f214055835009d594e1a0f019f289d3b88aa0b73df1799c +MD5 51555b18d648950047758224c14ee042 openoffice-2.1.0.ebuild 11028 +RMD160 cb872a110326f5c96eb30d900de03804b21f24fe openoffice-2.1.0.ebuild 11028 +SHA256 91b5f28cdc820e025f214055835009d594e1a0f019f289d3b88aa0b73df1799c openoffice-2.1.0.ebuild 11028 +MISC ChangeLog 60571 RMD160 b8fe9aa31caec2daeaaeb585a4d02be5aaf06122 SHA1 47dc0f98db4a6c0697bd45f907eb8fa7a8512458 SHA256 2748ca16729686ebe53d3a54ea278a491c41a990a75bb643598a80acea588238 +MD5 282c423ce042f461ff645f28cbb54104 ChangeLog 60571 +RMD160 b8fe9aa31caec2daeaaeb585a4d02be5aaf06122 ChangeLog 60571 +SHA256 2748ca16729686ebe53d3a54ea278a491c41a990a75bb643598a80acea588238 ChangeLog 60571 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/openoffice-2.1.0.ebuild b/app-office/openoffice/openoffice-2.1.0.ebuild index 1490e24fc670..5a9a5d8da83c 100644 --- 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.2 2007/01/12 12:06:57 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.1.0.ebuild,v 1.3 2007/01/12 17:11:48 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 seamonkey webdav" +IUSE="binfilter branding cairo cups dbus debug eds firefox gnome gstreamer gtk kde ldap sound odk pam webdav" MY_PV="2.1" PATCHLEVEL="OOE680" @@ -71,9 +71,6 @@ 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 ) @@ -219,14 +216,9 @@ src_unpack() { echo "`use_enable binfilter`" >> ${CONFFILE} - if use firefox || use seamonkey ; then - echo "--enable-mozilla" >> ${CONFFILE} - echo "--with-system-mozilla" >> ${CONFFILE} - echo "`use_with firefox`" >> ${CONFFILE} - else - echo "--disable-mozilla" >> ${CONFFILE} - echo "--without-system-mozilla" >> ${CONFFILE} - fi + echo "`use_enable firefox mozilla`" >> ${CONFFILE} + echo "`use_with firefox system-mozilla`" >> ${CONFFILE} + echo "`use_with firefox`" >> ${CONFFILE} echo "`use_enable cups`" >> ${CONFFILE} echo "`use_enable ldap`" >> ${CONFFILE} -- 2.26.2