Bump to LibreOffice 3.3.2, also fix db-5 support

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

5 files changed, 46 insertions, 12 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 8037a6b6062e..16db94422d1d 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.24 2011/03/18 22:39:38 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.25 2011/03/22 21:01:09 suka Exp $
+
+*libreoffice-3.3.2 (22 Mar 2011)
+
+  22 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  -libreoffice-3.3.2_rc2.ebuild, +files/gentoo-3.3.2.diff,
+  +files/libreoffice-libdb5-fix-check.diff, +libreoffice-3.3.2.ebuild,
+  -files/gentoo-3.3.2_rc2.diff:
+  Bump to LibreOffice 3.3.2, also fix db-5 support
 
   18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
   libreoffice-3.3.2_rc2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 03d6a1e1ab82..3c73108d1e9a 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -2,11 +2,12 @@ AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d46
 AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
 AUX gentoo-3.3.1.diff 2271 RMD160 ecd7bd0a6c34861ad3ef0bee8017a288286644c0 SHA1 0597c7e692873f128a898d1904445b9bbb06e6e8 SHA256 00b5b5fc5dbeafa18874575e78e6b3348d1293662b9c036ca918517a54edf1b6
-AUX gentoo-3.3.2_rc2.diff 1710 RMD160 406448b0b05ff95cf23d5e13a3a9e102955f296b SHA1 0149b456d80da07fea047c2443becf316f2711a2 SHA256 e31ebd94a154338e527976d24354917e01e9ca4ff54917e2a697d2cc2bca672e
+AUX gentoo-3.3.2.diff 1710 RMD160 406448b0b05ff95cf23d5e13a3a9e102955f296b SHA1 0149b456d80da07fea047c2443becf316f2711a2 SHA256 e31ebd94a154338e527976d24354917e01e9ca4ff54917e2a697d2cc2bca672e
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX libreoffice-3.3-libpng-1.5.diff 522 RMD160 4bc6ad8cec9c35d5a30b87c71d78deb75d42e184 SHA1 caf49686b19f11b56ea929494d16a56cc4e05326 SHA256 13c5d10642c2f044293186eb46de0611dd36ee3f0f3134ea2b3ea2c6ed6984f8
 AUX libreoffice-3.3.0_libxmlsec_fix_extern_c.diff 1256 RMD160 278ea1a7025e2e47ceb4b862ec0f8a95099367b0 SHA1 a888ff72ba4998ccc59cd88c31db452c715e3c34 SHA256 bf177f6445f67a1a2d9ac972e835b1308835ba4c1358f582939345caf469079c
 AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
+AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
 AUX scrap-pixmap-links.diff 1085 RMD160 29384dbf63fce1419e05ddd506915a73ef3459ab SHA1 44ad5198b7bc70813afd74b456a61081f18838cf SHA256 054b18ebe38c804082b66d763285f9c7af11da773486ba8e9f4255266efb7ac9
 AUX sdext-presenter.diff 649 RMD160 1f302a949deaba5c0243b18c60037c3602dc45ed SHA1 e4b2b653390e4fc972cfe5afc57911ece1c30f39 SHA256 7abf056815e5faee5fddfd17b25df5d7afe88347472695cfcadc0617739ac93f
 DIST 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz 4893724 RMD160 aefa80476ef8340be84440b61f738f432da51c92 SHA1 025d5d0d566a23ddb353495c116116c1088ba2e9 SHA256 9d29cba4312812a26b14effda2cf56284e70226cdccc90a83844297e3b7498ee
@@ -111,6 +112,6 @@ DIST libreoffice-writer-3.3.1.2.tar.bz2 6776894 RMD160 7667f4fbbe8d6eea2dd8b8fef
 DIST libreoffice-writer-3.3.2.2.tar.bz2 6778875 RMD160 db0b4ae2c1c93c6e35e93e48ee4ce5bdc1e963dc SHA1 d0d329bd1659c3d943c746c4f8cc76379094d7cc SHA256 3b7fe1fa2a889b5358a958c8e669505fa81251164c773d3dad650ce53009a973
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 e2ac30cb01e5ef6e960a4f42859784d41cc198c8 SHA1 13022920f459ae0ad42979be5ebc133287ad2754 SHA256 b703b014f027db3bb91c015dd11d21a4d0d0c2714f8031ccc43869846faf8635
-EBUILD libreoffice-3.3.2_rc2.ebuild 18004 RMD160 ad7678c22739db01b4b1a2f5d874d86fc972b1e0 SHA1 64f6a8876270ab716e38ccec28d22111b1f61061 SHA256 4ab0c77ff94a1fbdd3689ac31b07c413c1b92192784f1d423a19fdf105b49880
-MISC ChangeLog 5184 RMD160 79679a13009411802e24ba394145e9296c185056 SHA1 ab24a2c90634f455ee547b44499b31a4e0d1c1a8 SHA256 0c26296cf84c1885c92ace96b9e08129569befaf8d4f6c92390daefe57e12001
+EBUILD libreoffice-3.3.2.ebuild 18054 RMD160 9485b8c02a6277011e88a039ef593349c031a70b SHA1 4f849ea0ee2b8d160742ff6bd6c210cd907d3c86 SHA256 9fcf5dedfa6a16bc80cd4cb49cd6b19a4a1aa226b0ee33426511d2083a755e73
+MISC ChangeLog 5485 RMD160 7f1b07eefb5c23c50bbf7170decda06e87991b8c SHA1 b49ed2c957343335bb10f0349e09e29e7263d45e SHA256 f66114c507a5283d8a82e7fdddb7a69fc5926ed52338f6a0f853cc30f900c996
 MISC metadata.xml 693 RMD160 f538aa488c8ae05b34a37ea50c5fce9b9a85625e SHA1 85de4ea2ab18cfa53e8673430da6f2c15ce064b2 SHA256 ccbd40dc84f76608141535a48be034e0e24e96978d86ec4478a3efae4f4347b4
