diff --git a/net-misc/ifolder/ChangeLog b/net-misc/ifolder/ChangeLog index 2181a7c..86f6057 100644 --- a/net-misc/ifolder/ChangeLog +++ b/net-misc/ifolder/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 28 Feb 2009; Mario Fetka + files/ifolder-mono22-1.patch, +files/ifolder-disambiguate_process.dpatch, + +files/ifolder-lib_name.dpatch, +ifolder-3.6.7318.1-r2.ebuild: + Bump correct pkg-config + 22 Feb 2009; Mario Fetka ifolder-3.6.7318.1-r1.ebuild: correct mono dependency diff --git a/net-misc/ifolder/Manifest b/net-misc/ifolder/Manifest index 4ac84f6..a836e35 100644 --- a/net-misc/ifolder/Manifest +++ b/net-misc/ifolder/Manifest @@ -1,9 +1,12 @@ AUX desktop-file-categories.patch 426 RMD160 79fd3010215e2d98b2444788800d1d88c9dee810 SHA1 37d77c18cb99be9ea1f30b2ec4845e7b8640210a SHA256 3148babbed0a01799fd895bc6fb835a54556f5e74daf877c63e3c070450d2718 AUX ifolder-3.6.use_system_gsoap.patch 2078 RMD160 d06955a2bd6794d5332ea0967a398aa0d4caf67e SHA1 9532d503a7de2b21e5558ab2d07d6c7fb0864c4c SHA256 3ed5b56a78dcf75d6f0c1564b6b16dafb5f389246404e6f168f3d9768bdf0ac0 +AUX ifolder-disambiguate_process.dpatch 803 RMD160 6f058e9872cfc6bd98556f13c2815ca75a6cc358 SHA1 cf9fb4428147edf97befbad7126ce680a42d35fb SHA256 35340005ffe35507cd8f003b0b43efe51c4570a69b59a5ab8ab30bb957fb02fc 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 ifolder-lib_name.dpatch 856 RMD160 1ee4486c9d412e732617a3bc18387f9201931e64 SHA1 9d0ac4527f91f5f8997bcd7d1d622668898f2455 SHA256 c55cd504abb93b7aa534555940f1cc0b734d2d1f2c06a611808c11b8569b6c57 +AUX ifolder-mono22-1.patch 2794 RMD160 5fe95bedd74d227831d32f63643c9a9a96bbe9b2 SHA1 27d301c129d9f48dc5b89155df59f1d00fd30aa1 SHA256 495f8f17b895c15d1aa5314f7fb569a4d9d97db7e2bd0a35694dd29f907d6354 DIST ifolder3-3.6.7318.1.tar.gz 20848091 RMD160 df7df66641aa1f3a0bb488a1247228fccd2c0a73 SHA1 fafd731a2f18a6d1d36463d5a92c31dc0aa65499 SHA256 4d992f5b29b4c9dae49551d0b6e2b59f0adb972ed9018df0177ad414e74356a9 EBUILD ifolder-3.6.7318.1-r1.ebuild 1048 RMD160 91878b2903d3e10b9ef6df1052459a7ecdeb6506 SHA1 c781c785f8f519312695981af6dc46303d20f0ff SHA256 9c70ce05887d1f95e0f459c3d522d3e3739e4a392e1c08225713da49c1ca2a49 +EBUILD ifolder-3.6.7318.1-r2.ebuild 1152 RMD160 7995f232ab9314b7b6924c47c3c37fd913934fd8 SHA1 966609f9b2a31d8c79fcacfbce2927f90d8225e7 SHA256 b08e1c4a4499516bc8abc00b04fe4e5fa3a9901f0d3cc6c12618cd8151599221 EBUILD ifolder-3.6.7318.1.ebuild 1123 RMD160 35caabf9f6fec87724733c2335d4cbecb56bb44e SHA1 6f977900fec54a82204661e8e99f3e4f8e90ed53 SHA256 c21af2fa99ca654a89f4040796c8a0f40529d19f6469ffb0bc7fcb7f24897a11 -MISC ChangeLog 1681 RMD160 22c74a0e89fe72c8335b84f1037dff5fa8ce4d3e SHA1 1c339eadabaf1ec724b96460fc49f48c73d9cdd3 SHA256 45715cfbe3801a981eb6453241ab42cf28eaecb9dda9b4b5dd2417dc6d9416d2 +MISC ChangeLog 1900 RMD160 2b4df41de296e898a5dadde989d24d4bca7eeb44 SHA1 8ee170d26c8397324c21f1f0d4d87094bc92532e SHA256 b2f113dded03d4b1ac11aa0d95cd3ad3e0137f06e33ed369f09c98fc396ccbd9 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-misc/ifolder/files/ifolder-disambiguate_process.dpatch b/net-misc/ifolder/files/ifolder-disambiguate_process.dpatch new file mode 100755 index 0000000..1ea916f --- /dev/null +++ b/net-misc/ifolder/files/ifolder-disambiguate_process.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 002_disambiguate_process.dpatch by Tan Rui Boon +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad ifolder-3.6~/src/LinuxClient/application/iFolderApplication.cs ifolder-3.6/src/LinuxClient/application/iFolderApplication.cs +--- ifolder-3.6~/src/LinuxClient/application/iFolderApplication.cs 2008-06-04 11:58:33.000000000 +0800 ++++ ifolder-3.6/src/LinuxClient/application/iFolderApplication.cs 2008-06-04 12:14:08.000000000 +0800 +@@ -1722,7 +1722,7 @@ + */ + public static void Main (string[] args) + { +- Process[] processes = ++ System.Diagnostics.Process[] processes = + System.Diagnostics.Process.GetProcessesByName("iFolderClient"); + + if(processes.Length > 1) diff --git a/net-misc/ifolder/files/ifolder-lib_name.dpatch b/net-misc/ifolder/files/ifolder-lib_name.dpatch new file mode 100755 index 0000000..a4b2364 --- /dev/null +++ b/net-misc/ifolder/files/ifolder-lib_name.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## gtk.dpatch by Tan Rui Boon +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad ifolder-3.6~/configure.in ifolder-3.6/configure.in +--- ifolder-3.6~/configure.in 2008-06-03 23:32:04.000000000 +0800 ++++ ifolder-3.6/configure.in 2008-06-04 00:02:26.000000000 +0800 +@@ -498,8 +498,8 @@ + # AC_PROG_INTLTOOL + + PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP2_MINIMUM_VERSION) +- GTK_SHARP_PREFIX=`pkg-config --variable=prefix gtk-sharp` +- GTK_SHARP_VERSION=`pkg-config --modversion gtk-sharp` ++ GTK_SHARP_PREFIX=`pkg-config --variable=prefix gtk-sharp-2.0` ++ GTK_SHARP_VERSION=`pkg-config --modversion gtk-sharp-2.0` + AC_SUBST(GTK_SHARP_PREFIX) + AC_SUBST(GTK_SHARP_LIBS) + diff --git a/net-misc/ifolder/files/ifolder-mono22-1.patch b/net-misc/ifolder/files/ifolder-mono22-1.patch index bbae79a..e794de7 100644 --- a/net-misc/ifolder/files/ifolder-mono22-1.patch +++ b/net-misc/ifolder/files/ifolder-mono22-1.patch @@ -59,14 +59,3 @@ diff -uNr ifolder.orig/src/WebService/Makefile.am ifolder/src/WebService/Makefil 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/ifolder-3.6.7318.1-r2.ebuild b/net-misc/ifolder/ifolder-3.6.7318.1-r2.ebuild new file mode 100644 index 0000000..6179be3 --- /dev/null +++ b/net-misc/ifolder/ifolder-3.6.7318.1-r2.ebuild @@ -0,0 +1,46 @@ +# 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.2 + >=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" + +src_prepare() { + epatch "${FILESDIR}"/desktop-file-categories.patch || die "Error applying patch" + epatch "${FILESDIR}"/ifolder-mono22-1.patch + epatch "${FILESDIR}"/ifolder-disambiguate_process.dpatch + epatch "${FILESDIR}"/ifolder-lib_name.dpatch + 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 +}