gen_archlist.py, test-data: misc fixes

3 files changed, 152 insertions, 2 deletions

diff --git a/scripts/gen_archlist.py b/scripts/gen_archlist.py
index 5d9dee57..e53f9cc7 100755
--- a/scripts/gen_archlist.py
+++ b/scripts/gen_archlist.py
@@ -439,10 +439,11 @@ if __name__ == "__main__":
             raise Exception('Inline comments are not supported')
         if not portage.catpkgsplit(cpv):
             # It's actually a cp
-            cpv = match_wanted_atoms(cpv, release=NEW_REL)[0]
-            if not cpv:
+            cpv = match_wanted_atoms(cpv, release=NEW_REL)
+            if not cpv or not cpv[0]:
                 debug('%s: Invalid cpv' % cpv)
                 continue
+            cpv = cpv[0]
         kws_missing = max_kws(cpv, release=OLD_REL)
         if kws_missing == []:
             # Current cpv has the max keywords => nothing to do
diff --git a/scripts/test-data/gnome-list b/scripts/test-data/gnome-list
index a5795220..4b7bbf10 100644
--- a/scripts/test-data/gnome-list
+++ b/scripts/test-data/gnome-list
@@ -9,6 +9,7 @@ gnome-base/gnome-desktop
 gnome-base/librsvg
 media-libs/libcanberra
 net-libs/libsoup
+net-libs/libsoup-gnome
 x11-libs/libwnck
 x11-libs/libxklavier
 dev-libs/atk
diff --git a/scripts/test-data/gnome2-list b/scripts/test-data/gnome2-list
new file mode 100644
index 00000000..f096bdf1
--- /dev/null
+++ b/scripts/test-data/gnome2-list
@@ -0,0 +1,148 @@
+# Base libraries
+dev-libs/glib:2
+x11-libs/startup-notification
+x11-libs/pango
+dev-libs/libcroco
+dev-libs/libxml2:2
+dev-libs/libunique:1
+gnome-base/gnome-desktop:2
+gnome-base/librsvg:2
+media-libs/libcanberra
+net-libs/libsoup
+net-libs/libsoup-gnome
+x11-libs/libwnck:1
+x11-libs/libxklavier
+dev-libs/atk
+x11-libs/gtk+:2
+x11-libs/vte:0
+
+# Base utilities
+app-text/scrollkeeper
+app-text/scrollkeeper-dtd
+app-text/rarian
+dev-util/gtk-doc
+dev-util/gtk-doc-am
+dev-util/intltool
+gnome-base/gnome-common
+x11-misc/icon-naming-utils
+x11-misc/icon-naming-utils
+
+# Other libraries
+app-text/gnome-spell
+dev-libs/liboobs
+dev-libs/totem-pl-parser
+dev-python/gdata
+gnome-base/libgnome-keyring
+gnome-base/libgtop:2
+gnome-extra/gtkhtml:3.14
+gnome-extra/libgsf
+media-libs/audiofile
+media-libs/swfdec
+x11-libs/goocanvas:0
+x11-libs/gtksourceview:2.0
+
+# Theme-related
+x11-themes/gtk-engines:2
+x11-themes/gnome-backgrounds
+x11-themes/gnome-icon-theme
+x11-themes/gnome-themes
+x11-themes/hicolor-icon-theme
+x11-themes/sound-theme-freedesktop
+
+# Accessibility
+app-accessibility/accerciser
+gnome-extra/at-spi
+gnome-extra/libgail-gnome
+app-accessibility/dasher
+app-accessibility/gnome-mag
+app-accessibility/gnome-speech
+app-accessibility/gok
+app-accessibility/orca
+
+# Deprecated libraries
+gnome-base/gnome-vfs:2
+gnome-base/libbonobo
+gnome-base/libbonoboui
+gnome-base/libglade:2.0
+gnome-base/libgnome
+gnome-base/libgnomecanvas
+gnome-base/libgnomekbd
+gnome-base/libgnomeprint
+gnome-base/libgnomeprintui
+gnome-base/libgnomeui
+gnome-base/orbit
+media-libs/libart_lgpl
+media-sound/esound
+
+# Base applications
+gnome-base/gconf:2
+x11-wm/metacity
+sys-apps/gnome-disk-utility
+gnome-base/gvfs
+gnome-extra/zenity
+gnome-base/nautilus
+dev-libs/libgweather
+gnome-base/gnome-menus
+gnome-base/gnome-panel
+gnome-base/gnome-session
+gnome-base/gnome-settings-daemon
+gnome-base/gdm
+gnome-base/gnome-keyring
+gnome-base/gnome-menus
+gnome-base/gnome-applets
+gnome-extra/bug-buddy
+gnome-extra/evolution-data-server
+gnome-extra/gnome-media
+gnome-extra/gnome-power-manager
+
+# User applications
+app-arch/file-roller
+app-cdr/brasero
+app-crypt/seahorse
+app-crypt/seahorse-plugins
+app-editors/gedit
+app-text/evince
+gnome-base/gnome-control-center
+gnome-extra/gcalctool
+gnome-extra/gnome-screensaver
+gnome-extra/gnome-system-monitor
+gnome-extra/gucharmap
+gnome-extra/mousetweaks
+gnome-extra/yelp
+mail-client/evolution
+media-gfx/eog
+media-sound/sound-juicer
+media-video/totem
+net-im/empathy
+www-client/epiphany
+www-client/epiphany-extensions
+x11-misc/alacarte
+x11-terms/gnome-terminal
+
+# Other applications
+app-admin/system-tools-backends
+app-admin/gnome-system-tools
+app-admin/pessulus
+app-admin/sabayon
+app-misc/tomboy
+gnome-extra/deskbar-applet
+gnome-extra/evolution-exchange
+gnome-extra/evolution-webcal
+gnome-extra/gconf-editor
+gnome-extra/gnome-games
+gnome-extra/gnome-games-extra-data
+gnome-extra/gnome-user-share
+gnome-extra/gnome-utils
+gnome-extra/hamster-applet
+gnome-extra/swfdec-gnome
+media-video/cheese
+net-analyzer/gnome-netstatus
+net-analyzer/gnome-nettool
+net-misc/vinagre
+net-misc/vino
+net-print/gnome-cups-manager
+net-voip/ekiga
+
+# Documentation
+gnome-extra/gnome-devel-docs
+gnome-extra/gnome-user-docs