From fe4c57b65640fe4f91a3e17667d1eb2426c9ae82 Mon Sep 17 00:00:00 2001 From: geos_one Date: Mon, 6 Apr 2009 18:22:50 +0000 Subject: [PATCH] net-misc/ifolder: Bump to ifolder 3.7 git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/ifolder@919 6952d904-891a-0410-993b-d76249ca496b --- net-misc/ifolder/ChangeLog | 7 +++ net-misc/ifolder/Manifest | 8 ++- .../ifolder-3.7-desktop-file-categories.patch | 11 ++++ .../ifolder-3.7-disambiguate_process.dpatch | 12 ++++ .../files/ifolder-3.7-gnome-hack-1.patch | 16 ++++++ .../ifolder/files/ifolder-3.7-mono22-1.patch | 44 +++++++++++++++ .../files/ifolder-3.7-use_system_gsoap.patch | 56 +++++++++++++++++++ net-misc/ifolder/ifolder-3.7_pre6679.ebuild | 47 ++++++++++++++++ 8 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 net-misc/ifolder/files/ifolder-3.7-desktop-file-categories.patch create mode 100644 net-misc/ifolder/files/ifolder-3.7-disambiguate_process.dpatch create mode 100644 net-misc/ifolder/files/ifolder-3.7-gnome-hack-1.patch create mode 100644 net-misc/ifolder/files/ifolder-3.7-mono22-1.patch create mode 100644 net-misc/ifolder/files/ifolder-3.7-use_system_gsoap.patch create mode 100644 net-misc/ifolder/ifolder-3.7_pre6679.ebuild diff --git a/net-misc/ifolder/ChangeLog b/net-misc/ifolder/ChangeLog index 86f6057..8347fd7 100644 --- a/net-misc/ifolder/ChangeLog +++ b/net-misc/ifolder/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Apr 2009; Mario Fetka + +files/ifolder-3.7-desktop-file-categories.patch, + +files/ifolder-3.7-disambiguate_process.dpatch, + +files/ifolder-3.7-gnome-hack-1.patch, +files/ifolder-3.7-mono22-1.patch, + +files/ifolder-3.7-use_system_gsoap.patch, +ifolder-3.7_pre6679.ebuild: + Bump to ifolder 3.7 + 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: diff --git a/net-misc/ifolder/Manifest b/net-misc/ifolder/Manifest index a836e35..02e6877 100644 --- a/net-misc/ifolder/Manifest +++ b/net-misc/ifolder/Manifest @@ -1,5 +1,10 @@ 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-3.7-desktop-file-categories.patch 604 RMD160 66f37ba7d33cded3fbf53f2c9704e5bdebb9a0a5 SHA1 09b8bc84eadc0f440aa2148ea01ab5c3c9597cd6 SHA256 e0c9b0d1b5563bcc26ebfa3a9c7a7fa42a482e2840794a419b157b4b3d3c53c4 +AUX ifolder-3.7-disambiguate_process.dpatch 611 RMD160 8cf6281320f147c9566aa85a07176c54721ed400 SHA1 8b47bab51ec3aae61b5a9eccaaa13e4a9caf2f03 SHA256 de2bb1bc945c01db1771215a7e0c8870fe0341652fd83186174fd0739c01996b +AUX ifolder-3.7-gnome-hack-1.patch 605 RMD160 9ba979e823233ab0839fa3d4cde2c9f23f7eb9ab SHA1 86aa6f86a71a9625065304811c82bac4bda37fdc SHA256 6f8858fe3c04aeec066a86eb30ad470e5ee421a29c8f31f9362d2d17a4a2573e +AUX ifolder-3.7-mono22-1.patch 2087 RMD160 88712ee0eacdbaefdaf7361076b5bff5520648e9 SHA1 854b9177f743e6542753a46a1dd6d46c6cc06ad2 SHA256 6a7ed109602387c09ebeb11720595b29dac4ce1fa548d5ee7bde853b470258d7 +AUX ifolder-3.7-use_system_gsoap.patch 2106 RMD160 527c850f748e7511208c1d92b3f44eb9e48902ab SHA1 c105e7f5cb826f4a440f7494ecd108bca1bb124b SHA256 17f1edec7f7ab4202663516817b531ad112c115c677f937f01d516ceeb04cbf6 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-lib_name.dpatch 856 RMD160 1ee4486c9d412e732617a3bc18387f9201931e64 SHA1 9d0ac4527f91f5f8997bcd7d1d622668898f2455 SHA256 c55cd504abb93b7aa534555940f1cc0b734d2d1f2c06a611808c11b8569b6c57 @@ -8,5 +13,6 @@ DIST ifolder3-3.6.7318.1.tar.gz 20848091 RMD160 df7df66641aa1f3a0bb488a1247228fc 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 1900 RMD160 2b4df41de296e898a5dadde989d24d4bca7eeb44 SHA1 8ee170d26c8397324c21f1f0d4d87094bc92532e SHA256 b2f113dded03d4b1ac11aa0d95cd3ad3e0137f06e33ed369f09c98fc396ccbd9 +EBUILD ifolder-3.7_pre6679.ebuild 1406 RMD160 e794d982d211466ab8fe150125a1ce756cd1fd17 SHA1 1fa26652a394fc39b07b89073501ebde85b5a387 SHA256 11f21379d0e3fccea726ed85fc64e712b6e20491697c8cec7aed95daefef3e59 +MISC ChangeLog 2226 RMD160 3c04f158f70eb57489e2a7a115837ab69cdab65a SHA1 60f79d6c8e830e7508b34a4179e9332c7d56f3e5 SHA256 9cae6ca7fefc2ca759096bff55303fd63d7fc2f8e69dc63b7765e2f917fc26ed MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-misc/ifolder/files/ifolder-3.7-desktop-file-categories.patch b/net-misc/ifolder/files/ifolder-3.7-desktop-file-categories.patch new file mode 100644 index 0000000..d6c55c9 --- /dev/null +++ b/net-misc/ifolder/files/ifolder-3.7-desktop-file-categories.patch @@ -0,0 +1,11 @@ +diff -uNr ifolder.orig/src/UI/Linux/LinuxClient/application/ifolder.desktop.in ifolder/src/UI/Linux/LinuxClient/application/ifolder.desktop.in +--- ifolder.orig/src/UI/Linux/LinuxClient/application/ifolder.desktop.in 2009-04-06 11:33:57.236493486 +0200 ++++ ifolder/src/UI/Linux/LinuxClient/application/ifolder.desktop.in 2009-04-06 11:35:02.178603367 +0200 +@@ -1,6 +1,6 @@ + [Desktop Entry] + X-SuSE-translate=false +-Categories=Application;Utility;Filesystem; ++Categories=Application;Network; + Name=iFolder 3 + GenericName=Collaborative File Sharing + Comment=Backup, synchronize, and share files with others diff --git a/net-misc/ifolder/files/ifolder-3.7-disambiguate_process.dpatch b/net-misc/ifolder/files/ifolder-3.7-disambiguate_process.dpatch new file mode 100644 index 0000000..4969773 --- /dev/null +++ b/net-misc/ifolder/files/ifolder-3.7-disambiguate_process.dpatch @@ -0,0 +1,12 @@ +diff -uNr ifolder.orig/src/UI/Linux/LinuxClient/application/iFolderApplication.cs ifolder/src/UI/Linux/LinuxClient/application/iFolderApplication.cs +--- ifolder.orig/src/UI/Linux/LinuxClient/application/iFolderApplication.cs 2009-04-06 11:44:40.872846928 +0200 ++++ ifolder/src/UI/Linux/LinuxClient/application/iFolderApplication.cs 2009-04-06 11:45:02.963111818 +0200 +@@ -1968,7 +1968,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-3.7-gnome-hack-1.patch b/net-misc/ifolder/files/ifolder-3.7-gnome-hack-1.patch new file mode 100644 index 0000000..475207b --- /dev/null +++ b/net-misc/ifolder/files/ifolder-3.7-gnome-hack-1.patch @@ -0,0 +1,16 @@ +diff -uNr ifolder.orig/src/UI/Linux/LinuxClient/Makefile.am ifolder/src/UI/Linux/LinuxClient/Makefile.am +--- ifolder.orig/src/UI/Linux/LinuxClient/Makefile.am 2009-04-06 11:51:52.324659991 +0200 ++++ ifolder/src/UI/Linux/LinuxClient/Makefile.am 2009-04-06 11:52:27.963534276 +0200 +@@ -61,9 +61,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-3.7-mono22-1.patch b/net-misc/ifolder/files/ifolder-3.7-mono22-1.patch new file mode 100644 index 0000000..268c494 --- /dev/null +++ b/net-misc/ifolder/files/ifolder-3.7-mono22-1.patch @@ -0,0 +1,44 @@ +diff -uNr ifolder.orig/configure.in ifolder/configure.in +--- ifolder.orig/configure.in 2009-04-06 11:37:50.085948127 +0200 ++++ ifolder/configure.in 2009-04-06 11:38:29.039647854 +0200 +@@ -42,8 +42,8 @@ + 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=${LIB64} ;; + darwin*) + IFOLDER_OS='darwin' +@@ -68,7 +68,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") + + +@@ -102,7 +102,7 @@ + # + # Mono-specific configuration + # +- mcs) ++ gmcs) + CSC_EXEFLAG=/target:exe + CSC_LIBFLAG=/target:library + CSC_WINEXEFLAG=/target:winexe +diff -uNr ifolder.orig/src/common/WebService/Makefile.am ifolder/src/common/WebService/Makefile.am +--- ifolder.orig/src/common/WebService/Makefile.am 2009-04-06 11:37:50.083637002 +0200 ++++ ifolder/src/common/WebService/Makefile.am 2009-04-06 11:39:55.331276491 +0200 +@@ -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 --git a/net-misc/ifolder/files/ifolder-3.7-use_system_gsoap.patch b/net-misc/ifolder/files/ifolder-3.7-use_system_gsoap.patch new file mode 100644 index 0000000..64662c2 --- /dev/null +++ b/net-misc/ifolder/files/ifolder-3.7-use_system_gsoap.patch @@ -0,0 +1,56 @@ +diff -uNr ifolder.orig/src/common/libifolder/Makefile.am ifolder/src/common/libifolder/Makefile.am +--- ifolder.orig/src/common/libifolder/Makefile.am 2009-04-06 11:47:20.475212616 +0200 ++++ ifolder/src/common/libifolder/Makefile.am 2009-04-06 11:49:30.729802612 +0200 +@@ -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/ifolder-3.7_pre6679.ebuild b/net-misc/ifolder/ifolder-3.7_pre6679.ebuild new file mode 100644 index 0000000..dd9ad2f --- /dev/null +++ b/net-misc/ifolder/ifolder-3.7_pre6679.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +WANT_AUTOMAKE=1.9 +ESVN_REPO_URI="https://forgesvn1.novell.com/svn/ifolder/trunk/ifolder/@${PV/3.7_pre/}" + +inherit mono eutils autotools subversion + +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" + +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}"/ifolder-3.7-desktop-file-categories.patch || die "Error applying patch" + epatch "${FILESDIR}"/ifolder-3.7-mono22-1.patch || die "Error applying patch" + epatch "${FILESDIR}"/ifolder-3.7-disambiguate_process.dpatch || die "Error applying patch" + epatch "${FILESDIR}"/ifolder-lib_name.dpatch || die "Error applying patch" + epatch "${FILESDIR}"/ifolder-3.7-use_system_gsoap.patch || die "Error applying patch" + epatch "${FILESDIR}"/ifolder-3.7-gnome-hack-1.patch || die "Error applying patch" + eautoreconf || die "eautoreconf failed" +} + +src_configure() { + econf || die "configure failed" +} + +src_install() { + make DESTDIR=${D} install +}