From 65b760d5a6170264ae445cc5ab743a1be54a696c Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 21 Feb 2009 17:24:11 +0000 Subject: [PATCH] net-misc/ifolder: mono 2.2 git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@800 6952d904-891a-0410-993b-d76249ca496b --- net-misc/ifolder/ChangeLog | 11 ++- net-misc/ifolder/Manifest | 56 ++--------- ...figure.in-xsp-check-by-dl9pf-version3.diff | 94 +++++++++++++++++++ net-misc/ifolder/files/flex_in_lib64.diff | 12 +++ .../files/ifolder-3.6.use_system_gsoap.patch | 56 +++++++++++ .../ifolder/files/ifolder-gnome-hack-1.patch | 16 ++++ net-misc/ifolder/files/ifolder-mono22-1.patch | 72 ++++++++++++++ .../files/new_default_simias.config.diff | 14 +++ .../files/no_write_to_etc_during_install.diff | 16 ++++ .../files/simias_make_gcc43_happy.diff | 32 +++++++ net-misc/ifolder/ifolder-3.6.7318.1-r1.ebuild | 45 +++++++++ 11 files changed, 377 insertions(+), 47 deletions(-) create mode 100644 net-misc/ifolder/files/configure.in-xsp-check-by-dl9pf-version3.diff create mode 100644 net-misc/ifolder/files/flex_in_lib64.diff create mode 100644 net-misc/ifolder/files/ifolder-3.6.use_system_gsoap.patch create mode 100644 net-misc/ifolder/files/ifolder-gnome-hack-1.patch create mode 100644 net-misc/ifolder/files/ifolder-mono22-1.patch create mode 100644 net-misc/ifolder/files/new_default_simias.config.diff create mode 100644 net-misc/ifolder/files/no_write_to_etc_during_install.diff create mode 100644 net-misc/ifolder/files/simias_make_gcc43_happy.diff create mode 100644 net-misc/ifolder/ifolder-3.6.7318.1-r1.ebuild diff --git a/net-misc/ifolder/ChangeLog b/net-misc/ifolder/ChangeLog index 02c98bf..4457744 100644 --- a/net-misc/ifolder/ChangeLog +++ b/net-misc/ifolder/ChangeLog @@ -1,7 +1,16 @@ # ChangeLog for net-misc/ifolder -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Feb 2009; Mario Fetka + +files/ifolder-gnome-hack-1.patch, +files/ifolder-mono22-1.patch, + +files/ifolder-3.6.use_system_gsoap.patch, + +files/configure.in-xsp-check-by-dl9pf-version3.diff, + +files/flex_in_lib64.diff, +files/new_default_simias.config.diff, + +files/no_write_to_etc_during_install.diff, + +files/simias_make_gcc43_happy.diff, +ifolder-3.6.7318.1-r1.ebuild: + mono 2.2 + 26 Jan 2008; Mario Fetka +metadata.xml: initial ifolder import from http://trac.one-gear.com/chaos/wiki diff --git a/net-misc/ifolder/Manifest b/net-misc/ifolder/Manifest index e9ea268..5be09f4 100644 --- a/net-misc/ifolder/Manifest +++ b/net-misc/ifolder/Manifest @@ -1,60 +1,24 @@ AUX 3.4.6120.1-configure-help.patch 2305 RMD160 e3ca4712829761408b540b9b5a7e770ea63d078c SHA1 1b81fa9d0ef87a74f1f0ce123b1b137a87d16c18 SHA256 cac75e53b0d22b29328c486363805f67858cd1d78b9a431500c85598c0e05094 -MD5 e41b608b295c968b0f520d4144537a5b files/3.4.6120.1-configure-help.patch 2305 -RMD160 e3ca4712829761408b540b9b5a7e770ea63d078c files/3.4.6120.1-configure-help.patch 2305 -SHA256 cac75e53b0d22b29328c486363805f67858cd1d78b9a431500c85598c0e05094 files/3.4.6120.1-configure-help.patch 2305 AUX 3.4.6167.1-configure-help.patch 2305 RMD160 e3ca4712829761408b540b9b5a7e770ea63d078c SHA1 1b81fa9d0ef87a74f1f0ce123b1b137a87d16c18 SHA256 cac75e53b0d22b29328c486363805f67858cd1d78b9a431500c85598c0e05094 -MD5 e41b608b295c968b0f520d4144537a5b files/3.4.6167.1-configure-help.patch 2305 -RMD160 e3ca4712829761408b540b9b5a7e770ea63d078c files/3.4.6167.1-configure-help.patch 2305 -SHA256 cac75e53b0d22b29328c486363805f67858cd1d78b9a431500c85598c0e05094 files/3.4.6167.1-configure-help.patch 2305 AUX configure-help.patch 1659 RMD160 d10d4eca291e9dae2d97659124b1883b245d53d0 SHA1 19c4d12d2d39d076426f84bef73a183785b26ceb SHA256 f6a5cbbdcaea965a41b6f662b545d765682fa7d932c076e262bda18f1309d93b -MD5 de97542da5ec5a7c2541cfc46c18b2b9 files/configure-help.patch 1659 -RMD160 d10d4eca291e9dae2d97659124b1883b245d53d0 files/configure-help.patch 1659 -SHA256 f6a5cbbdcaea965a41b6f662b545d765682fa7d932c076e262bda18f1309d93b files/configure-help.patch 1659 +AUX configure.in-xsp-check-by-dl9pf-version3.diff 3030 RMD160 2ffd1183ae56b2b9389bb5fc366ae4f2b74006f9 SHA1 9e5c6e5eb9e38f7c131d0a8aac49e3cebff89093 SHA256 f241ff570abf445a1839b7dbb28b097010524a91e9a361336f25f8b2207eb738 AUX desktop-file-categories.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 -MD5 29706d1bf41f315b711ee075761828c7 files/desktop-file-categories.patch 426 -RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 files/desktop-file-categories.patch 426 -SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 files/desktop-file-categories.patch 426 +AUX flex_in_lib64.diff 435 RMD160 c884f5b5b8b11fbbde50efe0f33ecc14b9c7c7aa SHA1 362b8742f0f69bfabd7bd1b1ba0a8b55615ca4a5 SHA256 a8e62c614c07189ad8b4c5dd5c52ee9748a0fbb0f1aade12e3570669a4ca30cc AUX ifolder-3.4.6098.1-desktop-file-fix.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 -MD5 29706d1bf41f315b711ee075761828c7 files/ifolder-3.4.6098.1-desktop-file-fix.patch 426 -RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 files/ifolder-3.4.6098.1-desktop-file-fix.patch 426 -SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 files/ifolder-3.4.6098.1-desktop-file-fix.patch 426 AUX ifolder-3.4.6101.1-desktop-file-fix.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 -MD5 29706d1bf41f315b711ee075761828c7 files/ifolder-3.4.6101.1-desktop-file-fix.patch 426 -RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 files/ifolder-3.4.6101.1-desktop-file-fix.patch 426 -SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 files/ifolder-3.4.6101.1-desktop-file-fix.patch 426 AUX ifolder-3.4.6120.1-desktop-file-fix.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 -MD5 29706d1bf41f315b711ee075761828c7 files/ifolder-3.4.6120.1-desktop-file-fix.patch 426 -RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 files/ifolder-3.4.6120.1-desktop-file-fix.patch 426 -SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 files/ifolder-3.4.6120.1-desktop-file-fix.patch 426 AUX ifolder-3.4.6167.1-desktop-file-fix.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 -MD5 29706d1bf41f315b711ee075761828c7 files/ifolder-3.4.6167.1-desktop-file-fix.patch 426 -RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 files/ifolder-3.4.6167.1-desktop-file-fix.patch 426 -SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 files/ifolder-3.4.6167.1-desktop-file-fix.patch 426 AUX ifolder-3.4.6214.1-desktop-file-fix.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 -MD5 29706d1bf41f315b711ee075761828c7 files/ifolder-3.4.6214.1-desktop-file-fix.patch 426 -RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 files/ifolder-3.4.6214.1-desktop-file-fix.patch 426 -SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 files/ifolder-3.4.6214.1-desktop-file-fix.patch 426 +AUX ifolder-3.6.use_system_gsoap.patch 2078 RMD160 d06955a2bd6794d5332ea0967a398aa0d4caf67e SHA1 9532d503a7de2b21e5558ab2d07d6c7fb0864c4c SHA256 3ed5b56a78dcf75d6f0c1564b6b16dafb5f389246404e6f168f3d9768bdf0ac0 +AUX ifolder-gnome-hack-1.patch 569 RMD160 41fc4c52b1019070619c6fe711936417fa862d97 SHA1 c9a32b7679672b08788a2e31d79192c4abeff0af SHA256 efe1d83a25cac7305c550394240636f439687e6a38176541274bada575db09ad +AUX ifolder-mono22-1.patch 3286 RMD160 46db7651269cf28c4ef485f989275f5e70c1f2a1 SHA1 5cc2389211de7656e0dfaa6f832eb13496285648 SHA256 3b6d785f570d3b3a32c850c9d443c72f1d1c4069d56288acc5701c5fefac0f04 +AUX new_default_simias.config.diff 941 RMD160 92197dcb98f8429636c3d03c3813d3ce2e8b8ffb SHA1 a21205dbad60ddbedfbe1db58dc020813ca0c7e1 SHA256 a7dfc2508c37cf405f1b9b66d3e0e8c913cb4c0277ff8533834948274d685a7d +AUX no_write_to_etc_during_install.diff 916 RMD160 9cd1ee64a3006aad139892010b2ba9a4f0f695be SHA1 a4c1c6ed6ad7be0bbcf75fda1601d7edab843981 SHA256 3c8045848161d34a49f1c1934b1111489e18f48d0b4225e287f83d1407425d7f +AUX simias_make_gcc43_happy.diff 1296 RMD160 11d3abf250e494744a534bac0af2dde451248942 SHA1 45c5e8aa305664caa302cab9b5cbaa8590689d2d SHA256 667df49faa48bde3b4cb76fee38af01965c226af15ddd34b9bfe8083c05adb8b AUX tray-icon.patch 701 RMD160 9d1883204e8cc0ba7461106e55be57a3821dfba8 SHA1 cab92019f4e7034e35939302b5c6bd0cdc0e248a SHA256 0fc83bbf8e561e13dc2d046983f93d37e39f883de06ebaa86bffcaf17786dd3e -MD5 b0c39b6cfc9e8419e152be24837cf3af files/tray-icon.patch 701 -RMD160 9d1883204e8cc0ba7461106e55be57a3821dfba8 files/tray-icon.patch 701 -SHA256 0fc83bbf8e561e13dc2d046983f93d37e39f883de06ebaa86bffcaf17786dd3e files/tray-icon.patch 701 AUX webdir-prefix.patch 286 RMD160 63d8428c3e9f21ead6df1d88bba2b4c6ed2929e1 SHA1 4948761fb7e5fe178d097499f8aa389a26206dda SHA256 edde8ee1044bfaaf5cf24867aad60f51e0364a9c2e3de18ce3d85ca64dcbae27 -MD5 9e966a436ce0b595b350bbe9649c053e files/webdir-prefix.patch 286 -RMD160 63d8428c3e9f21ead6df1d88bba2b4c6ed2929e1 files/webdir-prefix.patch 286 -SHA256 edde8ee1044bfaaf5cf24867aad60f51e0364a9c2e3de18ce3d85ca64dcbae27 files/webdir-prefix.patch 286 DIST ifolder3-3.6.7318.1.tar.gz 20848091 RMD160 df7df66641aa1f3a0bb488a1247228fccd2c0a73 SHA1 fafd731a2f18a6d1d36463d5a92c31dc0aa65499 SHA256 4d992f5b29b4c9dae49551d0b6e2b59f0adb972ed9018df0177ad414e74356a9 +EBUILD ifolder-3.6.7318.1-r1.ebuild 1083 RMD160 d59b072f633cdc459c62c46b7c2fedd9a8ea9c07 SHA1 bae423d69f8a4b48afdab5f40b69cae30f0af599 SHA256 97992c40c508f800dabc76dd9b917342eca0c5bfeeae96992841435b39fe0bfb EBUILD ifolder-3.6.7318.1.ebuild 1123 RMD160 35caabf9f6fec87724733c2335d4cbecb56bb44e SHA1 6f977900fec54a82204661e8e99f3e4f8e90ed53 SHA256 c21af2fa99ca654a89f4040796c8a0f40529d19f6469ffb0bc7fcb7f24897a11 -MD5 e6396051f147ac072c8511cee0c1e43c ifolder-3.6.7318.1.ebuild 1123 -RMD160 35caabf9f6fec87724733c2335d4cbecb56bb44e ifolder-3.6.7318.1.ebuild 1123 -SHA256 c21af2fa99ca654a89f4040796c8a0f40529d19f6469ffb0bc7fcb7f24897a11 ifolder-3.6.7318.1.ebuild 1123 -MISC ChangeLog 247 RMD160 2d4f9197682a7bf8499b82bf321a370ac8338415 SHA1 1cda8d3e07b61fc56c4df3cd7c8ce1412be36ad0 SHA256 c931cf577c57934af3fb941b3107acff31be4886f2ccd745fcef94fe3d5107cf -MD5 e04ab24d48ef326df9644b6100b7d02a ChangeLog 247 -RMD160 2d4f9197682a7bf8499b82bf321a370ac8338415 ChangeLog 247 -SHA256 c931cf577c57934af3fb941b3107acff31be4886f2ccd745fcef94fe3d5107cf ChangeLog 247 +MISC ChangeLog 663 RMD160 dbd41ffaf17bf04eb7a78646df33cd9fc09c8035 SHA1 922c7231c1b10b7adb86a660b7c3110aae397fcd SHA256 07b545bb4b1cac3ad74b52ccb407bd4850ddae762442b5ffd56d70238e8be460 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 -MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170 -RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170 -SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170 -MD5 5c70c18e3c30faa2b29249ddac9991b5 files/digest-ifolder-3.6.7318.1 265 -RMD160 38f455ebcbf134b1cd2df210d5097ea14c5ec601 files/digest-ifolder-3.6.7318.1 265 -SHA256 7580383aa2018f2957ed95eef8dbf1cf2cbede4b8bca91159d9e8d01c56ec613 files/digest-ifolder-3.6.7318.1 265 diff --git a/net-misc/ifolder/files/configure.in-xsp-check-by-dl9pf-version3.diff b/net-misc/ifolder/files/configure.in-xsp-check-by-dl9pf-version3.diff new file mode 100644 index 0000000..d5d3b06 --- /dev/null +++ b/net-misc/ifolder/files/configure.in-xsp-check-by-dl9pf-version3.diff @@ -0,0 +1,94 @@ +Index: configure.in +=================================================================== +--- configure.in (Revision 6873) ++++ configure.in (Arbeitskopie) +@@ -607,8 +607,87 @@ + # Configure MONO_WEBSERVER + # + MONO_WEBSERVER="no" +-if test -e "/usr/lib/mono/1.0/Mono.WebServer.dll"; then +- MONO_WEBSERVER="yes" ++if test "$SIMIAS_OS" = "linux"; then ++ # If we have xsp in our $PATH, then we have xsp installed ++ AC_CHECK_PROG(HAVE_XSP, xsp, yes) ++ AC_CHECKING([whether xsp version is >= 1.1.13.8]) ++ if test "$HAVE_XSP" = "yes"; then ++ # Get the version info and check if we have a version >= 1.1.18 ++ # 1st: Get the version string ++ XSP_EXE_VER=`LANG="C" xsp --version | head -n 1 | cut -d" " -f2` ++ ++ # We have to look at a minimum of 3 digits (mono-W.X.Y.Z) ++ DIGIT_W=`echo $XSP_EXE_VER | cut -d"." -f1` # major ++ DIGIT_X=`echo $XSP_EXE_VER | cut -d"." -f2` # minor ++ DIGIT_Y=`echo $XSP_EXE_VER | cut -d"." -f3` # sub ++ DIGIT_Z=`echo $XSP_EXE_VER | cut -d"." -f4` # extra ++ ++ # We want to require a minimum of 1.1.18 (no z, setting "0") ++ REQ_MAJOR="1" ++ REQ_MINOR="1" ++ REQ_SUB="13" ++ REQ_EXTRA="7" ++ ++ # Lets compare things ++ echo " M M S E" ++ echo " A I U X" ++ echo " J N B T" ++ echo " O O R" ++ echo " R R A" ++ echo " - - - " ++ echo "DEBUG $DIGIT_W - $DIGIT_X - $DIGIT_Y - $DIGIT_Z" ++ echo "DEBUG $REQ_MAJOR - $REQ_MINOR - $REQ_SUB - $REQ_EXTRA" ++ ++XSP_ERROR_MSG=" ++* Your xsp version seems to be $DIGIT_W.$DIGIT_X.$DIGIT_Y.$DIGIT_Z ++* You need to install xsp >= $REQ_MAJOR.$REQ_MINOR.$REQ_SUB to run simias ++" ++ ++ if [[[ -n $DIGIT_W && $DIGIT_W -ge $REQ_MAJOR ]]] ; then ++ echo "MAJOR OK" ++ # MAJOR IS OK, NOW CHECK MINOR ++ if [[[ -n $DIGIT_X && $DIGIT_X -gt $REQ_MINOR ]]] ; then ++ echo "MINOR GREATER" ++ # MINOR IS GREATER, SKIP CHECK SUB ++ MONO_WEBSERVER="yes" ++ else ++ if [[[ -n $DIGIT_X && $DIGIT_X -eq $REQ_MINOR ]]] ; then ++ echo "MINOR EQUAL" ++ # MINOR IS EQUAL, CHECK SUB ++ if [[[ -n $DIGIT_Y && $DIGIT_Y -gt $REQ_SUB ]]] ; then ++ echo "SUB OK" ++ # SUB IS GREATER - SKIP CHECK EXTRA ++ MONO_WEBSERVER="yes" ++ else ++ if [[[ -n $DIGIT_Y && $DIGIT_Y -eq $REQ_SUB ]]] ; then ++ echo "SUB OK" ++ # SUB IS EQUAL, CHECK EXTRA ++ if [[[ -n $DIGIT_Z && $DIGIT_Z -ge $REQ_EXTRA ]]] ; then ++ echo "EXTRA OK" ++ # EXTRA IS GREATER/EQUAL ++ MONO_WEBSERVER="yes" ++ else ++ echo "EXTRA NOT OK !" ++ AC_MSG_ERROR($XSP_ERROR_MSG) ++ fi ++ else ++ echo "SUB NOT OK !" ++ AC_MSG_ERROR($XSP_ERROR_MSG) ++ fi ++ fi ++ else ++ echo "MINOR NOT OK !" ++ AC_MSG_ERROR($XSP_ERROR_MSG) ++ fi ++ fi ++ else ++ echo "MAJOR NOT OK !" ++ AC_MSG_ERROR($XSP_ERROR_MSG) ++ fi ++ echo "DEBUG MONO_WEBSERVER=yes" ++ else ++ AC_MSG_ERROR(* xsp command not found) ++ fi + fi + + AC_SUBST(MONO_WEBSERVER) diff --git a/net-misc/ifolder/files/flex_in_lib64.diff b/net-misc/ifolder/files/flex_in_lib64.diff new file mode 100644 index 0000000..624edd6 --- /dev/null +++ b/net-misc/ifolder/files/flex_in_lib64.diff @@ -0,0 +1,12 @@ +diff -Naur simias/tools/gsoap/gsoap-linux-2.7/src/Makefile simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile +--- simias/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-01 22:32:04.000000000 +0200 ++++ simias-changed/tools/gsoap/gsoap-linux-2.7/src/Makefile 2007-10-02 19:34:26.000000000 +0200 +@@ -10,7 +10,7 @@ + YACC=bison + # For static linkage with Flex use: + ifndef (lib) +-lib=lib ++lib=lib64 + endif + + LIBS=/usr/$(lib)/libfl.a diff --git a/net-misc/ifolder/files/ifolder-3.6.use_system_gsoap.patch b/net-misc/ifolder/files/ifolder-3.6.use_system_gsoap.patch new file mode 100644 index 0000000..84249ea --- /dev/null +++ b/net-misc/ifolder/files/ifolder-3.6.use_system_gsoap.patch @@ -0,0 +1,56 @@ +diff -uNr ifolder.orig/src/libifolder/Makefile.am ifolder/src/libifolder/Makefile.am +--- ifolder.orig/src/libifolder/Makefile.am 2009-02-21 17:10:23.648059042 +0100 ++++ ifolder/src/libifolder/Makefile.am 2009-02-21 17:11:44.226735427 +0100 +@@ -15,7 +15,7 @@ + override CFLAGS = + + libifolderclient_la_SOURCES = \ +- iFolderClientLib.c stdsoap2.h ifolder.c ifolder.h ++ iFolderClientLib.c ifolder.c ifolder.h + + libifolderclient_la_CFLAGS = \ + $(SIMIAS_CLIENT_C_CFLAGS) \ +@@ -28,18 +28,15 @@ + # > $(srcdir)/env.h + # $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h + +-$(srcdir)/stdsoap2.h: +- cp $(GSOAP_PATH)/stdsoap2.h $(srcdir) +- + #$(srcdir)/iFolderClient.h: $(srcdir)/stdsoap2.c $(IFOLDER_CLIENT_WSDL) + +-$(srcdir)/iFolderClient.h: $(srcdir)/stdsoap2.h $(IFOLDER_CLIENT_WSDL) +- $(GSOAP_PATH)/wsdl2h -c -o $@ $(IFOLDER_CLIENT_WSDL) ++$(srcdir)/iFolderClient.h: $(IFOLDER_CLIENT_WSDL) ++ wsdl2h -c -o $@ $(IFOLDER_CLIENT_WSDL) + + $(srcdir)/iFolderClientLib.c: $(srcdir)/iFolderClient.h + > $(srcdir)/env.h +- $(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h +- $(GSOAP_PATH)/soapcpp2 -c -n -piFolder $(srcdir)/iFolderClient.h ++ soapcpp2 -c -penv $(srcdir)/env.h ++ soapcpp2 -c -n -piFolder $(srcdir)/iFolderClient.h + + install-exec-hook: + if !WINDOWS +@@ -51,19 +48,17 @@ + $(mkinstalldirs) $(DESTDIR)$(includedir)/ifolder3 + $(INSTALL_PROGRAM) iFolderStub.h $(DESTDIR)$(includedir)/ifolder3 + $(INSTALL_PROGRAM) iFolder.nsmap $(DESTDIR)$(includedir)/ifolder3 +- $(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/ifolder3 + $(INSTALL_PROGRAM) iFolderH.h $(DESTDIR)$(includedir)/ifolder3 + $(INSTALL_PROGRAM) ifolder.h $(DESTDIR)$(includedir)/ifolder3 + + uninstall-local: + rm -f $(DESTDIR)$(includedir)/ifolder3/iFolderStub.h + rm -f $(DESTDIR)$(includedir)/ifolder3/iFolder.nsmap +- rm -f $(DESTDIR)$(includedir)/ifolder3/stdsoap2.h + rm -f $(DESTDIR)$(includedir)/ifolder3/iFolderH.h + rm -f $(DESTDIR)$(includedir)/ifolder3/ifolder.h + + clean-local: +- rm -f stdsoap2.* *.xml iFolder* env* soap* ++ rm -f *.xml iFolder* env* soap* + rm -rf $(COMMON_CLEAN_FILES) + + distclean-local: diff --git a/net-misc/ifolder/files/ifolder-gnome-hack-1.patch b/net-misc/ifolder/files/ifolder-gnome-hack-1.patch new file mode 100644 index 0000000..6e81d12 --- /dev/null +++ b/net-misc/ifolder/files/ifolder-gnome-hack-1.patch @@ -0,0 +1,16 @@ +diff -uNr ifolder.orig/src/LinuxClient/Makefile.am ifolder/src/LinuxClient/Makefile.am +--- ifolder.orig/src/LinuxClient/Makefile.am 2009-02-21 18:13:49.949960199 +0100 ++++ ifolder/src/LinuxClient/Makefile.am 2009-02-21 18:14:07.017661288 +0100 +@@ -58,9 +58,9 @@ + #@INTLTOOL_SCHEMAS_RULE@ + + #if GCONF_SCHEMAS_INSTALL +-install-data-local: +- GCONF_CONFIG_SOURCE="" \ +- $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ++#install-data-local: ++# GCONF_CONFIG_SOURCE="" \ ++# $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) + #endif + + EXTRA_DIST = $(schemas_DATA).in diff --git a/net-misc/ifolder/files/ifolder-mono22-1.patch b/net-misc/ifolder/files/ifolder-mono22-1.patch new file mode 100644 index 0000000..bbae79a --- /dev/null +++ b/net-misc/ifolder/files/ifolder-mono22-1.patch @@ -0,0 +1,72 @@ +diff -uNr ifolder.orig/configure.in ifolder/configure.in +--- ifolder.orig/configure.in 2009-02-21 17:03:50.447382682 +0100 ++++ ifolder/configure.in 2009-02-21 17:04:22.689853328 +0100 +@@ -20,21 +20,21 @@ + case $host_os in + linux*) + IFOLDER_OS='linux' +- AC_CHECK_PROG(CSC, mcs, mcs) +- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH]) ++ AC_CHECK_PROG(CSC, gmcs, gmcs) ++ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH]) + PKG_CONFIG_DIR='lib' + ;; + darwin*) + IFOLDER_OS='darwin' +- AC_CHECK_PROG(CSC, mcs, mcs) +- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: mcs not found in \$PATH]) ++ AC_CHECK_PROG(CSC, gmcs, gmcs) ++ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: gmcs not found in \$PATH]) + PKG_CONFIG_DIR='lib' + ;; + cygwin*) + IFOLDER_OS='windows' + AC_CHECK_PROG(CSC, csc, csc) +- test -z "$CSC" && AC_CHECK_PROG(CSC, mcs, mcs) +- test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor mcs found in \$PATH]) ++ test -z "$CSC" && AC_CHECK_PROG(CSC, gmcs, gmcs) ++ test -z "$CSC" && AC_MSG_ERROR([no C Sharp compiler: neither csc nor gmcs found in \$PATH]) + PKG_CONFIG_DIR='.' + ;; + *) +@@ -47,7 +47,7 @@ + AM_CONDITIONAL(LINUX, test "$IFOLDER_OS" = "linux") + AM_CONDITIONAL(WINDOWS, test "$IFOLDER_OS" = "windows") + AM_CONDITIONAL(DARWIN, test "$IFOLDER_OS" = "darwin") +-AM_CONDITIONAL(MONO, test "$CSC" = "mcs") ++AM_CONDITIONAL(MONO, test "$CSC" = "gmcs") + AM_CONDITIONAL(DOTNET, test "$CSC" = "csc") + + # +@@ -80,7 +80,7 @@ + # + # Mono-specific configuration + # +- mcs) ++ gmcs) + CSC_EXEFLAG=/target:exe + CSC_LIBFLAG=/target:library + CSC_WINEXEFLAG=/target:winexe +diff -uNr ifolder.orig/src/WebService/Makefile.am ifolder/src/WebService/Makefile.am +--- ifolder.orig/src/WebService/Makefile.am 2009-02-21 17:17:40.134595669 +0100 ++++ ifolder/src/WebService/Makefile.am 2009-02-21 17:19:12.055858183 +0100 +@@ -25,7 +25,7 @@ + $(CSC) /out:$@ $(CSCFLAGS) $(iFolderWebService_FLAGS) $(SIMIAS_LIBS) $(SIMIAS_CLIENT_LIBS) $(iFolderWebService_LIBS:%=/r:%) $(iFolderWebService_LIBPATH:%=/lib:%) $(iFolderWebService_RESOURCES:%=$(ICON_FLAG)%) $(srcdir)/AssemblyInfo.cs $(iFolderWebService_CSFILES_CSC) $(DOC_FILE_CMD) + + ../iFolder/iFolderWebService.cs: iFolderWebService.wsdl +- wsdl -out:../iFolder/iFolderWebService.cs iFolderWebService.wsdl ++ wsdl2 -out:../iFolder/iFolderWebService.cs iFolderWebService.wsdl + + iFolderWebService.wsdl: Novell.iFolder.Web.dll GenerateWsdl.exe copy + $(MONO) GenerateWsdl.exe Novell.iFolder.Web.dll Novell.iFolder.Web.iFolderService http://127.0.0.1:8086/simias10/iFolder.asmx $@ +diff -uNr ifolder.orig/src/LinuxClient/application/iFolderApplication.cs ifolder/src/LinuxClient/application/iFolderApplication.cs +--- ifolder.orig/src/LinuxClient/application/iFolderApplication.cs 2009-02-21 17:38:37.930448421 +0100 ++++ ifolder/src/LinuxClient/application/iFolderApplication.cs 2009-02-21 17:39:52.141070861 +0100 +@@ -43,6 +43,7 @@ + using Novell.iFolder.Events; + using Novell.iFolder.Controller; + ++using Process = System.Diagnostics.Process; + + namespace Novell.iFolder + { diff --git a/net-misc/ifolder/files/new_default_simias.config.diff b/net-misc/ifolder/files/new_default_simias.config.diff new file mode 100644 index 0000000..1eedff7 --- /dev/null +++ b/net-misc/ifolder/files/new_default_simias.config.diff @@ -0,0 +1,14 @@ +diff -Naur simias_orig/src/server/Simias.config.in simias/src/server/Simias.config.in +--- simias_orig/src/server/Simias.config.in 2007-10-16 16:19:39.000000000 +0200 ++++ simias/src/server/Simias.config.in 2007-10-30 01:10:50.068278089 +0100 +@@ -6,7 +6,9 @@ + + +
+- ++ ++ ++ +
+
+ diff --git a/net-misc/ifolder/files/no_write_to_etc_during_install.diff b/net-misc/ifolder/files/no_write_to_etc_during_install.diff new file mode 100644 index 0000000..76ba9fe --- /dev/null +++ b/net-misc/ifolder/files/no_write_to_etc_during_install.diff @@ -0,0 +1,16 @@ +diff -Naur simias/src/server/setup/Makefile.am simias-changed/src/server/setup/Makefile.am +--- simias/src/server/setup/Makefile.am 2007-10-01 22:53:18.000000000 +0200 ++++ simias-changed/src/server/setup/Makefile.am 2007-10-02 08:52:47.000000000 +0200 +@@ -120,9 +120,9 @@ + $(INSTALL_PROGRAM) ifolder-web-setup $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) ifolder-admin-setup $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) utility.exe $(DEBUG_FILES) $(DESTDIR)$(bindir) +- $(mkinstalldirs) /etc/ld.so.conf.d +- $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d +- grep -q "include /etc/ld.so.conf.d/\*.conf" /etc/ld.so.conf || echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf ++# $(mkinstalldirs) /etc/ld.so.conf.d ++# $(INSTALL_PROGRAM) novell-ifolder3.conf /etc/ld.so.conf.d ++# grep -q "include /etc/ld.so.conf.d/\*.conf" /etc/ld.so.conf || echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf + + + endif diff --git a/net-misc/ifolder/files/simias_make_gcc43_happy.diff b/net-misc/ifolder/files/simias_make_gcc43_happy.diff new file mode 100644 index 0000000..9950f2f --- /dev/null +++ b/net-misc/ifolder/files/simias_make_gcc43_happy.diff @@ -0,0 +1,32 @@ +commit 3fd0a202d298e633e00f1756405c82e4b794de25 +Author: Jan-Simon Möller +Date: Tue Aug 19 08:51:41 2008 +0200 + + Make gcc4.3 happy (added 2* #include ) + + Signed-off-by: Jan-Simon Möller + +diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp +index d47944d..16f87c0 100644 +--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp ++++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPObjectIterator.cpp +@@ -21,6 +21,7 @@ + * + ***********************************************************************/ + #include "CSPObjectIterator.h" ++#include + + CSPObjectIterator::CSPObjectIterator(HFCURSOR cursor, int count, FLMBOOL includeColId) : + m_Count(count), +diff --git a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h +index 616435f..58e4f92 100644 +--- a/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h ++++ b/simias/src/core/FlaimProvider/FlaimWrapper/CSPType.h +@@ -22,6 +22,7 @@ + ***********************************************************************/ + #ifndef _CSTYPE_H_ + #define _CSTYPE_H_ ++#include + + #define MAX_INT_STRING 21 + diff --git a/net-misc/ifolder/ifolder-3.6.7318.1-r1.ebuild b/net-misc/ifolder/ifolder-3.6.7318.1-r1.ebuild new file mode 100644 index 0000000..65474ed --- /dev/null +++ b/net-misc/ifolder/ifolder-3.6.7318.1-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +WANT_AUTOMAKE=1.9 +inherit mono eutils gnome2 autotools + +DESCRIPTION="Novell iFolder" +HOMEPAGE="http://www.ifolder.com/" +SRC_URI="http://distfiles.one-gear.com/distfiles/${PN}${PV:0:1}-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~amd64" +RESTRICT="mirror" + +IUSE="" +DEPEND=">=dev-lang/mono-2.0 + >=dev-dotnet/gconf-sharp-2.0 + >=dev-dotnet/gnome-sharp-2.0 + >=dev-dotnet/gtk-sharp-2.0 + >=net-misc/simias-1.6 + >=net-libs/gsoap-2.7.1 + >=gnome-base/eel-2.12" + +S="${WORKDIR}/${PN}" +MAKEOPTS="-j1" +G2CONF="--disable-schemas-install" + +src_prepare() { + epatch "${FILESDIR}"/desktop-file-categories.patch || die "Error applying patch" + epatch "${FILESDIR}"/ifolder-mono22-1.patch + epatch "${FILESDIR}"/ifolder-3.6.use_system_gsoap.patch + epatch "${FILESDIR}"/ifolder-gnome-hack-1.patch + eautoreconf || die "eautoreconf failed" +} + +src_configure() { + econf || die "configure failed" +} + +src_install() { + make DESTDIR=${D} install +}