1 files changed, 10 insertions, 93 deletions
diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist
index 52ebe7996fe5..acfb22e4aebe 100644
--- a/x11-toolkits/gtkmm24/pkg-plist
+++ b/x11-toolkits/gtkmm24/pkg-plist
@@ -1,44 +1,3 @@
-include/atkmm-1.6/atkmm.h
-include/atkmm-1.6/atkmm/action.h
-include/atkmm-1.6/atkmm/component.h
-include/atkmm-1.6/atkmm/document.h
-include/atkmm-1.6/atkmm/editabletext.h
-include/atkmm-1.6/atkmm/hyperlink.h
-include/atkmm-1.6/atkmm/hypertext.h
-include/atkmm-1.6/atkmm/image.h
-include/atkmm-1.6/atkmm/implementor.h
-include/atkmm-1.6/atkmm/init.h
-include/atkmm-1.6/atkmm/noopobject.h
-include/atkmm-1.6/atkmm/object.h
-include/atkmm-1.6/atkmm/objectaccessible.h
-include/atkmm-1.6/atkmm/private/action_p.h
-include/atkmm-1.6/atkmm/private/component_p.h
-include/atkmm-1.6/atkmm/private/document_p.h
-include/atkmm-1.6/atkmm/private/editabletext_p.h
-include/atkmm-1.6/atkmm/private/hyperlink_p.h
-include/atkmm-1.6/atkmm/private/hypertext_p.h
-include/atkmm-1.6/atkmm/private/image_p.h
-include/atkmm-1.6/atkmm/private/implementor_p.h
-include/atkmm-1.6/atkmm/private/noopobject_p.h
-include/atkmm-1.6/atkmm/private/object_p.h
-include/atkmm-1.6/atkmm/private/objectaccessible_p.h
-include/atkmm-1.6/atkmm/private/relation_p.h
-include/atkmm-1.6/atkmm/private/relationset_p.h
-include/atkmm-1.6/atkmm/private/selection_p.h
-include/atkmm-1.6/atkmm/private/stateset_p.h
-include/atkmm-1.6/atkmm/private/streamablecontent_p.h
-include/atkmm-1.6/atkmm/private/table_p.h
-include/atkmm-1.6/atkmm/private/text_p.h
-include/atkmm-1.6/atkmm/private/value_p.h
-include/atkmm-1.6/atkmm/relation.h
-include/atkmm-1.6/atkmm/relationset.h
-include/atkmm-1.6/atkmm/selection.h
-include/atkmm-1.6/atkmm/stateset.h
-include/atkmm-1.6/atkmm/streamablecontent.h
-include/atkmm-1.6/atkmm/table.h
-include/atkmm-1.6/atkmm/text.h
-include/atkmm-1.6/atkmm/value.h
-include/atkmm-1.6/atkmm/wrap_init.h
 include/gdkmm-%%API_VERSION%%/gdkmm.h
 include/gdkmm-%%API_VERSION%%/gdkmm/bitmap.h
 include/gdkmm-%%API_VERSION%%/gdkmm/color.h
@@ -53,7 +12,6 @@ include/gdkmm-%%API_VERSION%%/gdkmm/event.h
 include/gdkmm-%%API_VERSION%%/gdkmm/gc.h
 include/gdkmm-%%API_VERSION%%/gdkmm/general.h
 include/gdkmm-%%API_VERSION%%/gdkmm/image.h
-include/gtkmm-%%API_VERSION%%/gtkmm/infobar.h
 include/gdkmm-%%API_VERSION%%/gdkmm/list.h
 include/gdkmm-%%API_VERSION%%/gdkmm/pixbuf.h
 include/gdkmm-%%API_VERSION%%/gdkmm/pixbufanimation.h
@@ -73,7 +31,6 @@ include/gdkmm-%%API_VERSION%%/gdkmm/private/drawable_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/event_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/gc_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/image_p.h
-include/gtkmm-%%API_VERSION%%/gtkmm/private/infobar_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbuf_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimation_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/pixbufanimationiter_p.h
@@ -171,6 +128,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/icontheme.h
 include/gtkmm-%%API_VERSION%%/gtkmm/iconview.h
 include/gtkmm-%%API_VERSION%%/gtkmm/image.h
 include/gtkmm-%%API_VERSION%%/gtkmm/imagemenuitem.h
+include/gtkmm-%%API_VERSION%%/gtkmm/infobar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/inputdialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/invisible.h
 include/gtkmm-%%API_VERSION%%/gtkmm/item.h
@@ -272,6 +230,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/icontheme_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/iconview_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/image_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/imagemenuitem_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/infobar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/inputdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/invisible_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/item_p.h
@@ -460,10 +419,12 @@ include/gtkmm-%%API_VERSION%%/gtkmm/window.h
 include/gtkmm-%%API_VERSION%%/gtkmm/wrap_init.h
 lib/gdkmm-%%API_VERSION%%/include/gdkmmconfig.h
 lib/gtkmm-%%API_VERSION%%/include/gtkmmconfig.h
