python3-memcached: upgrade 1.57 -> 1.59

Consolidate inc and bb files into a single bb file.

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 23 insertions, 22 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-memcached.inc b/meta-openstack/recipes-devtools/python/python-memcached.inc
deleted file mode 100644
index 5acf43c..0000000
--- a/meta-openstack/recipes-devtools/python/python-memcached.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-SUMMARY = "Pure python memcached client"
-DESCRIPTION = "\
-  This software is a 100% Python interface to the memcached memory cache daemon. \
-  It is the client side software which allows storing values in one or more, possibly remote, \
-  memcached servers. Search google for memcached for more information."
-HOMEPAGE = "https://pypi.python.org/pypi/python-memcached/"
-SECTION = "devel/python"
-LICENSE = "PSF"
-LIC_FILES_CHKSUM = "file://PSF.LICENSE;md5=7dd786e8594f1e787da94a946557b40e"
-
-PV = "1.57+git${SRCPV}"
-SRCREV = "664bd3e23fe500fbde4c70636e2d24c8fd2f35af"
-
-SRC_URI = "git://github.com/linsomniac/python-memcached.git"
-
-S = "${WORKDIR}/git"
-
-RDEPENDS_${PN} += " \
-    ${PYTHON_PN}-six \
-    "
-
diff --git a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
index de96734..a129725 100644
--- a/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
+++ b/meta-openstack/recipes-devtools/python/python3-memcached_git.bb
@@ -1,2 +1,24 @@
-require python-memcached.inc
+SUMMARY = "Pure python memcached client"
+DESCRIPTION = "\
+  This software is a 100% Python interface to the memcached memory cache daemon. \
+  It is the client side software which allows storing values in one or more, possibly remote, \
+  memcached servers. Search google for memcached for more information."
+HOMEPAGE = "https://pypi.python.org/pypi/python-memcached/"
+SECTION = "devel/python"
+LICENSE = "PSF"
+LIC_FILES_CHKSUM = "file://PSF.LICENSE;md5=7dd786e8594f1e787da94a946557b40e"
+
+PV = "1.59+git${SRCPV}"
+SRCREV = "959e068fec8b4c956b0d82269336818e667726e7"
+
+SRC_URI = "git://github.com/linsomniac/python-memcached.git"
+
+S = "${WORKDIR}/git"
+
 inherit setuptools3
+
+RDEPENDS_${PN} += " \
+    ${PYTHON_PN}-six \
+    ${PYTHON_PN}-pickle \
+    "
+