Bump to OpenOffice.org 3.2.1

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 22 insertions, 26 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 6ebf0af727c7..a3e9af846e16 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.534 2010/05/25 16:42:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.535 2010/06/14 11:52:45 suka Exp $
+
+*openoffice-3.2.1 (14 Jun 2010)
+
+  14 Jun 2010; Andreas Proschofsky <suka@gentoo.org>
+  -openoffice-3.2.1_rc1.ebuild, +openoffice-3.2.1.ebuild,
+  -files/gentoo-3.2.1_rc1.diff, +files/gentoo-3.2.1.diff:
+  Bump to OpenOffice.org 3.2.1
 
   25 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   openoffice-3.2.0.ebuild, openoffice-3.2.1_rc1.ebuild:
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 91dd6c18b9fd..dbc1301bf714 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,7 +1,7 @@
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX gcc45-buildfix.diff 840 RMD160 fcb6c08ee67b61f60641d641daa329d5fd17772b SHA1 6344952a2d0d9690d4f864b3273713f95068eabd SHA256 2d5b95e94f9b9e95c97876db669aabe523d01194c9f7ce2f0a3ccb9bde9221bc
 AUX gentoo-3.2.0.diff 1972 RMD160 7c17515819d13c84c73b6361bc2c5fa3bcf26d17 SHA1 8d5df16b03e066e67a536e361b3670bca9651666 SHA256 f622b98d8988e904e6d168cbdc05ec44ae6388178f555d5943959f59282129f1
-AUX gentoo-3.2.1_rc1.diff 1533 RMD160 80501d8346d05e2cf4446ec96ebebf949ef50c23 SHA1 416f3102d956dafeb054b119bf7936f696719a79 SHA256 029ac1bae522c62b134b3ad73fe4d54deeb959725f427d9c25615d3bac475194
+AUX gentoo-3.2.1.diff 1239 RMD160 f55c9c7c0b228da729f03886ea90c2302655c30e SHA1 a9f57a94f2093f8e3c88629c3d5704154d6c364a SHA256 6f62dca2b15828e5644201daf82096b077f50e53fce1e41ddacf91d7f7dfe251
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX neon-remove-SSPI-support.diff 1091 RMD160 5dee3324b22b9c8d9f14b0e7998695a212c046a8 SHA1 e8541e791a03836d986d8e0db0d488570bb6ab36 SHA256 90d88d2fb96a0e82afe6b55e77c478ee9b1925e14dfbc998c2af0ef05edfd508
 AUX npwrap-fix-nogtk.diff 382 RMD160 557fe38a19d9a0e4505af34bed4033884f1075ab SHA1 209f73c706adabb1e2b2b3e4bc706f9afbbee172 SHA256 ad64cea66e4e4d9b351a44b3ed2774484baaaebe5e37ebea3121f4a0981d231f
@@ -13,12 +13,11 @@ DIST OOo_3.2.0_src_extensions.tar.bz2 13921000 RMD160 a274fabcc76bcc39640fe0c47a
 DIST OOo_3.2.0_src_l10n-fixed.tar.bz2 104366307 RMD160 f82cf11833e0cb77038921d127db6da8a14cc0cf SHA1 1cf8bb2c5a37e3d5aab6bf59bd018a0209b33e35 SHA256 3e633557845657dabab634e347827f56668c4c1d01ef3f925084ac30b43d01da
 DIST OOo_3.2.0_src_system.tar.bz2 59670795 RMD160 02281b8890c724b7f2ad3115578d876cd48dab0a SHA1 ea0cdaa50ac620219671deb30070d3c52d0e509c SHA256 97796333eb2f17e8199026d4ab4334d59bbbffc8d2f9d9100a0c27e823e1305a
 DIST OOo_3.2.0_src_testautomation.tar.bz2 49095034 RMD160 f8dd241fdfa788b367aaee9212a21d5085287b52 SHA1 2ceb738b76f70feb4b4459308180dd65fcedf7e5 SHA256 2acfd1e2c1f81096489dc453d8be99ab0df51130ddf29c14450aebb78a57a9a5
