projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 05f1f12)
Introduce gtk3 useflag so we can disable gtk3 by default.
authorTomas Chvatal <scarabeus@gentoo.org>
Sun, 4 Dec 2011 15:51:14 +0000 (15:51 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Sun, 4 Dec 2011 15:51:14 +0000 (15:51 +0000)
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

app-office/libreoffice/ChangeLog patch | blob | history
app-office/libreoffice/Manifest patch | blob | history
app-office/libreoffice/libreoffice-3.5.0.0.ebuild patch | blob | history
app-office/libreoffice/libreoffice-9999-r2.ebuild patch | blob | history
app-office/libreoffice/metadata.xml patch | blob | history

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 258e3d8390b87d9dbfa01e6cdf353f1859c4c415..209f48bf4a221e002d8fe69cba125b6953342495 100644 (file)
--- 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.209 2011/11/30 10:29:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.210 2011/12/04 15:51:14 scarabeus Exp $
+
+  04 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.5.0.0.ebuild, libreoffice-9999-r2.ebuild, metadata.xml:
+  Introduce gtk3 useflag so we can disable gtk3 by default.
 
   30 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.5.0.0.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 73d0dd8b1ad15a720c1d9db5343828dbd5bb4a3a..c5768a35fd214b8e9d5468ee8e94d13e26e5c586 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -178,24 +178,24 @@ EBUILD libreoffice-3.3.4.ebuild 18266 RMD160 c0204063e1a6bd7621267fd4dc92d8b7334
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 f97b7a6b4af7c5187fece7d7c233fc4f17d84449 SHA1 51ea539199105d8edb52f65e930e9580f4bdafc3 SHA256 392e764b95e09716f031ef22118e1eed25a892c75876b3614012b3743ec801db
 EBUILD libreoffice-3.4.4.2-r1.ebuild 16541 RMD160 f08a3b1e7826d489a580087b1638a4b98acfbca8 SHA1 f81fb848f6895c3c947fc56f0aef0963f15c93e3 SHA256 9c8adc1a3c217697dcaa7eb3722ae84b47926a9119c39f53b330243bd4b81ed4
 EBUILD libreoffice-3.4.9999-r2.ebuild 14991 RMD160 7abb80f9936495407114fa70260a6fc0f859fa07 SHA1 9f98e13f004793ce15a7285fe7bb2e9860ee31df SHA256 302684d2d6ccdb7ed8a48068f101d0b04037d6ff413bf8b3feccaf9141f19db7
-EBUILD libreoffice-3.5.0.0.ebuild 14000 RMD160 ee3c29e4c529a65a89a3840d8182fc26dffbbe2d SHA1 ba261e7dd845634b4877f6c7f27cb7fbe6912e2c SHA256 b1ca0875c41e78d178996c5cd6c07bd184c8434850b8768915b5226849d1a387
-EBUILD libreoffice-9999-r2.ebuild 14001 RMD160 9550903f6cf52e2178845c2eb30d3667fd50086a SHA1 3b3a1d2dd8d783d60f4fb5aa99b8413d91f78b16 SHA256 f1acdeb222342d7510431dafb58d037227656f53a786bd063c2fceedef62dc6e
-MISC ChangeLog 37840 RMD160 b422439c447ac896e6eeb2ba67d6b7daa76becf1 SHA1 5fa797646da9a49a4b26de8481127ea180964ef9 SHA256 a5b9979493f54253bcc423bd324ca003d156338e645a1b3a252ee3c39c91f0ce
-MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
+EBUILD libreoffice-3.5.0.0.ebuild 14007 RMD160 d0f9c702109a4f3d0847847cfa12eb8c3dd4b676 SHA1 1dd79506bb6cb7d4d666a44ad4a6873350dc779e SHA256 6a71a7843dd2effe28d42ffa43036182a916539a81dedc09eb56a78628285ba6
+EBUILD libreoffice-9999-r2.ebuild 14008 RMD160 654a4754caae39e33f6dc613fe241c6879c966c8 SHA1 e55579fd9c6356d537e52a04f9d1704c31604b53 SHA256 569bf53e1a5fa4dff7ce1a3f7cb73f8ab296a1ee8193bbb2af3898f7c850edaf
+MISC ChangeLog 38028 RMD160 4fac324a9cae998935b2f46c58216394bec3f30f SHA1 8e5352c073518b00b91311e4aaef2ddca8022465 SHA256 aa10ab2a4cd0c9b5611973aeb43df3a877a387b471dc85e926321d8f48166cbd
+MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO1gWbAAoJEOSiRoyO7jvoLbgP/2yTkGCKX/npc17JQbykZNDk
-v2qH/66vs2bVj9Y6UKver0dz9mT3wn7Xj+qzHRWZDgv6pCtp6QR6uW2st3gTjYwI
-rLaB7JJ2dxvnxe1xOZYGyQgf/iZ8RcFT3/5Ko7SSWz8RuB1lag9VXrYmt49gBXZy
-9BjmmG/84pLeQmRZd6jWfLOhInJ4lXUO9F/HW6d/MS0G1q5HlDLMDpQkR+DDJ5PK
-4FseuB0XYw6/dK3oguuSpqB+aGA8KqJH8RbahBjiOtkw5VUFpAZtBcUc956EEjL9
-gUk+qo0htshq3ZsJsjzrvfQv8BRbJfM6pXYY1EEfgS7LQa6UotjTcvGlkcQZrBev
-O4jM9c48HebauosdS98bVrJWsSCRJ9c82t4s4CtlaiE8nJjWUii1t55AqilYCCiZ
-s3BSVvMxiU6x1NA6X9cfcz9pGVZjv6uwZcls0c1SXspff0FgNlIwh+aL4Ker5lDS
-DI2fLEdRmJBR2QfK8HcgxZim6e6W84j7LuEGogIuGORW9nxkkrMQAHYBI6D6rvsi
-c3Zxr+ATD4PX/2ItU7r6tiexVD1QnX1tjvZ0Rig/72ZzUUSw4kjrW1Z5sDPR1bZe
-+CsRJRHRSzaCkawk341+4bxQpi3Ib9dAAGgFLadzxzjKvGnB2Bu42POFhi4j2doL
-FLyoaMLMcUcGPJscIsgx
-=g0np
+iQIcBAEBAgAGBQJO25byAAoJEOSiRoyO7jvoKw8P/0TVfw7/uGqa+IYxFMCwA1wU
+gtDVgboQ0bCNpjPKAMog2ymN1GVYmWwyIORT2JyOBiCWOeDTJgtnUSD2GGQCM/Cr
+xPtowUNuPZwSFuIcaucsKXwBz90vJpL2DdOUPJnhCZxiguKKLq5MAuMtJAiBRZ8k
+CIbyBJtV+sUhZ63JX+G35MIPnbbNEQG3qA9GlkCAoUo2zp4Gtj8yAuGev2W/tktB
+P2IgiuOtlFXZHLX6r/hoe6ufA0OeY6p/6V8mKalYS5UJ+lKq1UHkfmD0kgQdPWCS
+XVuIfGDIMQ08LaOWg+FbYyUDYUdh9yREHqXQRQ6B3sVAtqV5bCtxdNFJn8Bkz2rx
+ka3+OSAam8QgWwNr5P75/IIO6OAHYR2jIK71fk2kn990YpCarTTYg5LwC5tsyhmA
+gB8CutY8TOdiOZ+AMchRepNSLA86ZUSJt84l7n1AHnLHn2cEkOUtwTcrm/yYJvPm
+KMfIYiPAEnj/DENCxyIm2sd6XabeUrmkisQZQX1DofQ6TQG6ZhVP/Rlkdh/4oYgs
+Qpl6nqJ9lfUcOIBS33vIKA2YwKxb/7jFwe7oneu6mMJdAGFLVM42pS9JBFgFBmG5
+tKgNuQrK2BSm2z4IpNPvFCeh711dfAKZCGl8I1J+BaRGPjRVXyu4A0stU0ZWDRr2
+P8sIIQQxNe1C9DkwgDyB
+=I48j
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild b/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
index 62d4735961997084c9ae3827338c643fb246e31c..c2dcca4d094fb118d6d18a725492bf724ab71b89 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.5.0.0.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.0.0.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.5.0.0.ebuild,v 1.2 2011/11/30 10:29:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.0.ebuild,v 1.3 2011/12/04 15:51:14 scarabeus Exp $
 
 EAPI=4
 
@@ -69,7 +69,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk
+IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
@@ -117,10 +117,8 @@ COMMON_DEPEND="
                gnome-base/gconf:2
                gnome-base/orbit
        )
