Remove also graphite useflag.

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

4 files changed, 35 insertions, 31 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 51181c20b6fa..7c7c6426daa4 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.356 2012/08/12 09:00:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.357 2012/08/13 09:06:51 scarabeus Exp $
+
+  13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.9999.ebuild,
+  libreoffice-9999-r2.ebuild:
+  Remove also graphite useflag.
 
   12 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.9999.ebuild,
   libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c9b4ff9b01c5..e63513b64f5c 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -29,24 +29,24 @@ DIST libreoffice-help-3.6.0.4.tar.xz 1863972 SHA256 30b79e3b4cb5b2167d1f3c17b878
 EBUILD libreoffice-3.5.5.3.ebuild 15651 SHA256 2d917faf6e64025100fc3913d5709d995ecd608b65c977d029e789dfe0ac9d12 SHA512 c45a9848e807334c62b0e3ee537bbf96b4c5fae01756364c02e67b5c4cfc8ab53b5613408f7aa82e1e534ae54d56d375538210bd1cfea20e3375196f424f3364 WHIRLPOOL 63957862d965632f8f60a5fe2a4b1f5d86202f652e4bf5156f0ae62e333656c5c7f5b59dc74de1de4fbaa8805549afbf3e667f00e8c7fd31b3bd1db78472aaa7
 EBUILD libreoffice-3.5.9999.ebuild 15656 SHA256 e53d4935d180d5f3910904e1b90e091f392f268bae3a137fde30f0d1ec7ad996 SHA512 bb81fce7015a3bbb10684bde943bfa29b2f40dec6bffd91f844d770eafab0fba48015e29aaa29d55bcd74c4e67fa3d7c21c6628d8418d878197457894824b78d WHIRLPOOL a6813f67b4bd317f246dcec9347e0cc43d695751f0fd6c8055d0973469e0e31f50445fec4c77861dd4866b5cad0a85796c8120016700ef9780875d36254194ac
 EBUILD libreoffice-3.6.0.4.ebuild 17414 SHA256 13135143a6ecf38730523884b359385aaa182b6c462f42918426375cc14a0bea SHA512 941c6a6f935d1ae4ca713340c2a675872dc6e347874b5ea55ab29eaef606788f930188b4cc7e738131e3d5435bb843e1c9881a6f20b177dd5559576bfb593673 WHIRLPOOL 56651f50cc39b4aa360dcfb1a129d837c42159c4ffbaf652c54f168a574a9951bfefcf438d7e972662cbe4351329f54843839f7a697b49e5c5d506e1c69e4d79
-EBUILD libreoffice-3.6.9999.ebuild 17243 SHA256 a209917973121872d2c5a6e0f6b2b6c91bd1e28fc27406bc8f1b2be8f2a6eb59 SHA512 d8dbf43667942697d21c9a2ee0ceaa7c2545e80ac78d7b80077001d8f9e90b23385d3d8450365798d0d9ebb3fcd63208778a913b1c9b6c7f16bba7515849e9ab WHIRLPOOL ec482a59d6dc0482b0c0302f12fa0d1fc2b6b1936d2e9a3369b226a617bddb295842cdbdbdc4f04cd5038d5e8af2a523abe7ed0fda6c181d4df0d738f7f348d5
-EBUILD libreoffice-9999-r2.ebuild 17404 SHA256 26639e25e3339da04c1f1c104fd7b665f857f8de8012057acc7c530ef4a99bcc SHA512 5109fe391ec4f19a95fc46b3160f41f1421efa7fa4565426bf14d7454519fc76b92ee9b2bc6d1d3070397428cfe4a8b3c9aeef75e4a9e5133c3f3f0a08fdb7ff WHIRLPOOL a89adfe97f6595ffcf34d0dd28df5d7681fcc853f7a12855bf220a27d6ece87e0ef72128f286d131335f847463058932fd0bfce3836147b317d1844010e2ed47
-MISC ChangeLog 65509 SHA256 78c859eaef1889a50dc922d60a630527da20a55261208e1f8b511bdb7cd5056a SHA512 b2ea3934475ba8b6c8a6ec33ec4069d1963d8767c45e27c067c6a1a609f5ade2dd15aa5e4bb4baee455713dd85fc2e7a3c6983d6d9a08751321aa51738f26839 WHIRLPOOL e83f9942a6a2eb70a6e36c5a6ef34032eeb088d5d13ef4679b01ae621447d72281ef1488d2bb8483a2db11fbe2d2629840e4c012be52c10bd045cdf3aae8151e
+EBUILD libreoffice-3.6.9999.ebuild 17214 SHA256 d0d3a12af90311ab31af29aff3e7a70bf41f1dc1a638d67742cd333c9e7fdd40 SHA512 87d2902412f6da8f41fcc62577fd014c2ffe631533320611445d7bf821cf7846d0626c136748561c76887d93c99793e2c63fb4ab56dc2570eabcc3b385b3f56e WHIRLPOOL 15efa40c2f47314ac26722a105b757eca31c1f5b1295b8380176372429d0eb423e9366226dc739cf54b01d9f6a8bcfab6dc6e244576f95d730e1bdbba24c9809
+EBUILD libreoffice-9999-r2.ebuild 17493 SHA256 8569a0d838e5943fdf462f497f0d5c1f1e765f7a8c9874e7ebd93519e098234a SHA512 6ba6848074833730a657604b03795f4271e3fc7cb76833f11c9f35694efdc958bf851583b549329025e7e8985e12e8858d967951da11a9a9feb7f29567c43bbb WHIRLPOOL 8c14494752279aab5a11fd54011c4063e24e8b4b1024870bb0a799056ef2f26b4794c8eadbf45139baa7e33beffaccecc1fdfd29446f30c61b5c3098dab7b8f7
+MISC ChangeLog 65656 SHA256 a041344385f1502f72a83597b68435b9c3039418508515a2831d23f01567a665 SHA512 10c0fdeb41005231196f29b08002fe389c6b586e0682fa152af7d2a3b8bbd09cce05b1aa8bb8a627af889b91330a268422289f94179c462b7c4fa882676d6c47 WHIRLPOOL 63d0da3bf00225d59276b1d7194b41c30dfe7d1b3ba5ae651d21d8610aeeba7f4203bad0fd0b481526e1148e697829434bafc1c90f68c30f1ebe5c3570884f12
 MISC metadata.xml 1534 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401 SHA512 6e07d86c7aef51c72303ae0f41c49ebc9f0bb89d9bc176822c50a2f73684253c16acf718caef6bfe8bd072ae9e987235e0181806fb0989319ea40e894fa2ea39 WHIRLPOOL 4708c3823f88598934b7ffdcc5f02c8a1427e6d06d3424634042e22527f9e16786a45114ea6010fa085ae25170b8ca241a8f2741d522f159b563d511977d521f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQJ3C5AAoJEOSiRoyO7jvo/QsP+wU4+HO7tIiHd59QQzas0PNN