-DIST OOo_3.2.1rc1_20100506_src_binfilter.tar.bz2 6454808 RMD160 d8e69d108983174f2de97892d6b4ed9a8d7315ac SHA1 ee6257270c39f459a5ff6130b4d857b59a1a1e6a SHA256 a5673675f07f0ea7ea6e21855fe2909c22dd391c3868643fb87825da236c0b1b
-DIST OOo_3.2.1rc1_20100506_src_core.tar.bz2 214628215 RMD160 3bfd8f3942bcab49f69989ef5c345f11dbd9c7bc SHA1 31c8685f389ccfc387f6489dd534ad2fa0f435bd SHA256 4d1bdcdff89bde406cd392bd32f2148a48c577874aca4828f8df008e5ee44da7
-DIST OOo_3.2.1rc1_20100506_src_extensions.tar.bz2 13978789 RMD160 e8291a4fadda38b7157dd29d437c3e1fa1b77193 SHA1 9ee8e39226bc2f1c017a17357674f4a2ec623aad SHA256 bfe5c1b341a446a3e5dce7eb970b9f693213965c545c5dfac94a3b916b324367
-DIST OOo_3.2.1rc1_20100506_src_l10n.tar.bz2 106142968 RMD160 0a34f446f87478224b22c4815ecb416e00cba410 SHA1 c66c3f31ab6243316df1107c474f1b4b2829704a SHA256 96e66552ac3a64fd6950e3ff3b68b8e7872be75f43bbc53b43c981d473f1ab5d
-DIST OOo_3.2.1rc1_20100506_src_system.tar.bz2 60992865 RMD160 9e9537c6376033877ad9ba9f9e8f2415fe9dd208 SHA1 d8d4095c358c4dee0aa7470132dfd86e12d589a4 SHA256 1d6d9830c3a7d2b32630967a14eaa08a681556c7c7a95c6c539abae1eb78e8cf
-DIST OOo_3.2.1rc1_20100506_src_testautomation.tar.bz2 48988905 RMD160 6bd44fd3b6693a993a8378f96314152a010fe059 SHA1 29c0c17389e6cd4dcfaa5311ba4d7cabb4ddf912 SHA256 ffbd8d9db97fec635f5d302ce39fb3f0c615632d21a2e1a40a6dc65a09205995
+DIST OOo_3.2.1_src_binfilter.tar.bz2 6461292 RMD160 2d0a5cfc4b155582ccab30db26998fae10a746ea SHA1 120dcb4c080423eb1135c582e8d1251b67585a25 SHA256 d72cbd9f3c173250c7c7ec3d5545d3b4783ead5addc95db23dd198c25b0eb05b
+DIST OOo_3.2.1_src_core.tar.bz2 214703203 RMD160 f58b4adfe4beec9bcf37e8d063be253069dc31d0 SHA1 50416998ecca06118dbfb7ca8b1ab348cd9419c3 SHA256 d1dc94d1a82c0c2867c6f90917c431f648567a0156854908fc6a7e0b6d84423e
+DIST OOo_3.2.1_src_extensions.tar.bz2 13898563 RMD160 6d223db57fb042dfe43e76c7209cb663189da161 SHA1 e0cd094a38973f9314e775ece03e6d7315607733 SHA256 32dba3a668c2ead7bc936a04296a1d39b49b4f418d702644d41d30059ef7ab34
+DIST OOo_3.2.1_src_l10n.tar.bz2 106071765 RMD160 1b242bf561446814707cd8159131b61cea674ff0 SHA1 700bbc2ea378c866855512681369e67b21a03417 SHA256 55d7e90f1cd1305bce5472aca98ea687774e46ffe136ba6215cc33cc3f1b7154
+DIST OOo_3.2.1_src_system.tar.bz2 61044358 RMD160 619b382f43387cb5babd9952c14f06ab0594dd5a SHA1 a7ac0bf3806ffb1ee3fd05b71e9e6b1a7bf577b1 SHA256 cc7da43ad208ec3ae03688fcb99dc0b3ac3c33ebd98075780a3212a3be1e3e3e
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
 DIST Sun_ODF_Template_Pack_en-US.oxt 4997184 RMD160 f7040f83aeb60355d80c42434e60d236a8875753 SHA1 58c98de9c629aae878a58c2775b8546aa78fb04c SHA256 ba443e3dc988d64e239865a0a7e11b62125212a1049b7a5d866955b235d7f195
 DIST Sun_ODF_Template_Pack_es.oxt 4972619 RMD160 3b8bf592b34256969421472b6ca492479d10d145 SHA1 2b33b91d536c39dba2ec5504f68d72c001712782 SHA256 0a00c795f4af10919d981e7409895198c9f09d2ab05f9e578a1e8428071f5bc3
@@ -31,11 +30,11 @@ DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44
 DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
 DIST mdds_0.3.0.tar.bz2 43041 RMD160 76d894e8f083d03ef1795e9c4c764c4b20c90a3a SHA1 3a1d839b9a36287074c3724fa16ac1e04d343fbe SHA256 4d28548468bb63edf630ebfc8c14f80531f12265f8fa5694c01b401594d01dff
 DIST ooo-build-3.2.0.10.tar.gz 13064810 RMD160 da7a0d18dee79db651fa144e9775511af1f0efdb SHA1 b6ebdf18e9022e62c5a6a457405d694ff218dde2 SHA256 41f42155d2d453576821ae6d24b125e6dce0bf9d95ea2f4267c6ae785305d63c
