From 9a3030b6c46f70a06647c5dabad33649fc2ec6dc Mon Sep 17 00:00:00 2001
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Mon, 10 Nov 2014 12:43:31 -0500
Subject: trove: update core package and dependencies to juno -rc2

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../python/python-netifaces_0.10.4.bb              | 17 ++++++++++++++++
 .../python/python-netifaces_0.8.bb                 | 18 -----------------
 .../recipes-devtools/python/python-pexpect_3.3.bb  | 23 ++++++++++++++++++++++
 .../python/python-sqlalchemy_0.7.9.bbappend        |  5 -----
 .../recipes-devtools/python/python-trove_git.bb    |  4 ++--
 5 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 meta-openstack/recipes-devtools/python/python-netifaces_0.10.4.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python-netifaces_0.8.bb
 create mode 100644 meta-openstack/recipes-devtools/python/python-pexpect_3.3.bb
 delete mode 100644 meta-openstack/recipes-devtools/python/python-sqlalchemy_0.7.9.bbappend

diff --git a/meta-openstack/recipes-devtools/python/python-netifaces_0.10.4.bb b/meta-openstack/recipes-devtools/python/python-netifaces_0.10.4.bb
new file mode 100644
index 0000000..5ed80e3
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-netifaces_0.10.4.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Portable network interface information."
+HOMEPAGE = "http://alastairs-place.net/netifaces"
+SECTION = "devel/python"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+PR = "r0"
+SRCNAME = "netifaces"
+
+SRC_URI = "https://pypi.python.org/packages/source/n/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "36da76e2cfadd24cc7510c2c0012eb1e"
+SRC_URI[sha256sum] = "9656a169cb83da34d732b0eb72b39373d48774aee009a3d1272b7ea2ce109cde"
+
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-netifaces_0.8.bb b/meta-openstack/recipes-devtools/python/python-netifaces_0.8.bb
deleted file mode 100644
index 05a626f..0000000
--- a/meta-openstack/recipes-devtools/python/python-netifaces_0.8.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Portable network interface information."
-HOMEPAGE = "http://alastairs-place.net/netifaces"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-PR = "r0"
-SRCNAME = "netifaces"
-
-SRC_URI = "http://alastairs-place.net/projects/netifaces/netifaces-0.8.tar.gz \
-"
-
-SRC_URI[md5sum] = "e57e5983f4c286fac5f8068fbfc5c873"
-SRC_URI[sha256sum] = "53a711038db3d6e5cf7129d6f751185fd052f830f12f271fbfe17bd2671ab1ec"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
diff --git a/meta-openstack/recipes-devtools/python/python-pexpect_3.3.bb b/meta-openstack/recipes-devtools/python/python-pexpect_3.3.bb
new file mode 100644
index 0000000..d4c2ba4
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-pexpect_3.3.bb
@@ -0,0 +1,23 @@
+SUMMARY = "A Pure Python Expect like Module for Python"
+SECTION = "devel/python"
+LICENSE = "PSF"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=04a2bf11b85ce49d4a8c0c413fd34404"
+SRCNAME = "pexpect"
+PR = "ml3"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+RDEPENDS_${PN} = "\
+    python-core \
+    python-io \
+    python-terminal \
+    python-resource \
+    python-fcntl \
+"
+
+
+SRC_URI[md5sum] = "bf107cf54e67bc6dec5bea1f3e6a65c3"
+SRC_URI[sha256sum] = "d315e7f3a8544fd85034d7e17fd7c5854e8f0828f5791f83cf313f8fa5740b75"
diff --git a/meta-openstack/recipes-devtools/python/python-sqlalchemy_0.7.9.bbappend b/meta-openstack/recipes-devtools/python/python-sqlalchemy_0.7.9.bbappend
deleted file mode 100644
index ce4c1b9..0000000
--- a/meta-openstack/recipes-devtools/python/python-sqlalchemy_0.7.9.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-SRC_URI = "https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-0.7.9.tar.gz"
-
-SRC_URI[md5sum] = "a0b58defc5ad0c7e1baeb932f62d08dd"
-SRC_URI[sha256sum] = "4a89556cb55275d1af694dc4d5700d8bf0f83690bac16ab30340092ff25bb4d7"
-
diff --git a/meta-openstack/recipes-devtools/python/python-trove_git.bb b/meta-openstack/recipes-devtools/python/python-trove_git.bb
index c528836..bd2cac0 100755
--- a/meta-openstack/recipes-devtools/python/python-trove_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-trove_git.bb
@@ -11,8 +11,8 @@ SRC_URI = "git://github.com/openstack/trove.git;branch=master \
           file://trove-init \
           "
 
-SRCREV="a679d2626a91a20b42ce59364e4beb0c588b762b"
-PV="2014.2+git${SRCPV}"
+SRCREV="cd31f3d6b0a9cc02af1c50c719f6936679332f7e"
+PV="2014.2.rc1+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 inherit update-rc.d setuptools identity hosts useradd default_configs
-- 
cgit v1.2.3-54-g00ecf