projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b619be9)
Punt ldap until fixed updstream, feature is nice but non-working with system libs.
authorTomas Chvatal <scarabeus@gentoo.org>
Mon, 7 Nov 2011 18:04:49 +0000 (18:04 +0000)
committerTomas Chvatal <scarabeus@gentoo.org>
Mon, 7 Nov 2011 18:04:49 +0000 (18:04 +0000)
Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

app-office/libreoffice/ChangeLog patch | blob | history
app-office/libreoffice/Manifest patch | blob | history
app-office/libreoffice/libreoffice-3.4.4.2.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 8a9a1199aefc40af8724993b47056687b3f433e1..7ba2b6c9b954308d2b1f8ef9871016658b51f72f 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.190 2011/11/02 19:18:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.191 2011/11/07 18:04:49 scarabeus Exp $
+
+  07 Nov 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.4.2.ebuild, libreoffice-3.4.9999-r1.ebuild,
+  libreoffice-9999-r1.ebuild:
+  Punt ldap until fixed updstream, feature is nice but non-working with system
+  libs.
 
 *libreoffice-3.4.4.2 (02 Nov 2011)
 
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9ddeb349e7739eb79bae118075582b5fc9720db6..148e1364792201a5ced3ed7f206b930d7140644d 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -172,25 +172,25 @@ DIST libreoffice-writer-3.4.4.2.tar.bz2 7296517 RMD160 0ea8e99afe53c3ad81148562f
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.4.ebuild 18254 RMD160 f8ccfefe0f1663982a07f9468db62cd8be2e98f9 SHA1 76ee2d703a045fe306a119f7c750d5f1633a240e SHA256 4d723c31545c807a77b3b24199b566bcec50f4784a5a767ef021a13f5843d1f1
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18518 RMD160 08657e1067a7769b11aa1a095a9e755a478f9a24 SHA1 035c05abc1ccc7fd3834ebc0150103be35bec5eb SHA256 4265eb3af09948f4145550f372ad3d632ca36472ec461aa93d2fcbea4a27d242
-EBUILD libreoffice-3.4.4.2.ebuild 16297 RMD160 85c226c84ea5393f23dd22a43d206601f4d080c4 SHA1 42b2d6b6054aa82494f419fa74e50239f0c5b43b SHA256 7ca4ca0b2184a4f9d3b09e78a80ed7ddaa7b125f9f4805b18c82656cbcf7fd99
-EBUILD libreoffice-3.4.9999-r1.ebuild 16302 RMD160 b97872adbd22f9ee683d3ada98131de8dae31f39 SHA1 dd91bbc58f25dcc3f7d1551452d7b530cc1ea7bb SHA256 aa93f191a6df71d103d3855752a21965162eedb94d51285bf40fa36e626c47ce
-EBUILD libreoffice-9999-r1.ebuild 14536 RMD160 68698045a9829b9bc5413962a932ca59e0061ed5 SHA1 d726760653c9f80b0d58853f005e81aff912d61c SHA256 3437b0bdbfa811765bb8dfbe4a18699b6d356ce6f47f897ff67183b937249dec
-MISC ChangeLog 34617 RMD160 c4e8a743da03074938b30aec36895dbd5146c653 SHA1 2903b50a323a0ca0c51428fde4f112ff8d32d527 SHA256 980f76d276e61ca9d84ac72157588898e19b1291515ee9bb53bf5272b42a8437
+EBUILD libreoffice-3.4.4.2.ebuild 16230 RMD160 e9dee95e4c013d38e0ed97e94837679402918494 SHA1 235a45abfcd1dca5ffc3dea94366bcfa7294858e SHA256 0af9ab7b728b6f781648c0174fdf8e3f7512db853e114d628ba4f6e4576b40f9
+EBUILD libreoffice-3.4.9999-r1.ebuild 16235 RMD160 760cac63fb0d1689889becfbd2a205459f435ed3 SHA1 2557f8a9cfb15042c79c915c08b33e8fced3de08 SHA256 10dc12813968fd9fd8b0ffaadc46b8ef1012c3c4eaa55d09fdc05727c2a390eb
+EBUILD libreoffice-9999-r1.ebuild 14542 RMD160 736eb7f6719451a73e61ac727ffac63afb7d157f SHA1 10c9d2c1ce56fda2ed6fce2902d3f8456e7efc99 SHA256 890fae952b230961af79eae25ca521c96d376a5424f9c0ce8eccc45259100a9d
+MISC ChangeLog 34852 RMD160 b88ae71bb66a0f6ed1e2964ebb04e67913472c02 SHA1 1a357ecb73821eac2b0952d6bbe5b8fb0b66883f SHA256 6c2af6373121d096e170d1d0d4df5906ebf89aa9dddac43dc7b1bacee0f04f78
 MISC metadata.xml 1341 RMD160 532608f457f9d6f714051e0b118e6a6a1fc4dee4 SHA1 7890f0068f2750aee68293f9bc1248037f799ca7 SHA256 0f7c6fbbf0a908b5206bc6af740375006f903b61f356fb21b6df8d1fc6a59755
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOsZcqAAoJEOSiRoyO7jvojp4QAJP40LZpaBhBOLCeSFfobV3A
-X41IdI6WSdTO3F5Towdr7EVIZLSUqaJ2GCpRY3pzUKiBOMPAY8oFIGOq5LP8m35P
-AGlJE3Gt03FXM+tXPNR1AZ1ycv34O8Zoz7GWQ5PIbPlHX8h/RHnNkX6dWnFSbnjK
-r1AHogKGQdVjvO4SEBp/rnIQVh113Sz4w1sEEq6pi9plhmWXrpNQHKYlmYs3SJC5
-Zit2p3L3UPDwqRT6mMwFMee6gA8Jsrupt5oExEHuc4hmHvYLILS7g/Tz5oLXYEtM
-VtdwquHVacdWa/beNyHFgjrY9FaFCzh/0oCISd6QPyw8014n7YQeQ0BmHb5o9AJq
-ccHv7JgbSV4fk3pg56eisa6i8Bhg4wlZo4XUYJH+V094xS5Cka/dG3rPBG85omPV
-IoA5fw0qm6wwSg5xOGrwJYBMIb2XN0cyQTsxfvHFAdhrWEhEoZbTVFry527ehDyP
-EKqT9AdNo9YCYjfYa8Cju8LNa4fDRzBRBQ5V9Seqbh8mGL7UEmJWKYO2CaftDmdU
-0LYoRkiFpjOYqmyhW16CpxCE9GE8wW8uHZ0VWz2OOmITOhUIkB7oWwXyaSqf3nzL
-TCJx6sO4r9G6jNyD41DTOkcLuMsiR+ZI8RvOwP3tj4/HvBisoVKLpWIImirjtGEs
-gD0GEvTOtS6WGTJovqED
-=jRvp
+iQIcBAEBAgAGBQJOuB20AAoJEOSiRoyO7jvopAcQAJgJ/byRXbsyv/7I66HWeOJN
+N5+Z15OGbd2vnjEajjFln/9ewXB6My0/jszdlWd/L2mjHUq2MlzzmS3ArQpFVegs
+BOTPSfPdtqf4vj0oS5j+02TFwWUhBUKUK34gJ2NWGbmM7IBFRaaiu+NWNtR+E6di
+3/7lw28CLGmiIsXcLMqNumveGU05yl0T9h0G1gUGIvapzVHubS4paHHgFJkKGMRC
+LqB6L65NMt+5KDv5qJ/QmNTDVNVmY5rH50RDuBIN0dNoEKyf6vw5/ivPYDmJbtKu
+rEFcAqcTSec/Em4mkR8JntJzEsVzTM/CLYpssyPpGGXdTRDKZjuWpe6F9oZnn2T4
+BXOMMy/uJOzj4HmrS0dfWKIsqVXo5Yx9RTPauN6wApQNGEDBw6CVCXHaj8/H/32W
+acv3iUPi4AzUXOykBMiLZc1mN9dzTPttfIKjqs4b+Vg+WxgFMayiqXkLHYkMRwo/
+amIIhgcdcvc3wO9P7glknmou7rkFC9Q+2uwADzHABf6jauWF1fly7fTD/B8K+6ZZ
+mrGSYtGsQit3CUbYh96jbstquHw4LFHXeMJUfB429z3OKtxrhW5KRscEVR1LwuRp
+V1owq7hZh/ch3IL5EbJEjxuT6U1HQVUE6A9hvBdOymkaNZGn45l6rfIGpQMLUjyi
+HSdHtniRZNvHWaPejk72
+=NXfu
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.4.2.ebuild b/app-office/libreoffice/libreoffice-3.4.4.2.ebuild
index 52e05398323ff255660fc7e19d12e8ce8cb540a2..58b5f92b01d57de7f7efeac583c5b8c7e5ca2f4b 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.4.2.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.4.2.ebuild,v 1.1 2011/11/02 19:18:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.4.2.ebuild,v 1.2 2011/11/07 18:04:49 scarabeus Exp $
 
 EAPI=4
 
