1 files changed, 68 insertions, 90 deletions

diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 2183339b927c..5bf925ac1a89 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,4 +1,10 @@
 bin/gtk-config-2.0
+bin/gtk-demo
+bin/gtk-query-immodules-2.0
+bin/make-inline-pixbuf
+etc/gtk-2.0/gtk.immodules
+include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
+include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
 include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
 include/gtk-2.0/gdk/gdk.h
@@ -33,6 +39,7 @@ include/gtk-2.0/gdk/x11/gdkdrawable-x11.h
 include/gtk-2.0/gdk/x11/gdkpixmap-x11.h
 include/gtk-2.0/gdk/x11/gdkwindow-x11.h
 include/gtk-2.0/gtk/gdk-pixbuf-loader.h
+include/gtk-2.0/gtk/gdkconfig.h
 include/gtk-2.0/gtk/gtk.h
 include/gtk-2.0/gtk/gtkaccelgroup.h
 include/gtk-2.0/gtk/gtkaccellabel.h
@@ -47,8 +54,14 @@ include/gtk-2.0/gtk/gtkbindings.h
 include/gtk-2.0/gtk/gtkbox.h
 include/gtk-2.0/gtk/gtkbutton.h
 include/gtk-2.0/gtk/gtkcalendar.h
+include/gtk-2.0/gtk/gtkcellrenderer.h
+include/gtk-2.0/gtk/gtkcellrendererpixbuf.h
+include/gtk-2.0/gtk/gtkcellrenderertext.h
+include/gtk-2.0/gtk/gtkcellrenderertextpixbuf.h
+include/gtk-2.0/gtk/gtkcellrenderertoggle.h
 include/gtk-2.0/gtk/gtkcheckbutton.h
 include/gtk-2.0/gtk/gtkcheckmenuitem.h
+include/gtk-2.0/gtk/gtkclipboard.h
 include/gtk-2.0/gtk/gtkclist.h
 include/gtk-2.0/gtk/gtkcolorsel.h
 include/gtk-2.0/gtk/gtkcolorseldialog.h
@@ -81,8 +94,10 @@ include/gtk-2.0/gtk/gtkhscale.h
 include/gtk-2.0/gtk/gtkhscrollbar.h
 include/gtk-2.0/gtk/gtkhseparator.h
 include/gtk-2.0/gtk/gtkhsv.h
+include/gtk-2.0/gtk/gtkiconfactory.h
 include/gtk-2.0/gtk/gtkimage.h
 include/gtk-2.0/gtk/gtkimcontext.h
+include/gtk-2.0/gtk/gtkimmodule.h
 include/gtk-2.0/gtk/gtkimmulticontext.h
 include/gtk-2.0/gtk/gtkinputdialog.h
 include/gtk-2.0/gtk/gtkinvisible.h
@@ -92,6 +107,7 @@ include/gtk-2.0/gtk/gtklabel.h
 include/gtk-2.0/gtk/gtklayout.h
 include/gtk-2.0/gtk/gtklist.h
 include/gtk-2.0/gtk/gtklistitem.h
+include/gtk-2.0/gtk/gtkliststore.h
 include/gtk-2.0/gtk/gtkmain.h
 include/gtk-2.0/gtk/gtkmarshal.h
 include/gtk-2.0/gtk/gtkmenu.h
@@ -99,9 +115,12 @@ include/gtk-2.0/gtk/gtkmenubar.h
 include/gtk-2.0/gtk/gtkmenufactory.h
 include/gtk-2.0/gtk/gtkmenuitem.h
 include/gtk-2.0/gtk/gtkmenushell.h
+include/gtk-2.0/gtk/gtkmessagedialog.h
 include/gtk-2.0/gtk/gtkmisc.h
+include/gtk-2.0/gtk/gtkmodelsimple.h
 include/gtk-2.0/gtk/gtknotebook.h
 include/gtk-2.0/gtk/gtkobject.h
+include/gtk-2.0/gtk/gtkoldeditable.h
 include/gtk-2.0/gtk/gtkoptionmenu.h
 include/gtk-2.0/gtk/gtkpacker.h
 include/gtk-2.0/gtk/gtkpaned.h
@@ -125,29 +144,32 @@ include/gtk-2.0/gtk/gtksignal.h
 include/gtk-2.0/gtk/gtksocket.h
 include/gtk-2.0/gtk/gtkspinbutton.h
 include/gtk-2.0/gtk/gtkstatusbar.h
+include/gtk-2.0/gtk/gtkstock.h
 include/gtk-2.0/gtk/gtkstyle.h
 include/gtk-2.0/gtk/gtktable.h
 include/gtk-2.0/gtk/gtktearoffmenuitem.h
 include/gtk-2.0/gtk/gtktext.h
