From c5cdc0b1557416e09b5392e2360cf2110925a3c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 00:06:02 +0000
Subject: Move pyyalm from core to python-core

---
 strata/core.morph               | 7 -------
 strata/core/pyyaml.morph        | 6 ------
 strata/python-core.morph        | 6 ++++++
 strata/python-core/pyyaml.morph | 6 ++++++
 4 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 strata/core/pyyaml.morph
 create mode 100644 strata/python-core/pyyaml.morph

diff --git a/strata/core.morph b/strata/core.morph
index 0184de51..126bd6ed 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -277,13 +277,6 @@ chunks:
   unpetrify-ref: baserock/master
   build-depends:
   - cpython
-- name: pyyaml
-  morph: strata/core/pyyaml.morph
-  repo: upstream:pyyaml
-  ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - python-setuptools
 - name: shadow
   morph: strata/core/shadow.morph
   repo: upstream:shadow
diff --git a/strata/core/pyyaml.morph b/strata/core/pyyaml.morph
deleted file mode 100644
index 8ebd7b57..00000000
--- a/strata/core/pyyaml.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: pyyaml
-kind: chunk
-build-commands:
-- python setup.py --without-libyaml build
-install-commands:
-- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR"
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 409d6f17..6f61a0e8 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -25,3 +25,9 @@ chunks:
   ref: 8cfbff6b764af86d825086fa1637aa009e90d75a
   unpetrify-ref: 1.9.0
   build-depends: []
+- name: pyyaml
+  morph: strata/python-core/pyyaml.morph
+  repo: upstream:pyyaml
+  ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
+  unpetrify-ref: baserock/morph
+  build-depends: []
diff --git a/strata/python-core/pyyaml.morph b/strata/python-core/pyyaml.morph
new file mode 100644
index 00000000..8ebd7b57
--- /dev/null
+++ b/strata/python-core/pyyaml.morph
@@ -0,0 +1,6 @@
+name: pyyaml
+kind: chunk
+build-commands:
+- python setup.py --without-libyaml build
+install-commands:
+- python setup.py --without-libyaml install --prefix="$PREFIX" --root "$DESTDIR"
-- 
cgit v1.2.1


From 5f951de61c9ed050381054dd71ea07da37b3f19a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 19 Feb 2015 01:02:00 +0000
Subject: Move python-setuptools from core to python-core

---
 strata/core.morph        |  7 -------
 strata/python-core.morph | 12 ++++++++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 126bd6ed..37183baa 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -270,13 +270,6 @@ chunks:
   build-depends:
   - flex
   - texinfo-tarball
-- name: python-setuptools
-  morph: strata/core/python-setuptools.morph
-  repo: upstream:python-setuptools-bitbucket
-  ref: 0aa6a4de5931d02876428388678802db2371fd37
-  unpetrify-ref: baserock/master
-  build-depends:
-  - cpython
 - name: shadow
   morph: strata/core/shadow.morph
   repo: upstream:shadow
diff --git a/strata/python-core.morph b/strata/python-core.morph
index 6f61a0e8..2daf78b0 100644
--- a/strata/python-core.morph
+++ b/strata/python-core.morph
@@ -4,11 +4,18 @@ description: Core python packages
 build-depends:
 - morph: strata/core.morph
 chunks:
+- name: python-setuptools
+  morph: strata/core/python-setuptools.morph
+  repo: upstream:python-setuptools-bitbucket
+  ref: 0aa6a4de5931d02876428388678802db2371fd37
+  unpetrify-ref: baserock/master
+  build-depends: []
 - name: pip
   repo: upstream:pip
   ref: ea680f204fb0e48789710c22c8f597a9bf01bc16
   unpetrify-ref: baserock/master
-  build-depends: []
+  build-depends:
+  - python-setuptools
 - name: pbr
   repo: upstream:pbr
   ref: aef4f7ef4faec987d553d1ca40b55951235af0b1
@@ -30,4 +37,5 @@ chunks:
   repo: upstream:pyyaml
   ref: d9fbcceaed39d955f6871b07c61dc42f824285c1
   unpetrify-ref: baserock/morph
-  build-depends: []
+  build-depends:
+  - python-setuptools
-- 
cgit v1.2.1