Index: documentation/content/en/books/porters-handbook/special/_index.adoc
===================================================================
--- documentation/content/en/books/porters-handbook/special/_index.adoc
+++ documentation/content/en/books/porters-handbook/special/_index.adoc
@@ -1746,6 +1746,10 @@
 |graphics/cairomm
 |c++ bindings for cairo
 
+|`cairomm11`
+|graphics/cairomm11
+|c++ bindings for cairo
+
 |`dconf`
 |devel/dconf
 |Configuration database system (both, build, run)
@@ -1754,7 +1758,7 @@
 |databases/evolution-data-server
 |Data backends for the Evolution integrated mail/PIM suite
 
-|`gdkpixbuf2`
+|`gdkpixbuf`
 |graphics/gdk-pixbuf2
 |Graphics library for GTK+
 
@@ -1766,13 +1770,21 @@
 |devel/glibmm
 |c++ bindings for glib20
 
+|`glibmm26`
+|devel/glibmm26
+|c++ bindings for glib20
+
 |`gnomecontrolcenter3`
 |sysutils/gnome-control-center
-|GNOME 3 Control Center
+|GNOME Control Center
 
 |`gnomedesktop3`
 |x11/gnome-desktop
-|GNOME 3 desktop UI library
+|GNOME desktop Gtk3-based UI library
+
+|`gnomedesktop4`
+|x11/gnome-desktop
+|GNOME desktop Gtk4-based UI library
 
 |`gsound`
 |audio/gsound
@@ -1784,15 +1796,15 @@
 
 |`gtk20`
 |x11-toolkits/gtk20
-|Gtk+ 2 toolkit
+|Gtk2 toolkit
 
 |`gtk30`
 |x11-toolkits/gtk30
-|Gtk+ 3 toolkit
+|Gtk3 toolkit
 
-|`gtkmm20`
-|x11-toolkits/gtkmm20
-|c++ bindings 2.0 for the gtk20 toolkit
+|`gtk40`
+|x11-toolkits/gtk40
+|Gtk4 toolkit
 
 |`gtkmm24`
 |x11-toolkits/gtkmm24
@@ -1802,14 +1814,22 @@
 |x11-toolkits/gtkmm30
 |c++ bindings 3.0 for the gtk30 toolkit
 
-|`gtksourceview2`
-|x11-toolkits/gtksourceview2
-|Widget that adds syntax highlighting to GtkTextView
+|`gtkmm40`
+|x11-toolkits/gtkmm40
+|c++ bindings 4.0 for the gtk40 toolkit
 
 |`gtksourceview3`
 |x11-toolkits/gtksourceview3
 |Text widget that adds syntax highlighting to the GtkTextView widget
 
+|`gtksourceview4`
+|x11-toolkits/gtksourceview4
+|Text widget that adds syntax highlighting to the GtkTextView widget
+
+|`gtksourceview5`
+|x11-toolkits/gtksourceview5
+|Text widget that adds syntax highlighting to the GtkTextView widget
+
 |`gtksourceviewmm3`
 |x11-toolkits/gtksourceviewmm3
 |c++ bindings for the gtksourceview3 library
@@ -1838,6 +1858,10 @@
 |databases/libgdamm5
 |c++ bindings for the libgda5 library
 
+|`libgda6`
+|databases/libgda6
+|Provides uniform access to different kinds of data sources
+
 |`libgsf`
 |devel/libgsf
 |Extensible I/O abstraction for dealing with structured file formats
@@ -1850,6 +1874,14 @@
 |devel/libsigc++20
 |Callback Framework for C++
 
+|`libsigc++30`
+|devel/libsigc++30
+|Callback Framework for C++
+
+|`libwnck3`
+|x11-toolkits/libwnck3
+|Library used for writing pagers and taskslists
+
 |`libxml++26`
 |textproc/libxml++26
 |c++ bindings for the libxml2 library
@@ -1862,11 +1894,7 @@
 |textproc/libxslt
 |XSLT C library (both, build, run)
 
-|`metacity`
-|x11-wm/metacity
-|Window manager from GNOME
-
-|`nautilus3`
+|`nautilus4`
 |x11-fm/nautilus
 |GNOME file manager
 
@@ -1878,13 +1906,13 @@
 |x11-toolkits/pangomm
 |c++ bindings for the pango library
 
