Try to enable tests again.

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

3 files changed, 29 insertions, 25 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 29c15b6a3440..7e05c4cf68b5 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.146 2011/09/23 14:35:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.147 2011/09/23 14:44:42 scarabeus Exp $
+
+  23 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r1.ebuild:
+  Try to enable tests again.
 
   23 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index deae5c80a5d0..b55d7ae275ca 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -173,23 +173,23 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c0
 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d
 EBUILD libreoffice-3.4.9999-r1.ebuild 18444 RMD160 6209f79b7aee2ef034810b62a30d80a6c573e683 SHA1 76cd9106979325bbc55127c9a37d83514f179a11 SHA256 578c8666330d5e81c00f11127f6c671e780addb01ac8052dcf508388b691c8fb
-EBUILD libreoffice-9999-r1.ebuild 16433 RMD160 c9a8eda1d9d240ad9f4a6513f3b46eab07a56923 SHA1 92e2e4cec98ff7bfb54cd4c8c7dc2f91ec8e2038 SHA256 36f52e6700d4e2c00f940796769488f7b836acd15f7a2065c76f8024b30ca560
-MISC ChangeLog 28024 RMD160 d283fdda47b363db33f26442067578e68b6bde0e SHA1 aefd166480c42e493dbb7a86e3302193317c86d8 SHA256 bbaf41183e5c2b493c6b6af61d99ca2a054e58d9238b583443acdc81842e09bf
+EBUILD libreoffice-9999-r1.ebuild 16335 RMD160 0ba68d4969b908aefb822870982280011d6efdd0 SHA1 5be0670d2466f3f3ceb7480f9fc9fb0eafab4014 SHA256 94098206ed0443665ce6d160864f3becee37df2eba88d425cac285452df65dea
+MISC ChangeLog 28139 RMD160 df17e73697282c709dd2cab14ac222eb908980c5 SHA1 06c410c15567d2d49bb7e21012bd67cb6c23c2f6 SHA256 56bad45102c07c9b9f1aadfc747bb423b11f679d9519352a397c941a52458463
 MISC metadata.xml 1060 RMD160 d45f264670abdfa12c42935b489af5f462f70189 SHA1 d3932fab9bb5ab0bc404a95c60fa6a03f08044bd SHA256 f7a39bf4b3077ec5bada9e35940d1a02dcf9a62b77a56cc6346f750528a1e092
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOfJkhAAoJEOSiRoyO7jvo9cEQAKdkCP3BWiH9GbcQnDisEBN/
-yf7XIMqiv9MfKxkXo3xAhJp1UVS2986kHOTJp33S7U5tPk3UksocMYd6loeL/eT1
-jP1HqF/dp1sPLJvRVErTeaszhj7S5sb6puK/HFJNHQtH9wJjO7InG3PNjdK2j9qL
-w3iIx2eY6JQs09RzDud9qRMwvbUIKiyr4nR6LvISO3eXcbxzfgY+6af5RnG01pVA
-nPKlH2TdtTHxYvzrp/45hoySJIWdeRTtACERdFbYChbxW9mslsaNmTugl8Di38P8
-8D68bHXvEkND1lI9BflZa2QkAWUsP2XAGu1qnNf3d7vZoYGyhaVEkzrYIZfeLzpy
-Yqe1lJhi9QfdoeOcIJcH1VjJ3cK1LLknQzJ/o1Z02gxfe6WhNRdnvf6Ixex+uJr8
-v0HEMgKr3V2EIdDBMRU1tHH+/+Gvg3SWyCQ7JtgLkV+nCqTO73MzXYqTbeQpv7D2
-tMgRc0yMpSdHpWq2c8L5/uT3nuh1k3GRzmkn6CpOoaO8lbqO7d8e4AaJGEPRJp7H
-Xk0TUgbE6wA9mn0RLhrXPNlplyVt1747YiHc/98zIa5uzTRF3cF/rj7HaXTZ8mjG
-MqVzbkMc56nzGhIkbmOBEXM1KtXhTZspJHahJpiYn++gbivSsVPjkrF4o7i23qE8
-FOxnZEujMoUxGvfCl+l1
-=7ntC
+iQIcBAEBAgAGBQJOfJs8AAoJEOSiRoyO7jvoyOsQAIutgrzcEImGTZbm5qwaGw2M
+I9qRyMCdYylX+Q6wiOxHBbqk+ACHwYzggPgjeXn5lB47p3TwxI7Q5Lf96z2OQbrz
+bTIP/j9KBWLClVk18IMMk5AHjnGqh6xBuy2qtLhJT2WcSfxMryYNOsmdCcWncxTT
+Sg/bmyKcHROx+T57wsS/t0eZWhCY/UmVLa2CYFGq47qDSwrK3wAvywObBgWy/fm7
+I93O2oP7E95FqZ8Xj02x1gyj4hhJJ4r1L3OPIZi6uVDtMCzd1oijjj0XYDwOF9k8
+2ybyeGOFkAwaAA9UPfFq5ujjel+5t4G1BiFIwcqasyYr2QnFrk/mk4AMzbuAz8Se
+Qj9r3oa08YBjrWZ2wIi7cHQ2O3499ffs2jiWhZZoHgqXsPL92uoNhCCGnAS0QYQw
+fZ66e50LKeyj8eijb9S/C8rKNjOuzgAwr3YnXxW2I/SN7nI+xwb8BFd8AlyvEeCw
+TNvO0jMjRbDhRmIzqPcAWznMZYT2y4wpOsEbq8coH0Agl22cV0ay9rg7/fWYb5LY
+quHo4mVpwg7KRtNYgtplwiQGtEAXXPTFj0yRM9fX8WDooVESiBYVjGe66Hwln0wB
+yjzyJy87v1yo0ADslzET0qwNIjTJr4I7UXd8GDFZSc4zsPM642p6rqtO0X4QUIZP
+0DT9rz+UtceS0bj8gMlk
+=0+RC
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 3dc53466ece1..a4624aac683e 100644
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.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-9999-r1.ebuild,v 1.22 2011/09/23 14:35:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.23 2011/09/23 14:44:42 scarabeus Exp $
 
 EAPI=3
 
