[app-office/libreoffice] bump to 3.4.2.2 (this WON'T work now)

2 files changed, 16 insertions, 25 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ab15402..7f6ad6e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -91,4 +91,4 @@ DIST libreoffice-translations-3.4.2.1.tar.bz2 137254228 RMD160 c2db7ac14da37013e
 DIST libreoffice-ure-3.4.2.1.tar.bz2 6211917 RMD160 0cbb1cc96fdf35d96f3340651d5426cd6f61c3a1 SHA1 b2bea4903545d70242aff28764c1fd1c51aee022 SHA256 429698ae0f71d07eff1cd0c8611e84ec944f0082c1c427f28e1a5cdbd8ded29d
 DIST libreoffice-writer-3.4.2.1.tar.bz2 7295133 RMD160 e9f49fb4d64b9c7b54d34cd488d1923969842fc5 SHA1 73a784172c191df755ad47ad9fc040bfabe5d9f2 SHA256 98735be34c2ddbebed0411b776ac7480e0e458dc4253fb57a467846e7b2db131
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD libreoffice-3.4.2.1.ebuild 19633 RMD160 2575d5d245b91dec4c07094df21adb1a833e64b5 SHA1 83beb341fe94801cd04bc9be737645db2293da1d SHA256 3ee5e17136365c44184a8719b1490e1cf9d27641e5eca01a6765864c81f8b475
+EBUILD libreoffice-3.4.2.1.ebuild 19664 RMD160 142c7a8c11220739daa9ce2047330e12993f8380 SHA1 91a14581cb67d548a00878c1f1b8f5e400bb495a SHA256 7242a2d024fc29c9322ee51ad2c380f208ef182829579544c2b8063ada471ce6
diff --git a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
index aae7afe..80534a7 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.2.ebuild
@@ -114,7 +114,6 @@ SRC_URI+=" templates? ( ${TDEPEND} )"
 
 unset ADDONS_URI
 unset EXT_URI
-unset TDEPEND
 unset ADDONS_SRC
 
 IUSE+=" binfilter cups custom-cflags dbus debug eds gnome graphite gstreamer
@@ -163,11 +162,10 @@ COMMON_DEPEND="
 		>=media-libs/gst-plugins-base-0.10
 	)
 	java? (
-		dev-db/hsqldb
 		>=dev-java/bsh-2.0_beta4
-		dev-java/lucene:3.0
+		dev-java/lucene:2.9
 		dev-java/lucene-analyzers:2.3
-		dev-java/saxon
+		dev-java/saxon:0
 	)
 	ldap? ( net-nds/openldap )
 	mysql? ( dev-db/mysql-connector-c++ )
@@ -232,9 +230,6 @@ PATCHES=(
 
 S="${WORKDIR}/${PN}-bootstrap-${PV}"
 
-# the libreoffice build system is not parallel safe at all :/
-MAKEOPTS+=" -j1"
-
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 	kde4-base_pkg_setup
@@ -291,7 +286,6 @@ src_unpack() {
 
 	# don't forget the wrapper...
 	cp "${FILESDIR}"/wrapper.in "${T}"
-	eprefixify "${T}"/wrapper.in
 
 	# copy extension templates; o what fun ...
 	if use templates; then
@@ -299,10 +293,11 @@ src_unpack() {
 		mkdir -p "${dest}"
 
 		for template in ${TDEPEND}; do
-			if [[ ${template} == *oxt ]]; then
+			if [[ ${template} == *.oxt ]]; then
 				tmplfile="${DISTDIR}/$(basename ${template})"
 				tmplname="$(echo "${template}" | \
 					cut -f 2- -s -d - | cut -f 1 -d _)"
+				echo ">>> Unpacking ${tmplfile/\*/} to ${dest}"
 				if [[ -f ${tmplfile} && ! -f "${dest}/${tmplname}.oxt" ]]; then
 					cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
 				fi
@@ -312,17 +307,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	strip-linguas ${LANGUAGES}
-
-	# en_US is built by default, upstream needs us to use --with-lang="" in this case though, so strip it out
-	export LINGUAS_TEMP=$(echo ${LINGUAS} | sed -e 's/\ben_US\b//g;s/en//g;s/_GB/en_GB/g;s/_ZA/en_ZA/g')
+	eprefixify "${T}"/wrapper.in
 
-	if [[ -z "${LINGUAS_TEMP}" ]] || [[ ${LINGUAS_TEMP} == " " ]]; then
-		export LINGUAS_OOO=""
-	else
-		# always build en-US as a fallback (needed for broken code / translations)
-		export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}"
-	fi
+	strip-linguas ${LANGUAGES}
 
 	# Now for our optimization flags ...
 	export ARCH_FLAGS="${CXXFLAGS}"
@@ -373,8 +360,10 @@ src_configure() {
 
 	# Things that do not have gentoo packages
 	# system dmake fails to compile anything in loo
+	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
 	internal_libs+="
 		--without-system-altlinuxhyph
+		--without-system-hsqldb
 		--without-system-lpsolve
 		--without-system-mdds
 	"
@@ -385,7 +374,7 @@ src_configure() {
 		internal_libs+="
 			--without-system-beanshell
 			--without-system-lucene
-			--without-system-hsqldb
+
 			--without-system-saxon
 		"
 	else
@@ -395,8 +384,10 @@ src_configure() {
 			--with-java-target-version=$(java-pkg_get-target)
 			--with-jvm-path=${EPREFIX}/usr/$(get_libdir)/
 			--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
-			--with-lucene-core-jar=$(java-pkg_getjar lucene lucene-core.jar)
-			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers lucene-analyzers.jar)
+			--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
+			--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
+			--with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
+			--with-junit=$(java-pkg_getjar junit-4 junit.jar)
 		"
 	fi
 
@@ -456,8 +447,8 @@ src_configure() {
 		--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
 		--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
 		--with-external-tar="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-max-jobs=${jobs} \
+		--with-lang="${LINGUAS}" \
+		--with-max-jobs=1 \
 		--with-num-cpus=${jobs} \
 		--with-theme="${themes}" \
 		--with-unix-wrapper=libreoffice \