1 |
commit: e712fb7ce2e440079074c6311fdbdae762a9a36a |
2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 3 06:03:20 2011 +0000 |
4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 3 06:03:20 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e712fb7c |
7 |
|
8 |
gen_archlist.py, test-data: misc fixes |
9 |
|
10 |
--- |
11 |
scripts/gen_archlist.py | 5 ++- |
12 |
scripts/test-data/gnome-list | 1 + |
13 |
scripts/test-data/{gnome-list => gnome2-list} | 32 +++++++++++++----------- |
14 |
3 files changed, 21 insertions(+), 17 deletions(-) |
15 |
|
16 |
diff --git a/scripts/gen_archlist.py b/scripts/gen_archlist.py |
17 |
index 5d9dee5..e53f9cc 100755 |
18 |
--- a/scripts/gen_archlist.py |
19 |
+++ b/scripts/gen_archlist.py |
20 |
@@ -439,10 +439,11 @@ if __name__ == "__main__": |
21 |
raise Exception('Inline comments are not supported') |
22 |
if not portage.catpkgsplit(cpv): |
23 |
# It's actually a cp |
24 |
- cpv = match_wanted_atoms(cpv, release=NEW_REL)[0] |
25 |
- if not cpv: |
26 |
+ cpv = match_wanted_atoms(cpv, release=NEW_REL) |
27 |
+ if not cpv or not cpv[0]: |
28 |
debug('%s: Invalid cpv' % cpv) |
29 |
continue |
30 |
+ cpv = cpv[0] |
31 |
kws_missing = max_kws(cpv, release=OLD_REL) |
32 |
if kws_missing == []: |
33 |
# Current cpv has the max keywords => nothing to do |
34 |
|
35 |
diff --git a/scripts/test-data/gnome-list b/scripts/test-data/gnome-list |
36 |
index a579522..4b7bbf1 100644 |
37 |
--- a/scripts/test-data/gnome-list |
38 |
+++ b/scripts/test-data/gnome-list |
39 |
@@ -9,6 +9,7 @@ gnome-base/gnome-desktop |
40 |
gnome-base/librsvg |
41 |
media-libs/libcanberra |
42 |
net-libs/libsoup |
43 |
+net-libs/libsoup-gnome |
44 |
x11-libs/libwnck |
45 |
x11-libs/libxklavier |
46 |
dev-libs/atk |
47 |
|
48 |
diff --git a/scripts/test-data/gnome-list b/scripts/test-data/gnome2-list |
49 |
similarity index 88% |
50 |
copy from scripts/test-data/gnome-list |
51 |
copy to scripts/test-data/gnome2-list |
52 |
index a579522..f096bdf 100644 |
53 |
--- a/scripts/test-data/gnome-list |
54 |
+++ b/scripts/test-data/gnome2-list |
55 |
@@ -1,19 +1,20 @@ |
56 |
# Base libraries |
57 |
-dev-libs/glib |
58 |
+dev-libs/glib:2 |
59 |
x11-libs/startup-notification |
60 |
x11-libs/pango |
61 |
dev-libs/libcroco |
62 |
-dev-libs/libxml2 |
63 |
-dev-libs/libunique |
64 |
-gnome-base/gnome-desktop |
65 |
-gnome-base/librsvg |
66 |
+dev-libs/libxml2:2 |
67 |
+dev-libs/libunique:1 |
68 |
+gnome-base/gnome-desktop:2 |
69 |
+gnome-base/librsvg:2 |
70 |
media-libs/libcanberra |
71 |
net-libs/libsoup |
72 |
-x11-libs/libwnck |
73 |
+net-libs/libsoup-gnome |
74 |
+x11-libs/libwnck:1 |
75 |
x11-libs/libxklavier |
76 |
dev-libs/atk |
77 |
-x11-libs/gtk+ |
78 |
-x11-libs/vte |
79 |
+x11-libs/gtk+:2 |
80 |
+x11-libs/vte:0 |
81 |
|
82 |
# Base utilities |
83 |
app-text/scrollkeeper |
84 |
@@ -32,15 +33,16 @@ dev-libs/liboobs |
85 |
dev-libs/totem-pl-parser |
86 |
dev-python/gdata |
87 |
gnome-base/libgnome-keyring |
88 |
-gnome-base/libgtop |
89 |
-gnome-extra/gtkhtml |
90 |
+gnome-base/libgtop:2 |
91 |
+gnome-extra/gtkhtml:3.14 |
92 |
gnome-extra/libgsf |
93 |
media-libs/audiofile |
94 |
media-libs/swfdec |
95 |
-x11-libs/gtksourceview |
96 |
+x11-libs/goocanvas:0 |
97 |
+x11-libs/gtksourceview:2.0 |
98 |
|
99 |
# Theme-related |
100 |
-x11-themes/gtk-engines |
101 |
+x11-themes/gtk-engines:2 |
102 |
x11-themes/gnome-backgrounds |
103 |
x11-themes/gnome-icon-theme |
104 |
x11-themes/gnome-themes |
105 |
@@ -58,10 +60,10 @@ app-accessibility/gok |
106 |
app-accessibility/orca |
107 |
|
108 |
# Deprecated libraries |
109 |
-gnome-base/gnome-vfs |
110 |
+gnome-base/gnome-vfs:2 |
111 |
gnome-base/libbonobo |
112 |
gnome-base/libbonoboui |
113 |
-gnome-base/libglade |
114 |
+gnome-base/libglade:2.0 |
115 |
gnome-base/libgnome |
116 |
gnome-base/libgnomecanvas |
117 |
gnome-base/libgnomekbd |
118 |
@@ -73,7 +75,7 @@ media-libs/libart_lgpl |
119 |
media-sound/esound |
120 |
|
121 |
# Base applications |
122 |
-gnome-base/gconf |
123 |
+gnome-base/gconf:2 |
124 |
x11-wm/metacity |
125 |
sys-apps/gnome-disk-utility |
126 |
gnome-base/gvfs |