-include/gtk-2.0/gtk/gtktextbtree.h
 include/gtk-2.0/gtk/gtktextbuffer.h
 include/gtk-2.0/gtk/gtktextchild.h
 include/gtk-2.0/gtk/gtktextdisplay.h
 include/gtk-2.0/gtk/gtktextiter.h
 include/gtk-2.0/gtk/gtktextlayout.h
 include/gtk-2.0/gtk/gtktextmark.h
-include/gtk-2.0/gtk/gtktextsegment.h
 include/gtk-2.0/gtk/gtktexttag.h
 include/gtk-2.0/gtk/gtktexttagtable.h
-include/gtk-2.0/gtk/gtktexttypes.h
 include/gtk-2.0/gtk/gtktextview.h
-include/gtk-2.0/gtk/gtkthemes.h
 include/gtk-2.0/gtk/gtktipsquery.h
 include/gtk-2.0/gtk/gtktogglebutton.h
 include/gtk-2.0/gtk/gtktoolbar.h
 include/gtk-2.0/gtk/gtktooltips.h
 include/gtk-2.0/gtk/gtktree.h
 include/gtk-2.0/gtk/gtktreeitem.h
+include/gtk-2.0/gtk/gtktreemodel.h
+include/gtk-2.0/gtk/gtktreemodelsort.h
+include/gtk-2.0/gtk/gtktreeselection.h
+include/gtk-2.0/gtk/gtktreestore.h
+include/gtk-2.0/gtk/gtktreeview.h
+include/gtk-2.0/gtk/gtktreeviewcolumn.h
 include/gtk-2.0/gtk/gtktypebuiltins.h
 include/gtk-2.0/gtk/gtktypeutils.h
 include/gtk-2.0/gtk/gtkvbbox.h
@@ -160,58 +182,58 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
 include/gtk-2.0/gtk/gtkvseparator.h
 include/gtk-2.0/gtk/gtkwidget.h
 include/gtk-2.0/gtk/gtkwindow.h
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.a
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.so
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-bmp.so.1
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.a
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.so
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-gif.so.1
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.a
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.so
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ico.so.1
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.a
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.so
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-jpeg.so.1
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.a
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.so
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-png.so.1
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.a
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.so
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-pnm.so.1
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.a
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.so
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-ras.so.1
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.a
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.so
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-tiff.so.1
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.a
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.so
-lib/gtk-2.0/1.3.1/loaders/libpixbufloader-xpm.so.1
-lib/gtk-2.0/include/gdkconfig.h
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
 lib/libgdk-x11-1.3.a
 lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.1
+lib/libgdk-x11-1.3.so.2
 lib/libgdk_pixbuf-1.3.a
 lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.1
+lib/libgdk_pixbuf-1.3.so.2
+lib/libgdk_pixbuf_xlib-1.3.a
+lib/libgdk_pixbuf_xlib-1.3.so
+lib/libgdk_pixbuf_xlib-1.3.so.0
 lib/libgtk-x11-1.3.a
 lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.1
+lib/libgtk-x11-1.3.so.2
 share/aclocal/gtk-2.0.m4
+share/gtk-2.0/demo/button_box.c
+share/gtk-2.0/demo/item_factory.c
+share/gtk-2.0/demo/menus.c
+share/gtk-2.0/demo/panes.c
+share/gtk-2.0/demo/textview.c
 share/locale/ca/LC_MESSAGES/gtk20.mo
 share/locale/cs/LC_MESSAGES/gtk20.mo
 share/locale/da/LC_MESSAGES/gtk20.mo
 share/locale/de/LC_MESSAGES/gtk20.mo
 share/locale/el/LC_MESSAGES/gtk20.mo
+share/locale/en@IPA/LC_MESSAGES/gtk20.mo
+share/locale/en_GB/LC_MESSAGES/gtk20.mo
 share/locale/es/LC_MESSAGES/gtk20.mo
 share/locale/et/LC_MESSAGES/gtk20.mo
 share/locale/eu/LC_MESSAGES/gtk20.mo
+share/locale/fa/LC_MESSAGES/gtk20.mo
 share/locale/fi/LC_MESSAGES/gtk20.mo
 share/locale/fr/LC_MESSAGES/gtk20.mo
 share/locale/ga/LC_MESSAGES/gtk20.mo
 share/locale/gl/LC_MESSAGES/gtk20.mo
+share/locale/he/LC_MESSAGES/gtk20.mo
 share/locale/hr/LC_MESSAGES/gtk20.mo
 share/locale/hu/LC_MESSAGES/gtk20.mo
+share/locale/ia/LC_MESSAGES/gtk20.mo
 share/locale/it/LC_MESSAGES/gtk20.mo
 share/locale/ja/LC_MESSAGES/gtk20.mo
 share/locale/ko/LC_MESSAGES/gtk20.mo
@@ -225,71 +247,27 @@ share/locale/ro/LC_MESSAGES/gtk20.mo
 share/locale/ru/LC_MESSAGES/gtk20.mo
 share/locale/sk/LC_MESSAGES/gtk20.mo
 share/locale/sl/LC_MESSAGES/gtk20.mo