-       gtk? (
-               >=x11-libs/gtk+-2.24:2
-               >=x11-libs/gtk+-3.2:3
-       )
+       gtk? ( >=x11-libs/gtk+-2.24:2 )
+       gtk3? ( >=x11-libs/gtk+-3.2:3 )
        graphite? ( media-gfx/graphite2 )
        gstreamer? (
                >=media-libs/gstreamer-0.10
@@ -434,7 +432,7 @@ src_configure() {
                $(use_enable graphite) \
                $(use_enable gstreamer) \
                $(use_enable gtk) \
-               $(use_enable gtk gtk3) \
+               $(use_enable gtk3) \
                $(use_enable gtk systray) \
                $(use_enable java ext-scripting-beanshell) \
                $(use_enable kde kde4) \
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 39d95f00f840b89e8a8d9a363149fe17ad7829b8..d607875aef03084757520e097cff5ad8d32978c6 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.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-r2.ebuild,v 1.10 2011/11/30 10:29:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.11 2011/12/04 15:51:14 scarabeus Exp $
 
 EAPI=4
 
@@ -69,7 +69,7 @@ unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
-IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk
+IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer +gtk gtk3
 +jemalloc kde mysql +nsplugin odk opengl pdfimport postgres svg test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
@@ -117,10 +117,8 @@ COMMON_DEPEND="
                gnome-base/gconf:2
                gnome-base/orbit
        )
-       gtk? (
-               >=x11-libs/gtk+-2.24:2
-               >=x11-libs/gtk+-3.2:3
-       )
+       gtk? ( >=x11-libs/gtk+-2.24:2 )
+       gtk3? ( >=x11-libs/gtk+-3.2:3 )
        graphite? ( media-gfx/graphite2 )
        gstreamer? (
                >=media-libs/gstreamer-0.10
@@ -434,7 +432,7 @@ src_configure() {
                $(use_enable graphite) \
                $(use_enable gstreamer) \
                $(use_enable gtk) \
-               $(use_enable gtk gtk3) \
+               $(use_enable gtk3) \
                $(use_enable gtk systray) \
                $(use_enable java ext-scripting-beanshell) \
                $(use_enable kde kde4) \
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index fec5e3c492a83581b6ac174078803ef4a933e16e..d9e38ea4eaf8fd1b379a1a85bcf47e098a07df16 100644 (file)
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -10,6 +10,7 @@ version</longdescription>
        <use>
                <flag name="binfilter">Enable support for legacy StarOffice 5.x and earlier file formats</flag>
                <flag name="graphite">Enable support for non-Roman fonts via <pkg>media-gfx/graphite2</pkg></flag>
+               <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
                <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
                <flag name="odk">Build the Office Development Kit</flag>
                <flag name="pdfimport">Build pdf-import extension using <pkg>app-text/poppler</pkg>. Note that you don't need this for pdf-export!</flag>
Unnamed repository; edit this file 'description' to name the repository.