Bump to second release candidate for OOo 2.4.1

(Portage version: 2.1.5.3)

4 files changed, 23 insertions, 15 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/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}