Bump to second release candidate for OOo 2.4.1

Package-Manager: portage-2.1.5.3

5 files changed, 32 insertions, 24 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 770b7534aecd..a01939ae615c 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.399 2008/05/29 12:24:40 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.400 2008/06/01 19:14:34 suka Exp $
+
+*openoffice-2.4.1_rc2 (01 Jun 2008)
+
+  01 Jun 2008; Andreas Proschofsky <suka@gentoo.org>
+  -files/2.4.1_rc1/gentoo-2.4.1_rc1.diff, +files/gentoo-2.4.1_rc2.diff,
+  -files/2.4.1_rc1/ooo-env_log.diff, +files/ooo-env_log.diff,
+  -openoffice-2.4.1_rc1.ebuild, +openoffice-2.4.1_rc2.ebuild:
+  Bump to second release candidate for OOo 2.4.1
 
   29 May 2008; Andreas Proschofsky <suka@gentoo.org>
   openoffice-2.4.0.ebuild, openoffice-2.4.1_rc1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 3965b6c53aae..447bf22bf74a 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,26 +1,26 @@
 AUX 2.4.0/gentoo-2.4.0.diff 572 RMD160 1107e41d7b19b1a71e501b4dfa6f8f204517ecdc SHA1 f68cb994ee45080f24c0c97b695cc1fb87e58157 SHA256 bbf60d7d89c3347d0aa10dfa9c9aa899c1ef8a97111584cf7ec3b8d1db30a9f7
 AUX 2.4.0/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
-AUX 2.4.1_rc1/gentoo-2.4.1_rc1.diff 894 RMD160 7dfa03b31f572e04ae0a5d28dbb50d23f87ca2f4 SHA1 3d6ecd6564f9980a904328d3a5f34e5cbf7f2b4b SHA256 4b05dcf64461a77a0b6ca49b9da39739309f96bf2ac8e75d799c046297363f9b
-AUX 2.4.1_rc1/ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
+AUX gentoo-2.4.1_rc2.diff 894 RMD160 bb907d97fecfa50a1ad48049ecbad68580bab27e SHA1 378242bb1a2253124da5ecba9b47290b8ec4533b SHA256 b78223be69222bb34dae9b041702085c10db693062f21609fb3cfb305778d68d
+AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 DIST OOo_2.4.0_src_binfilter.tar.bz2 6675120 RMD160 fff7a0a61b19881559e4f20ddd36031565f635e1 SHA1 6196fd2d2b5b37635d9a08a36f5476d57b14e0d8 SHA256 e9ca5f5a744dc39a6785bc54964119c4e7eafa2035c4c2151138749e5e1cc723
 DIST OOo_2.4.0_src_core.tar.bz2 153590855 RMD160 f8be874225a4f8a90bf20d563db175f3381e224e SHA1 1f775a0f2b755ad1c4cb7d14df93d86948424e7f SHA256 77c923ff93fb122ea9fefea21a578f5be825bae7f7e7ab3a88ff9fee87047921
 DIST OOo_2.4.0_src_l10n.tar.bz2 81193819 RMD160 a52ed9e7a7511ad12cf6cef98e64a3ef384dd383 SHA1 3ef13fbaa6c41ab920ba9a9f4494f6c4f805c28e SHA256 9aae5acd77e21a6a342e9577136b336d903a883b6707684498fc1863c061ced2
 DIST OOo_2.4.0_src_sdk.tar.bz2 38429 RMD160 a7be6d25e51c240ade4e6c6045cfa2ee737f9fd1 SHA1 74c6a92ddb6694850aaae10fa0e7c485e8083a7e SHA256 117b8a2d0ad4e31745f35e0695fa26e39fcc04b07c42f75ddf3715b40958f368
