Add patch to build 0.19.2.1 with evolution-data-server-2.26.0, patch snatched from OpenSuse, remove no-longer-used patch.

(Portage version: 2.2_rc26/cvs/Linux x86_64)

2 files changed, 107 insertions, 35 deletions

diff --git a/dev-dotnet/evolution-sharp/files/evolution-sharp-0.18.0-respectlibdir.patch b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.18.0-respectlibdir.patch
deleted file mode 100644
index ee6b6311b5f8..000000000000
--- a/dev-dotnet/evolution-sharp/files/evolution-sharp-0.18.0-respectlibdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: evolution-sharp-0.18.0/evolution/Makefile.am
-===================================================================
---- evolution-sharp-0.18.0.orig/evolution/Makefile.am
-+++ evolution-sharp-0.18.0/evolution/Makefile.am
-@@ -92,14 +92,14 @@ all: $(ASSEMBLY) $(TEST_TARGETS)
- 
- install-data-local:
- 	@if test -n '$(TARGET)'; then									\
--	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib";		\
--	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1;		\
-+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
-+	  $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;		\
- 	fi
- 
- uninstall-local:
- 	@if test -n '$(TARGET)'; then									\
--	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib";		\
--	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(prefix)/lib || exit 1;	\
-+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)";		\
-+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1;	\
- 	fi
- 
- evolution-sharp.snk: $(top_srcdir)/evolution-sharp.snk
-Index: evolution-sharp-0.18.0/evolution-sharp.pc.in
-===================================================================
---- evolution-sharp-0.18.0.orig/evolution-sharp.pc.in
-+++ evolution-sharp-0.18.0/evolution-sharp.pc.in
-@@ -1,5 +1,6 @@
- prefix=@prefix@
--libdir=${prefix}/lib
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
- 
- Name: Evolution#
- Description: Evolution# - Evolution .NET Binding
diff --git a/dev-dotnet/evolution-sharp/files/evolution-sharp-0.19.2.1-newer-eds.patch b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.19.2.1-newer-eds.patch
new file mode 100644
index 000000000000..8c74e14fbc08
--- /dev/null
+++ b/dev-dotnet/evolution-sharp/files/evolution-sharp-0.19.2.1-newer-eds.patch
@@ -0,0 +1,107 @@
+Index: evolution-sharp-0.19.2.1/configure.in
+===================================================================
+--- evolution-sharp-0.19.2.1.orig/configure.in
++++ evolution-sharp-0.19.2.1/configure.in
+@@ -16,8 +16,8 @@ fi
+ PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_8, evolution-data-server-1.2 >= 1.8 evolution-data-server-1.2 < 1.9, edsver="1.8", AC_MSG_RESULT([no]))
+ PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_9, evolution-data-server-1.2 >= 1.9 evolution-data-server-1.2 < 1.10, edsver="1.9", AC_MSG_RESULT([no]))
+ PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_10, evolution-data-server-1.2 >= 1.10 evolution-data-server-1.2 < 2.23.92, edsver="1.10", AC_MSG_RESULT([no]))
+-PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92, edsver="2.24", AC_MSG_RESULT([no]))
+-PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.25.92, edsver="unsupported", AC_MSG_RESULT([no]))
++PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27, edsver="2.24", AC_MSG_RESULT([no]))
++PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.27, edsver="unsupported", AC_MSG_RESULT([no]))
+ 
+ if test "x$edsver" = "x1.8"; then
+ 	EDS_VERSION=-1.2
+Index: evolution-sharp-0.19.2.1/configure
+===================================================================
+--- evolution-sharp-0.19.2.1.orig/configure
++++ evolution-sharp-0.19.2.1/configure
+@@ -20552,12 +20552,12 @@ if test -n "$EVOLUTION_DATA_SERVER_2_24_
+     pkg_cv_EVOLUTION_DATA_SERVER_2_24_CFLAGS="$EVOLUTION_DATA_SERVER_2_24_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27\"") >&5
++  ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_EVOLUTION_DATA_SERVER_2_24_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92" 2>/dev/null`
++  pkg_cv_EVOLUTION_DATA_SERVER_2_24_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -20568,12 +20568,12 @@ if test -n "$EVOLUTION_DATA_SERVER_2_24_
+     pkg_cv_EVOLUTION_DATA_SERVER_2_24_LIBS="$EVOLUTION_DATA_SERVER_2_24_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27\"") >&5
++  ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_EVOLUTION_DATA_SERVER_2_24_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92" 2>/dev/null`
++  pkg_cv_EVOLUTION_DATA_SERVER_2_24_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -20591,9 +20591,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92" 2>&1`
++	        EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27" 2>&1`
+         else
+-	        EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.25.92" 2>&1`
++	        EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVOLUTION_DATA_SERVER_2_24_PKG_ERRORS" >&5
+@@ -20621,12 +20621,12 @@ if test -n "$TOO_NEW_EDS_CFLAGS"; then
+     pkg_cv_TOO_NEW_EDS_CFLAGS="$TOO_NEW_EDS_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.25.92\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.25.92") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.27\"") >&5
++  ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.27") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_TOO_NEW_EDS_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 2.25.92" 2>/dev/null`
++  pkg_cv_TOO_NEW_EDS_CFLAGS=`$PKG_CONFIG --cflags "evolution-data-server-1.2 >= 2.27" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -20637,12 +20637,12 @@ if test -n "$TOO_NEW_EDS_LIBS"; then
+     pkg_cv_TOO_NEW_EDS_LIBS="$TOO_NEW_EDS_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.25.92\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.25.92") 2>&5
++    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-data-server-1.2 >= 2.27\"") >&5
++  ($PKG_CONFIG --exists --print-errors "evolution-data-server-1.2 >= 2.27") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_TOO_NEW_EDS_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 2.25.92" 2>/dev/null`
++  pkg_cv_TOO_NEW_EDS_LIBS=`$PKG_CONFIG --libs "evolution-data-server-1.2 >= 2.27" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -20660,9 +20660,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        TOO_NEW_EDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-1.2 >= 2.25.92" 2>&1`
++	        TOO_NEW_EDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evolution-data-server-1.2 >= 2.27" 2>&1`
+         else
+-	        TOO_NEW_EDS_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-1.2 >= 2.25.92" 2>&1`
++	        TOO_NEW_EDS_PKG_ERRORS=`$PKG_CONFIG --print-errors "evolution-data-server-1.2 >= 2.27" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$TOO_NEW_EDS_PKG_ERRORS" >&5