-Mckib/hPeLfEx/IRzFEAmJtiHUMUqmAK0AVlAwXT/ed0Msh31xybydUqOQX8fF4x
-yRpoXKqESgOVvD7LytC9v3UkNDir6Pxs1Yu6Da8/MTzXmjx+SYIPJ6nvBRU1Ewz9
-kmji4jMGKZd9bFBfTD4SDmPO01Sd/ZDnya7NWGBpri5FOfP8aj74eD5y8DYZ8ftt
-eU9roB8Uk1t0f4zLJdeJv04WDxv8nRgK+kVTd6CMWxIfMpzprYR5ctK1t5NOusrl
-ojKZxJy1a2n1XwnJdeB948URpBovlBrq5qtw9/bHV+YP+GQdMA8JRYax8bT8qBMy
-V8977xNI8kJWfc2pc1z33jb32Wrn6owstzt9coLtN1pRmqsgX5Svo1VenBiQ5WFf
-qhetRqcDv0s6VWIIqIthOM7N3yz1K6EAVhfzoY2iRQJatBSMwfVzhlb6PqO/dtDs
-6dv8PHkdGNrDlfiPb8TFKy4Qs0JZReqNqErY6vvS+cOB0wQ0F5+lNHGPHZZJbibc
-bzz2txi3FB/9hxPCQCYm5fzslE2D8ZBIjMHWm7CnjRegWFH6gkqcOYGjF6kxpTSQ
-6ik1bneU+0J5nSPbBa8m6xIPIM6o4VbvggsJGO7q31OV3hHyeVeHwvRuTbqqWgca
-kR6GmzJsoTyOLZW6sdTg
-=F6cC
+iQIcBAEBCAAGBQJQKMQBAAoJEOSiRoyO7jvo6W0P/2VtORBEQSxc+4LvDYCkQn4Y
+SCBFz0QErvNPnFQf4Bwxxnr8nJeca21Yc2lxgZ6esHMnPNI5O3evxdGDzTc3370E
+a5LawRkjSkSkedRGmdyFaoEjvChVPQIw4ztCzAyShy/87LmxS5zR17dyF9dPE8pX
+RmSE/SZcSykGwSp8nu391OVHT4MZ+5mrxk6wXQIXRAt6D9RNlTEvZYzXePCHL+8O
+xS1CF10s8ffcRKG1g9h6xZosCXdoaW8ChGmwG9VH/4KOtLOVYXvIeecVDeD8MTp+
+VK0C+FbXgPWFK9g4FLf8xMZ7qoInbYo0X7bqxk4zVvkztaUhGP2ACQqYsSk/l4ZN
+zrRp4WjlaA5MXInPI+NZ0QZBFYr7i3SqXj3cPKSZfZ/hZLbY224R0tEyv92vB30h
+cRDm8I/cdBnuo+ywVXBgrqc6E419Koqh13Z7VyHXZJxYLVtv7JY5kHQGITktyW0H
+DKtJRrhr2IM6bQbu9Zxi6btRhEfz8iPo7g5xC4e9DAf1e764/lYW7tJViB3Jkl9i
+sEkTKXjPt144opftzFCMiuJL+qpBhKi17DxcDcMPScqzB8lGxJpY+Maqp86Oy+RU
+eI1peEd3I01/BL0WVF0imGDkJVtvvMSXQMfeLpv17aYl/kiZFNnIgVHLF50YXiDB
+qSx77yOkWulslmP544qg
+=hKRB
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 8abc5d225aab..8109c8994163 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.19 2012/08/12 09:00:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.20 2012/08/13 09:06:51 scarabeus Exp $
 
 EAPI=4
 
