From 946be30ea13e95c4f8708ed06860a7240ae7bb88 Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 12 Oct 2010 15:08:24 +0000 Subject: [PATCH] www-apps/zarafa: repoman cleanup git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2521 6952d904-891a-0410-993b-d76249ca496b --- www-apps/zarafa/ChangeLog | 3 ++ www-apps/zarafa/Manifest | 4 +-- www-apps/zarafa/zarafa-6.40.2.ebuild | 44 +++++++++++++--------------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/www-apps/zarafa/ChangeLog b/www-apps/zarafa/ChangeLog index 0f721a3..a0014ed 100644 --- a/www-apps/zarafa/ChangeLog +++ b/www-apps/zarafa/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: + repoman cleanup + 12 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: add webaccess multiusercalendar diff --git a/www-apps/zarafa/Manifest b/www-apps/zarafa/Manifest index 408cfdd..700a904 100644 --- a/www-apps/zarafa/Manifest +++ b/www-apps/zarafa/Manifest @@ -16,6 +16,6 @@ AUX zarafa.logrotate 1857 RMD160 d295f5307be6577d3f8fdc89edc7995adae2fd47 SHA1 7 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 -EBUILD zarafa-6.40.2.ebuild 4818 RMD160 b03f2dd8ba8f2d4653fbcccb45d674e1fa46d75a SHA1 70e341478b6f874a6e1e1ba651e57bbcd20e4fdc SHA256 ced93beb928540259c1d0ecb73ea7d88ec713d61f6748e4df8550dbd0059d96d -MISC ChangeLog 696 RMD160 025c93a00b5a0b3270d5fb45b35a639eef1fa4a0 SHA1 00b6d4803a85cd0f4d4494d817c3a06229db8dfd SHA256 cdc9e47120b1a9915f3eccf3506808ebdc217bfb0176f2e90d7091dfbcc47e65 +EBUILD zarafa-6.40.2.ebuild 5664 RMD160 326231cfa36f1ab463455abe8032edcc956614c6 SHA1 7924ce7f21411cd35960174c5aeaf54c65cf298a SHA256 493ee6304f29e686f2e2deaec401884275a5f8d27fcdf8e9367f6a3cb0ac5581 +MISC ChangeLog 788 RMD160 205f4a67f407d2b4e5c2e255c6b86bfc955a3661 SHA1 2162012e51ca5e969cf6120c832496ee12266902 SHA256 5714fd8604a83356ca423d703b190482bae13a543a7ee71239a1a3a5927b127e MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/www-apps/zarafa/zarafa-6.40.2.ebuild b/www-apps/zarafa/zarafa-6.40.2.ebuild index 50374f6..1d0a678 100644 --- a/www-apps/zarafa/zarafa-6.40.2.ebuild +++ b/www-apps/zarafa/zarafa-6.40.2.ebuild @@ -66,7 +66,6 @@ QA_DT_HASH=" usr/lib/zarafa/ldapmsplugin.so usr/lib64/zarafa/ldapmsplugin.so" - src_unpack() { unpack ${A} if use licensed; then @@ -112,11 +111,11 @@ src_install() { 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 - newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf + 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 - rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf + 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 @@ -128,9 +127,8 @@ src_install() { # install ldap files if use ldap; then insinto /etc/openldap/schema - doins installer/ldap/zarafa.* - fi - + 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" @@ -139,26 +137,26 @@ src_install() { keepdir /var/log/zarafa if use licensed; then - dobin ${WORKDIR}/licensed/usr/bin/* + dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries" exeinto /usr/$(get_libdir)/zarafa/ - doexe ${WORKDIR}/licensed/usr/$(get_libdir)/zarafa/*.so - doman ${WORKDIR}/licensed/usr/share/man/*/*.gz + 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/* - dodoc ${WORKDIR}/licensed/usr/share/doc/packages/zarafa-licensed/* + 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/* + doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" insinto /etc/cron.d - doins ${WORKDIR}/licensed/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/* - newinitd ${FILESDIR}/zarafa-licensed.rc6 zarafa-licensed + 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 - newinitd ${FILESDIR}/zarafa-gateway.rc6 zarafa-gateway - newinitd ${FILESDIR}/zarafa-ical.rc6 zarafa-ical - newinitd ${FILESDIR}/zarafa-indexer.rc6 zarafa-indexer - newinitd ${FILESDIR}/zarafa-monitor.rc6 zarafa-monitor - newinitd ${FILESDIR}/zarafa-server.rc6 zarafa-server - newinitd ${FILESDIR}/zarafa-spooler.rc6 zarafa-spooler + 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" }