From 9d204ad1e53fcb93b3f75b8c8e68030f9e82243a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 9 Aug 2008 19:56:57 +0000
Subject: python-pycurl 7.16.4 update to 7.18.2; use dynamic linking

---
 packages/python/python-pycurl/.mtn2git_empty       |  0
 packages/python/python-pycurl/no-static-link.patch | 14 ++++++++++++++
 packages/python/python-pycurl_7.16.4.bb            | 12 ------------
 packages/python/python-pycurl_7.18.2.bb            | 21 +++++++++++++++++++++
 4 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 packages/python/python-pycurl/.mtn2git_empty
 create mode 100644 packages/python/python-pycurl/no-static-link.patch
 delete mode 100644 packages/python/python-pycurl_7.16.4.bb
 create mode 100644 packages/python/python-pycurl_7.18.2.bb

diff --git a/packages/python/python-pycurl/.mtn2git_empty b/packages/python/python-pycurl/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/python/python-pycurl/no-static-link.patch b/packages/python/python-pycurl/no-static-link.patch
new file mode 100644
index 0000000000..b7c5ab9c9c
--- /dev/null
+++ b/packages/python/python-pycurl/no-static-link.patch
@@ -0,0 +1,14 @@
+Index: pycurl-7.18.2/setup.py
+===================================================================
+--- pycurl-7.18.2.orig/setup.py
++++ pycurl-7.18.2/setup.py
+@@ -97,8 +97,7 @@ else:
+         else:
+             extra_compile_args.append(e)
+     libs = split_quoted(
+-        os.popen("'%s' --libs" % CURL_CONFIG).read()+\
+-        os.popen("'%s' --static-libs" % CURL_CONFIG).read())
++        os.popen("'%s' --libs" % CURL_CONFIG).read())
+     for e in libs:
+         if e[:2] == "-l":
+             libraries.append(e[2:])
diff --git a/packages/python/python-pycurl_7.16.4.bb b/packages/python/python-pycurl_7.16.4.bb
deleted file mode 100644
index a9480ad949..0000000000
--- a/packages/python/python-pycurl_7.16.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "libcurl Python Bindings"
-SECTION = "devel/python"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-RDEPENDS = "python-core curl (>=${PV})"
-DEPENDS = "curl-${PV}"
-SRCNAME = "pycurl"
-
-SRC_URI = "http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/packages/python/python-pycurl_7.18.2.bb b/packages/python/python-pycurl_7.18.2.bb
new file mode 100644
index 0000000000..406add10c8
--- /dev/null
+++ b/packages/python/python-pycurl_7.18.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "libcurl Python Bindings"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "curl-${PV}"
+SRCNAME = "pycurl"
+PR = "ml0"
+
+SRC_URI = "\
+  http://${SRCNAME}.sourceforge.net/download/${SRCNAME}-${PV}.tar.gz \
+  file://no-static-link.patch;patch=1 \
+"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+do_install_append() {
+	mv -f ${D}${datadir}/share/* ${D}${datadir}/
+}
+
+RDEPENDS = "python-core curl (>=${PV})"
-- 
cgit v1.2.3