summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-05-09 15:43:15 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-05-09 15:43:15 +0000
commitd9da1fa26f714dc55d38f11ff5de77f7cc516656 (patch)
tree715db7efc8162c272771f6febd57e1c046d84982 /app-office
parentkeyword ~amd64-fbsd (diff)
downloadhistorical-d9da1fa26f714dc55d38f11ff5de77f7cc516656.tar.gz
historical-d9da1fa26f714dc55d38f11ff5de77f7cc516656.tar.bz2
historical-d9da1fa26f714dc55d38f11ff5de77f7cc516656.zip
Introduce proper cups useflag. Thanks to Dave Flogeras.
Package-Manager: portage-2.2.0_alpha102/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog5
-rw-r--r--app-office/libreoffice/Manifest30
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild6
3 files changed, 22 insertions, 19 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index d8a1b9be6b12..faa1a15fdcb7 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,9 @@
# 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.306 2012/05/06 10:55:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.307 2012/05/09 15:43:15 scarabeus Exp $
+
+ 09 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
+ Introduce proper cups useflag. Thanks to Dave Flogeras.
06 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
First attempt to use sytem rhino. Still needs code fixes wrt internal debug
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 50276cb72266..34e410a4e18d 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -26,23 +26,23 @@ DIST libreoffice-core-3.5.3.2.tar.xz 103327220 RMD160 cb084b763e6a8136ab23f368b7
EBUILD libreoffice-3.5.2.2.ebuild 14796 RMD160 50e705b52d06cbe7e2aa820fbafd8cbe56997d7a SHA1 c0130bdd1cd67d9d60a285ff2842581952d6eb24 SHA256 69394c1cf5045771069a2cd2fcbb0b2e64127b57ae637447364f53947db5033f
EBUILD libreoffice-3.5.3.2.ebuild 14713 RMD160 69113220913112ad2991ac8d11b6430709b2b533 SHA1 c39c772b87a65eafa21268d6a02265fefce7d6c9 SHA256 897b78d4873db482cea569f967c9c5620044ca4e36a2bac627135a55d2d039b6
EBUILD libreoffice-3.5.9999.ebuild 15227 RMD160 d2d899c2d2016d64d64bee9135dbf4c1b7d1947b SHA1 bbf9ba1d42ac09045b11c395129ddbe4608bb955 SHA256 28afcaabc0080ea25eaf553543a54f9d1b81b557f7828189091a03829767d0fe
-EBUILD libreoffice-9999-r2.ebuild 16972 RMD160 f7b5bd5291026e6094f30108a72272ef487dd29c SHA1 2e846bcc9b8eda139e42709efa950b73f1ec9a29 SHA256 e032c7adb6bc43db9a7940855cce50bc5cb30c49e5ee52653600aa6813da2643
-MISC ChangeLog 56915 RMD160 67ef56451d6a76cc51a2ee40dee78d54a5f02f57 SHA1 780e344c776534b4c6510f415288cb613428e7b0 SHA256 8b4b30434d48067b0c567380ddd370ffc2b9dca173586a7c663bba9210ccb659
+EBUILD libreoffice-9999-r2.ebuild 16979 RMD160 fbef18f292b41fc52f25de63804d412f3eb75628 SHA1 73118a2a42b63a4ab401aeceec9e99ff0d592661 SHA256 fc1acc11fd218c183c6544ff2a7c0a66a51b329d7396d443416530ba275637f3
+MISC ChangeLog 57057 RMD160 45ae6c8ab11dd80914cdd181a37c155a77e70f3f SHA1 a98ff0561f367f5b4cc9221af083ed527db85952 SHA256 a902e3179bcd5de42b48dad399db04941785aa9577b1a0ae51b741619109d90a
MISC metadata.xml 1421 RMD160 a0e0f80b284843de1d2dcdb3b5f8031cd564fe9a SHA1 6bf23b009c940cfbe05d28ca6fad31abfb7a5040 SHA256 74eaaa0c786765c327bbd8dfa8a5ad51b044e050717f8a6311f71e773ade1936
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJPpliNAAoJEOSiRoyO7jvoiWMP/2krUOzJkd2V+t0eaqG5DYM1
-wlw1DkjaYm18On5N2lpBWX9xTW5yPM84ihWPzy52sfMwS8ct11OK6nhBU4kwJ1BX
-JIsomPFjaxFn6A1JKPYoVve0Nl5tS+jjiJycZ1a9o/e6Jc/5msgGB9gs0gg0Jwdh
-yUAGQj3D739sn/ByuG1MEI2JglKbzj6k72zq15Yd7NYcVG+jNB5NrT5/+Utpz1PP
-DpygpNM2PmN4eOPYhvvdIjr8qNNqD3R9Ebc/k7YVweOKUlwUJl8OAOBDbycuzO1+
-WaODU0cybsoxwr7w8LEeuSnRU583ydzvgbYt3h+hHsSxN6ns8YEql8PTRxSzRKTD
-6oY5E4IgmcV18NhXCVakPPnxaRAe8tM4rUVHiZfpoi1CgzCO734Jn3zaK155XW5B
-USTluhKSJGofmYSLNrTxLniqyscLNaLbv5k/LPXBTtfBCNGHCPsFtfajHeUmBsGi
-9tNaNmpkddsgQB5l6zwk0TeUlFEhjQUDmPTnJX5l0N5RPC7WAP7IVZR8LC/BaruC
-KQgtjG3fJDd6LhiZlwAn9YdPegtcrx7hT4LRhSd65uVRGKQgM4tmvpZW1jbVpUKd
-7CnP7JO6wf3qi8oZQ0ds0c0EBfFoJjIriyhkD3GEgo8aeqqw2MgctxyN0L7nlAVg
-2Ccr2JooGAV/VIht0LLl
-=LA6d
+iQIcBAEBAgAGBQJPqpCeAAoJEOSiRoyO7jvo+lMQAJJp9GVrmIQhDmfAst3Hxvpz
+MWVG3y/BzEEkaaDVuZvIRldvl1Nw2AFvwfIM5CQtP+kZ939RE2TQPxqwENVlNKsY
+YiIejvCDsjynzPuwTGjwl/LOxJ2X9GXlCTsGflbnuujADfP92PcoEV9zhErNloUf
+UsXXTgxZIQQBgSVXQistcPMGun48k1fc/80JkgTfcnaa2gVDK7Pt95HOg6svLRLP
+HvlA8ib9GEpFcmYeHS7u+qGfKBRrL+qPlRa0v4NkuBVViScLt4a5ipNafX0tIWYV
+cE0VjjHGV5Y34wSMdUqzRHQm1vAcGXnCKszhEdR2J/h3LyRLh3PR5tAU3YSC3doz
+UxmdEBjUSLBqGxjo9n+TWJ6zqgAqyd5ONRq7PMvw9jjmnP61YjQZooKrfk93YU1D
+zKqJZuGvW36jD37lBMGYRWuzy8wZ+b2mwWErrJtFzSuvRSAT8pzmi6VuGYaJcFPN
+GtrFiLHdK0ERW9TEu0RHehF6r6Rc0KyAf9bsm4Yf+KU+0FWemBqd2/YE0vtWQ6gy
+lRl/F4BoIp07tOqq96ycGft/JHiStHT6l+hX1D8C+kJP/Wh53VXhipwmRJFFOAB2
+h0nFbe3IbVnIOsaBpfQ6TWRju7Wa+dR0UatpqfnnjMpUzPe5TGrkPOheptaARApQ
+bJTmHyzn+dKr9gR3uE1q
+=jFeK
-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 23bac8fbf94d..d0836623523b 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.67 2012/05/06 10:55:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.68 2012/05/09 15:43:15 scarabeus Exp $
EAPI=4
@@ -129,6 +129,7 @@ COMMON_DEPEND="
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
+ cups? ( net-print/cups )
dbus? ( >=dev-libs/dbus-glib-0.92 )
eds? ( gnome-extra/evolution-data-server )
gnome? (
@@ -172,7 +173,6 @@ RDEPEND="${COMMON_DEPEND}
media-fonts/libertine-ttf
media-fonts/liberation-fonts
media-fonts/urw-fonts
- cups? ( net-print/cups )
java? ( >=virtual/jre-1.6 )
"
@@ -195,7 +195,6 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
media-libs/sampleicc
net-misc/npapi-sdk
- net-print/cups
>=sys-apps/findutils-4.4.2
sys-devel/bison
sys-apps/coreutils
@@ -478,6 +477,7 @@ src_configure() {
--with-helppack-integration \
--without-sun-templates \
$(use_enable binfilter) \
+ $(use_enable cups) \
$(use_enable dbus) \
$(use_enable eds evolution2) \
$(use_enable gnome gconf) \