+share/locale/sp/LC_MESSAGES/gtk20.mo
+share/locale/sr/LC_MESSAGES/gtk20.mo
 share/locale/sv/LC_MESSAGES/gtk20.mo
 share/locale/tr/LC_MESSAGES/gtk20.mo
 share/locale/uk/LC_MESSAGES/gtk20.mo
 share/locale/wa/LC_MESSAGES/gtk20.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gtk20.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gtk20.mo
+share/locale/zh_CN/LC_MESSAGES/gtk20.mo
+share/locale/zh_TW/LC_MESSAGES/gtk20.mo
 share/themes/Default/gtk-2.0/gtkrc
-share/themes/Default/gtk-2.0/gtkrc.be
-share/themes/Default/gtk-2.0/gtkrc.bg
-share/themes/Default/gtk-2.0/gtkrc.bg_BG.iso88595
-share/themes/Default/gtk-2.0/gtkrc.cp1251
-share/themes/Default/gtk-2.0/gtkrc.cs
-share/themes/Default/gtk-2.0/gtkrc.cy
-share/themes/Default/gtk-2.0/gtkrc.el
-share/themes/Default/gtk-2.0/gtkrc.eo
-share/themes/Default/gtk-2.0/gtkrc.et
-share/themes/Default/gtk-2.0/gtkrc.ga
-share/themes/Default/gtk-2.0/gtkrc.he
-share/themes/Default/gtk-2.0/gtkrc.hr
-share/themes/Default/gtk-2.0/gtkrc.hu
-share/themes/Default/gtk-2.0/gtkrc.hy
-share/themes/Default/gtk-2.0/gtkrc.iso-8859-13
-share/themes/Default/gtk-2.0/gtkrc.iso-8859-14
-share/themes/Default/gtk-2.0/gtkrc.iso-8859-15
-share/themes/Default/gtk-2.0/gtkrc.iso-8859-2
-share/themes/Default/gtk-2.0/gtkrc.iso-8859-5
-share/themes/Default/gtk-2.0/gtkrc.ja
-share/themes/Default/gtk-2.0/gtkrc.ka
-share/themes/Default/gtk-2.0/gtkrc.ka_GE.georgianacademy
-share/themes/Default/gtk-2.0/gtkrc.ka_GE.georgianps
-share/themes/Default/gtk-2.0/gtkrc.ko
-share/themes/Default/gtk-2.0/gtkrc.lt
-share/themes/Default/gtk-2.0/gtkrc.lv
-share/themes/Default/gtk-2.0/gtkrc.mk
-share/themes/Default/gtk-2.0/gtkrc.pl
-share/themes/Default/gtk-2.0/gtkrc.ro
-share/themes/Default/gtk-2.0/gtkrc.ru
-share/themes/Default/gtk-2.0/gtkrc.ru_RU.iso88595
-share/themes/Default/gtk-2.0/gtkrc.sk
-share/themes/Default/gtk-2.0/gtkrc.sl
-share/themes/Default/gtk-2.0/gtkrc.sp
-share/themes/Default/gtk-2.0/gtkrc.sq
-share/themes/Default/gtk-2.0/gtkrc.sr
-share/themes/Default/gtk-2.0/gtkrc.th
-share/themes/Default/gtk-2.0/gtkrc.tr
-share/themes/Default/gtk-2.0/gtkrc.uk
-share/themes/Default/gtk-2.0/gtkrc.vi
-share/themes/Default/gtk-2.0/gtkrc.vi_VN.tcvn
-share/themes/Default/gtk-2.0/gtkrc.vi_VN.tcvn5712
-share/themes/Default/gtk-2.0/gtkrc.vi_VN.viscii
-share/themes/Default/gtk-2.0/gtkrc.vi_VN.viscii111
-share/themes/Default/gtk-2.0/gtkrc.zh_CN
-share/themes/Default/gtk-2.0/gtkrc.zh_TW.Big5
 @dirrm share/themes/Default/gtk-2.0
 @dirrm share/themes/Default
-@dirrm share/themes
-@dirrm lib/gtk-2.0/include
-@dirrm lib/gtk-2.0/1.3.1/loaders
-@dirrm lib/gtk-2.0/1.3.1
+@dirrm share/gtk-2.0/demo
+@dirrm share/gtk-2.0
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/loaders
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%/immodules
+@dirrm lib/gtk-2.0/%%GTK_VERSION%%
 @dirrm lib/gtk-2.0
 @dirrm include/gtk-2.0/gtk
 @dirrm include/gtk-2.0/gdk/x11
+@dirrm include/gtk-2.0/gdk-pixbuf-xlib
 @dirrm include/gtk-2.0/gdk-pixbuf
 @dirrm include/gtk-2.0/gdk
 @dirrm include/gtk-2.0
-@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/* 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
+@dirrm etc/gtk-2.0