diff --git a/app-office/libreoffice/files/gentoo-3.3.2_rc2.diff b/app-office/libreoffice/files/gentoo-3.3.2.diff
index 2a4b293ea2af..2a4b293ea2af 100644
--- a/app-office/libreoffice/files/gentoo-3.3.2_rc2.diff
+++ b/app-office/libreoffice/files/gentoo-3.3.2.diff
diff --git a/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff
new file mode 100644
index 000000000000..0c59f0202d6b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff
@@ -0,0 +1,25 @@
+--- configure.in.orig	2011-01-13 21:12:40.420005851 +0100
++++ configure.in	2011-01-13 21:15:23.680008513 +0100
+@@ -4456,16 +4456,17 @@
+        else return 1;
+ }
+     ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
+-    DB_LIB=
+-    for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do
+-        AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
+-            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ]
++    save_LIBS="$LIBS"
++    for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
++        AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ] ,
++            AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ]
+             )
+         )
+     done
+     if test -z "$DB_LIB" ; then 
+-        AC_MSG_ERROR([db not installed or functional])
++        AC_CHECK_FUNC(dbopen, [], [ AC_MSG_ERROR([db not installed or functional]) ])
+     fi
++    LIBS="$save_LIBS"
+     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
+ else
+     AC_MSG_RESULT([internal])
diff --git a/app-office/libreoffice/libreoffice-3.3.2_rc2.ebuild b/app-office/libreoffice/libreoffice-3.3.2.ebuild
index 765e66f340d6..6ece8ebdafe1 100644
--- a/app-office/libreoffice/libreoffice-3.3.2_rc2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.2_rc2.ebuild,v 1.2 2011/03/18 22:39:38 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.2.ebuild,v 1.1 2011/03/22 21:01:09 suka Exp $
 
 EAPI="3"
 
@@ -20,12 +20,13 @@ MY_PV=3.3.2.2
 MY_P="${PN}-build-${MY_PV}"
 PATCHLEVEL=OOO320
 SRC=OOo_${PV}_src
-DEVPATH="http://download.documentfoundation.org/libreoffice/src"
 S="${WORKDIR}/${MY_P}"
+DEVPATH="http://download.documentfoundation.org/libreoffice/src"
 CONFFILE=${S}/distro-configs/Gentoo.conf.in
 BASIS=basis3.3
-DESCRIPTION="LibreOffice, a full office productivity suite."
 
+DESCRIPTION="LibreOffice, a full office productivity suite."
+HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="${DEVPATH}/${PN}-build-${MY_PV}.tar.gz
 	templates? (
 		http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
@@ -115,8 +116,6 @@ for X in ${SPELL_DIRS} ; do
 	SPELL_DIRS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
 done
 
-HOMEPAGE="http://www.libreoffice.org"
-
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
@@ -265,9 +264,10 @@ src_prepare() {
 	epatch "${FILESDIR}/scrap-pixmap-links.diff"
 	epatch "${FILESDIR}/enable-startup-notification.diff"
 	use java && cp -f "${FILESDIR}/sdext-presenter.diff" "${S}/patches/hotfixes"
-	cp -f "${FILESDIR}/libreoffice-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patches/hotfixes"
-	cp -f "${FILESDIR}/libreoffice-3.3-libpng-1.5.diff" "${S}/patches/hotfixes"
-	cp -f "${FILESDIR}/libreoffice-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-3.3.0_libxmlsec_fix_extern_c.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-3.3-libpng-1.5.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff" "${S}/patches/hotfixes"
+	cp -f "${FILESDIR}/${PN}-libdb5-fix-check.diff" "${S}/patches/hotfixes"
 
 	#Use flag checks
 	if use java ; then