From a210f1254ae4f0555454ae1ffbd15e28c4437a2a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sat, 7 Mar 2020 11:50:30 +0000
Subject: [PATCH] SoaS: some fixes/updates for F-32+

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 comps-f32.xml.in | 11 ++++-------
 comps-f33.xml.in | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/comps-f32.xml.in b/comps-f32.xml.in
index 5a817206..fde25b5b 100644
--- a/comps-f32.xml.in
+++ b/comps-f32.xml.in
@@ -5373,12 +5373,10 @@
       <packagereq>sugar-connect</packagereq>
       <packagereq>sugar-countries</packagereq>
       <packagereq>sugar-deducto</packagereq>
+      <packagereq>sugar-distance</packagereq>
       <packagereq>sugar-flipsticks</packagereq>
-      <packagereq>sugar-implode</packagereq>
       <packagereq>sugar-kuku</packagereq>
       <packagereq>sugar-labyrinth</packagereq>
-      <packagereq>sugar-physics</packagereq>
-      <packagereq>sugar-pippy</packagereq>
       <packagereq>sugar-playgo</packagereq>
       <packagereq>sugar-pukllanapac</packagereq>
       <packagereq>sugar-ruler</packagereq>
@@ -5407,9 +5405,6 @@
       <packagereq>metacity</packagereq>
       <packagereq>pulseaudio</packagereq>
       <packagereq>pulseaudio-utils</packagereq>
-      <!-- this is for sugargame, which doesn't yet work with python3
-           https://github.com/sugarlabs/sugargame/issues/2 -->
-      <packagereq>python2-pygame</packagereq>
       <packagereq>sugar</packagereq>
       <packagereq>sugar-logos</packagereq>
       <packagereq>sugar-cp-updater</packagereq>
@@ -5419,11 +5414,11 @@
       <packagereq>sugar-chat</packagereq>
       <packagereq>sugar-clock</packagereq>
       <packagereq>sugar-cp-all</packagereq>
-      <packagereq>sugar-distance</packagereq>
       <packagereq>sugar-finance</packagereq>
       <packagereq>sugar-fototoon</packagereq>
       <packagereq>sugar-getiabooks</packagereq>
       <packagereq>sugar-imageviewer</packagereq>
+      <packagereq>sugar-implode</packagereq>
       <packagereq>sugar-infoslicer</packagereq>
       <packagereq>sugar-jukebox</packagereq>
       <packagereq>sugar-log</packagereq>
@@ -5431,6 +5426,8 @@
       <packagereq>sugar-memorize</packagereq>
       <packagereq>sugar-moon</packagereq>
       <packagereq>sugar-paint</packagereq>
+      <packagereq>sugar-physics</packagereq>
+      <packagereq>sugar-pippy</packagereq>
       <packagereq>sugar-portfolio</packagereq>
       <packagereq>sugar-read</packagereq>
       <packagereq>sugar-record</packagereq>
diff --git a/comps-f33.xml.in b/comps-f33.xml.in
index 6c72f477..12a66013 100644
--- a/comps-f33.xml.in
+++ b/comps-f33.xml.in
@@ -5363,12 +5363,10 @@
       <packagereq>sugar-connect</packagereq>
       <packagereq>sugar-countries</packagereq>
       <packagereq>sugar-deducto</packagereq>
+      <packagereq>sugar-distance</packagereq>
       <packagereq>sugar-flipsticks</packagereq>
-      <packagereq>sugar-implode</packagereq>
       <packagereq>sugar-kuku</packagereq>
       <packagereq>sugar-labyrinth</packagereq>
-      <packagereq>sugar-physics</packagereq>
-      <packagereq>sugar-pippy</packagereq>
       <packagereq>sugar-playgo</packagereq>
       <packagereq>sugar-pukllanapac</packagereq>
       <packagereq>sugar-ruler</packagereq>
@@ -5397,9 +5395,6 @@
       <packagereq>metacity</packagereq>
       <packagereq>pulseaudio</packagereq>
       <packagereq>pulseaudio-utils</packagereq>
-      <!-- this is for sugargame, which doesn't yet work with python3
-           https://github.com/sugarlabs/sugargame/issues/2 -->
-      <packagereq>python2-pygame</packagereq>
       <packagereq>sugar</packagereq>
       <packagereq>sugar-logos</packagereq>
       <packagereq>sugar-cp-updater</packagereq>
@@ -5409,11 +5404,11 @@
       <packagereq>sugar-chat</packagereq>
       <packagereq>sugar-clock</packagereq>
       <packagereq>sugar-cp-all</packagereq>
-      <packagereq>sugar-distance</packagereq>
       <packagereq>sugar-finance</packagereq>
       <packagereq>sugar-fototoon</packagereq>
       <packagereq>sugar-getiabooks</packagereq>
       <packagereq>sugar-imageviewer</packagereq>
+      <packagereq>sugar-implode</packagereq>
       <packagereq>sugar-infoslicer</packagereq>
       <packagereq>sugar-jukebox</packagereq>
       <packagereq>sugar-log</packagereq>
@@ -5421,6 +5416,8 @@
       <packagereq>sugar-memorize</packagereq>
       <packagereq>sugar-moon</packagereq>
       <packagereq>sugar-paint</packagereq>
+      <packagereq>sugar-physics</packagereq>
+      <packagereq>sugar-pippy</packagereq>
       <packagereq>sugar-portfolio</packagereq>
       <packagereq>sugar-read</packagereq>
       <packagereq>sugar-record</packagereq>