projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: af60a53)
Make cups harddep to solve build system issues. Also harddep for 3.5 and later anyway.
authorTomas Chvatal <scarabeus@gentoo.org>
Sun, 4 Sep 2011 11:52:14 +0000 (11:52 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Sun, 4 Sep 2011 11:52:14 +0000 (11:52 +0000)
Package-Manager: portage-2.2.0_alpha53/cvs/Linux x86_64

app-office/libreoffice/ChangeLog patch | blob | history
app-office/libreoffice/Manifest patch | blob | history
app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild patch | blob | history
app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild patch | blob | history
app-office/libreoffice/libreoffice-9999-r1.ebuild patch | blob | history

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 100d26f5f113256cbaaac62f43f58f309d2e3316..e44541ce338558a6c5c06f488de1fffcee8c2957 100644 (file)
--- 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.123 2011/09/04 09:24:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.124 2011/09/04 11:52:14 scarabeus Exp $
+
+  04 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
+  libreoffice-9999-r1.ebuild:
+  Make cups harddep to solve build system issues. Also harddep for 3.5 and
+  later anyway.
 
   04 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ffb93249c230f98051b59b086b7e28a15bf5e58f..77e175185046f1f157a0c74fee00040a2b09b7fa 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -169,25 +169,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
 EBUILD libreoffice-3.3.4.ebuild 18141 RMD160 50ac48e5cc3206f2cfc35c69a098fba8e38da4b7 SHA1 a2bb549a0c6c66c477db08bae202d581ecfea5b4 SHA256 1233871084a7fb29500478bc3891f23c398d30811c06224c3da4344f3c4fd280
-EBUILD libreoffice-3.4.3.2-r1.ebuild 18576 RMD160 c156c44f4af61587a2dc75288e5af38247a61cda SHA1 f26e95bd92c1e5acda5a65047789a81babd7e747 SHA256 c579569dcd4211af308f2b1898ca80b9577d34d085ddf1663d2e19fc0a2faee1
-EBUILD libreoffice-3.4.9999-r1.ebuild 18580 RMD160 eef9e40a572102ab0bc616e61e1937fa654604ef SHA1 5db5d1b948f0d8a584aa9950070cfbde7925b8b3 SHA256 dbd13dc7d55ecd9b9f07096b63673962beb8b5564f2bfe545417e2456896f7a0
-EBUILD libreoffice-9999-r1.ebuild 17907 RMD160 60546265036d2a494fa6e9e7de7f3c67ca9d2a00 SHA1 d7f2efc74675957d4adf56eea85f5e41e9bb612e SHA256 2d476e0c83c574958f610c786f1d32de1743faa010cdbe14dc96f2a914b22160
-MISC ChangeLog 24289 RMD160 02e7d335a27de33e4e568e1fe8776f9b1bec5f15 SHA1 15531da521c4e18c2d5265fe024fbd9cad69ea27 SHA256 01bf082d5e7b9776d8a1405cbc518bcba072a175f6599c01683b6539675c227d
+EBUILD libreoffice-3.4.3.2-r1.ebuild 18556 RMD160 1d0b7a84aea772e4ff950ffab34baf10a9349f2b SHA1 d23b8e2422a39b79f8abc0d03119b7e4cd59eb7b SHA256 a67bc0be9feccbb88c28bceb038835fe7fad245df9db8e01fb1a9cffc1070caa
+EBUILD libreoffice-3.4.9999-r1.ebuild 18557 RMD160 5ee2944f460d4a124f9f6d8f485a20ee24c44e5f SHA1 b72b9457950888930917b258818cd6bd102045c4 SHA256 ca9fe06c69485e233b5600e7b96bccf3b8fe9fa24c2e13adb5a956466a771a32
+EBUILD libreoffice-9999-r1.ebuild 17904 RMD160 5bee8df8614bb19964a553a3cfd434cec6048598 SHA1 ae90da7f3e32b238d344897381230a448096de21 SHA256 b79d3133a7366e552c1cc4c824c5b81ed36bed7b4853da6ec95794297a35abfb
+MISC ChangeLog 24531 RMD160 73ae99719cce0ad4da35a7feda196089b03a5aaa SHA1 cce41ca12fb361a1be75dd3386cc5052e2d04e53 SHA256 492098c98df8fdbccb1238917205562c84dd9ee1f9734ed7869f6cb0dfb39a19
 MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOY0O3AAoJEOSiRoyO7jvodHIP+QFqf50zlxCjkgeMvQOSj5F3
-XyA/+Wwn8eiFFuk++hJPj20KPxMULHNfGeP32vHdmK00iQJAdwI82V7hBp2PmmSG
-5XREtK5JLlsrXxkmmGjTKdH/1emzia1cn3UxZ9zhAif7JLN1/agbSadrBE9Mo+KW
-6HYAwtJXjC3HeW94d3TD/epDEuheji2c1tsuNN4e5HSxx0wXY9ZBboHil8eGjWNp
-o0RKCGnCnfZLCWS5SZkn70x5y0LV+3MpTdOA3fc1WmXrqIomVPJIFjO4dlcJJLCX
-HReSDN4EMOf1ZLG988fol25z8CpJRoB+v0vsvlMknKuHquGu/fxl+0jElkKhUK3k
-TcLNmzoGBHV6JWImCtzrVNZtHW5fUs4bFAyVu4Shdfp1ha3oE+qMPGoyNfu4eQG2
-UbD2w8Fgr51X2jEOStOgm4puOPDmQ5H+h7EoGFnN7QfiVJhZ74QyhxMzWJCg7QWU
-k0Y9loh6BUEQCVKZqmcB80V45gK4wqqGt7jXohskWmUFMzhurpMmoV1X9jfvAG5h
-GqJy/4vLR4t8hBisaiQyLwO2DGQ/x0xW1EkVDI/KoHpn6kyBA0ckquMxgPN/JOdQ
-Rat14jUOQkdcWPdbrLZ2o2AEhW56UuhmDCe3ag1o5pwBkjh/fyj4Wzc6EphcCkXL
-NZVopyVcFSUeYO5vgbuw
-=Syta
+iQIcBAEBAgAGBQJOY2ZzAAoJEOSiRoyO7jvo1TcP/RSHqkn7ybXRrwXXO5BWJBjj
+H+qUUAMlK4ttRfcFEyv5Mx/6eo2vN0og1/inuJFqMISWhzRmDly+4FWxpgNouPFf
+2PFlgWPiJVnVakyHS7tFHCip1Hh01jwv55857EX3swjfxeh7B+H9SgfrWfeaOlcF
+RKDykkWRJQV6kBeYtoaiw8Uxx101TlRINrk44i429lmZdSL24Knvs4JywxBpWxZr
+KxditY+G7SDf8UKdr4qIUKSDbEKAvQvuh9PSr/SFAFNgd6SStznkXt2OC69OZFuw
+pBvP7oTdNvkTmydWE983wom7JcUUXCldjASwP4s7lNfGHpKWbP23DYL9GxN6zKEA
+uFU28sZ2hg+4dsGbO/FU8U+Grhl7zLK+2GWOso1BTIoBuPgKTq3HueUm9IybuRIh
+iY1rrnCZJ3Eyj3IpAgjQjMnfOYZbp86m2AWUmp+AvOT9KBAYyXCjHVOU/hjtoUKG
+wVl2SnUOvtWduFuGKend8DjKoAcaGoHtW6jRBf/XOyuYpEJ7g4iBPF6G1/tlNWyQ
+GtCYWn61K9hTULsTwW8s4E+sgVt5QwQmLtI9tbJ65p33+Ohgwg5TO1RfKw+6XnQw
+/ZquMuuRGrO3Iux2AZAcWKci9F/xpOQBCTvMcFkv2ov/jVf50wNygPsAmA0+wAYH
+SlNl6u8BLwvyMtxNGF0/
+=lzfa
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
index e495b1dc8c8b5193416aed5bef5a9682c9c8ea5e..329d861ab6b3431f047b4833377c9267212c0753 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-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-3.4.3.2-r1.ebuild,v 1.2 2011/09/04 09:24:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.3 2011/09/04 11:52:14 scarabeus Exp $
 
 EAPI=3
 
@@ -100,7 +100,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding cups custom-cflags dbus debug eds gnome graphite
+IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
 gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba
 webdav"
 LICENSE="LGPL-3"
@@ -135,6 +135,7 @@ COMMON_DEPEND="
        >=media-libs/fontconfig-2.3.0
        >=media-libs/vigra-1.7
        >=media-libs/libpng-1.4
+       net-print/cups
        sci-mathematics/lpsolve
        >=sys-libs/db-4.8
        virtual/jpeg
@@ -143,7 +144,6 @@ COMMON_DEPEND="
        x11-libs/libXinerama
        x11-libs/libXrandr
        x11-libs/libXrender
-       cups? ( net-print/cups )
        dbus? ( >=dev-libs/dbus-glib-0.94 )
        eds? ( gnome-extra/evolution-data-server )
        gnome? ( gnome-base/gconf:2 )
@@ -449,6 +449,7 @@ src_configure() {
                --with-system-db \
                --with-system-dicts \
                --enable-cairo \
+               --enable-cups \
                --enable-fontconfig \
                --enable-largefile \
                --enable-randr \
@@ -491,7 +492,6 @@ src_configure() {
                --without-stlport \
                --without-helppack-integration \
                $(use_enable binfilter) \
-               $(use_enable cups) \
                $(use_enable dbus) \
                $(use_enable debug crashdump) \
                $(use_enable eds evolution2) \
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 41b732ea35c9892d95f6e40fd78c66c9840c1c1b..14dd4fc68487f1558567f548c4d859de353c69d1 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.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-3.4.9999-r1.ebuild,v 1.2 2011/09/04 09:24:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.3 2011/09/04 11:52:14 scarabeus Exp $
 
 EAPI=3
 
@@ -100,7 +100,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding cups custom-cflags dbus debug eds gnome graphite
+IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
 gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba
 webdav"
 LICENSE="LGPL-3"
@@ -135,6 +135,7 @@ COMMON_DEPEND="
        >=media-libs/fontconfig-2.3.0
        >=media-libs/vigra-1.7
        >=media-libs/libpng-1.4
+       net-print/cups
        sci-mathematics/lpsolve
        >=sys-libs/db-4.8
        virtual/jpeg
@@ -143,7 +144,6 @@ COMMON_DEPEND="
        x11-libs/libXinerama
        x11-libs/libXrandr
        x11-libs/libXrender
-       cups? ( net-print/cups )
        dbus? ( >=dev-libs/dbus-glib-0.94 )
        eds? ( gnome-extra/evolution-data-server )
        gnome? ( gnome-base/gconf:2 )
@@ -178,7 +178,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 PDEPEND="
-    >=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
+       >=app-office/libreoffice-l10n-$(get_version_component_range 1-2)
 "
 
 DEPEND="${COMMON_DEPEND}
@@ -449,6 +449,7 @@ src_configure() {
                --with-system-db \
                --with-system-dicts \
                --enable-cairo \
+               --enable-cups \
                --enable-fontconfig \
                --enable-largefile \
                --enable-randr \
@@ -491,7 +492,6 @@ src_configure() {
                --without-stlport \
                --without-helppack-integration \
                $(use_enable binfilter) \
-               $(use_enable cups) \
                $(use_enable dbus) \
                $(use_enable debug crashdump) \
                $(use_enable eds evolution2) \
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 07e51915ad0285b08fdae9d3e370af6492c0d2e6..f86db839d3c9a969d8fa12de96f0064a14c11ae6 100644 (file)
--- 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.2 2011/09/04 09:24:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.3 2011/09/04 11:52:14 scarabeus Exp $
 
 EAPI=3
 
@@ -178,7 +178,7 @@ RDEPEND="${COMMON_DEPEND}
 
 # FIXME: l10n after release/branching
 PDEPEND="
-    >=app-office/libreoffice-l10n-3.4
+       >=app-office/libreoffice-l10n-3.4
 "
 
 DEPEND="${COMMON_DEPEND}
Unnamed repository; edit this file 'description' to name the repository.