-DIST ooo-build-3.2.1.1.tar.gz 14448636 RMD160 09e675981735e6f436d8517162e54706cbad76d1 SHA1 49ebd1fd22187e0090698f606068447f160b8bc5 SHA256 82719e1126460a189db42685eccb8204891df34456b02e95375016b068d8093f
+DIST ooo-build-3.2.1.3.tar.gz 14480496 RMD160 ccc21cfb19dc3fb711b6c0f892e82bbf3d22876f SHA1 8b48473fd2ba81a68bdb3b5ce6033f536f3e62bb SHA256 a1f168a2bc149b859f73d72ec1e2ab40bc7dbfbe747d25ed5f4edba498311e31
 DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.2.0.ebuild 13541 RMD160 95447ab23c23e7643136e2e4a96e32133319a0e6 SHA1 5ecbc46ba5816acc74c5251913491ee654299ae7 SHA256 9207a2a1be79dd783763e2749775662733e2e35b5f001212d3ba0c77b0bcbd04
-EBUILD openoffice-3.2.1_rc1.ebuild 13301 RMD160 8c4368d5201883a77aef98f25074847d290ff213 SHA1 bb5341e5b322c3d6587b3073c3110e1fd99c42c4 SHA256 c3ffd7a706e46c8c786a304150c31bb6b2b5741a73c97f0b8a4140c96ba637c7
-MISC ChangeLog 109450 RMD160 e776ce4a90b360af49342bce18650aa287efe32d SHA1 b251b82439f5ff3eea8da2b3ea6a5c1ebe25b40a SHA256 92de320bfbc2e8f671f9cb6ede2d693ed35dc2a7128bd952cd7ed8992fb613bc
+EBUILD openoffice-3.2.1.ebuild 13241 RMD160 dce4cfd44b33449f8271d270982d767f4e2e8f0e SHA1 a8baa2b620fd5f75e1a6893292f938e65b37ca45 SHA256 cbd8b0e245f3103180ba8bd47018be0b790c5f2095d83c7465856749092e717b
+MISC ChangeLog 109680 RMD160 56c0079ad59576fb6dc875d57b836c63545b375e SHA1 318f3ceb9167d0293d04e412608a86fd72df114c SHA256 f90854ca4e4261716941d6dd591745ab84daca2bf2769eaa9c302484b88c5461
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/gentoo-3.2.1_rc1.diff b/app-office/openoffice/files/gentoo-3.2.1.diff
index 0bdfde41f361..a7e0dc961d82 100644
--- a/app-office/openoffice/files/gentoo-3.2.1_rc1.diff
+++ b/app-office/openoffice/files/gentoo-3.2.1.diff
@@ -42,13 +42,4 @@
      AC_MSG_RESULT([$SUNTEMPLATES_LANG])
  fi
  AC_SUBST(SUNTEMPLATES_LANG)
-@@ -1584,7 +1584,7 @@
- elif test "$with_tag" = "OOO320_m8" ; then
-    UPSTREAM_VERSION=3.2.0
- elif test "$with_tag" = "OOO320_m17" ; then
--   UPSTREAM_VERSION=3.2.1
-+   UPSTREAM_VERSION=3.2.1rc1_20100506
- fi
- if test -n "$UPSTREAM_VERSION"; then
-    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
 
diff --git a/app-office/openoffice/openoffice-3.2.1_rc1.ebuild b/app-office/openoffice/openoffice-3.2.1.ebuild
index 5ece3fe26915..c2ada8b374f5 100644
--- a/app-office/openoffice/openoffice-3.2.1_rc1.ebuild
+++ b/app-office/openoffice/openoffice-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1_rc1.ebuild,v 1.2 2010/05/25 16:42:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.1.ebuild,v 1.1 2010/06/14 11:52:45 suka Exp $
 
 WANT_AUTOMAKE="1.9"
 EAPI="2"
@@ -13,11 +13,11 @@ inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl pam templates"
 
-MY_PV=3.2.1.1
+MY_PV=3.2.1.3
 PATCHLEVEL=OOO320
-SRC=OOo_${PV/_/}_20100506_src
-MST=OOO320_m17
-DEVPATH=http://download.services.openoffice.org/files/extended/${PV/_/}/${SRC}
+SRC=OOo_${PV}_src
+MST=OOO320_m19
+DEVPATH=http://download.services.openoffice.org/files/stable/${PV}/${SRC}
 S=${WORKDIR}/ooo
 S_OLD=${WORKDIR}/ooo-build-${MY_PV}
 CONFFILE=${S}/distro-configs/Gentoo.conf.in
@@ -27,7 +27,6 @@ DESCRIPTION="OpenOffice.org, a full office productivity suite."
 SRC_URI="${DEVPATH}_core.tar.bz2
 	${DEVPATH}_extensions.tar.bz2
 	${DEVPATH}_system.tar.bz2
-	${DEVPATH}_testautomation.tar.bz2
 	${DEVPATH}_l10n.tar.bz2
 	binfilter? ( ${DEVPATH}_binfilter.tar.bz2 )
 	templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt