Few cleanups in live ebuild to match upstream no longer using dmake.

Package-Manager: portage-2.2.0_alpha165/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

3 files changed, 27 insertions, 13 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 66cb0ae1d377..982155c32d93 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.442 2013/02/16 13:18:10 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.443 2013/03/04 20:53:22 scarabeus Exp $
+
+  04 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+  Few cleanups in live ebuild to match upstream no longer using dmake.
 
   16 Feb 2013; Mark Wright <gienah@gentoo.org>
   +files/libreoffice-3.6.4.3-boost-1.53.0.patch,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ad613acdd8d2..136261a2f9f2 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -27,13 +27,23 @@ EBUILD libreoffice-3.6.4.3.ebuild 17474 SHA256 ebfebf22f2c06bc68f4a63e2ae74a9f0f
 EBUILD libreoffice-3.6.9999.ebuild 17504 SHA256 63590679442804681a97aeb2a575da274b6da92761f61df81eda0a38352a5411 SHA512 90b2c48c1e9f9bf2b543eb09d8a5d9fda7f26291adfc7f3a3a6da8502259542a0bb87503f093e8383ec2c3f4cc15be67a0d87a5045518833eab2842f93193195 WHIRLPOOL d7f48a6495f6901e5e7989d63dd23b242488b040cc128374c96816ff647fb3f263ebdffe8a8d32eb5e9913c8d97f83ce9a39ed83926d106bf6f83a3c416880e6
 EBUILD libreoffice-4.0.0.3.ebuild 17487 SHA256 2698936104aab1b46a99ce2cb9aad1b82897ed8db060e3abe1733cc336c18014 SHA512 86e7a8b45e2a2fa0eac54fba59c6a92aa6e2455f1425d0e100a55fdc7e94f06c695199b720be21ba677c808a76e528e766d6212ef47e1f4ae8e228a458e94965 WHIRLPOOL 779b4c530d659911cabd5c4cc64f3932eaf992bb4407ddf8d04436c75a53f3740d2cb8308911b849fa21e0f86f891b5d1b4a431c81b6ce68335e1bfb23981ccc
 EBUILD libreoffice-4.0.9999.ebuild 17435 SHA256 cb6921bfa2d8b744cfc8a0115510ef44daa0e0a2b25bc10073d19da48eb8b5e8 SHA512 2ec9e50c9d04b5664dbf501f7b526e963102693d7f90c57518ef07ada11aacf93ede0df9b1598012604fd295055cc9c4b8d69ea12f4d7d2a1be84a275d20e72d WHIRLPOOL 6fd8994b66346ce330bfa5ee4d02966a9505c494006cec7cb537d44ba12782af2507aaef5f2967a09e807b47ba698f173a93851c66fa96a7ac1b5d03b206ff12
-EBUILD libreoffice-9999-r2.ebuild 17248 SHA256 91e6f6150d9807259614f4b42608b42b34856dde88132eca5b5f039a0256132c SHA512 a14c639c5c9870bd0e690800ccbcb45f2ae0f49639860e678bdb6016da8527bbed94a3eb3345d9529f8b13ae7147dcef9603bd0b9be89e6a455c7c3de2191996 WHIRLPOOL 2e3851f7c893a8c4daa4f2635bf575bcdeb671a1ed1a1305307f6f39d32e0228fd3b472a8053dc9c70b4b6e32d5748c326af004c588e1f38c730a05219ef1a5e
-MISC ChangeLog 80538 SHA256 714a0077e7f84bb19e8d74d0992d558705aa003a4db07aa22279c4f0ddbe763e SHA512 5f1f11e42670215280f1e4da3ab2ef9efbf302b1ce067c87e2e4cf21bfd76cc22315a4e3672caa307f872846ac73f7323fbe4a8614a67df63b85da348530361d WHIRLPOOL a2eb9dc3ad5e2688479a50efc185a784068b9aa88b56a55f4df1bf7d755ee7d18807b75645a9bce64b849a4f474386b8dd14098df67c5916922831a1913dfd5b
+EBUILD libreoffice-9999-r2.ebuild 17259 SHA256 659d694ddb07080cd8b122b1913eab4bef6ecd097813e1f58153786671e386b4 SHA512 461f3e181ecf16c2e4ac9dce7f12625ea45356622dd8259874f77ae31ab0ac107f0568af0830e462886560ceac0f721d25f4d839016aeb7c83adac03e9c3e3c9 WHIRLPOOL 5284a413b1978a6a11e7b743e2e406bd4df9d35b11199733f37bb663a491ee1b649f7e81883b4929b72726c7511e6b1bf459953b76adac4879fb8b05be6644fb
+MISC ChangeLog 80696 SHA256 b4e1537ea4c9bca3b593b7ad9a3e9e518a35dc3dcd6eda952f61a5a6ce674df6 SHA512 980c68c66031351c0bf1e7ab438edc4a50d873a8c007dc0fd03371e084e7ae0e6aecf87dbf657a0378dd19e74eb0ab84080bf31ae9102a5770d967fe922adac2 WHIRLPOOL c6a1237448f4a7970b034b57e834157930c87efb5b3f1d3547f457bd82d941ae8e6f4dd68cb6cf167b2c87832785d47e176289d04df3df5e0773dc8cd2f1f7e1
 MISC metadata.xml 1176 SHA256 c1690efe4b2a0fa49801e5cbe66637e25ba71fb902115a75d363f6fe7dc444fb SHA512 2889263d6cf5388d402b2c3999d471e2a2e8c852dcd50755d9f6fd7a549e8b70af7afb66d2f58bc8b9f7bedb4d01a05dda6159c5433a5fdce20ba69f49b9d1b1 WHIRLPOOL e4b548267c79bee3de7bdec839c0fd4d2f1166ded0464d65e6103e63ffb8fb9c08c6a9ff0d01ab09c02826ff1b0b0233a55c5d49b701e963d8c732685b3267dd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEfhx0ACgkQoBEVQmGOlx+E5AD/W2ouTslGxX29MBFSL8zBRy4Z
-G1vKVAYDJAapokE6eq8BAMGg8f+n80OrrT8pVd9p2qugtERuCCsKYfpRIWKodEWQ
-=csrn
+iQIcBAEBCAAGBQJRNQnMAAoJEOSiRoyO7jvo6WkP/0x8htKrAwuIXPlu/EwxMSUN
+CSZDEqeQefSwcGPiAqQzAhqcyOWyi2BjgC2zHWplkagGm8jj0Poky8i3feBFvQSG
+gOExbrCeJb6pON6nQlhSU9jLI9tXYo5Wei9FdTSWGGyhM0Ft5D2PmIQ/ygFe/KPR
+BTh0KPbyrFFlg/fkB4M/146jUd8PnPrUDrJWLTa5U4F4OQN2cFkvyyLZ6OYmVo0M
+VjsZ0qn6OPVzSfF7ZUtdR8rrTiX0AwrILjENcwv/dx/cGpzPgWwNJih9S4VFlCjW
+ugYlvZyhHoX2N6xjzUGapDdhSE8K5xM9MrTsc7/ZOYch2h8hdq2xeHhDPblK/Gj2
+wKVodFSAiEdSnrUrXyVvu8wYHvuQLLVF2qYt0fbnZ27bf5feU8TLn2GiFFL/+Wgf
+6OE858+W6t7y1hLfdfDaulFtwXB/4MwsrZIfTTYPQcpmnS0uvJXsKL3cx0FGmvUV
+s1ZYVEMj8LJrg3aUtyrf5nEzaBJvELYr7acU4Rxe6fNXwd0NBdy5TvokhSNSuSol
+xLrFaW8u00HuP1BsrOIFP4m6cQZEKKUQBuaOML8aPivZ+Felkf2yv5R2aHds/IGZ
+ArTLEWzD9Q2U0JXnA6+r2mRk4Pxgy+rLB6UpmDLdn+tMHToR+4uFwgLbGuRvhsPv
+iB/oIrdhEocJ6SXbHVpF
+=pgy+
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 5e48868344aa..95a61b73740c 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.159 2013/01/31 15:36:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.160 2013/03/04 20:53:22 scarabeus Exp $
 
 EAPI=5
 
@@ -227,7 +227,6 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
-	"${FILESDIR}/${PN}-3.7-separate-checks.patch"
 )
 
 REQUIRED_USE="
@@ -313,8 +312,6 @@ src_unpack() {
 
 src_prepare() {
 	# optimization flags
-	export ARCH_FLAGS="${CXXFLAGS}"
-	export LINKFLAGSOPTIMIZE="${LDFLAGS}"
 	export GMAKE_OPTIONS="${MAKEOPTS}"
 
 	# patchset
@@ -338,6 +335,13 @@ src_prepare() {
 		-e "s:%libdir%:$(get_libdir):g" \
 		-i pyuno/source/module/uno.py \
 		-i scripting/source/pyprov/officehelper.py || die
+	# sed in the tests
+	sed -i \
+		-e 's#all : build unitcheck#all : build#g' \
+		solenv/gbuild/Module.mk || die
+	sed -i \
+		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+		Makefile.in || die
 }
 
 src_configure() {
@@ -376,7 +380,6 @@ src_configure() {
 			--without-system-hsqldb
 			--with-ant-home="${ANT_HOME}"
 			--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-			--with-java-target-version=$(java-pkg_get-target)
 			--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
 		"
 
@@ -420,7 +423,6 @@ src_configure() {
 	# --disable-rpath: relative runtime path is not desired
 	# --disable-systray: quickstarter does not actually work at all so do not
 	#   promote it
-	# --disable-zenity: disable build icon
 	# --enable-extension-integration: enable any extension integration support
 	# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
 	# --disable-ext-report-builder: too much java packages pulled in
@@ -453,7 +455,6 @@ src_configure() {
 		--disable-online-update \
 		--disable-rpath \
 		--disable-systray \
-		--disable-zenity \
 		--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
 		--with-build-version="Gentoo official package" \
 		--enable-extension-integration \