From 09e8765cc2fd3ae65d0cbebbbf62e2a11c1fbe2b Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 12 Aug 2011 09:57:21 +0000 Subject: [PATCH] Really drop the cppunit dep and also get rid of sane-backends dependency to make people happy. Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64 --- app-office/libreoffice/ChangeLog | 8 +++++++- app-office/libreoffice/Manifest | 14 +++++++------- app-office/libreoffice/libreoffice-3.4.2.3.ebuild | 7 ++++--- app-office/libreoffice/libreoffice-3.4.9999.ebuild | 7 ++++--- app-office/libreoffice/libreoffice-9999.ebuild | 7 ++++--- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index b79dcfe3c4a3..91fa01244c69 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,12 @@ # 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.104 2011/08/11 18:08:49 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.105 2011/08/12 09:57:21 scarabeus Exp $ + + 12 Aug 2011; Tomáš Chvátal + libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild, + libreoffice-9999.ebuild: + Really drop the cppunit dep and also get rid of sane-backends dependency to + make people happy. 11 Aug 2011; Tomáš Chvátal files/libreoffice-kill-cppunit.patch: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 3fb646220f7b..c1b66aca7d65 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -171,15 +171,15 @@ DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a50 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 bd31b78ac9b3d4a0917f4d4ce824a7f82c8c9d9d SHA1 7e7d0c226a3948ca569acdc3b38921a67dbdabc0 SHA256 11c4b4508bd20b4f15d0835b8c9b052588e078c649e138a50e0bc0222c41008d -EBUILD libreoffice-3.4.2.3.ebuild 19524 RMD160 3f20ecce6bd76e1935ceb70e9679802a3f1332ac SHA1 e0f50f98936fb77c2c59b34bf8be59c9b9871cdd SHA256 8b640ef102a661f15d192472529752277c8a6e1e9e25682ca1b9199955d4ca58 -EBUILD libreoffice-3.4.9999.ebuild 19445 RMD160 414a14d324576f880fa503110fb9e9f1905e4a1d SHA1 b72c72cada623c72b73c25d02b60c7909e460845 SHA256 27f7d615b993c2cbc911320782c64fa1628ca9f15763cefee1fc990d6a10de52 -EBUILD libreoffice-9999.ebuild 18872 RMD160 366094ce7d6d513d476a6d69ef878c3873ed7d1c SHA1 8c0b6cf4f8e95c7b506d8dcab2f740a239df29de SHA256 e520329be224cb2cd4c9cf6b3389782913440f5e325b9de12114aae576f003d7 -MISC ChangeLog 20351 RMD160 2c5e939998979a523d0819ee1d9f042eaa8bc8a7 SHA1 b515e0274ef0d2d21de3f45edaef9fea25f557e6 SHA256 700d6993572e79f34e84209bb242a65f17f146eeacf3d19c042c35adf3a24389 +EBUILD libreoffice-3.4.2.3.ebuild 19627 RMD160 f85f5c23d253d754d876779a9e29fef934443958 SHA1 693a7c104af71f1a859ae6f4a96c7c287cbcef2a SHA256 f4d34636bbbec54302eebc99cd66becb370062ffd65dd232b0a1412ebed4a559 +EBUILD libreoffice-3.4.9999.ebuild 19548 RMD160 608c1c73a995bab23b94cea2a2c9953bfec143c9 SHA1 494bd138b5a2954c4db3918b5b934ab430031dfb SHA256 3958248b0b680c5efae05ac0c691f50ff17b8f5f54e5cc00abb03bb58f6cfe08 +EBUILD libreoffice-9999.ebuild 18975 RMD160 ade20095c351f895ac2226659101b1b9cdfde214 SHA1 219d6fcd66b49446919365a2a2c8591d1cdb901a SHA256 1b44164503d7d1a04e2acd8746359f5e91082c3baa081678e944fe9619313500 +MISC ChangeLog 20592 RMD160 cdc204c6f340b82e8451ce2316d64714076c525f SHA1 f640779d0789db0790583747abe9e7b1bfa9bd79 SHA256 1fa3c0ac9c3a79879526149a05c5d1f834988399587ef595110807db1dcb706a MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5EGrcACgkQHB6c3gNBRYfV7ACfc8kkpVtl6WN4A8Hhh7qLUW4t -sxEAnjZFGgonJW9UaMaT48+uX1tGNKyI -=zcyK +iEYEARECAAYFAk5E+Q0ACgkQHB6c3gNBRYdf1ACgzCbyYBlHBlV6zw+BiH6cac86 +UNoAoIB1KfIR3ivf7hUdpG4Sn2Ohw1Mz +=0mcR -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild index 480ee04ab911..59adcee38152 100644 --- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.2.3.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.4.2.3.ebuild,v 1.25 2011/08/11 10:21:56 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.26 2011/08/12 09:57:21 scarabeus Exp $ EAPI=3 @@ -199,12 +199,10 @@ DEPEND="${COMMON_DEPEND} >=dev-libs/libxml2-2.0 dev-libs/libxslt dev-perl/Archive-Zip - dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds dev-util/pkgconfig - media-gfx/sane-backends >=net-misc/curl-7.12 >=sys-apps/findutils-4.1.20-r1 sys-devel/bison @@ -411,9 +409,12 @@ src_configure() { # 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-hsqldb --without-system-cppunit + --without-system-sane " # When building without java some things needs to be done diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild index 5f50c047a338..85a91260e056 100644 --- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild +++ b/app-office/libreoffice/libreoffice-3.4.9999.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.4.9999.ebuild,v 1.17 2011/08/11 10:21:56 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.18 2011/08/12 09:57:21 scarabeus Exp $ EAPI=3 @@ -199,12 +199,10 @@ DEPEND="${COMMON_DEPEND} >=dev-libs/libxml2-2.0 dev-libs/libxslt dev-perl/Archive-Zip - dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds dev-util/pkgconfig - media-gfx/sane-backends >=net-misc/curl-7.12 >=sys-apps/findutils-4.1.20-r1 sys-devel/bison @@ -410,9 +408,12 @@ src_configure() { # 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-hsqldb --without-system-cppunit + --without-system-sane " # When building without java some things needs to be done diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index e24a56ec69ef..44039e8839d4 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.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.ebuild,v 1.12 2011/08/11 10:21:56 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.13 2011/08/12 09:57:21 scarabeus Exp $ EAPI=3 @@ -202,12 +202,10 @@ DEPEND="${COMMON_DEPEND} >=dev-libs/libxml2-2.0 dev-libs/libxslt dev-perl/Archive-Zip - dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds dev-util/pkgconfig - media-gfx/sane-backends >=net-misc/curl-7.12 >=sys-apps/findutils-4.1.20-r1 sys-devel/bison @@ -404,9 +402,12 @@ src_configure() { # 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-hsqldb --without-system-cppunit + --without-system-sane " # When building without java some things needs to be done -- 2.26.2