-DIST OOo_2.4.1rc1_src_binfilter.tar.bz2 6674638 RMD160 57ab714eef5ce4d73ce4587dc7f4fcc30a72f90e SHA1 facaa01e016f8bed5aed24343c55983d9e5d3dc2 SHA256 27d4811b07f8670cf0595083165956ed589a26af4e94bf4f5a048e913f11c0d1
-DIST OOo_2.4.1rc1_src_core.tar.bz2 153564440 RMD160 bf4842f05b390beaf8bf50ccbd827abf44acc44a SHA1 5a0096330672d891480f5edb9640a88622f76975 SHA256 f2b6ee3e15b7e3daecd913c0c26a046c77afb366ad361c06b139330d59f4f87e
-DIST OOo_2.4.1rc1_src_l10n.tar.bz2 81194155 RMD160 f3b02d5eac91a080ba6f71b14a3e7cd293ed24da SHA1 0d8cdd3f1edc8bc7d483927f7f3b8f8602b4487e SHA256 bd59a6da5d8127403545fa37a3f674c8197848daf0e5b1f8ba7d83bf2e152826
-DIST OOo_2.4.1rc1_src_sdk.tar.bz2 38456 RMD160 c830ba383d0a36349400573ea7758aaa1405d803 SHA1 4cadb22a7532d25eafda48ce7564e1c62bf3c172 SHA256 88cf945f02746154b317055f74a4e3883c5965f392b46e4213227c05156f65ae
+DIST OOo_2.4.1rc2_src_binfilter.tar.bz2 6674779 RMD160 04ffce167f94a250f94f05923a70af0b0744c417 SHA1 a50c7f317643b756c2b0e8937fa9d64b99f05ed9 SHA256 b40403f9adc395846e33f2fc02e0bff133976766988702ef8b13e83448fbd390
+DIST OOo_2.4.1rc2_src_core.tar.bz2 153573457 RMD160 64f43d426005b6c5f464cf55e72df41fe833620b SHA1 170642263c32f614ee7e9439a8af30410e00d318 SHA256 abf576f3d451a981887c2a1985b2b72724af204491da6407a1c6e3b0baa10590
+DIST OOo_2.4.1rc2_src_l10n.tar.bz2 81193580 RMD160 d41f43b27e84ae5a4620b591e46d884e0c94a72c SHA1 b21f4531ea8182d87ff6f5f68809086c1c063295 SHA256 7abf85bdf53730d4461376a3e44721763ded5e076fba1739da8c2a64752fe571
+DIST OOo_2.4.1rc2_src_sdk.tar.bz2 8509 RMD160 d141eea56c95393ef8a37d20d4ab72c011e9e17d SHA1 23e74b861cfbba8a3a3fc7b43d5e9a9725546467 SHA256 3a6d15a0f28a037acd333f87fefef56ca266e6df6d670923712cdeb0df1fcd1f
 DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
 DIST extras-2.tar.bz2 94740 RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd SHA1 2c7fca93c106e23961f4aaa7cdfcaeb97064eed1 SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863
 DIST libwpg-0.1.2.tar.gz 401460 RMD160 9bb39a4b3081277209326c0f553d398c51b4f3bf SHA1 06f4da8fcddaa1987c761f617c41724734e839fa SHA256 1fd363db1debd3f0883b942704809d758f54a3a7d09fc1ddfbd99a1062d4e851
 DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
 DIST lp_solve_5.5.0.10_source.tar.gz 769268 RMD160 17e16c6c9fe9807e148d0b96bd8a3b41953681f6 SHA1 815216ecc4c8cac1cc5905ca3fb5d6168c1deac4 SHA256 171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
 DIST ooo-build-2.4.0.13.tar.gz 8628867 RMD160 804b5bdcef030b585f323d0e07dd6c0ccb019460 SHA1 0400a6743357f0e3f3528501defe65e3a4b0be64 SHA256 07ff66d38c4926bd3a03939667c4766b7436b8fe5ce3e2c1ccb596b412655d2c
-DIST ooo-build-2.4.1.1.tar.gz 8813021 RMD160 ae3c806123a6713694ff5282552260ff036b10e1 SHA1 e11ee940bd123b65c3587b93acf050fa412b81b4 SHA256 81e833f167dd67805560f7d84d5f9f68aec8a31287f90e631528ee269871e2cc
+DIST ooo-build-2.4.1.3.tar.gz 8823412 RMD160 d5e13b9be4938ba445e8ab77d65e2f098748abee SHA1 cbbe298bc1dc44162c2a2794a6d6bbc8d03edf87 SHA256 d7e4ce6b0879ec7033b96a0ad1cf5a0a200bd9ba0c4e1bd3e0f416f5552654a0
 DIST oox.2008-02-29.tar.bz2 454902 RMD160 ff23feb96d9f950e230c419529862de2f748635b SHA1 b8e9136219e2d3d67a2353579a7f2afb2a21d563 SHA256 112ea899a8f8f69cbeeaffa7ec219fc275190c4c8cad2416a5587283dcd89685
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 DIST writerfilter.2008-02-29.tar.bz2 745803 RMD160 5f1642ee32757bf235ab8ada9f88023608dbf0e6 SHA1 398ebd9a18af5ae4a08305443cd4b16036ad1a37 SHA256 be55befd2694a8f5871a96cf7d33919dece8b890a081d7da493c6889db27dd94
 EBUILD openoffice-2.4.0.ebuild 12526 RMD160 80183a9a47575e26c34f84e11acfaff572bb7841 SHA1 573230844c7f8a6b37b7753f96541af4639a3fd2 SHA256 9db8c468920f8bbf40ba98eec1e1b2175c6c150254678ac30b602887dd13b9dc
-EBUILD openoffice-2.4.1_rc1.ebuild 12585 RMD160 28059c76b85fd88feb90d3b2d739a59abbaa13fd SHA1 5e42ad832673e1731e14114d2a24374cb3ef01c9 SHA256 96fd9cf4dc0a673826be66342b8e4609c0756641f87f842cbccf01eb463fe663
-MISC ChangeLog 82997 RMD160 3acfee11dbc730efb701454f46c64f8b6eb7d9ff SHA1 e042c5a7550455a89a83fa14b2e44dc408e0c9a8 SHA256 d04a78cdf44f0e01d6db3a8ab4128774e94eef685937bdf9717d1fb9d4b89305
+EBUILD openoffice-2.4.1_rc2.ebuild 12520 RMD160 b44c2f65f874cc126abe390686247ca5f202832a SHA1 fb5580bb9e18e324e264783d51ae17d82879cffe SHA256 8958fb5bbd30a1e13d06c39835890c44783989fc6803c96d80e2cb96bca17ee0
+MISC ChangeLog 83333 RMD160 f38edcbb9f7116907ee4d5827113c034eda9761f SHA1 bafa9074916c752f0015122e68969b410ac20318 SHA256 9359841e1c6a879e632c2493a1f13c8d44b4b49c260acf74e25eb734871c1ced
 MISC metadata.xml 461 RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 SHA1 dc88aabf10f5ff2f3e4613172ba8f12abe4d0f59 SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291