-|`py3gobject3`
-|devel/py3-gobject3
-|Python 3, GObject 3.0 bindings
+|`pangomm24`
+|x11-toolkits/pangomm24
+|c++ bindings for the pango library
 
 |`pygobject3`
-|devel/py-gobject3
-|Python 2, GObject 3.0 bindings
+|devel/py-pygobject
+|Python, GObject 3.0 bindings
 
 |`vte3`
 |x11-toolkits/vte3
@@ -1936,10 +1964,6 @@
 |devel/gconfmm26
 |c++ bindings for gconf2
 
-|`gdkpixbuf`
-|graphics/gdk-pixbuf
-|Graphics library for GTK+
-
 |`glib12`
 |devel/glib12
 |glib 1.2 core library
@@ -1984,6 +2008,10 @@
 |x11-toolkits/gtksourceview
 |Widget that adds syntax highlighting to GtkTextView
 
+|`gtksourceview2`
+|x11-toolkits/gtksourceview2
+|Widget that adds syntax highlighting to GtkTextView
+
 |`libartgpl2`
 |graphics/libart_lgpl
 |Library for high-performance 2D graphics
@@ -2048,10 +2076,6 @@
 |x11-toolkits/libwnck
 |Library used for writing pagers and taskslists
 
-|`libwnck3`
-|x11-toolkits/libwnck3
-|Library used for writing pagers and taskslists
-
 |`orbit2`
 |devel/ORBit2
 |High-performance CORBA ORB with support for the C language
Index: documentation/content/en/books/porters-handbook/uses/_index.adoc
===================================================================
--- documentation/content/en/books/porters-handbook/uses/_index.adoc
+++ documentation/content/en/books/porters-handbook/uses/_index.adoc
@@ -950,81 +950,64 @@
 * `atkmm`
 * `cairo`
 * `cairomm`
+* `cairomm11`
 * `dconf`
-* `esound`
 * `evolutiondataserver3`
 * `gconf2`
 * `gconfmm26`
 * `gdkpixbuf`
-* `gdkpixbuf2`
-* `glib12`
+* `gdkpixbuf2xlib`
+* `gdkpixbufextra`
 * `glib20`
 * `glibmm`
+* `glibmm26`
 * `gnomecontrolcenter3`
 * `gnomedesktop3`
-* `gnomedocutils`
+* `gnomedesktop4`
 * `gnomemenus3`
 * `gnomemimedata`
 * `gnomeprefix`
-* `gnomesharp20`
-* `gnomevfs2`
 * `gsound`
 * `gtk-update-icon-cache`
-* `gtk12`
 * `gtk20`
 * `gtk30`
-* `gtkhtml3`
 * `gtkhtml4`
-* `gtkmm20`
 * `gtkmm24`
 * `gtkmm30`
+* `gtkmm40`
 * `gtksharp20`
-* `gtksourceview`
 * `gtksourceview2`
 * `gtksourceview3`
+* `gtksourceview4`
+* `gtksourceview5`
 * `gtksourceviewmm3`
 * `gvfs`
 * `intlhack`
 * `intltool`
 * `introspection`
 * `libartlgpl2`
-* `libbonobo`
-* `libbonoboui`
 * `libgda5`
 * `libgda5-ui`
+* `libgda6`
 * `libgdamm5`
 * `libglade2`
-* `libgnome`
 * `libgnomecanvas`
 * `libgnomekbd`
-* `libgnomeprint`
-* `libgnomeprintui`
-* `libgnomeui`
 * `libgsf`
-* `libgtkhtml`
-* `libgtksourceviewmm`
 * `libidl`
 * `librsvg2`
-* `libsigc++12`
 * `libsigc++20`
-* `libwnck`
+* `libsigc++30`
 * `libwnck3`
 * `libxml++26`
 * `libxml2`
 * `libxslt`
-* `metacity`
-* `nautilus3`
-* `orbit2`
+* `nautilus4`
 * `pango`
 * `pangomm`
+* `pangomm24`
 * `pangox-compat`
-* `py3gobject3`
-* `pygnome2`
-* `pygobject`
 * `pygobject3`
-* `pygtk2`
-* `pygtksourceview`
-* `referencehack`
 * `vte`
 * `vte3`