From 77eac2022eb8fcfc87bca3d1804d233909f79218 Mon Sep 17 00:00:00 2001 From: geos_one Date: Wed, 13 Oct 2010 08:15:48 +0000 Subject: [PATCH] www-apps/zarafa: finish arm support and mask licensed on arm git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2526 6952d904-891a-0410-993b-d76249ca496b --- www-apps/zarafa/ChangeLog | 3 +++ www-apps/zarafa/Manifest | 4 ++-- www-apps/zarafa/zarafa-6.40.2.ebuild | 32 +++++++++++++++------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/www-apps/zarafa/ChangeLog b/www-apps/zarafa/ChangeLog index 7d947ca..dd1d30a 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: $ + 13 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: + finish arm support and mask licensed on arm + 13 Oct 2010; Mario Fetka zarafa-6.40.2.ebuild: add arm keyword diff --git a/www-apps/zarafa/Manifest b/www-apps/zarafa/Manifest index 6f84476..d53d9a6 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 5689 RMD160 23d62facb268e367152917fef29c3bebdce49d73 SHA1 0f85b1e906d64403059d0d0fb74ce0b1f76d5da1 SHA256 43a200f64934f8ab60c765781e949f70f137c6dfc3342b33f134bc982901e1ca -MISC ChangeLog 880 RMD160 916d24373705b7fb53590ff159767f9fa7181fba SHA1 cf15573af18b900caaee6d0788480d2df1a2d290 SHA256 f2d0ae77acf569856b083920f4b516ebc60ac6cf1f7ce33b3aaed383a25d068d +EBUILD zarafa-6.40.2.ebuild 5729 RMD160 edb5d50452f67a2ed9754bbc8494bfd0ac7f07c2 SHA1 ca19b11f6e987e3de9158fbe42b633b49bfb5d2b SHA256 08d250449df01b0234bfc75dbf98a1a20449412062c9ffc5e60ffb91e4416974 +MISC ChangeLog 1000 RMD160 89bf625127fa3d86582175b7b669001324d8107a SHA1 cd2d2fdd16e0c78839fe968e9923c9615b1e754d SHA256 a633601278fd3ab820639c8fc848729f4b6c070645002af9f1b4342aa7bdb914 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 47b6e61..4fdd2b3 100644 --- a/www-apps/zarafa/zarafa-6.40.2.ebuild +++ b/www-apps/zarafa/zarafa-6.40.2.ebuild @@ -136,21 +136,23 @@ src_install() { dodir /var/log/zarafa keepdir /var/log/zarafa - 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" + 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"