From 936511599125185d5c6ef988401b0ce740a48827 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Tue, 13 May 2008 09:21:08 +0000
Subject: libetpan: updated to 0.54, added curl/expat to dependencies

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4465 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/libetpan/files/cxx-is-here.patch     | 18 +++++++++++++++++
 meta/packages/libetpan/files/honor-oe-lflags.patch | 16 ---------------
 meta/packages/libetpan/libetpan_0.48.bb            | 23 ----------------------
 meta/packages/libetpan/libetpan_0.54.bb            | 22 +++++++++++++++++++++
 4 files changed, 40 insertions(+), 39 deletions(-)
 create mode 100644 meta/packages/libetpan/files/cxx-is-here.patch
 delete mode 100644 meta/packages/libetpan/files/honor-oe-lflags.patch
 delete mode 100644 meta/packages/libetpan/libetpan_0.48.bb
 create mode 100644 meta/packages/libetpan/libetpan_0.54.bb

diff --git a/meta/packages/libetpan/files/cxx-is-here.patch b/meta/packages/libetpan/files/cxx-is-here.patch
new file mode 100644
index 000000000..d910daab1
--- /dev/null
+++ b/meta/packages/libetpan/files/cxx-is-here.patch
@@ -0,0 +1,18 @@
+---
+ configure.ac |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- libetpan-0.54.orig/configure.ac
++++ libetpan-0.54/configure.ac
+@@ -104,10 +104,11 @@ if test "$have_w32_system" = yes; then
+ fi
+ AM_CONDITIONAL(HAVE_MINGW32_SYSTEM, test "$have_w32_system" = yes)
+ 
+ # Check the C compiler.
+ AC_PROG_CC
++AC_PROG_CXX
+ 
+ # Compiler flags.
+ AC_ARG_ENABLE(debug,   [  --enable-debug          setup flags (gcc) for debugging (default=no)],
+ if test "x$GCC" = xyes; then
+   CFLAGS="$CFLAGS -O2 -g"
diff --git a/meta/packages/libetpan/files/honor-oe-lflags.patch b/meta/packages/libetpan/files/honor-oe-lflags.patch
deleted file mode 100644
index 15a1535bf..000000000
--- a/meta/packages/libetpan/files/honor-oe-lflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
-#
-
---- libetpan-0.46/configure.in~honor-oe-lflags
-+++ libetpan-0.46/configure.in
-@@ -361,7 +361,7 @@
-       LDFLAGS="-$flag $LDFLAGS"
-       AC_TRY_LINK([], [pthread_create();], 
-                       [pthflag=yes; checkpthread=no], 
--                      [pthflag=no; LDFLAGS="$OLDCFLAGS"])
-+                      [pthflag=no; LDFLAGS="$OLDFLAGS"])
-       AC_MSG_RESULT($pthflag)
-     fi
-   done
diff --git a/meta/packages/libetpan/libetpan_0.48.bb b/meta/packages/libetpan/libetpan_0.48.bb
deleted file mode 100644
index dfef3b19c..000000000
--- a/meta/packages/libetpan/libetpan_0.48.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
-It supports the protocols SMTP, POP3, IMAP and NNTP."
-HOMEPAGE = "http://www.etpan.org"
-SECTION = "libs"
-DEPENDS = "gnutls"
-LICENSE = "BSD"
-PR = "r0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
-           file://honor-oe-lflags.patch;patch=1"
-
-inherit autotools pkgconfig gettext binconfig
-
-EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
-
-PARALLEL_MAKE = ""
-
-do_stage() {
-	autotools_stage_all
-}
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
diff --git a/meta/packages/libetpan/libetpan_0.54.bb b/meta/packages/libetpan/libetpan_0.54.bb
new file mode 100644
index 000000000..0e2c5ab81
--- /dev/null
+++ b/meta/packages/libetpan/libetpan_0.54.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "libetpan is a library for communicating with mail and news servers. \
+It supports the protocols SMTP, POP3, IMAP and NNTP."
+HOMEPAGE = "http://www.etpan.org"
+SECTION = "libs"
+DEPENDS = "curl expat gnutls"
+LICENSE = "BSD"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libetpan/libetpan-${PV}.tar.gz \
+           file://cxx-is-here.patch"
+
+inherit autotools pkgconfig gettext binconfig
+
+EXTRA_OECONF = "--without-openssl --with-gnutls --disable-db"
+
+PARALLEL_MAKE = ""
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev = "${bindir} ${includedir} ${libdir}/lib*.so ${libdir}/*.la ${libdir}/*.a ${libdir}/pkgconfig"
-- 
cgit v1.2.3