diff --git a/common/options.description b/common/options.description
index c3f0472451b..4fb6ffe65d0 100644
--- a/common/options.description
+++ b/common/options.description
@@ -2,7 +2,6 @@ desc_option_aalib="Enable support for aalib video output"
 desc_option_acl="Enable support for ACLs and Extended Attributes"
 desc_option_backtrace="Enable support for backtraces via libunwind"
 desc_option_bluetooth="Enable support for bluetooth"
-desc_option_broadway="Enable support for the HTML5 Broadway backend"
 desc_option_cdparanoia="Enable support for CD audio (cdparanoia)"
 desc_option_colord="Enable support for colord"
 desc_option_cups="Enable support for CUPS"
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 61f96b9c742..2a30ea0fca2 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -17,7 +17,6 @@ checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index a318c2da821..cf9f705f9d6 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -36,9 +36,6 @@ systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
 # Package build options
 build_options="gir systemd"
 build_options_default="systemd"
-desc_option_gir="Enable support for building gobject introspection data"
-desc_option_systemd="Enable support for systemd"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gir"
diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template
index 6d544248a5f..dbe2e2a27bd 100644
--- a/srcpkgs/SDL/template
+++ b/srcpkgs/SDL/template
@@ -20,12 +20,6 @@ makedepends="alsa-lib-devel"
 
 # Package build options
 build_options="x11 opengl aalib pulseaudio"
-
-desc_option_x11="Enable support for X11 video output"
-desc_option_opengl="Enable support for OpenGL support"
-desc_option_aalib="Enable support for aalib video output"
-desc_option_pulseaudio="Enable support for pulseaudio autio output"
-
 build_options_default="x11"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 5f0e1826ea8..5803800996d 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -18,12 +18,6 @@ checksum=a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c
 # Package build options
 build_options="gles opengl pulseaudio wayland x11"
 
-desc_option_gles="Enable support for OpenGL/ES rendering"
-desc_option_opengl="Enable support for OpenGL rendering"
-desc_option_pulseaudio="Enable support for pulseaudio audio output"
-desc_option_wayland="Enable support for wayland video output"
-desc_option_x11="Enable support for X11 video output"
-
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	# Enable OpenGL, pulseaudio and x11
 	build_options_default+=" opengl pulseaudio x11"
diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index c80417ad4e3..d4c5702b629 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -20,8 +20,6 @@ checksum=b0b21136dc9d74a7135fd5ed7fa1a8069efb91bc6ecc1ef8911125433345a5c1
 
 # Package build options
 build_options="gir systemd"
-desc_option_gir="Enable support for building gobject introspection data"
-desc_option_systemd="Enable support for systemd"
 
 build_options_default="systemd"
 # Disable gir for cross builds.
diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template
index e41ca689ecf..52ecca1731e 100644
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@@ -20,7 +20,6 @@ depends="autogen"
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index b0be043c4f8..d7b8f84e882 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -15,7 +15,6 @@ checksum=db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
index f756cca5952..506fa4ab281 100644
--- a/srcpkgs/atk/template
+++ b/srcpkgs/atk/template
@@ -14,7 +14,6 @@ checksum=48a8431974639c5a59c24fcd3ece1a19709872d5dfe78907524d9f5e9993f18f
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template
index d415620e7ee..a2e02162098 100644
--- a/srcpkgs/avahi-discover/template
+++ b/srcpkgs/avahi-discover/template
@@ -33,7 +33,6 @@ pycompile_module="avahi_discover"
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template
index 46fdea0506f..dedd88de66a 100644
--- a/srcpkgs/bluefish/template
+++ b/srcpkgs/bluefish/template
@@ -19,7 +19,6 @@ checksum=54c2892c317eb2287c9fb0a3e29c3f19bef51d9ab0353bfb158e52a1cdae4216
 
 # Package build options
 build_options="python"