diff --git a/app-office/openoffice/files/2.4.1_rc1/gentoo-2.4.1_rc1.diff b/app-office/openoffice/files/gentoo-2.4.1_rc2.diff
index ede7f34cdbcc..2f6c8fc22da0 100644
--- a/app-office/openoffice/files/2.4.1_rc1/gentoo-2.4.1_rc1.diff
+++ b/app-office/openoffice/files/gentoo-2.4.1_rc2.diff
@@ -24,9 +24,9 @@
 @@ -1136,7 +1136,7 @@
  elif test "$with_tag" = "OOH680_m12" ; then
     UPSTREAM_VERSION=2.4.0
- elif test "$with_tag" = "OOH680_m16" ; then
+ elif test "$with_tag" = "OOH680_m17" ; then
 -   UPSTREAM_VERSION=2.4.1
-+   UPSTREAM_VERSION=2.4.1rc1
++   UPSTREAM_VERSION=2.4.1rc2
  fi
  if test -n "$UPSTREAM_VERSION"; then
     UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
diff --git a/app-office/openoffice/files/2.4.1_rc1/ooo-env_log.diff b/app-office/openoffice/files/ooo-env_log.diff
index 908169ab6c5a..908169ab6c5a 100644
--- a/app-office/openoffice/files/2.4.1_rc1/ooo-env_log.diff
+++ b/app-office/openoffice/files/ooo-env_log.diff
diff --git a/app-office/openoffice/openoffice-2.4.1_rc1.ebuild b/app-office/openoffice/openoffice-2.4.1_rc2.ebuild
index e9469468137a..73f8ef52b7b9 100644
--- a/app-office/openoffice/openoffice-2.4.1_rc1.ebuild
+++ b/app-office/openoffice/openoffice-2.4.1_rc2.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.1_rc1.ebuild,v 1.3 2008/05/29 12:24:40 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.1_rc2.ebuild,v 1.1 2008/06/01 19:14:34 suka Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
 
 inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib
 
-IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk opengl pam seamonkey webdav xulrunner"
+IUSE="binfilter cups dbus debug eds firefox gnome gstreamer gtk kde ldap mono odk opengl pam seamonkey xulrunner"
 
-MY_PV="2.4.1.1"
-MY_PV2="2.4.1rc1"
+MY_PV="2.4.1.3"
+MY_PV2="2.4.1rc2"
 PATCHLEVEL="OOH680"
 SRC="OOo_${MY_PV2}_src"
-MST="OOH680_m16"
+MST="OOH680_m17"
 S="${WORKDIR}/ooo"
 S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
 CONFFILE="${S}/distro-configs/Gentoo.conf.in"
@@ -82,8 +82,8 @@ COMMON_DEPEND="!app-office/openoffice-bin
 	!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1*
 		>=dev-libs/nspr-4.6.6
 		>=dev-libs/nss-3.11-r1 ) ) )
-	webdav? ( >=net-misc/neon-0.24.7
-		>=dev-libs/openssl-0.9.8g )
+	>=net-misc/neon-0.24.7
+	>=dev-libs/openssl-0.9.8g
 	>=x11-libs/startup-notification-0.5
 	>=media-libs/freetype-2.1.10-r2
 	>=media-libs/fontconfig-2.3.0
@@ -223,8 +223,8 @@ src_unpack() {
 
 	#Some fixes for our patchset
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}/gentoo-${PV}.diff"
-	epatch "${FILESDIR}/${PV}/ooo-env_log.diff"
+	epatch "${FILESDIR}/gentoo-${PV}.diff"
+	epatch "${FILESDIR}/ooo-env_log.diff"
 
 	#Use flag checks
 	if use java ; then
@@ -270,9 +270,9 @@ src_unpack() {
 	echo "`use_enable ldap`" >> ${CONFFILE}
 	echo "`use_enable opengl`" >> ${CONFFILE}
 	echo "`use_with ldap openldap`" >> ${CONFFILE}
-	echo "`use_enable webdav neon`" >> ${CONFFILE}
-	echo "`use_with webdav system-neon`" >> ${CONFFILE}
-	echo "`use_with webdav system-openssl`" >> ${CONFFILE}
+	echo "--enable-neon" >> ${CONFFILE}
+	echo "--with-system-neon" >> ${CONFFILE}
+	echo "--with-system-openssl" >> ${CONFFILE}
 
 	echo "`use_enable debug crashdump`" >> ${CONFFILE}