-lib/libatkmm-1.6.a
-lib/libatkmm-1.6.la
-lib/libatkmm-1.6.so
-lib/libatkmm-1.6.so.1
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_atk.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gdk.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtk.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_gtkmm.m4
+lib/gtkmm-%%API_VERSION%%/proc/m4/convert_pango.m4
 lib/libgdkmm-%%VERSION%%.a
 lib/libgdkmm-%%VERSION%%.la
 lib/libgdkmm-%%VERSION%%.so
@@ -472,51 +433,10 @@ lib/libgtkmm-%%VERSION%%.a
 lib/libgtkmm-%%VERSION%%.la
 lib/libgtkmm-%%VERSION%%.so
 lib/libgtkmm-%%VERSION%%.so.1
-libdata/pkgconfig/atkmm-1.6.pc
 libdata/pkgconfig/gdkmm-%%API_VERSION%%.pc
 libdata/pkgconfig/gtkmm-%%API_VERSION%%.pc
-share/gtkmm-%%API_VERSION%%/demo/alphatest.png
-share/gtkmm-%%API_VERSION%%/demo/apple-red.png
-share/gtkmm-%%API_VERSION%%/demo/background.jpg
-share/gtkmm-%%API_VERSION%%/demo/demo-common.cc
-share/gtkmm-%%API_VERSION%%/demo/demo-common.h
-share/gtkmm-%%API_VERSION%%/demo/demos.h
-share/gtkmm-%%API_VERSION%%/demo/demowindow.cc
-share/gtkmm-%%API_VERSION%%/demo/demowindow.h
-share/gtkmm-%%API_VERSION%%/demo/example_appwindow.cc
-share/gtkmm-%%API_VERSION%%/demo/example_buttonbox.cc
-share/gtkmm-%%API_VERSION%%/demo/example_change_display.cc
-share/gtkmm-%%API_VERSION%%/demo/example_colorsel.cc
-share/gtkmm-%%API_VERSION%%/demo/example_dialog.cc
-share/gtkmm-%%API_VERSION%%/demo/example_drawingarea.cc
-share/gtkmm-%%API_VERSION%%/demo/example_iconview.cc
-share/gtkmm-%%API_VERSION%%/demo/example_images.cc
-share/gtkmm-%%API_VERSION%%/demo/example_menus.cc
-share/gtkmm-%%API_VERSION%%/demo/example_panes.cc
-share/gtkmm-%%API_VERSION%%/demo/example_pixbufs.cc
-share/gtkmm-%%API_VERSION%%/demo/example_sizegroup.cc
-share/gtkmm-%%API_VERSION%%/demo/example_stockbrowser.cc
-share/gtkmm-%%API_VERSION%%/demo/example_textview.cc
-share/gtkmm-%%API_VERSION%%/demo/example_treeview_editable_cells.cc
-share/gtkmm-%%API_VERSION%%/demo/example_treeview_liststore.cc
-share/gtkmm-%%API_VERSION%%/demo/example_treeview_treestore.cc
-share/gtkmm-%%API_VERSION%%/demo/example_uimanager.cc
-share/gtkmm-%%API_VERSION%%/demo/floppybuddy.gif
-share/gtkmm-%%API_VERSION%%/demo/gnome-applets.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-calendar.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-foot.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-fs-directory.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-fs-regular.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-gimp.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-gmush.png
-share/gtkmm-%%API_VERSION%%/demo/gnome-gsame.png
-share/gtkmm-%%API_VERSION%%/demo/gnu-keys.png
-share/gtkmm-%%API_VERSION%%/demo/gtk-logo-rgb.gif
-share/gtkmm-%%API_VERSION%%/demo/main.cc
-share/gtkmm-%%API_VERSION%%/demo/textwidget.cc
-share/gtkmm-%%API_VERSION%%/demo/textwidget.h
-@dirrm share/gtkmm-%%API_VERSION%%/demo
-@dirrm share/gtkmm-%%API_VERSION%%
+@dirrm lib/gtkmm-%%API_VERSION%%/proc/m4
+@dirrm lib/gtkmm-%%API_VERSION%%/proc
 @dirrm lib/gtkmm-%%API_VERSION%%/include
 @dirrm lib/gtkmm-%%API_VERSION%%
 @dirrm lib/gdkmm-%%API_VERSION%%/include
@@ -527,6 +447,3 @@ share/gtkmm-%%API_VERSION%%/demo/textwidget.h
 @dirrm include/gdkmm-%%API_VERSION%%/gdkmm/private
 @dirrm include/gdkmm-%%API_VERSION%%/gdkmm
 @dirrm include/gdkmm-%%API_VERSION%%
-@dirrm include/atkmm-1.6/atkmm/private
-@dirrm include/atkmm-1.6/atkmm
-@dirrm include/atkmm-1.6