From 1a7cc311258d973b3a1acc675467f50c7f5fa69b Mon Sep 17 00:00:00 2001
From: Paul Sherwood <paul.sherwood@codethink.co.uk>
Date: Wed, 5 Mar 2014 14:09:03 +0000
Subject: drop Qt4 and old gstreamer-0.10. Qt5 and enlightenment now use normal
 multimedia stratum

---
 enlightenment.morph                   |  2 +-
 multimedia-gstreamer-0.10.morph       | 29 -----------------------------
 qt4-devel-system-x86_64-generic.morph | 26 --------------------------
 qt4-sdk.morph                         | 10 ----------
 qt4-tools.morph                       | 27 ---------------------------
 qt5-devel-system-x86_64-generic.morph |  2 +-
 qt5-tools.morph                       |  2 +-
 7 files changed, 3 insertions(+), 95 deletions(-)
 delete mode 100644 multimedia-gstreamer-0.10.morph
 delete mode 100644 qt4-devel-system-x86_64-generic.morph
 delete mode 100644 qt4-sdk.morph
 delete mode 100644 qt4-tools.morph

diff --git a/enlightenment.morph b/enlightenment.morph
index f7d87af4..6e42ad60 100644
--- a/enlightenment.morph
+++ b/enlightenment.morph
@@ -6,7 +6,7 @@ build-depends:
 - morph: x-x86_64-generic
 - morph: lua
 - morph: audio-bluetooth
-- morph: multimedia-gstreamer-0.10
+- morph: multimedia
 - morph: connectivity
 chunks:
 - name: efl
diff --git a/multimedia-gstreamer-0.10.morph b/multimedia-gstreamer-0.10.morph
deleted file mode 100644
index 67f802ec..00000000
--- a/multimedia-gstreamer-0.10.morph
+++ /dev/null
@@ -1,29 +0,0 @@
-name: multimedia-gstreamer-0.10
-kind: stratum
-description: Codecs
-build-depends:
-- morph: core
-- morph: foundation
-- morph: audio-bluetooth
-chunks:
-- name: orc
-  repo: upstream:orc
-  ref: baserock/morph
-  build-depends: []
-- name: gstreamer
-  repo: upstream:gstreamer
-  ref: baserock/morph/0.10
-  build-depends:
-  - orc
-- name: gstreamer-plugins-base
-  repo: upstream:gstreamer-plugins-base
-  ref: baserock/morph/0.10
-  build-depends:
-  - gstreamer
-- name: gstreamer-plugins-good
-  repo: upstream:gstreamer-plugins-good
-  ref: baserock/morph/0.10
-  build-depends:
-  - gstreamer
-  - gstreamer-plugins-base
-  - orc
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
deleted file mode 100644
index 7a45c0fe..00000000
--- a/qt4-devel-system-x86_64-generic.morph
+++ /dev/null
@@ -1,26 +0,0 @@
-arch: x86_64
-configuration-extensions:
-- set-hostname
-- add-config-files
-- simple-network
-- nfsboot
-- install-files
-description: A system that is able to build other systems based on the 64-bit x86
-  architecture.
-kind: system
-name: qt4-devel-system-x86_64-generic
-strata:
-- morph: build-essential
-- morph: core
-- morph: foundation
-- morph: audio-bluetooth
-- morph: multimedia-gstreamer-0.10
-- morph: bsp-x86_64-generic
-- morph: tools
-- morph: x-common
-- morph: x-x86_64-generic
-- morph: qt4-tools
-- morph: qt4-sdk
-- morph: lua
-- morph: connectivity
-- morph: enlightenment
diff --git a/qt4-sdk.morph b/qt4-sdk.morph
deleted file mode 100644
index b4844ff8..00000000
--- a/qt4-sdk.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-name: qt4-sdk
-kind: stratum
-description: Qt4 Desktop Environment, IDE and Example Apps
-build-depends:
-- morph: qt4-tools
-chunks:
-- name: qt-creator
-  repo: upstream:qt-creator
-  ref: baserock/morph/2.7
-  build-depends: []
diff --git a/qt4-tools.morph b/qt4-tools.morph
deleted file mode 100644
index 387b5dd9..00000000
--- a/qt4-tools.morph
+++ /dev/null
@@ -1,27 +0,0 @@
-name: qt4-tools
-kind: stratum
-description: Qt4 Development Libraries and Tools
-build-depends:
-- morph: tools
-- morph: x-x86_64-generic
-- morph: multimedia-gstreamer-0.10
-chunks:
-- name: icu
-  repo: upstream:icu
-  ref: baserock/morph
-  build-depends: []
-- name: ruby-1.8
-  repo: upstream:ruby
-  ref: baserock/morph/ruby_1_8_7
-  build-depends: []
-- name: ruby-1.9
-  repo: upstream:ruby
-  ref: baserock/morph/ruby_1_9_3
-  build-depends:
-  - ruby-1.8
-- name: qt4-tools
-  repo: upstream:qt4-tools
-  ref: baserock/morph
-  build-depends:
-  - icu
-  - ruby-1.9
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
index 2c75333f..524f11f3 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -14,7 +14,7 @@ strata:
 - morph: core
 - morph: foundation
 - morph: audio-bluetooth
-- morph: multimedia-gstreamer-0.10
+- morph: multimedia
 - morph: bsp-x86_64-generic
 - morph: tools
 - morph: x-common
diff --git a/qt5-tools.morph b/qt5-tools.morph
index 9f36f412..4ac1f1bd 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -4,7 +4,7 @@ description: Qt5 Development Libraries and Tools
 build-depends:
 - morph: tools
 - morph: x-x86_64-generic
-- morph: multimedia-gstreamer-0.10
+- morph: multimedia
 chunks:
 - name: icu
   repo: upstream:icu
-- 
cgit v1.2.1