From 80a0feae27e354482b9a0f2a6ed47463179850dd Mon Sep 17 00:00:00 2001
From: Peter Gordon <peter@thecodergeek.com>
Date: Wed, 8 Aug 2007 17:30:25 +0000
Subject: [PATCH] Sync comps with retired packages list from
 PackageMaintainers/RetiredPackages on the wiki. Removals: * gcfilms
 (obsoleted by gcstar) * gnome-sudoku (merged into upstream gnome-games) *
 graveman (upstream dead) * l2tpd (obsoleted by xl2tpd) * nomadsync (upstream
 dead) * rssowl (BuildRequires itext, which was removed due to licensing
 problems) * search4files (renamed to catfish)

Additions:
* xl2tpd (successor of l2tpd)
---
 comps-f7.xml.in | 7 +------
 comps-f8.xml.in | 8 +-------
 comps-f9.xml.in | 8 +-------
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/comps-f7.xml.in b/comps-f7.xml.in
index 7e056b56..a941aa23 100644
--- a/comps-f7.xml.in
+++ b/comps-f7.xml.in
@@ -1312,7 +1312,6 @@
       <packagereq type="optional">gl-117</packagereq>
       <packagereq type="optional">glest</packagereq>
       <packagereq type="optional">gnofract4d</packagereq>
-      <packagereq type="optional">gnome-sudoku</packagereq>
       <packagereq type="optional">gnubg</packagereq>
       <packagereq type="optional">gnuchess</packagereq>
       <packagereq type="optional">gnugo</packagereq>
@@ -1700,7 +1699,6 @@
       <packagereq type="optional">prozilla</packagereq>
       <packagereq type="optional">psi</packagereq>
       <packagereq type="optional">putty</packagereq>
-      <packagereq type="optional">rssowl</packagereq>
       <packagereq type="optional">screem</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
@@ -2525,7 +2523,6 @@
       <packagereq type="optional">kannel</packagereq>
       <packagereq type="optional">koan</packagereq>
       <packagereq type="optional">krb5-server</packagereq>
-      <packagereq type="optional">l2tpd</packagereq>
       <packagereq type="optional">netatalk</packagereq>
       <packagereq type="optional">netdump-server</packagereq>
       <packagereq type="optional">nsd</packagereq>
@@ -2546,6 +2543,7 @@
       <packagereq type="optional">ushare</packagereq>
       <packagereq type="optional">vnc-reflector</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
+      <packagereq type="optional">xl2tpd</packagereq>
       <packagereq type="optional">ypserv</packagereq>
     </packagelist>
   </group>
@@ -2984,7 +2982,6 @@
       <packagereq type="optional">festvox-clb-arctic-hts</packagereq>
       <packagereq type="optional">festvox-rms-arctic-hts</packagereq>
       <packagereq type="optional">gcdmaster</packagereq>
-      <packagereq type="optional">gcfilms</packagereq>
       <packagereq type="optional">gcombust</packagereq>
       <packagereq type="optional">gcstar</packagereq>
       <packagereq type="optional">gnomad2</packagereq>
@@ -3005,7 +3002,6 @@
       <packagereq type="optional">kover</packagereq>
       <packagereq type="optional">mikmod</packagereq>
       <packagereq type="optional">muine</packagereq>
-      <packagereq type="optional">nomadsync</packagereq>
       <packagereq type="optional">nyquist</packagereq>
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">regionset</packagereq>
@@ -3270,7 +3266,6 @@
       <packagereq type="optional">rsnapshot</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scrub</packagereq>
-      <packagereq type="optional">search4files</packagereq>
       <packagereq type="optional">sec</packagereq>
       <packagereq type="optional">shorewall</packagereq>
       <packagereq type="optional">smart</packagereq>
diff --git a/comps-f8.xml.in b/comps-f8.xml.in
index 2f3e2cb2..f4e7dac6 100644
--- a/comps-f8.xml.in
+++ b/comps-f8.xml.in
@@ -1344,7 +1344,6 @@
       <packagereq type="optional">gl-117</packagereq>
       <packagereq type="optional">glest</packagereq>
       <packagereq type="optional">gnofract4d</packagereq>
-      <packagereq type="optional">gnome-sudoku</packagereq>
       <packagereq type="optional">gnubg</packagereq>
       <packagereq type="optional">gnuchess</packagereq>
       <packagereq type="optional">gnugo</packagereq>
@@ -1733,7 +1732,6 @@
       <packagereq type="optional">prozilla</packagereq>
       <packagereq type="optional">psi</packagereq>
       <packagereq type="optional">putty</packagereq>
-      <packagereq type="optional">rssowl</packagereq>
       <packagereq type="optional">screem</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
@@ -2570,7 +2568,6 @@
       <packagereq type="optional">kannel</packagereq>
       <packagereq type="optional">koan</packagereq>
       <packagereq type="optional">krb5-server</packagereq>
-      <packagereq type="optional">l2tpd</packagereq>
       <packagereq type="optional">netatalk</packagereq>
       <packagereq type="optional">netdump-server</packagereq>
       <packagereq type="optional">nsd</packagereq>