-desc_option_python="Enable support for python plugin"
 
 if [ "$build_option_python" ]; then
 	configure_args+=" --enable-python"
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index 17efdb0d2c7..5954a89c838 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -18,7 +18,6 @@ checksum=0b6fa557d67845b7a4f9978b565a6769e1a023c397a73f2891a8f1c7c55e2d4c
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template
index 8c1ef950c9a..97e59d8f60b 100644
--- a/srcpkgs/cairo/template
+++ b/srcpkgs/cairo/template
@@ -21,8 +21,6 @@ pre_configure() {
 
 # Package build options
 build_options="gles2 opengl"
-desc_option_gles2="Enable support for building the GLESv2 surface backend"
-desc_option_opengl="Enable support for building the OpenGL surface backend"
 
 # Enable gles2 by default on x86.
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 5d8c61d73af..78f304abff5 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -15,7 +15,6 @@ checksum=bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template
index 4a6b54808d3..3c80b4591f0 100644
--- a/srcpkgs/colord/template
+++ b/srcpkgs/colord/template
@@ -32,8 +32,6 @@ fi
 # Package build options
 build_options="gir systemd"
 build_options_default="systemd"
-desc_option_gir="Enable support for building gobject introspection data"
-desc_option_systemd="Enable support for systemd"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template
index 3f3557e5505..e9500230d1c 100644
--- a/srcpkgs/dbus/template
+++ b/srcpkgs/dbus/template
@@ -23,7 +23,6 @@ conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
 
 # Package build options
 build_options="systemd"
-desc_option_systemd="Enable support for systemd"
 
 # Disable systemd option for *-musl.
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index cfebeeed849..ff39d274c17 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -30,15 +30,6 @@ fi
 
 # Package build options
 build_options="framebuffer gles2 harfbuzz opengl pulseaudio systemd wayland x11"
-desc_option_framebuffer="Enable support for the Framebuffer"
-desc_option_gles2="Enable support for GLESv2"
-desc_option_harfbuzz="enable support for Harfbuzz"
-desc_option_opengl="Enable support for OpenGL"
-desc_option_pulseaudio="Enable support for Pulseaudio"
-desc_option_systemd="Enable support for systemd"
-desc_option_wayland="Enable support for Wayland"
-desc_option_x11="Enable support for X11"
-
 # Enable harfbuzz, pulseaudio, systemd and wayland by default.
 build_options_default="harfbuzz pulseaudio systemd wayland x11"
 
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index fe7db30f2e7..e8c3156941d 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -15,14 +15,6 @@ checksum=0098ca3204813d69cd8412045ba33e8701fa2062f4bff56bedafc064979eef41
 
 # Package build options
 build_options="dbus jpeg tiff gif png svg xml imagemagick"
-desc_option_dbus="Enable support for dbus"
-desc_option_jpeg="Enable support for JPEG images"
-desc_option_tiff="Enable support for TIFF images"
-desc_option_gif="Enable support for GIF images"
-desc_option_png="Enable support for PNG images"
-desc_option_svg="Enable support for SVG images"
-desc_option_imagemagick="Enable support for ImageMagick"
-desc_option_xml="Enable support for XML parsing"
 
 if [ "$build_option_dbus" ]; then
 	configure_args+=" --with-dbus"
diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template
index 235de6bd608..dd80e809e90 100644
--- a/srcpkgs/enlightenment/template
+++ b/srcpkgs/enlightenment/template
@@ -22,8 +22,6 @@ checksum=e99b1d8a9c64dad80611310bd3dc3a7b6d9eaefbd21d0f4a3c350aed9137ca13
 # Package build options
 build_options="systemd wayland"
 build_options_default="systemd wayland"
-desc_option_systemd="Enable support for systemd"
-desc_option_wayland="Enable support for wayland"
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --enable-systemd"
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index 94e9a255730..33406f070da 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -23,7 +23,6 @@ system_groups="input:25"
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 if [ "$build_option_gir" ]; then
 	configure_args+=" --enable-introspection"
diff --git a/srcpkgs/evas_generic_loaders/template b/srcpkgs/evas_generic_loaders/template
index a88ec21b111..0a829f4f7ee 100644
--- a/srcpkgs/evas_generic_loaders/template
+++ b/srcpkgs/evas_generic_loaders/template
@@ -14,12 +14,6 @@ distfiles="http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${ve
 checksum=56bee455b31aee39429e3e8bf67e2a2f0109d9a19da9dac17a3b971e5b32a55a
 
 build_options="gstreamer pdf ps raw svg"
-desc_option_gstreamer="Enable support to preview video files"
-desc_option_pdf="Enable support to preview PDF files"
-desc_option_ps="Enable support to preview PS files"
-desc_option_svg="Enable support to preview SVG files"
-desc_option_raw="Enable support to preview RAW files"
-
 build_options_default="gstreamer pdf raw"
 # XXX disable ps and svg options in cross mode.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template
index 078363324be..f45696e1b6f 100644
--- a/srcpkgs/gcr/template
+++ b/srcpkgs/gcr/template
@@ -19,7 +19,6 @@ checksum=456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template
index 804b59644f5..be87d6ff6c9 100644
--- a/srcpkgs/gdb/template
+++ b/srcpkgs/gdb/template
@@ -1,7 +1,7 @@
 # Template file for 'gdb'
 pkgname=gdb
 version=7.7.1
-revision=1
+revision=2
 patch_args="-Np1"
 build_style=gnu-configure
 configure_args="--disable-werror --disable-nls --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit"
@@ -18,7 +18,7 @@ checksum=0dbd5260406f1b0c70fcf027c6488527fadde0cd9bb574593491fe076eb03aa5
 # Package build options
 build_options="gdbserver static"
 desc_option_gdbserver="Enable support for building GDB server"
-desc_option_static="Enable support for building GDB statically"
+desc_option_gdbstatic="Enable support for building GDB statically"
 
 # Enable gdbserver if !static.
 build_options_default="gdbserver"
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index be8075ac137..36b3c064380 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -16,7 +16,6 @@ checksum=4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gdl/template b/srcpkgs/gdl/template
index 5b31da123b2..d4ab263522a 100644
--- a/srcpkgs/gdl/template
+++ b/srcpkgs/gdl/template
@@ -14,7 +14,6 @@ checksum=4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template
index 82ce5e8c8dc..db42ed7009a 100644
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@@ -35,8 +35,6 @@ checksum=cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4
 
 # Package build options
 build_options="gir systemd"
-desc_option_gir="Enable support for building gobject introspection data"
-desc_option_systemd="Enable support for systemd"
 
 build_options_default="systemd"
 # Disable gir for cross builds.
diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template
index b054c104e2d..aef16925c46 100644
--- a/srcpkgs/geoclue2/template
+++ b/srcpkgs/geoclue2/template
@@ -24,7 +24,6 @@ lib32disabled=yes
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template
index 0aedd7a5c07..2ea73a4b004 100644
--- a/srcpkgs/geocode-glib/template
+++ b/srcpkgs/geocode-glib/template
@@ -15,7 +15,6 @@ checksum=5ca581a927cac3025adc2afadfdaf9a493ca887537a548aa47296bc77bcfa49e
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 474be1ed642..6b9eb2edd83 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -19,7 +19,6 @@ lib32disabled=yes
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template
index c8f2cd3338c..f0438586b9f 100644
--- a/srcpkgs/gnome-disk-utility/template
+++ b/srcpkgs/gnome-disk-utility/template
@@ -19,7 +19,6 @@ checksum=5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e
 
 # Package build options
 build_options="gir systemd"
-desc_option_systemd="Enable support for systemd"
 build_options_default="systemd"
 
 if [ "$build_option_systemd" ]; then
diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template
index 5eaef7fb6b4..5f4079db97d 100644
--- a/srcpkgs/gnome-session/template
+++ b/srcpkgs/gnome-session/template
@@ -19,7 +19,6 @@ checksum=fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3
 
 # Package build options
 build_options="systemd"
-desc_option_systemd="Enable support for systemd"
 build_options_default="systemd"
 
 if [ "$build_option_systemd" ]; then
diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 028bdd8d9d2..41b3c3f9b54 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -25,7 +25,6 @@ checksum=3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71
 # Package build options
 build_options="systemd"
 build_options_default="systemd"
-desc_option_systemd="Enable support for systemd"
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --enable-systemd"
diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template
index a86d8aaf23b..7804fdae10b 100644
--- a/srcpkgs/gnome-system-monitor/template
+++ b/srcpkgs/gnome-system-monitor/template
@@ -16,7 +16,6 @@ checksum=ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8
 
 # Package build options
 build_options="systemd"
-desc_option_systemd="Enable support for systemd"
 build_options_default="systemd"
 
 if [ "$build_option_systemd" ]; then
diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template
index 5d64aade28e..93957d8c033 100644
--- a/srcpkgs/grilo/template
+++ b/srcpkgs/grilo/template
@@ -16,7 +16,6 @@ checksum=559a2470fe541b0090bcfdfac7a33e92dba967727bbab6d0eca70e5636a77b25
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template
index 06c8b4e8837..b99815981ec 100644
--- a/srcpkgs/gsettings-desktop-schemas/template
+++ b/srcpkgs/gsettings-desktop-schemas/template
@@ -14,7 +14,6 @@ checksum=da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template
index c45d3556f65..0814c8a768d 100644
--- a/srcpkgs/gssdp/template
+++ b/srcpkgs/gssdp/template
@@ -15,7 +15,6 @@ checksum=02db81cb90a86c08579fc06f55584aea6b30dc6dcc7a5b5a4864a0ecb2f3d8b5
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template
index 9d98dacc6a0..131a7da1c64 100644
--- a/srcpkgs/gst-plugins-base/template
+++ b/srcpkgs/gst-plugins-base/template
@@ -41,9 +41,6 @@ fi
 
 # Package build options
 build_options="cdparanoia gir"
-desc_option_cdparanoia="Enable support for CD audio (cdparanoia)"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable options for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="cdparanoia gir"
diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index fdf42409122..54e7b9e150f 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -25,9 +25,6 @@ fi
 
 # Package build options
 build_options="cdparanoia gir"
-desc_option_cdparanoia="Enable support for CD audio (cdparanoia)"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable options for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="cdparanoia gir"
diff --git a/srcpkgs/gstreamer/template b/srcpkgs/gstreamer/template
index 3490fd15daa..180f7bb216d 100644
--- a/srcpkgs/gstreamer/template
+++ b/srcpkgs/gstreamer/template
@@ -15,7 +15,6 @@ checksum=9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index 9695f069720..7a9116751e8 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -17,7 +17,6 @@ checksum=1e7ca67a7870a82c9ed51d51d0008cdbc550c41d64cc3ff3f9a1c2fc311b4929
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 7bff1fcf24d..d4a915feda4 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -38,7 +38,6 @@ post_install() {
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template
index 660356ded92..c4a2394638b 100644
--- a/srcpkgs/gtk+3/template
+++ b/srcpkgs/gtk+3/template
@@ -23,11 +23,6 @@ conf_files="/etc/gtk-3.0/im-multipress.conf"
 # Package build options
 build_options="broadway colord cups gir wayland x11"
 desc_option_broadway="Enable support for the HTML5 Broadway backend"
-desc_option_colord="Enable support for colord"
-desc_option_cups="Enable support for the cups print backend"
-desc_option_gir="Enable support for gobject introspection data"
-desc_option_wayland="Enable support for the Wayland backend"
-desc_option_x11="Enable support for the X11 backend"
 
 # Enable all options by default.
 build_options_default="colord cups broadway wayland x11"
diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template
index ceb321ca71a..330705c2e14 100644
--- a/srcpkgs/gtksourceview/template
+++ b/srcpkgs/gtksourceview/template
@@ -15,7 +15,6 @@ checksum=62a31eee00f633d7959efb7eec44049ebd0345d670265853dcd21c057f3f30ad
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template
index 110d1c68258..d04c63d1906 100644
--- a/srcpkgs/gucharmap/template
+++ b/srcpkgs/gucharmap/template
@@ -16,7 +16,6 @@ checksum=5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gupnp-av/template b/srcpkgs/gupnp-av/template
index 66dee5555d4..86e45956813 100644
--- a/srcpkgs/gupnp-av/template
+++ b/srcpkgs/gupnp-av/template
@@ -15,7 +15,6 @@ checksum=e0553d60dd7c7277c65c02a68a270c4dcb9036a4c7075c902fc8111c6a5e6a44
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template
index 0e5c7520445..8c712c7a1b8 100644
--- a/srcpkgs/gupnp-dlna/template
+++ b/srcpkgs/gupnp-dlna/template
@@ -15,7 +15,6 @@ checksum=158a22dc9c11645817596322e2516701f0d49e40f1892ddc8832afd26221c5c3
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gupnp-igd/template b/srcpkgs/gupnp-igd/template
index 61bc10f79a9..545f359cbb2 100644
--- a/srcpkgs/gupnp-igd/template
+++ b/srcpkgs/gupnp-igd/template
@@ -15,7 +15,6 @@ checksum=ccaf49f9d4f38ac646f1b00341d4db767291e56592286da0e0eb0835811f462d
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template
index 0b6cf0fe9d2..627cd7343a4 100644
--- a/srcpkgs/gupnp/template
+++ b/srcpkgs/gupnp/template
@@ -15,7 +15,6 @@ checksum=205d47b950a1b7190df1115f454cb38a44d71aacfec75d4287299e400e139b69
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template
index 4b5bacc4ed4..24efba9faa6 100644
--- a/srcpkgs/gvfs/template
+++ b/srcpkgs/gvfs/template
@@ -22,7 +22,6 @@ checksum=84d9412e7bedfba902696ae7fb0cfceb0b66b98823f8388745b20693e3b24f8e
 # Package build options
 build_options="systemd"
 build_options_default="systemd"
-desc_option_systemd="Enable support for systemd"
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --enable-systemd"
diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template
index d8836fddbee..eb0d708f7ad 100644
--- a/srcpkgs/ibus/template
+++ b/srcpkgs/ibus/template
@@ -21,7 +21,6 @@ checksum=94c35138340b3a449f72456c3c77cc9e4f39283ddf9cfbebdbacf6387541343f
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index 092ae5a166c..9660d32c6c6 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -14,7 +14,6 @@ checksum=887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template
index e705f7a0e38..27ed93446c6 100644
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@@ -19,7 +19,6 @@ checksum=0ab01c1cdc4fbd692ce765e80478bc2d9663a7c55a5c75cc7ac421366ee6ae2b
 # Package build options
 build_options="systemd"
 build_options_default="systemd"
-desc_option_systemd="Enable support for systemd"
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --enable-multi-seat"
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index f9a63af836e..a098d5f0216 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -27,11 +27,6 @@ fi
 
 # Package build options
 build_options="acl expat lzo ssl"
-desc_option_acl="Enable support for ACLs and Extended Attributes"
-desc_option_expat="Enable support for XAR format through expat"
-desc_option_lzo="Enable support for LZO format"
-desc_option_ssl="Enable support for mtree/XAR hashes"
-
 # Enable acl and ssl by default.
 build_options_default="acl ssl"
 
diff --git a/srcpkgs/libchamplain/template b/srcpkgs/libchamplain/template
index 0173977dc18..7fc3f498ba3 100644
--- a/srcpkgs/libchamplain/template
+++ b/srcpkgs/libchamplain/template
@@ -15,7 +15,6 @@ checksum=b607fa7e32dd67e5d9541d620abb212a85d076d1def0252c0112a362bddeac5e
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 34c3151b845..e71136dcff2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -18,7 +18,6 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libgee/template b/srcpkgs/libgee/template
index 74b99a5faba..ebe339d4928 100644
--- a/srcpkgs/libgee/template
+++ b/srcpkgs/libgee/template
@@ -15,7 +15,6 @@ checksum=a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libgee08/template b/srcpkgs/libgee08/template
index 4158c4f76ed..075b4ff6a67 100644
--- a/srcpkgs/libgee08/template
+++ b/srcpkgs/libgee08/template
@@ -16,7 +16,6 @@ checksum=08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 65540f7e4d6..abef1c1b633 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -15,7 +15,6 @@ checksum=052cf1121ba823359afe534c425f7e216c6a2b1a2b316dee279dcf9032423772
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template
index 4c907af8e86..107d45c765c 100644
--- a/srcpkgs/libgsf/template
+++ b/srcpkgs/libgsf/template
@@ -15,7 +15,6 @@ checksum=cb48c3480be4a691963548e664308f497d93c9d7bc12cf6a68d5ebae930a5b70
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libgtop/template b/srcpkgs/libgtop/template
index 59c86332444..9c67e946577 100644
--- a/srcpkgs/libgtop/template
+++ b/srcpkgs/libgtop/template
@@ -15,7 +15,6 @@ checksum=c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libgudev/template b/srcpkgs/libgudev/template
index 365de27afc7..f15398fe937 100644
--- a/srcpkgs/libgudev/template
+++ b/srcpkgs/libgudev/template
@@ -39,8 +39,6 @@ do_install() {
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 7f256853f80..bf99fe045f7 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -15,7 +15,6 @@ checksum=900103ff24a851ef8395b992236ced0aedb4c265ef2264f6ad8349300095198b
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template
index c5458dd74e8..569b818c9bd 100644
--- a/srcpkgs/libgxps/template
+++ b/srcpkgs/libgxps/template
@@ -16,7 +16,6 @@ checksum=39d104739bf0db43905c315de1d8002460f1a098576f4418f69294013a5820be
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/liblogging/template b/srcpkgs/liblogging/template
index 93e44821bcd..dde4e9ee3ad 100644
--- a/srcpkgs/liblogging/template
+++ b/srcpkgs/liblogging/template
@@ -14,7 +14,6 @@ checksum=1fecfdc506ee937c21c30d868c76842506dc34ea5eb168b81fd11eb9483e4388
 
 # Package build options
 build_options="systemd"
-desc_option_systemd="Enable support for systemd journal"
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --enable-journal"
diff --git a/srcpkgs/libmediaart/template b/srcpkgs/libmediaart/template
index 155b99ed6ca..9568c21e01f 100644
--- a/srcpkgs/libmediaart/template
+++ b/srcpkgs/libmediaart/template
@@ -15,7 +15,6 @@ checksum=e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template
index bee05181612..b4b66f724eb 100644
--- a/srcpkgs/libnotify/template
+++ b/srcpkgs/libnotify/template
@@ -15,7 +15,6 @@ checksum=0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template
index 75008f04ebd..51244fc535c 100644
--- a/srcpkgs/libosinfo/template
+++ b/srcpkgs/libosinfo/template
@@ -15,7 +15,6 @@ checksum=564bd487a39dc09a10917c1d7a95f739ee7701d9cd0fbabcacea64f615e20a2d
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template
index 20c02d05ee2..29db1f57d44 100644
--- a/srcpkgs/libpcap/template
+++ b/srcpkgs/libpcap/template
@@ -21,9 +21,6 @@ post_install() {
 build_options="bluetooth dbus usb"
 build_options_default="usb"
 
-desc_option_bluetooth="Enable support for bluetooth sniffing"
-desc_option_dbus="Enable support for dbus"
-desc_option_usb="Enable support for USB sniffing"
 
 if [ "$build_option_bluetooth" ]; then
 	configure_args+=" --enable-bluetooth"
diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template
index e25e9bedb6c..16a2ce4bccc 100644
--- a/srcpkgs/librsvg/template
+++ b/srcpkgs/librsvg/template
@@ -17,7 +17,6 @@ checksum=48049b643294636df7de1a4b997414d699666f5dc44776945c218a257d2a291c
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libsecret/template b/srcpkgs/libsecret/template
index 0fa671e1144..e55d169881e 100644
--- a/srcpkgs/libsecret/template
+++ b/srcpkgs/libsecret/template
@@ -15,7 +15,6 @@ checksum=0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template
index 6024685af68..2a5b71cf1e9 100644
--- a/srcpkgs/libsoup/template
+++ b/srcpkgs/libsoup/template
@@ -16,7 +16,6 @@ checksum=fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libunique/template b/srcpkgs/libunique/template
index 80e91fae465..5a879c6668d 100644
--- a/srcpkgs/libunique/template
+++ b/srcpkgs/libunique/template
@@ -15,7 +15,6 @@ checksum=50269a87c7aabf1e25f01b3bbb280133138ffd7b6776289894c614a4b6ca968d
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libunique1/template b/srcpkgs/libunique1/template
index c7f9672622c..1e865e4c0d1 100644
--- a/srcpkgs/libunique1/template
+++ b/srcpkgs/libunique1/template
@@ -17,7 +17,6 @@ checksum=e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 964b3b376ef..e8e36247873 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -15,7 +15,6 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/libxklavier/template b/srcpkgs/libxklavier/template
index 6e5eac59a69..04430915436 100644
--- a/srcpkgs/libxklavier/template
+++ b/srcpkgs/libxklavier/template
@@ -16,8 +16,6 @@ checksum=ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 1f1cab0b89d..0becbf7549f 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -42,13 +42,6 @@ post_install() {
 
 # Package build options
 build_options="jack lame mpcdec pulseaudio systemd wavpack"
-desc_option_jack="Enable support for the JACK sound server"
-desc_option_lame="Enable support for the LAME encoder"
-desc_option_mpcdec="Enable support for the Musepack decoder"
-desc_option_systemd="Enable support for systemd"
-desc_option_pulseaudio="Enable support for the PulseAudio sound server"
-desc_option_wavpack="Enable support for the Wavpack decoder"
-
 build_options_default="systemd pulseaudio"
 
 if [ "$build_option_jack" ]; then
diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 4c46f8ec453..d3adbf22318 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -13,12 +13,6 @@ checksum=2bf0c5c7e78f9905f48de235a75111a1a88238793043bbeae00360b22f1a5f88
 
 # Package build options
 build_options="openssl gnutls idn sasl gnome"
-desc_option_openssl="Enable support for SSL with OpenSSL"
-desc_option_gnutls="Enable support for SSL with gnutls"
-desc_option_idn="Enable support for IDN"
-desc_option_sasl="Enable support for SASL"
-desc_option_gnome="Enable support for gnome-keyring"
-
 build_options_default="openssl idn"
 
 if [ "$build_option_openssl" ]; then
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 66f24eb1e48..8536bb061b8 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -20,7 +20,6 @@ checksum=46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 2e47f21cd73..e99b309af8a 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -16,8 +16,6 @@ checksum=b5b04f559bb533efc6821f2e62d83af8d196f7aa29a3710ff1e898d4e3c28a6f
 
 # Package build options
 build_options="ssl"
-desc_option_ssl="Enable support for SSL"
-
 # Enable ssl by default.
 build_options_default="ssl"
 
diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 2a0b37cc7be..3d3203fcd1f 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -14,9 +14,6 @@ checksum=3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5
 
 # Package build options
 build_options="lua ssl"
-desc_option_lua="Enable support for Lua scripting"
-desc_option_ssl="Enable support for SSL"
-
 # Enable ssl option by default.
 build_options_default="ssl"
 
diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template
index ab30e6f0f5d..0ed3bdf10ba 100644
--- a/srcpkgs/openbox/template
+++ b/srcpkgs/openbox/template
@@ -21,7 +21,6 @@ checksum=128fb4ef11f83f6edb1685cfc04f44a16a5322082fc519f9d7cac84fc658af33
 
 # Package build options
 build_options="svg"
-desc_option_svg="Enable support for SVG icons"
 
 if [ "$build_option_svg" ]; then
 	configure_args+=" --enable-librsvg"
diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 38c06f8806e..8ffa14b7228 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -18,8 +18,6 @@ checksum=be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template
index 432df83c3c4..692b73bb1a5 100644
--- a/srcpkgs/polkit/template
+++ b/srcpkgs/polkit/template
@@ -20,9 +20,6 @@ system_accounts="polkitd"
 # Package build options
 build_options="gir systemd"
 build_options_default="systemd"
-desc_option_gir="Enable support for building gobject introspection data"
-desc_option_systemd="Enable support for systemd"
-
 # Disable gir for cross builds.
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gettext-devel gtk-doc gobject-introspection"
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index bbc18c99104..030d001d9f1 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -18,8 +18,6 @@ checksum=1dd9963a82eba00b7a8c9f57a7d1d787be22f5e6cb0aead5dfe602775d0d9526
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template
index e742b91537f..b2a2b2869b0 100644
--- a/srcpkgs/procps-ng/template
+++ b/srcpkgs/procps-ng/template
@@ -17,7 +17,6 @@ checksum=00f0cb0fadf968ddf605b0ef119846af07386629244d4f3da711a2cecf4e8663
 
 # Package build options
 build_options="systemd"
-desc_option_systemd="Enable support for systemd login"
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --with-systemd"
diff --git a/srcpkgs/profanity/template b/srcpkgs/profanity/template
index 5cc758b4254..8c42640561b 100644
--- a/srcpkgs/profanity/template
+++ b/srcpkgs/profanity/template
@@ -14,8 +14,6 @@ checksum=9b65095a6bf971c423d7512433fcae95c25f2de1355fbd6d8e4794a9c72c9021
 
 # Package build options
 build_options="notify xscreensaver"
-desc_option_notify="Enable support for desktop notifications"
-desc_option_xscreensaver="Enable support for libXScrnSaver to determine idle time"
 
 if [ "$build_option_notify" ]; then
 	configure_args+=" --enable-notifications"
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 7957d4facb8..193919fdce4 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -31,7 +31,6 @@ checksum=99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939
 # Package build options
 build_options="systemd"
 build_options_default="systemd"
-desc_option_systemd="Enable support for systemd"
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --enable-systemd --enable-systemd-journal"
diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index 989ce4a933b..6000694aa12 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -21,10 +21,6 @@ conf_files="
  /etc/qingy/welcomes"
 
 build_options="pam x11"
-
-desc_option_pam="turn on PAM support"
-desc_option_x11="enable support for X server"
-
 build_options_default="pam x11"
 
 if [ "$build_option_pam" ]; then
diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template
index 9cac9b06fdf..0bca2174596 100644
--- a/srcpkgs/rest/template
+++ b/srcpkgs/rest/template
@@ -16,8 +16,6 @@ checksum=838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template
index 5e27f9c4218..e45c265d1b0 100644
--- a/srcpkgs/rsyslog/template
+++ b/srcpkgs/rsyslog/template
@@ -41,7 +41,6 @@ fi
 
 # Package build options
 build_options="systemd"
-desc_option_systemd="Enable support for systemd journal"
 
 if [ "$build_option_systemd" ]; then
 	configure_args+=" --enable-imjournal --enable-omjournal"
diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template
index ced9b4379c9..22e7f9fc05b 100644
--- a/srcpkgs/rxvt-unicode/template
+++ b/srcpkgs/rxvt-unicode/template
@@ -31,9 +31,6 @@ post_install() {
 
 # Package build options
 build_options="gdk_pixbuf perl startup_notification unicode3"
-desc_option_gdk_pixbuf="Enable support to use transparency via gdk-pixbuf"
-desc_option_perl="Enable support for perl bindings"
-desc_option_startup_notification="Enable support for desktop notification"
 desc_option_unicode3="Use 21 instead of 16 bits to represent unicode chars"
 
 # Enable startup-notification by default.
diff --git a/srcpkgs/silc-client/template b/srcpkgs/silc-client/template
index 49ccbd1a103..5eaeeb36a0c 100644
--- a/srcpkgs/silc-client/template
+++ b/srcpkgs/silc-client/template
@@ -19,7 +19,6 @@ LDFLAGS="-lncursesw"
 
 # Package build options
 build_options="perl"
-desc_option_perl="Enable support for perl scripting"
 
 if [ "$build_option_perl" ]; then
 	configure_args+=" --with-perl"
diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template
index d28a16513b1..4e79532bb93 100644
--- a/srcpkgs/systemd/template
+++ b/srcpkgs/systemd/template
@@ -45,11 +45,6 @@ lib32disabled=yes
 
 # Package build options
 build_options="efi microhttpd qrencode tcpwrappers"
-desc_option_efi="Enable support for EFI"
-desc_option_microhttpd="Enable support for microhttpd"
-desc_option_qrencode="Enable support for qrencode"
-desc_option_tcpwrappers="Enable support for tcpwrappers"
-
 # Enable EFI by default on x86.
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	build_options_default="efi"
diff --git a/srcpkgs/telepathy-farstream/template b/srcpkgs/telepathy-farstream/template
index a50d088dd80..f0a2d90c5a5 100644
--- a/srcpkgs/telepathy-farstream/template
+++ b/srcpkgs/telepathy-farstream/template
@@ -18,8 +18,6 @@ checksum=0524e09f6f3a9617b9dcb5a1c1cb75fa80afb722709f9967386a091925096413
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template
index eebb4d24336..925285ae370 100644
--- a/srcpkgs/telepathy-glib/template
+++ b/srcpkgs/telepathy-glib/template
@@ -15,8 +15,6 @@ checksum=ae0002134991217f42e503c43dea7817853afc18863b913744d51ffa029818cf
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/telepathy-logger/template b/srcpkgs/telepathy-logger/template
index 5343df341b0..e612d77fc87 100644
--- a/srcpkgs/telepathy-logger/template
+++ b/srcpkgs/telepathy-logger/template
@@ -15,8 +15,6 @@ checksum=d476f3c16fa25988ced2c0771de70542091d81b5fdd657317cad5c4b110520a2
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template
index b6f11f0a7ba..608ce738ae5 100644
--- a/srcpkgs/totem-pl-parser/template
+++ b/srcpkgs/totem-pl-parser/template
@@ -18,8 +18,6 @@ checksum=13d20222e7230eff1b22acc2b6b54d3c910590782a3ac39b859857407fb5e413
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 29f3d5e41e2..ddb465c56d1 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -23,8 +23,6 @@ checksum=76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template
index 7f5bef08c19..73222910800 100644
--- a/srcpkgs/udisks2/template
+++ b/srcpkgs/udisks2/template
@@ -19,9 +19,6 @@ checksum=5cc92fd651ee49a7888f90d091282b949afc629b31fdb34e187208750720632d
 
 # Package build options
 build_options="gir systemd"
-desc_option_gir="Enable support for building gobject introspection data"
-desc_option_systemd="Enable support for systemd"
-
 build_options_default="systemd"
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index 6c3182eb55f..c414fc79d6e 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -19,8 +19,6 @@ checksum=5f354b9949108cb21180224ef3dba33b41c9221a79f71a8f76c47f56246a39a1
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template
index 6e00b6f99ba..2b0c5ba4cb2 100644
--- a/srcpkgs/vice/template
+++ b/srcpkgs/vice/template
@@ -15,7 +15,6 @@ checksum=ff8b8d5f0f497d1f8e75b95bbc4204993a789284a08a8a59ba727ad81dcace10
 
 # Package build options
 build_options="pulseaudio"
-desc_option_pulseaudio="Enable support for Pulseaudio"
 build_options_default="pulseaudio"
 
 if [ "$build_option_pulseaudio" ]; then
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index ae7d6403b32..92edd730126 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=2.1.4
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --disable-lua --disable-live555 --disable-fluidsynth
@@ -48,12 +48,7 @@ if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
 fi
 
 # Package build options
-build_options="notify opengl qt svg v4l"
-desc_option_notify="Enable support for desktop notifications (libnotify)"
-desc_option_svg="Enable support for SVG"
-desc_option_opengl="Enable support for OpenGL"
-desc_option_qt="Enable support for building the QT UI"
-desc_option_v4l="Enable support for V4L2 (Video 4 Linux 2)"
+build_options="notify opengl qt svg v4l2"
 
 # Enable opengl by default on x86.
 if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index d0b10da71b7..cc7424b55c5 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -17,8 +17,6 @@ checksum=54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"
diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template
index 8d1f8ea48c9..6c1373dcae1 100644
--- a/srcpkgs/webkitgtk/template
+++ b/srcpkgs/webkitgtk/template
@@ -21,10 +21,6 @@ makedepends="
 
 # Package build options
 build_options="gir wayland x11"
-desc_option_gir="Enable support for building gobject introspection data"
-desc_option_wayland="Enable support for wayland"
-desc_option_x11="Enable support for X11"
-
 # Disable gir for cross builds.
 build_options_default="wayland x11"
 if [ -z "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template
index 870d2d0b973..1be7630d6ce 100644
--- a/srcpkgs/weston/template
+++ b/srcpkgs/weston/template
@@ -31,11 +31,6 @@ if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; the
 	build_options_default+=" vaapi"
 fi
 
-desc_option_backtrace="Enable support for backtraces via libunwind"
-desc_option_dbus="Enable support for D-BUS"
-desc_option_systemd="Enable support for systemd"
-desc_option_vaapi="Enable support for VA-API H.264 recording"
-
 if [ "$build_option_backtrace" ]; then
 	configure_args+=" --enable-libunwind"
 	makedepends+=" libunwind-devel"
diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index cea1bb24128..68f6ddb5710 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -14,7 +14,6 @@ checksum=175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576
 
 # Package build options
 build_options="perl"
-desc_option_perl="Enable support for perl bindings"
 
 if [ "$build_option_perl" ]; then
 	configure_args+=" --enable-perl-bindings"
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index aed13ab8c44..a5767486582 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -39,10 +39,6 @@ provides="xserver-abi-extension-8_1 xserver-abi-input-20_1 xserver-abi-video-15_
 
 # Package build options
 build_options="dri dri2 opengl"
-desc_option_dri="Enable support for the DRI extension"
-desc_option_dri2="Enable support for the DRI2 extension"
-desc_option_opengl="Enable support for OpenGL/GLX and DRI"
-
 # enable dri2 for all platforms via libdri2.
 build_options_default="dri2"
 
diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template
index a18d858c664..ab60ad89a31 100644
--- a/srcpkgs/zeitgeist/template
+++ b/srcpkgs/zeitgeist/template
@@ -20,8 +20,6 @@ checksum=769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061
 
 # Package build options
 build_options="gir"
-desc_option_gir="Enable support for building gobject introspection data"
-
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="gir"