[gentoo-commits] proj/gnome:master commit in: scripts/test-data/, scripts/

[gentoo-commits] proj/gnome:master commit in: scripts/test-data/, scripts/

[Nirbheek Chauhan]

commit:     e712fb7ce2e440079074c6311fdbdae762a9a36a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 06:03:20 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue May  3 06:03:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e712fb7c

gen_archlist.py, test-data: misc fixes

---
 scripts/gen_archlist.py                       |    5 ++-
 scripts/test-data/gnome-list                  |    1 +
 scripts/test-data/{gnome-list => gnome2-list} |   32 +++++++++++++-----------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/scripts/gen_archlist.py b/scripts/gen_archlist.py
index 5d9dee5..e53f9cc 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 a579522..4b7bbf1 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/gnome-list b/scripts/test-data/gnome2-list
similarity index 88%
copy from scripts/test-data/gnome-list
copy to scripts/test-data/gnome2-list
index a579522..f096bdf 100644
--- a/scripts/test-data/gnome-list
+++ b/scripts/test-data/gnome2-list
@@ -1,19 +1,20 @@
 # Base libraries
-dev-libs/glib
+dev-libs/glib:2
 x11-libs/startup-notification
 x11-libs/pango
 dev-libs/libcroco
-dev-libs/libxml2
-dev-libs/libunique
-gnome-base/gnome-desktop
-gnome-base/librsvg
+dev-libs/libxml2:2
+dev-libs/libunique:1
+gnome-base/gnome-desktop:2
+gnome-base/librsvg:2
 media-libs/libcanberra
 net-libs/libsoup
-x11-libs/libwnck
+net-libs/libsoup-gnome
+x11-libs/libwnck:1
 x11-libs/libxklavier
 dev-libs/atk
-x11-libs/gtk+
-x11-libs/vte
+x11-libs/gtk+:2
+x11-libs/vte:0
 
 # Base utilities
 app-text/scrollkeeper
@@ -32,15 +33,16 @@ dev-libs/liboobs
 dev-libs/totem-pl-parser
 dev-python/gdata
 gnome-base/libgnome-keyring
-gnome-base/libgtop
-gnome-extra/gtkhtml
+gnome-base/libgtop:2
+gnome-extra/gtkhtml:3.14
 gnome-extra/libgsf
 media-libs/audiofile
 media-libs/swfdec
-x11-libs/gtksourceview
+x11-libs/goocanvas:0
+x11-libs/gtksourceview:2.0
 
 # Theme-related
-x11-themes/gtk-engines
+x11-themes/gtk-engines:2
 x11-themes/gnome-backgrounds
 x11-themes/gnome-icon-theme
 x11-themes/gnome-themes
@@ -58,10 +60,10 @@ app-accessibility/gok
 app-accessibility/orca
 
 # Deprecated libraries
-gnome-base/gnome-vfs
+gnome-base/gnome-vfs:2
 gnome-base/libbonobo
 gnome-base/libbonoboui
-gnome-base/libglade
+gnome-base/libglade:2.0
 gnome-base/libgnome
 gnome-base/libgnomecanvas
 gnome-base/libgnomekbd
@@ -73,7 +75,7 @@ media-libs/libart_lgpl
 media-sound/esound
 
 # Base applications
-gnome-base/gconf
+gnome-base/gconf:2
 x11-wm/metacity
 sys-apps/gnome-disk-utility
 gnome-base/gvfs