From 46f5ca142841cb67a3a00d12abdc2e184fc053cf Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 29 Jan 2011 04:42:35 +0000 Subject: [PATCH] net-mail/zarafa: Bump and remove old (Portage version: 2.2.0_alpha19-r1/svn/Linux x86_64, RepoMan options: --force) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2814 6952d904-891a-0410-993b-d76249ca496b --- net-mail/zarafa/ChangeLog | 11 +- net-mail/zarafa/Manifest | 21 +-- .../patches/zarafa-6.40.1-no-php-conf.patch | 44 +++++ .../zarafa-6.40.5-add-missing-endif.patch | 10 + ...6.40.5-fix-missing-installation-file.patch | 19 ++ net-mail/zarafa/zarafa-6.40.2.ebuild | 174 ------------------ ...40.3.ebuild => zarafa-6.40.5.24860.ebuild} | 56 ++++-- 7 files changed, 129 insertions(+), 206 deletions(-) create mode 100644 net-mail/zarafa/files/patches/zarafa-6.40.1-no-php-conf.patch create mode 100644 net-mail/zarafa/files/patches/zarafa-6.40.5-add-missing-endif.patch create mode 100644 net-mail/zarafa/files/patches/zarafa-6.40.5-fix-missing-installation-file.patch delete mode 100644 net-mail/zarafa/zarafa-6.40.2.ebuild rename net-mail/zarafa/{zarafa-6.40.3.ebuild => zarafa-6.40.5.24860.ebuild} (74%) diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog index 197689d..af983b7 100644 --- a/net-mail/zarafa/ChangeLog +++ b/net-mail/zarafa/ChangeLog @@ -1,7 +1,16 @@ # ChangeLog for net-mail/zarafa -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*zarafa-6.40.5.24860 (29 Jan 2011) + + 29 Jan 2011; Mario Fetka + +files/patches/zarafa-6.40.1-no-php-conf.patch, -zarafa-6.40.2.ebuild, + -zarafa-6.40.3.ebuild, +zarafa-6.40.5.24860.ebuild, + +files/patches/zarafa-6.40.5-add-missing-endif.patch, + +files/patches/zarafa-6.40.5-fix-missing-installation-file.patch: + Bump and remove old + *zarafa-6.40.3 (11 Nov 2010) 11 Nov 2010; Mario Fetka +zarafa-6.40.3.ebuild, diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest index 59c2ac4..0582141 100644 --- a/net-mail/zarafa/Manifest +++ b/net-mail/zarafa/Manifest @@ -4,8 +4,11 @@ AUX patches/fix-pthread.patch 1779 RMD160 48976038f579e5472395efdcec860b131e6be6 AUX patches/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 AUX patches/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 AUX patches/zarafa-6.40.0-package.patch 1938 RMD160 48ec724a787bd2b4db3b81b763fc1726a55eec3b SHA1 30aee89b4d186d2371568911ccfa245f1e39b4b7 SHA256 546ae930ee2f167987f336d873e68110394dad7573d9397c39f5c10166aa8eab +AUX patches/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f AUX patches/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 7112bfd1b5c1bf628f33521138d76ebdc9e8fa84 SHA1 638f39aa252c644362952becd5eb28fe06db8743 SHA256 c66f888d89a07c2c962f60aae81dee5b97cc2f0c0d4b5f725309f9f7509bea55 AUX patches/zarafa-6.40.2-sysconfig2confd-1.patch 8497 RMD160 1838567e668a32833d22e286defa73877cb515d2 SHA1 4ce13564cfc80598636b1c94028db3613feeb98c SHA256 cd1128ec66f18c887b6b304648e3a94b9aea782e363a303fc636b8f66b43fc5f +AUX patches/zarafa-6.40.5-add-missing-endif.patch 249 RMD160 ed06c81f50d6a4359ccaa001540a29b4c105e468 SHA1 b6a38c5af35fae2f79bd70846f057873109e9b90 SHA256 e4bb216f1eacebbaa628fad164bcc4f045e9d5b28a17566f2f6a076695a48ba4 +AUX patches/zarafa-6.40.5-fix-missing-installation-file.patch 1221 RMD160 cdc3c85558de3fd35453a174b8af0a5631ea1922 SHA1 2b490e2fb5a27243a77cdbf97a82a859d5a51979 SHA256 41a73e36d939aa9e162ca6df175673329246610dc0e52d998c86d2581b0c5457 AUX zarafa-dagent.rc6 2016 RMD160 45cbcb81da30a34be4202f3d9b84f38b12ecf57b SHA1 aaccebd9658dc8da88a32f7300922557fd4c621c SHA256 696d0f7b0c41814ca15d775b0595eb46b95fc59e1cf2a30935eba2c717ff16d6 AUX zarafa-gateway.rc6 747 RMD160 c6094f036814bb289eade6f309b9c48ed6b683d5 SHA1 6182824447f9373badf2b2536d41190451fbceb0 SHA256 d08eb9eb5e548dca24e644aee4196aa135ef79d74d244675eeb9ea47594311b0 AUX zarafa-ical.rc6 663 RMD160 db306a10e7777889e9460488575cbdd1ddc9037e SHA1 8fa807d0da22ab4fc1f3156c3a7dc0fe3cdab1ad SHA256 1eec0c538a0264eb2757b5687c8285394f899740bc4cba913115f82ccab703e2 @@ -15,17 +18,9 @@ AUX zarafa-monitor.rc6 705 RMD160 d1e524b7ed48ec5b53594595a35d4fb3c02b1a5a SHA1 AUX zarafa-server.rc6 706 RMD160 d3734a455367d93d316fca873e79467f624b97a2 SHA1 e819806ba99c5b5d4c195cfbace7b4027b053976 SHA256 5a8553127bc529350cf56ea35b558e1d276ca0d4bde92a32583d62d0d790fa4f AUX zarafa-spooler.rc6 705 RMD160 a2981b8e9b60df19d5adce5507ec51ac6d5b12e8 SHA1 09527095beb3891986656cb0e1c53414b7f038bf SHA256 4cf183daf6d86e2bb39073993af8f244bc28ee90feb4cf1ba34e5302894aa2fe AUX zarafa.logrotate 1857 RMD160 d295f5307be6577d3f8fdc89edc7995adae2fd47 SHA1 7188133da91ad6d453811ff5e67d84fde49b4fb9 SHA256 44e26d9ad5eff2e159388698a068df72d9626d91e9be478be00b3e3eaa15913f -DIST zarafa-6.40.2-sles11-i586.tar.gz 33437198 RMD160 7fb143fe435a4bf08d1ce8b292388e6d21cb27e1 SHA1 4413d70a5a4d38cd982932caa339d840201ca56d SHA256 28f312275483ad69aa6dd4f120d1b0f96438f3096642d5611be59835e6f34d8e -DIST zarafa-6.40.2-sles11-x86_64.tar.gz 33495754 RMD160 d13b1ba2ec8ac21605baac4fb473b6dfa7c33e92 SHA1 98b82ba0343b0eab734cb4c528c869f4133a878e SHA256 b8a0c09c44b22bdfedd146cf79cc2327c95f6c13d3d08bcdfbf25409e363d2a9 -DIST zarafa-6.40.2.tar.gz 4605538 RMD160 9da243c0d7f5b9e86a5606482a1728b1056dde89 SHA1 3554a6f6cc2f32ee30f628598eb2d5de09fe5f1d SHA256 3ad4598cc6943e7e99d3d8340916dc425db1c54ed76c66a309183cb53b838350 -DIST zarafa-6.40.3-sles11-i586.tar.gz 33442154 RMD160 ce7df049fb212b780ffda7d760639055fa70837a SHA1 4fbff313b380b9f19a980c978fb0c8cb0df91db0 SHA256 20abea6680dc2b712627ca7ad6a31160cc119c0418aa47a4a7dee15b7d7450a4 -DIST zarafa-6.40.3-sles11-x86_64.tar.gz 33498710 RMD160 a248f9c912f3278a80f31e3af3fcdd63de20dc1b SHA1 af2e9ca6dc0166290f0c2244c58ff62bf8e7846d SHA256 34898af3076f0a28e85b5319d548b136f0aa5a744b3776a1c045793fd5490863 -DIST zarafa-6.40.3.tar.gz 4609906 RMD160 36cf0a26f57335b155483d91177a7450dba86162 SHA1 dc1b5df3fc817d2c382fae9e23b7799f22348e11 SHA256 f9fa001ebc912ec17e1cc68b0eceaa7872f735c65f4a9d11e054d1918bc41433 -DIST zcp-6.40.3-23410-sles-11-i586-free.tgz 22972880 RMD160 0033b2fb3848210cb53fb7080e1a130a828dd00d SHA1 96eb391815c3ce23dcddf349210668d47e31133c SHA256 f4443be98b169e3fa5346a4268551590f8ec2b19c49ddf688a01dbc474f499bc -DIST zcp-6.40.3-23410-sles-11-x86_64-free.tgz 23028029 RMD160 6646bcee1c05e96462d8ebbe80f5a986bf1f14d7 SHA1 98dc2fa7ed12dbc1856e2e786aeb1dc553b9c576 SHA256 281c9d3c359b42b769836a5435beb4bcd33601c90bfe5efb0d0924060473b4fe -DIST zcp-source-6.40.3-23410.tgz 6133118 RMD160 14d2e82cb01ebe904a826f4cc83501b8418a7ef4 SHA1 e6b6948476faa23ab09dad63b5a3d8dbda0a28d7 SHA256 6301d9b8d0ea941315dfc093ca2c851e5f0f0e01f395b899fd631fae9e95828a -EBUILD zarafa-6.40.2.ebuild 5891 RMD160 df18e48c535664d6e6fdd12c317bf5cb7c9491ce SHA1 10a11963d0dc299b7408fe6381e2a72c83578f78 SHA256 85b6a58aef2533c2d4d07133e33940be519fee3958b63f0b59e3b65c1c4a63ea -EBUILD zarafa-6.40.3.23410.ebuild 6010 RMD160 83dadf36d27e50861948e495848365fd05114613 SHA1 92718d361aec4a5ada81bc545ce9fcc1211f8376 SHA256 c2dc51967d639c6076b4f49096eda671293d39524e22666b5a3a5214f57c08de -EBUILD zarafa-6.40.3.ebuild 5946 RMD160 df73f86e7c925336f7aff6465ae6b371c3ac8074 SHA1 83d30f1f89bb9a4f070a323246fbe7188d6adbb4 SHA256 439a63403644f6dfed33263984ed181f3fb14b5d45eb46f469bd51af1d4361ed -MISC ChangeLog 1251 RMD160 e1148a1dc01768d4812139ec202d5cd19ce3b418 SHA1 a622636c5a1971cd6e7f2d6b4a40fefbde5e0d1a SHA256 8b531b81598430be1b34955ae7e28fde5bc2af8fa1cc017c5a3bb4b331af0140 +DIST zcp-6.40.5-24860-sles-11-i586-free.tgz 23140783 RMD160 0ad70bf6be5ce481d2dbcaaea05297aa0f1e658a SHA1 e1cc20e6e4cac7f67a6f7b1826bcb6e793abec73 SHA256 312559d65514e7de9924b2f8a8f8cb78502b057b1464495ef3243705da260888 +DIST zcp-6.40.5-24860-sles-11-x86_64-free.tgz 23195063 RMD160 8633a69b08f21003bc3c02b4bc10956461144630 SHA1 0b5a1b7c3591597f30be00629e71e496a0d83ab7 SHA256 606dc5c5da4cf6d7566ce1ba077317f4e41fe72831f07ced1bf0f70ad7a3e26e +DIST zcp-source-6.40.5-24860.tgz 7075378 RMD160 1d350cb5dd0df326f3c96ace088f8a40783193aa SHA1 b7c00fae3e49af8e733cb76dfb5a6ba57867a14f SHA256 dbc69d9261bd19479f81024d0482b641b4b6a65089e67076d29eec116edcb546 +EBUILD zarafa-6.40.5.24860.ebuild 6479 RMD160 853f423f883e39217a15a8b2a10cc7a0dfa05d25 SHA1 0cbd37f019b1b08717eec50fb4bd8d0801c76af5 SHA256 96d306f6eecc951fc6d4a943cd173c9f34f20765f838ca56a232710a769cc349 +MISC ChangeLog 1612 RMD160 cae47445fb7711a247f9cc743acea4adcc92412c SHA1 8a5ab6b3a4bd1f93cafd07345717398b36d0e37e SHA256 e41ade50675ffb02147c03bf4db21696c5a3503e719fd65da09a3521dd262a23 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/net-mail/zarafa/files/patches/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/patches/zarafa-6.40.1-no-php-conf.patch new file mode 100644 index 0000000..9e51f09 --- /dev/null +++ b/net-mail/zarafa/files/patches/zarafa-6.40.1-no-php-conf.patch @@ -0,0 +1,44 @@ +--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100 ++++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100 +@@ -34,7 +34,7 @@ + build_triplet = @build@ + host_triplet = @host@ + subdir = php-ext +-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \ ++DIST_COMMON = $(dist_data_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -86,7 +86,7 @@ + DIST_SOURCES = $(mapi_la_SOURCES) + dist_dataDATA_INSTALL = $(INSTALL_DATA) + dist_sysconfDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(dist_data_DATA) $(dist_sysconf_DATA) ++DATA = $(dist_data_DATA) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -406,23 +406,6 @@ + echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ + rm -f "$(DESTDIR)$(datadir)/$$f"; \ + done +-install-dist_sysconfDATA: $(dist_sysconf_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done +- +-uninstall-dist_sysconfDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ diff --git a/net-mail/zarafa/files/patches/zarafa-6.40.5-add-missing-endif.patch b/net-mail/zarafa/files/patches/zarafa-6.40.5-add-missing-endif.patch new file mode 100644 index 0000000..755ad79 --- /dev/null +++ b/net-mail/zarafa/files/patches/zarafa-6.40.5-add-missing-endif.patch @@ -0,0 +1,10 @@ +--- provider/libserver/ECIndexer.h~ 2011-01-24 15:55:05.000000000 +0000 ++++ provider/libserver/ECIndexer.h 2011-01-25 09:56:36.786592403 +0000 +@@ -49,6 +49,7 @@ + + #ifndef ECINDEXER_H + #define ECINDEXER_H ++#endif + + class ECConfig; + class ECLogger; diff --git a/net-mail/zarafa/files/patches/zarafa-6.40.5-fix-missing-installation-file.patch b/net-mail/zarafa/files/patches/zarafa-6.40.5-fix-missing-installation-file.patch new file mode 100644 index 0000000..ef79757 --- /dev/null +++ b/net-mail/zarafa/files/patches/zarafa-6.40.5-fix-missing-installation-file.patch @@ -0,0 +1,19 @@ +--- installer/linux/Makefile.in~ 2011-01-24 12:06:15.000000000 +0000 ++++ installer/linux/Makefile.in 2011-01-25 10:36:31.784330713 +0000 +@@ -693,8 +693,6 @@ + fi + install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config + mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config +- install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config +- mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +--- installer/linux/Makefile.am~ 2011-01-24 11:03:45.000000000 +0000 ++++ installer/linux/Makefile.am 2011-01-25 10:36:27.234524257 +0000 +@@ -108,5 +108,3 @@ + fi + install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config + mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config +- install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config +- mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config diff --git a/net-mail/zarafa/zarafa-6.40.2.ebuild b/net-mail/zarafa/zarafa-6.40.2.ebuild deleted file mode 100644 index 2f6dfce..0000000 --- a/net-mail/zarafa/zarafa-6.40.2.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -PHP_EXT_NAME="mapi" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -inherit eutils php-ext-base-r1 autotools rpm5 - -DESCRIPTION="Open Source Groupware Solution" -HOMEPAGE="http://zarafa.com/" -SRC_URI="http://download.zarafa.com/zarafa/drupal/ondemand.php?version=${PV}&src=zarafa-${PV} -> ${P}.tar.gz - !arm? ( licensed? ( - amd64? ( http://download.zarafa.com/zarafa/drupal/ondemand.php?version=${PV}&distro=sles&distroversion=11&arch=x86_64&type=1 -> zarafa-${PV}-sles11-x86_64.tar.gz ) - x86? ( http://download.zarafa.com/zarafa/drupal/ondemand.php?version=${PV}&distro=sles&distroversion=11&arch=i586&type=1 -> zarafa-${PV}-sles11-i586.tar.gz ) ) )" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -RESTRICT="" -IUSE="debug ldap logrotate licensed static tcmalloc perl kerberos" - -RDEPEND=">=dev-libs/libical-0.44 - dev-cpp/libvmime:0.7 - >=dev-lang/php-5.2.0 - app-text/catdoc - app-text/poppler - dev-cpp/clucene - dev-db/mysql - dev-libs/libxml2 - dev-libs/openssl - net-misc/curl - sys-libs/e2fsprogs-libs - sys-libs/zlib - sys-libs/ncurses - sys-libs/pam - virtual/httpd-php - kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) - ldap? ( net-nds/openldap ) - logrotate? ( app-admin/logrotate ) - tcmalloc? ( dev-util/google-perftools ) - perl? ( dev-lang/perl ) - !arm? ( licensed? ( - dev-libs/openssl:0.9.8 - >=sys-libs/zlib-1.2.4 - ) )" - -# sparsehash? ( dev-cpp/sparsehash ) - - -DEPEND="${RDEPEND} - dev-util/pkgconfig - sys-devel/gettext" - -QA_PRESTRIPPED=" - usr/bin/zarafa-restore - usr/bin/zarafa-report - usr/bin/zarafa-backup - usr/bin/zarafa-licensed - usr/lib/zarafa/ldapmsplugin.so - usr/lib64/zarafa/ldapmsplugin.so" - -QA_DT_HASH=" - usr/bin/zarafa-restore - usr/bin/zarafa-report - usr/bin/zarafa-backup - usr/bin/zarafa-licensed - usr/lib/zarafa/ldapmsplugin.so - usr/lib64/zarafa/ldapmsplugin.so" - -src_unpack() { - unpack ${A} - if ! use arm; then - if use licensed; then - cd "${WORKDIR}" - mkdir licensed - cd licensed - if use x86; then - rpm5_unpack $(find ./../zarafa-${PV}-sles11-i586 -name "zarafa-licensed*") - rpm5_unpack $(find ./../zarafa-${PV}-sles11-i586 -name "zarafa-webaccess-muc*") - fi - if use amd64; then - rpm5_unpack $(find ./../zarafa-${PV}-sles11-x86_64 -name "zarafa-licensed*") - rpm5_unpack $(find ./../zarafa-${PV}-sles11-x86_64 -name "zarafa-webaccess-muc*") - fi - cd "${S}" - fi - fi -} - -src_prepare() { - EPATCH_SOURCE="${FILESDIR}/patches" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" epatch - edos2unix php-webclient-ajax/config.php.dist - eautoreconf -} - -src_configure() { - econf \ - --enable-oss \ - --disable-perl \ - --disable-testtools \ - --enable-release \ - --with-userscript-prefix=/etc/zarafa/userscripts \ - --with-quotatemplate-prefix=/etc/zarafa/quotamails \ - --with-indexerscripts-prefix=/etc/zarafa/indexerscripts \ - $(use_enable perl) \ - $(use_enable static) \ - $(use_enable tcmalloc) \ - $(use_enable debug) -} - -# $(use_enable sparsehash) \ - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - make DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed" - make DESTDIR="${D}" install-mobile-webaccess || die "make install-mobile-webaccess failed" - - insinto /etc/apache2/modules.d - newins "${FILESDIR}/50_zarafa-webaccess-mobile.conf" 50_zarafa-webaccess-mobile.conf || die "Failed to install apache config files" - newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf || die "Failed to install apache config files" - - rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files" - rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files" - - php-ext-base-r1_src_install - - if use logrotate; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate" - fi - - # install ldap files - if use ldap; then - insinto /etc/openldap/schema - doins installer/ldap/zarafa.* || die "Failed to install ldap schema files" - fi - - insinto /etc/zarafa - doins installer/linux/*.cfg || die "Failed to install config files" - - dodir /var/log/zarafa - keepdir /var/log/zarafa - - if ! use arm; then - if use licensed; then - dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries" - exeinto /usr/$(get_libdir)/zarafa/ - doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib" - doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files" - exeinto /usr/share/zarafa/zarafa-backup-helpers/ - doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts" - dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs" - insinto /etc/zarafa - doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" - insinto /etc/cron.d - doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files" - insinto /usr/share/zarafa-webaccess/ - doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files" - newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files" - fi - fi - - newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway || die "Failed to install init.d files" - newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical || die "Failed to install init.d files" - newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer || die "Failed to install init.d files" - newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor || die "Failed to install init.d files" - newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server || die "Failed to install init.d files" - newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler || die "Failed to install init.d files" -} diff --git a/net-mail/zarafa/zarafa-6.40.3.ebuild b/net-mail/zarafa/zarafa-6.40.5.24860.ebuild similarity index 74% rename from net-mail/zarafa/zarafa-6.40.3.ebuild rename to net-mail/zarafa/zarafa-6.40.5.24860.ebuild index 5f03f66..5843a6d 100644 --- a/net-mail/zarafa/zarafa-6.40.3.ebuild +++ b/net-mail/zarafa/zarafa-6.40.5.24860.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -7,21 +7,26 @@ EAPI="2" PHP_EXT_NAME="mapi" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" +USE_PHP="php5-3" -inherit eutils php-ext-base-r1 autotools rpm5 +inherit php-ext-source-r2 eutils autotools rpm5 versionator + +MY_PV=$(replace_version_separator 3 '-' ) +MY_PVM=$(get_version_component_range 1-2 ) +MY_PVR=$(get_version_component_range 1-3 ) DESCRIPTION="Open Source Groupware Solution" HOMEPAGE="http://zarafa.com/" -SRC_URI="http://download.zarafa.com/zarafa/drupal/ondemand.php?version=${PV}&src=zarafa-${PV} -> ${P}.tar.gz +SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-source-${MY_PV}.tgz !arm? ( licensed? ( - amd64? ( http://download.zarafa.com/zarafa/drupal/ondemand.php?version=${PV}&distro=sles&distroversion=11&arch=x86_64&type=1 -> zarafa-${PV}-sles11-x86_64.tar.gz ) - x86? ( http://download.zarafa.com/zarafa/drupal/ondemand.php?version=${PV}&distro=sles&distroversion=11&arch=i586&type=1 -> zarafa-${PV}-sles11-i586.tar.gz ) ) )" + amd64? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tgz ) + x86? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tgz ) ) )" LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" RESTRICT="" -IUSE="debug ldap logrotate licensed static tcmalloc perl kerberos" +IUSE="debug ldap logrotate licensed static tcmalloc perl kerberos sparsehash" RDEPEND=">=dev-libs/libical-0.44 dev-cpp/libvmime:0.7 @@ -40,18 +45,19 @@ RDEPEND=">=dev-libs/libical-0.44 ldap? ( net-nds/openldap ) logrotate? ( app-admin/logrotate ) tcmalloc? ( dev-util/google-perftools ) + sparsehash? ( dev-cpp/sparsehash ) perl? ( dev-lang/perl ) !arm? ( licensed? ( dev-libs/openssl:0.9.8 >=sys-libs/zlib-1.2.4 ) )" -# sparsehash? ( dev-cpp/sparsehash ) - +S="${WORKDIR}"/zcp-source-${MY_PV}/src DEPEND="${RDEPEND} dev-util/pkgconfig - sys-devel/gettext" + sys-devel/gettext + dev-lang/php" QA_PRESTRIPPED=" usr/bin/zarafa-restore @@ -77,12 +83,12 @@ src_unpack() { mkdir licensed cd licensed if use x86; then - rpm5_unpack $(find ./../zarafa-${PV}-sles11-i586 -name "zarafa-licensed*") - rpm5_unpack $(find ./../zarafa-${PV}-sles11-i586 -name "zarafa-webaccess-muc*") + rpm5_unpack $(find ./../ -name "zarafa-licensed*") +# rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*") fi if use amd64; then - rpm5_unpack $(find ./../zarafa-${PV}-sles11-x86_64 -name "zarafa-licensed*") - rpm5_unpack $(find ./../zarafa-${PV}-sles11-x86_64 -name "zarafa-webaccess-muc*") + rpm5_unpack $(find ./../ -name "zarafa-licensed*") +# rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*") fi cd "${S}" fi @@ -93,7 +99,7 @@ src_prepare() { EPATCH_SOURCE="${FILESDIR}/patches" EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" epatch edos2unix php-webclient-ajax/config.php.dist - eautoreconf + AT_M4DIR="autoconf" eautoreconf } src_configure() { @@ -107,11 +113,11 @@ src_configure() { --with-indexerscripts-prefix=/etc/zarafa/indexerscripts \ $(use_enable perl) \ $(use_enable static) \ + $(use_enable sparsehash) \ $(use_enable tcmalloc) \ $(use_enable debug) } -# $(use_enable sparsehash) \ src_install() { make DESTDIR="${D}" install || die "make install failed" @@ -125,7 +131,21 @@ src_install() { rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files" rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files" - php-ext-base-r1_src_install + # Use only some parts of PHP eclass + php-ext-source-r2_buildinilist php${slot} + php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" + + # Symlink the .ini files from ext/ to ext-active/ + for inifile in ${PHPINIFILELIST} ; do + inidir="${inifile/${PHP_EXT_NAME}.ini/}" + inidir="${inidir/ext/ext-active}" + dodir "/${inidir}" + dosym "/${inifile}" "/${inifile/ext/ext-active}" + done + + # Install PHP module + php-ext-source-r2_addtoinifiles ";mapi.cache_max_sessions" "128" + php-ext-source-r2_addtoinifiles ";mapi.cache_lifetime" "300" if use logrotate; then insinto /etc/logrotate.d @@ -157,8 +177,8 @@ src_install() { doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" insinto /etc/cron.d doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files" - insinto /usr/share/zarafa-webaccess/ - doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files" +# insinto /usr/share/zarafa-webaccess/ +# doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files" newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files" fi fi