summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-03-22 01:41:30 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-03-22 01:41:30 +0000
commit994d14ba161695aaf9f9337de8ae8ddbb9afdf58 (patch)
tree0cdfd30d7d2d35fc8677ac27c8095cc415e93075 /dev-dotnet
parentRemoving hawking as a maintainer since he was retired. (diff)
downloadhistorical-994d14ba161695aaf9f9337de8ae8ddbb9afdf58.tar.gz
historical-994d14ba161695aaf9f9337de8ae8ddbb9afdf58.tar.bz2
historical-994d14ba161695aaf9f9337de8ae8ddbb9afdf58.zip
Add patch to build 0.19.2.1 with evolution-data-server-2.26.0, patch snatched from OpenSuse, remove no-longer-used patch.
Package-Manager: portage-2.2_rc26/cvs/Linux x86_64
Diffstat (limited to 'dev-dotnet')
-rw-r--r--dev-dotnet/evolution-sharp/ChangeLog9
-rw-r--r--dev-dotnet/evolution-sharp/Manifest6
-rw-r--r--dev-dotnet/evolution-sharp/evolution-sharp-0.19.2.1.ebuild18
-rw-r--r--dev-dotnet/evolution-sharp/files/evolution-sharp-0.18.0-respectlibdir.patch35
-rw-r--r--dev-dotnet/evolution-sharp/files/evolution-sharp-0.19.2.1-newer-eds.patch107
5 files changed, 125 insertions, 50 deletions
diff --git a/dev-dotnet/evolution-sharp/ChangeLog b/dev-dotnet/evolution-sharp/ChangeLog
index 9a313e280e44..652ece828a8a 100644
--- a/dev-dotnet/evolution-sharp/ChangeLog
+++ b/dev-dotnet/evolution-sharp/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-dotnet/evolution-sharp
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.37 2009/03/19 05:15:15 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/ChangeLog,v 1.38 2009/03/22 01:41:30 loki_val Exp $
+
+ 22 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
+ -files/evolution-sharp-0.18.0-respectlibdir.patch,
+ +files/evolution-sharp-0.19.2.1-newer-eds.patch,
+ evolution-sharp-0.19.2.1.ebuild:
+ Add patch to build 0.19.2.1 with evolution-data-server-2.26.0, patch
+ snatched from OpenSuse, remove no-longer-used patch.
19 Mar 2009; Peter Alfredsen <loki_val@gentoo.org>
evolution-sharp-0.18.1.ebuild:
diff --git a/dev-dotnet/evolution-sharp/Manifest b/dev-dotnet/evolution-sharp/Manifest
index 1d6174f34646..ac4f0e9ae29d 100644
--- a/dev-dotnet/evolution-sharp/Manifest
+++ b/dev-dotnet/evolution-sharp/Manifest
@@ -1,9 +1,9 @@
-AUX evolution-sharp-0.18.0-respectlibdir.patch 1617 RMD160 6e8ad68e4637bdc3245d117038c0b48918eea613 SHA1 a2ca8b3c97a8598b7863bb50b5021f97c7a162c1 SHA256 6be548a1393ce87172b068c46f68cd69deecf5d2f76ab7ffe6558d09729baad1
+AUX evolution-sharp-0.19.2.1-newer-eds.patch 7278 RMD160 1f67a43165154df077be9ceec8fe4c1231e40d73 SHA1 b81e41d14ecebdedaa5dda59c5785aeb9daae392 SHA256 6d8fc61d3bb60b95ccc96f3d6354669f5bc42a9fb555ac4e9aa4adcb2095ac60
DIST evolution-sharp-0.17.4.tar.bz2 276899 RMD160 45cba93354068e8417912744545a600079d73737 SHA1 2bb975fd77d73a65f6b6aa1d637a73d0ab8fefb3 SHA256 f5895815caa31f7b878294bfb0023a3d465705389b7fb92400e03d29256cebdf
DIST evolution-sharp-0.18.1.tar.bz2 317001 RMD160 88433a61f7098052fbba38634b5d2fbbca758d91 SHA1 259bfb2e6709f24db9e6fae23ee5da310b41e172 SHA256 bf0258f2d73a7bacafb94dde87b4806f4b6bf9d94a96d98fa1cea09026d215c4
DIST evolution-sharp-0.19.2.1.tar.bz2 334858 RMD160 08243b661b7651ec009c14c9780345fe6b5804d0 SHA1 0eeca5357109db8451757a87920fcb21cf35f26a SHA256 9c757b0afa31d09f234165a580076cdbc93b42d843fa249a0a94b25567937c90
EBUILD evolution-sharp-0.17.4.ebuild 955 RMD160 8a4dff6a410e9c4f1fb73e87647555d6e28195a1 SHA1 31ee9c949e1df6299a3640c74adbe9323a8862e2 SHA256 18e7ca3779b3947f3b836c1c2f3275159d90d541914cd3ef0aa8f6265f2a6313
EBUILD evolution-sharp-0.18.1.ebuild 703 RMD160 6e122e8da2e99c8f8a17590d4d2d5b9806b8fcc6 SHA1 3261ef853bd5a37fe1c5ad7441562486c7c329e2 SHA256 202751264a19d5bdd6d8f1ec829fd74f7e799520c04486a17b2f5852b59db5ac
-EBUILD evolution-sharp-0.19.2.1.ebuild 1515 RMD160 1c63b94de05615e4dfaf7e0503fb0a2f67ef776a SHA1 b16d2d35a88c1c228874826971fe40ce71fcbd36 SHA256 985560899934de7cf8481ab4c92d70363a9d72cfa7644ab02c92b24f030e7a82
-MISC ChangeLog 6735 RMD160 d4eed3e0fbac2add808b7f704cd2a5cac64c1317 SHA1 b9f85195900e5a93fb6454bc68e73b31a2825918 SHA256 e977888e30e81edd359e84700b3e97c377d254bd7c671c822dca62be29563972
+EBUILD evolution-sharp-0.19.2.1.ebuild 1213 RMD160 8ce5b63bc747c9ebd71ccd5c43e1e87cc8b65fb3 SHA1 3eba2e9352cdb858a12b23620a55dbc32c78dd32 SHA256 33ed92a9272a665e2b0eebbdf9ad197b8329286b2e3a47d1abdf446a0dde9a26
+MISC ChangeLog 7054 RMD160 f7c3cabfb4c44d54e89aa5e98e1b89c0ff4422db SHA1 06a01628f4a5402698310e56fe5aa64d565d949f SHA256 f8b31b891cf0d834c6964b90cbefc797847c19fcc588be69fb9297a3a8f99da0
MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
diff --git a/dev-dotnet/evolution-sharp/evolution-sharp-0.19.2.1.ebuild b/dev-dotnet/evolution-sharp/evolution-sharp-0.19.2.1.ebuild
index 1e631caf4372..0d728f529245 100644
--- a/dev-dotnet/evolution-sharp/evolution-sharp-0.19.2.1.ebuild
+++ b/dev-dotnet/evolution-sharp/evolution-sharp-0.19.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.19.2.1.ebuild,v 1.1 2009/03/03 11:06:47 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/evolution-sharp/evolution-sharp-0.19.2.1.ebuild,v 1.2 2009/03/22 01:41:30 loki_val Exp $
EAPI=2
@@ -18,16 +18,8 @@ IUSE=""
RDEPEND="
|| (
- =gnome-extra/evolution-data-server-2.25.9*
- =gnome-extra/evolution-data-server-2.25.8*
- =gnome-extra/evolution-data-server-2.25.7*
- =gnome-extra/evolution-data-server-2.25.6*
- =gnome-extra/evolution-data-server-2.25.5*
- =gnome-extra/evolution-data-server-2.25.4*
- =gnome-extra/evolution-data-server-2.25.3*
- =gnome-extra/evolution-data-server-2.25.2*
- =gnome-extra/evolution-data-server-2.25.1*
- =gnome-extra/evolution-data-server-2.25.0*
+ =gnome-extra/evolution-data-server-2.26*
+ =gnome-extra/evolution-data-server-2.25*
=gnome-extra/evolution-data-server-2.24*
)
>=dev-dotnet/glib-sharp-2.12
@@ -37,6 +29,10 @@ DEPEND="${RDEPEND}
>=dev-dotnet/gtk-sharp-gapi-2.12
dev-util/pkgconfig"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-newer-eds.patch
+}
+
src_configure() {
econf --disable-static
}
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