@@ -76,7 +76,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
-gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl pdfimport python
+gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
 templates test +vba webdav"
 LICENSE="LGPL-3"
 SLOT="0"
@@ -137,7 +137,6 @@ COMMON_DEPEND="
                dev-java/saxon:0
        )
        jemalloc? ( dev-libs/jemalloc )
-       ldap? ( net-nds/openldap )
        mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
        nsplugin? (
                net-libs/xulrunner:1.9
@@ -441,6 +440,7 @@ src_configure() {
                --disable-gnome-vfs \
                --disable-kdeab \
                --disable-kde \
+               --disable-ldap \
                --disable-online-update \
                --disable-pch \
                --disable-rpath \
@@ -480,7 +480,6 @@ src_configure() {
                $(use_enable gtk systray) \
                $(use_enable java ext-scripting-beanshell) \
                $(use_enable kde kde4) \
-               $(use_enable ldap) \
                $(use_enable mysql ext-mysql-connector) \
                $(use_enable nsplugin mozilla) \
                $(use_enable odk) \
@@ -491,7 +490,6 @@ src_configure() {
                $(use_enable vba activex-component) \
                $(use_enable webdav neon) \
                $(use_with java) \
-               $(use_with ldap openldap) \
                $(use_with mysql system-mysql-cppconn) \
                $(use_with nsplugin system-mozilla libxul) \
                $(use_with templates sun-templates) \
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index fc1493f16bac60f43fb514264e9cb1f451b8ec5e..4960ef15a79112497947befd26ddb1fcad3c793f 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.18 2011/11/02 12:28:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.19 2011/11/07 18:04:49 scarabeus Exp $
 
 EAPI=4
 
@@ -76,7 +76,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
-gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl pdfimport python
+gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python
 templates test +vba webdav"
 LICENSE="LGPL-3"
 SLOT="0"
@@ -137,7 +137,6 @@ COMMON_DEPEND="
                dev-java/saxon:0
        )
        jemalloc? ( dev-libs/jemalloc )
-       ldap? ( net-nds/openldap )
        mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
        nsplugin? (
                net-libs/xulrunner:1.9
@@ -441,6 +440,7 @@ src_configure() {
                --disable-gnome-vfs \
                --disable-kdeab \
                --disable-kde \
+               --disable-ldap \
                --disable-online-update \
                --disable-pch \
                --disable-rpath \
@@ -480,7 +480,6 @@ src_configure() {
                $(use_enable gtk systray) \
                $(use_enable java ext-scripting-beanshell) \
                $(use_enable kde kde4) \
-               $(use_enable ldap) \
                $(use_enable mysql ext-mysql-connector) \
                $(use_enable nsplugin mozilla) \
                $(use_enable odk) \
@@ -491,7 +490,6 @@ src_configure() {
                $(use_enable vba activex-component) \
                $(use_enable webdav neon) \
                $(use_with java) \
-               $(use_with ldap openldap) \
                $(use_with mysql system-mysql-cppconn) \
                $(use_with nsplugin system-mozilla libxul) \
                $(use_with templates sun-templates) \
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 90ed930471da84bd5b64be682154b59dd915c8ae..a0876f4d81bdba4cdf070ef77eb2588483dd41f3 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.52 2011/11/02 18:27:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.53 2011/11/07 18:04:49 scarabeus Exp $
 
 EAPI=4
 
@@ -77,7 +77,7 @@ unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk
-+jemalloc kde ldap mysql nsplugin odk opengl pdfimport svg templates test +vba
++jemalloc kde mysql nsplugin odk opengl pdfimport svg templates test +vba
 +webdav +xmlsec"
 LICENSE="LGPL-3"
 SLOT="0"
@@ -147,7 +147,6 @@ COMMON_DEPEND="
                dev-java/saxon:0
        )
        jemalloc? ( dev-libs/jemalloc )
-       ldap? ( net-nds/openldap )
        mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
        nsplugin? (
                net-libs/xulrunner:1.9
@@ -366,6 +365,7 @@ src_configure() {
        # --disable-gnome-vfs: old gnome virtual fs support
        # --disable-kdeab: kde3 adressbook
        # --disable-kde: kde3 support
+       # --disable-ldap: ldap requires internal mozilla stuff, same like mozab
        # --disable-pch: precompiled headers cause build crashes
        # --disable-rpath: relative runtime path is not desired
        # --disable-static-gtk: ensure that gtk is linked dynamically
@@ -398,6 +398,7 @@ src_configure() {
                --disable-ext-report-builder \
                --disable-kdeab \
                --disable-kde \
+               --disable-ldap \
                --disable-online-update \
                --disable-pch \
                --disable-rpath \
@@ -439,7 +440,6 @@ src_configure() {
                $(use_enable gtk systray) \
                $(use_enable java ext-scripting-beanshell) \
                $(use_enable kde kde4) \
-               $(use_enable ldap) \
                $(use_enable mysql ext-mysql-connector) \
                $(use_enable nsplugin mozilla) \
                $(use_enable odk) \
@@ -452,7 +452,6 @@ src_configure() {
                $(use_enable webdav neon) \
                $(use_enable xmlsec) \
                $(use_with java) \
-               $(use_with ldap openldap) \
                $(use_with mysql system-mysql-cppconn) \
                $(use_with nsplugin system-mozilla libxul) \
                $(use_with templates sun-templates) \
Unnamed repository; edit this file 'description' to name the repository.