summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Piasek <dagger@gentoo.org>2010-08-20 09:59:21 +0100
committerRobert Piasek <dagger@gentoo.org>2010-08-20 09:59:21 +0100
commit902659788b812adc12379b4fd6b329737c8d4c5f (patch)
tree695f5fd7ed8da340c26853234bfed4fd15901e20
parentRemoved libical. Fix pushed to portage (diff)
parentzarafa-webaccess: Remove useless whitespace (diff)
downloaddagger-902659788b812adc12379b4fd6b329737c8d4c5f.tar.gz
dagger-902659788b812adc12379b4fd6b329737c8d4c5f.tar.bz2
dagger-902659788b812adc12379b4fd6b329737c8d4c5f.zip
Merge branch 'master' of http://github.com/webkiller71/dagger
Conflicts: dev-cpp/libvmime/Manifest dev-cpp/libvmime/libvmime-0.7.1.ebuild
-rw-r--r--dev-cpp/libvmime/Manifest2
-rw-r--r--dev-cpp/libvmime/libvmime-0.7.1.ebuild4
-rw-r--r--www-apps/zarafa-webaccess/Manifest2
-rw-r--r--www-apps/zarafa-webaccess/zarafa-webaccess-6.40.1.ebuild2
4 files changed, 6 insertions, 4 deletions
diff --git a/dev-cpp/libvmime/Manifest b/dev-cpp/libvmime/Manifest
index c45ceba..3785b4d 100644
--- a/dev-cpp/libvmime/Manifest
+++ b/dev-cpp/libvmime/Manifest
@@ -1,4 +1,4 @@
DIST libvmime-0.7.1.tar.bz2 418302 RMD160 259983c8844108c8040bcbae2ea53e453a811124 SHA1 30fefbdd31c2fa46976984f18d4d21bf3c2ec20a SHA256 fc3476aec565341594c7c4dca982539695b61ecb92a438f19860e9130ca019e3
DIST zarafa-vmime-patches.tar.gz 12326 RMD160 db7d53e7876208f8f6bd773c28350b834a56c0b4 SHA1 b85c3b6a25eb5d20429a5532c52b01e54549f7d2 SHA256 f6eacba0c8e7f33ee7b9a9acf9ea1b230d205c8da4710633e3c512d902e60d7d
-EBUILD libvmime-0.7.1.ebuild 1518 RMD160 835c33582326809ff37e2be3d38e07f4455e9187 SHA1 37f377b8842aa329040cba99a22286ff78231903 SHA256 64237722f2115b2d5ce84c9e68628d431f855da1b28d83e7282684281e981657
+EBUILD libvmime-0.7.1.ebuild 1538 RMD160 c01d3988bd9848a2adf38b939f60c327292bcd78 SHA1 5b02972c83c6038dbda536cccea175f5cd8a4760 SHA256 be0ac7f91e90d55831fa0f4f76d5f69c810a3bb1d5f39a3d9e1d5fd532601e03
MISC metadata.xml 304 RMD160 23e397929b6605943317b4fbd69db305c5ef8a02 SHA1 f3b916535984f33f3043d8604df1e0ef339c3a1c SHA256 0c98ac7f0a2531510882542d931289f98051eee6b58aa0c5f598d9ba0c4454c3
diff --git a/dev-cpp/libvmime/libvmime-0.7.1.ebuild b/dev-cpp/libvmime/libvmime-0.7.1.ebuild
index e73ac87..2ce5116 100644
--- a/dev-cpp/libvmime/libvmime-0.7.1.ebuild
+++ b/dev-cpp/libvmime/libvmime-0.7.1.ebuild
@@ -47,7 +47,11 @@ src_configure() {
--enable-messaging-proto-imap \
--enable-messaging-proto-maildir \
--enable-messaging-proto-sendmail
+}
+
+src_compile() {
emake || die "emake failed"
+
if use doc ; then
doxygen vmime.doxygen || die "doxygen failed"
fi
diff --git a/www-apps/zarafa-webaccess/Manifest b/www-apps/zarafa-webaccess/Manifest
index a239594..c888017 100644
--- a/www-apps/zarafa-webaccess/Manifest
+++ b/www-apps/zarafa-webaccess/Manifest
@@ -1,3 +1,3 @@
DIST zarafa-6.40.1.tar.gz 4518286 RMD160 bbbbeacd0dc0d05bccda2c782e6353fff4d418cc SHA1 d7041698302316d33a9fd41b564fdbfc8f6355cc SHA256 7e6c5c088db5491e6873f73a3b9574be2ec434c17fbd49ba24148fec2f6b7668
-EBUILD zarafa-webaccess-6.40.1.ebuild 901 RMD160 fb0cc587a0f166ee298422d6c77ce7d2cb19a3b2 SHA1 0cc270baff4efe4751f72145799e417a08c1862b SHA256 a8e2335da19ed662a1f23110b84fb95f3569d6d5ae857518a5f38071241cd23f
+EBUILD zarafa-webaccess-6.40.1.ebuild 898 RMD160 bb97d004a9670248fd0e9ce343ab3083c0fa0939 SHA1 160b6781da04347a62d89a61b775a5b690263cb3 SHA256 cc7e35edc30667bed05efc7411799c09589a33c80ead1b9765156144c10775bc
MISC ChangeLog 252 RMD160 5e326f43a7b07243807f16dba875772c2a0d432a SHA1 3a00eb32919239f9641592df35fb24c4201544a6 SHA256 28da8f62458075b7c5796f9b97027af6d52af6b39850080264ee0f1e156e41f5
diff --git a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.1.ebuild b/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.1.ebuild
index 17869fd..2b22368 100644
--- a/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.1.ebuild
+++ b/www-apps/zarafa-webaccess/zarafa-webaccess-6.40.1.ebuild
@@ -29,14 +29,12 @@ pkg_setup () {
require_php_with_use iconv session xml
}
-
src_install() {
webapp_src_preinst
cp "${S}"/config.php.dist "${S}"/config.php
insinto "${MY_HTDOCSDIR}"
doins -r "${S}"/*
-
webapp_configfile "${MY_HTDOCSDIR}"/config.php
webapp_serverowned "${MY_HTDOCSDIR}"/config.php