@@ -71,9 +71,8 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite
-gstreamer +gtk jemalloc kde mysql odk opengl postgres svg test +vba
-+webdav"
+IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk
+jemalloc kde mysql odk opengl postgres svg test +vba +webdav"
 
 LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -113,6 +112,7 @@ COMMON_DEPEND="
 	>=dev-lang/perl-5.0
 	>=dev-libs/openssl-1.0.0d
 	>=dev-libs/redland-1.0.14[ssl]
+	media-gfx/graphite2
 	>=media-libs/fontconfig-2.8.0
 	media-libs/freetype:2
 	media-libs/lcms:2
@@ -135,7 +135,6 @@ COMMON_DEPEND="
 		x11-libs/gdk-pixbuf[X]
 		>=x11-libs/gtk+-2.24:2
 	)
-	graphite? ( media-gfx/graphite2 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10
 		>=media-libs/gst-plugins-base-0.10
@@ -437,6 +436,7 @@ src_configure() {
 		--with-system-libs \
 		--with-system-jars \
 		--with-system-dicts \
+		--enable-graphite \
 		--enable-cairo-canvas \
 		--enable-largefile \
 		--enable-mergelibs \
@@ -492,7 +492,6 @@ src_configure() {
 		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
 		$(use_enable gnome lockdown) \
-		$(use_enable graphite) \
 		$(use_enable gstreamer) \
 		$(use_enable gtk) \
 		$(use_enable kde kde4) \
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 24bb9336dee9..d6e4a71d9df7 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.101 2012/08/12 09:00:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.102 2012/08/13 09:06:51 scarabeus Exp $
 
 EAPI=4
 
@@ -71,9 +71,8 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome +graphite
-gstreamer +gtk gtk3 jemalloc kde mysql odk opengl postgres svg test +vba
-+webdav"
+IUSE="binfilter binfilterdebug +branding +cups dbus eds gnome gstreamer +gtk
+gtk3 jemalloc kde mysql odk opengl postgres svg test +vba +webdav"
 
 LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -115,6 +114,7 @@ COMMON_DEPEND="
 	>=dev-lang/perl-5.0
 	>=dev-libs/openssl-1.0.0d
 	>=dev-libs/redland-1.0.14[ssl]
+	media-gfx/graphite2
 	>=media-libs/fontconfig-2.8.0
 	media-libs/freetype:2
 	media-libs/lcms:2
@@ -139,10 +139,9 @@ COMMON_DEPEND="
 		>=x11-libs/gtk+-2.24:2
 	)
 	gtk3? ( >=x11-libs/gtk+-3.2:3 )
-	graphite? ( media-gfx/graphite2 )
 	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10
+		>=media-libs/gstreamer-0.10:0.10
+		>=media-libs/gst-plugins-base-0.10:0.10
 	)
 	jemalloc? ( dev-libs/jemalloc )
 	libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
@@ -414,8 +413,10 @@ src_configure() {
 	# system headers/libs/...: enforce using system packages
 	# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
 	# --enable-cairo: ensure that cairo is always required
+	# --enable-graphite: disabling causes build breakages
 	# --enable-*-link: link to the library rather than just dlopen on runtime
 	# --enable-release-build: build the libreoffice as release
+	# --enable-xmlsec: disabling causes build breakages
 	# --disable-fetch-external: prevent dowloading during compile phase
 	# --disable-gnome-vfs: old gnome virtual fs support
 	# --disable-gstreamer: support for 1.0 api, we use gstreamer-0.10 for now
@@ -442,6 +443,7 @@ src_configure() {
 		--with-system-jars \
 		--with-system-dicts \
 		--enable-cairo-canvas \
+		--enable-graphite \
 		--enable-largefile \
 		--enable-mergelibs \
 		--enable-python=system \
@@ -495,7 +497,6 @@ src_configure() {
 		$(use_enable gnome gconf) \
 		$(use_enable gnome gio) \
 		$(use_enable gnome lockdown) \
-		$(use_enable graphite) \
 		$(use_enable gstreamer gstreamer-0-10) \
 		$(use_enable gtk) \
 		$(use_enable gtk3) \