@@ -184,11 +184,15 @@ PDEPEND="
 	>=app-office/libreoffice-l10n-3.4
 "
 
+# FIXME: cppunit should be moved to test conditional
+#        after everything upstream is under gbuild
+#        as dmake execute tests right away
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/boost-1.46
 	>=dev-libs/libxml2-2.7.8
 	dev-libs/libxslt
 	dev-perl/Archive-Zip
+	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
 	dev-util/mdds
@@ -216,7 +220,6 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
-	"${FILESDIR}/${PN}-kill-cppunit.patch"
 )
 
 # Uncoment me when updating to eapi4
@@ -226,9 +229,6 @@ PATCHES=(
 #	nsplugin? ( gtk )
 #"
 
-# Needs lots and lots of work and compiling
-RESTRICT="test"
-
 S="${WORKDIR}/${PN}-core-${PV}"
 
 pkg_setup() {
@@ -330,13 +330,9 @@ src_configure() {
 	use gnome && themes+=" tango"
 	use kde && themes+=" oxygen"
 
-	# dmake: not worth of splitting out
-	# cppunit: patched not to run anything, just main() { return 0; }
-	#          workaround to upstream running the tests during build
 	# sane: just sane.h header that is used for scan in writer, not
 	#       linked or anything else, worthless to depend on
 	internal_libs+="
-		--without-system-cppunit
 		--without-system-sane
 	"
 
@@ -474,6 +470,10 @@ src_compile() {
 	make build || die
 }
 
+src_test() {
+	make check || die
+}
+
 src_install() {
 	# This is not Makefile so no buildserver
 	make DESTDIR="${D}" distro-pack-install -o build || die