@@ -2591,6 +2588,7 @@
       <packagereq type="optional">ushare</packagereq>
       <packagereq type="optional">vnc-reflector</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
+      <packagereq type="optional">xl2tpd</packagereq>
       <packagereq type="optional">ypserv</packagereq>
     </packagelist>
   </group>
@@ -3037,13 +3035,11 @@
       <packagereq type="optional">festvox-clb-arctic-hts</packagereq>
       <packagereq type="optional">festvox-rms-arctic-hts</packagereq>
       <packagereq type="optional">gcdmaster</packagereq>
-      <packagereq type="optional">gcfilms</packagereq>
       <packagereq type="optional">gcombust</packagereq>
       <packagereq type="optional">gcstar</packagereq>
       <packagereq type="optional">gnomad2</packagereq>
       <packagereq type="optional">gnomebaker</packagereq>
       <packagereq type="optional">gnomeradio</packagereq>
-      <packagereq type="optional">graveman</packagereq>
       <packagereq type="optional">grip</packagereq>
       <packagereq type="optional">gtkpod</packagereq>
       <packagereq type="optional">HelixPlayer</packagereq>
@@ -3059,7 +3055,6 @@
       <packagereq type="optional">kover</packagereq>
       <packagereq type="optional">mikmod</packagereq>
       <packagereq type="optional">muine</packagereq>
-      <packagereq type="optional">nomadsync</packagereq>
       <packagereq type="optional">nyquist</packagereq>
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">regionset</packagereq>
@@ -3324,7 +3319,6 @@
       <packagereq type="optional">rsnapshot</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scrub</packagereq>
-      <packagereq type="optional">search4files</packagereq>
       <packagereq type="optional">sec</packagereq>
       <packagereq type="optional">shorewall</packagereq>
       <packagereq type="optional">smart</packagereq>
diff --git a/comps-f9.xml.in b/comps-f9.xml.in
index 2f3e2cb2..f4e7dac6 100644
--- a/comps-f9.xml.in
+++ b/comps-f9.xml.in
@@ -1344,7 +1344,6 @@
       <packagereq type="optional">gl-117</packagereq>
       <packagereq type="optional">glest</packagereq>
       <packagereq type="optional">gnofract4d</packagereq>
-      <packagereq type="optional">gnome-sudoku</packagereq>
       <packagereq type="optional">gnubg</packagereq>
       <packagereq type="optional">gnuchess</packagereq>
       <packagereq type="optional">gnugo</packagereq>
@@ -1733,7 +1732,6 @@
       <packagereq type="optional">prozilla</packagereq>
       <packagereq type="optional">psi</packagereq>
       <packagereq type="optional">putty</packagereq>
-      <packagereq type="optional">rssowl</packagereq>
       <packagereq type="optional">screem</packagereq>
       <packagereq type="optional">streamtuner</packagereq>
       <packagereq type="optional">sylpheed</packagereq>
@@ -2570,7 +2568,6 @@
       <packagereq type="optional">kannel</packagereq>
       <packagereq type="optional">koan</packagereq>
       <packagereq type="optional">krb5-server</packagereq>
-      <packagereq type="optional">l2tpd</packagereq>
       <packagereq type="optional">netatalk</packagereq>
       <packagereq type="optional">netdump-server</packagereq>
       <packagereq type="optional">nsd</packagereq>
@@ -2591,6 +2588,7 @@
       <packagereq type="optional">ushare</packagereq>
       <packagereq type="optional">vnc-reflector</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
+      <packagereq type="optional">xl2tpd</packagereq>
       <packagereq type="optional">ypserv</packagereq>
     </packagelist>
   </group>
@@ -3037,13 +3035,11 @@
       <packagereq type="optional">festvox-clb-arctic-hts</packagereq>
       <packagereq type="optional">festvox-rms-arctic-hts</packagereq>
       <packagereq type="optional">gcdmaster</packagereq>
-      <packagereq type="optional">gcfilms</packagereq>
       <packagereq type="optional">gcombust</packagereq>
       <packagereq type="optional">gcstar</packagereq>
       <packagereq type="optional">gnomad2</packagereq>
       <packagereq type="optional">gnomebaker</packagereq>
       <packagereq type="optional">gnomeradio</packagereq>
-      <packagereq type="optional">graveman</packagereq>
       <packagereq type="optional">grip</packagereq>
       <packagereq type="optional">gtkpod</packagereq>
       <packagereq type="optional">HelixPlayer</packagereq>
@@ -3059,7 +3055,6 @@
       <packagereq type="optional">kover</packagereq>
       <packagereq type="optional">mikmod</packagereq>
       <packagereq type="optional">muine</packagereq>
-      <packagereq type="optional">nomadsync</packagereq>
       <packagereq type="optional">nyquist</packagereq>
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">regionset</packagereq>
@@ -3324,7 +3319,6 @@
       <packagereq type="optional">rsnapshot</packagereq>
       <packagereq type="optional">sabayon</packagereq>
       <packagereq type="optional">scrub</packagereq>
-      <packagereq type="optional">search4files</packagereq>
       <packagereq type="optional">sec</packagereq>
       <packagereq type="optional">shorewall</packagereq>
       <packagereq type="optional">smart</packagereq>