diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index da4149c2..52d22680 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -271,7 +271,6 @@
xmlto
abcm2ps
BibTool
- conglomerate
dblatex
docbook2X
html401-dtds
@@ -400,7 +399,6 @@
true
diveintopython
- javanotes
ldd-pdf
@@ -572,7 +570,6 @@
true
ceph
- deltacloud-core-all
euca2ools
glusterfs
hail
@@ -603,11 +600,7 @@
python-libcloud
python-openstackclient
rubygem-amazon-ec2
- rubygem-cloudfiles
- rubygem-cloudservers
rubygem-amazon-ec2-doc
- rubygem-cloudfiles-doc
- rubygem-cloudservers-doc
@@ -840,8 +833,6 @@
gl3n-devel
insight
nemiver
- syntastic-d
- tango-devel
uncrustify
@@ -1014,7 +1005,6 @@
archmage
buildbot
bzr
- bzr-explorer
colordiff
cvs2cl
cvsgraph
@@ -1139,7 +1129,6 @@
pki-kra
pki-ocsp
pki-javadoc
- pki-ra
pki-tks
pki-tps
@@ -1214,7 +1203,6 @@
emacs-auctex
emacs-bbdb
emacs-ess
- emacs-muse
emacs-vm
geany
gobby
@@ -1227,8 +1215,6 @@
vim-enhanced
vim-X11
xemacs
- xemacs-ess
- xemacs-muse
xemacs-packages-base
xemacs-packages-extra
xemacs-xft
@@ -1295,13 +1281,6 @@
alliance
archimedes
arduino
- arm-gp2x-linux-binutils
- arm-gp2x-linux-gcc
- arm-gp2x-linux-gcc-c++
- arm-gp2x-linux-glibc
- arm-gp2x-linux-kernel-headers
- arm-gp2x-linux-SDL
- arm-gp2x-linux-zlib
avarice
avr-binutils
avr-gcc
@@ -1420,7 +1399,6 @@
kdesvn
minicom
rfdump
- simulavr
@@ -1550,7 +1528,6 @@
polybori-gui
polybori-ipbori
polymake
- pvm
pvs-sbcl
pypop
python-biopython
@@ -1692,7 +1669,6 @@
gimp-data-extras
gimp-help
gimp-help-browser
- gnome-specimen
gucharmap
inkscape
perl-Font-TTF
@@ -1910,7 +1886,6 @@
google-noto-sans-glagolitic-fonts
google-noto-sans-gujarati-fonts
google-noto-sans-gujarati-ui-fonts
- google-noto-sans-hanunno-fonts
google-noto-sans-hebrew-fonts
google-noto-sans-imperial-aramaic-fonts
google-noto-sans-kaithi-fonts
@@ -1992,7 +1967,6 @@
levien-museum-fonts
liberation-narrow-fonts
libreoffice-opensymbol-fonts
- lilypond-century-schoolbook-l-fonts
lilypond-emmentaler-fonts
linux-libertine-biolinum-fonts
linux-libertine-fonts
@@ -2194,7 +2168,6 @@
vsftpd
proftpd
pure-ftpd
- xferstats
@@ -2250,7 +2223,6 @@
btanks
bygfoot
bzflag
- ca-installer
CardManager
cave9
ccgo
@@ -2366,7 +2338,6 @@
maniadrive
maniadrive-music
megaglest
- MegaMek
methane
mindless
minetest
@@ -2454,9 +2425,7 @@
tong
toppler
torcs
- torcs-data-cars-extra
- torcs-data-tracks-dirt
- torcs-data-tracks-oval
+ torcs-data
trackballs
trackballs-music
tremulous
@@ -2697,7 +2666,6 @@
libgnome-keyring-devel
libnotify-devel
webkitgtk4-devel
- at-spi-devel
cairomm-devel
cairomm-doc
clutter-gst-devel
@@ -2717,12 +2685,10 @@
false
false
- amsn
arora
azureus
balsa
bluefish
- checkgmail
choqok
claws-mail
deluge
@@ -2736,7 +2702,6 @@
evolution-perl
filezilla
firefox
- fwbuilder
gajim
gftp
gnash-plugin
@@ -2763,7 +2728,6 @@
midori
mitter
mtr-gtk
- netactview
nicotine+
nntpgrab-gui
ochusha
@@ -2810,7 +2774,6 @@
comix
dcraw
digikam
- f-spot
gcolor2
geeqie
gifsicle
@@ -2821,7 +2784,6 @@
gimp-help-browser
gipfel
gnofract4d
- gpp
graphviz
gutenprint-plugin
gv
@@ -2836,7 +2798,6 @@
kphotoalbum
ksnapshot
libsane-hpaio
- makehuman
mirage
netpbm-progs
nip2
@@ -3033,7 +2994,6 @@
false
false
- cabal-dev
cabal-rpm
darcs
ghc
@@ -3042,7 +3002,6 @@
hlint
hscolour
emacs-haskell-mode
- leksah
@@ -3645,7 +3604,6 @@
cmake
extra-cmake-modules
- qt5-base-devel
qt5-qtdeclarative-devel
qt5-qtquickcontrols
qt5-qttools-devel
@@ -4062,7 +4020,7 @@
notification-daemon
obconf
openbox
- oxygen-gtk2-theme
+ oxygen-gtk2
pcmanfm-qt
perl-File-MimeInfo
qterminal
@@ -4239,7 +4197,6 @@
ccsm
compiz
compiz-bcop
- compiz-config-python
compiz-manager
compiz-mate
compiz-plugins-extra
@@ -4686,17 +4643,13 @@
libreoffice-emailmerge
libreoffice-graphicfilter
libreoffice-impress
- libreoffice-javafilter
libreoffice-math
libreoffice-ogltrans
- libreoffice-presentation-minimizer
- libreoffice-report-builder
libreoffice-TexMaths
libreoffice-voikko
libreoffice-wiki-publisher
libreoffice-writer
libreoffice-xsltfilter
- lonote
lyx
MagicPoint
okular
@@ -5143,8 +5096,6 @@
ettercap
examiner
firewalk
- firstaidkit-gui
- firstaidkit-plugin-all
flawfinder
foremost
fping
@@ -5189,7 +5140,6 @@
nebula
net-snmp
net-snmp-utils
- netactview
nethogs
netsed
netsniff-ng
@@ -5217,9 +5167,6 @@
pcapdiff
pdfcrack
powertop
- prelude-lml
- prelude-manager
- prewikka
proxychains
pscan
pwgen
@@ -5249,7 +5196,6 @@
splint
sqlninja
srm
- sshscan
ssldump
sslscan
sslsplit
@@ -5283,7 +5229,6 @@
wipe
wireshark
xmount
- xprobe2
yersinia
zmap
@@ -5414,7 +5359,6 @@
true
abcde
- AcetoneISO2
adplay
alsamixergui
amarok
@@ -5424,7 +5368,6 @@
audacious
audacity
banshee
- bluez-alsa
brasero
camE
cdcollect
@@ -5449,7 +5392,6 @@
gnomad2
gnome-sound-recorder
gnomebaker
- gnomeradio
grip
gtk-v4l
gtkpod
@@ -5505,11 +5447,9 @@
tomahawk
totem
totem-lirc
- totem-mozplugin
totem-nautilus
tvtime
ucview
- ushare
v4l2ucp
vdr
vdr-epgsearch
@@ -5522,7 +5462,6 @@
vdr-sudoku
vdr-ttxtsubs
vdr-tvonscreen
- vdradmin-am
volumeicon
vorbis-tools
whaawmp
@@ -5798,7 +5737,6 @@
ddclient
denyhosts
dkms
- dnrd
dstat
dtach
ebtables
@@ -5813,13 +5751,11 @@
fatsort
fdupes
fedora-package-config-apt
- fedora-package-config-smart
festival
foremost
freerdp
freeze
fuse
- fwbuilder
fwknop
fwrestart
ganglia
@@ -5847,10 +5783,8 @@
inadyn-mt
incron
iotop
- ip6sic
ipsec-tools
ircp-tray
- isic
javasysmon
jfbterm
john
@@ -5869,7 +5803,6 @@
munin
nagios
net-snmp-utils
- netgo
nethogs
netstat-nat
nfswatch
@@ -5881,7 +5814,6 @@
ntp-perl
ntpdate
nut
- obexfs
obexftp
oddjob
oddjob-mkhomedir
@@ -5912,12 +5844,9 @@
rmanage
rootsh
rsnapshot
- sabayon
scrub
sec
shorewall
- smart
- smart-gui
socat
speech-dispatcher
speech-dispatcher-espeak
@@ -5930,7 +5859,6 @@
syslog-ng
sysstat
testdisk
- tiobench
tn5250
torque-client
torque-gui
@@ -6006,8 +5934,6 @@
cone
ctorrent
deletemail
- ekg
- ekg2
elinks
emacs-mew
epic
@@ -6021,12 +5947,9 @@
lynx
maildirproc
mutt
- naim
ncftp
- ninja
nmh
offlineimap
- pork
rss2email
rtorrent
sitecopy
@@ -6293,12 +6216,9 @@
php-pgsql
phpldapadmin
phpMyAdmin
- pootle
Pound
thttpd
tiquit
- vdr-wapd
- vdradmin-am
wordpress
@@ -6642,7 +6562,6 @@
xfce4-time-out-plugin
xfce4-verve-plugin
xfce4-weather-plugin
- xfce4-websearch-plugin
xfce4-whiskermenu-plugin
xfce4-xkb-plugin
xfdashboard