public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/spacefm/, sys-cluster/corosync/, sys-process/procps/, ...
@ 2020-02-23 14:17 David Seifert
  0 siblings, 0 replies; only message in thread
From: David Seifert @ 2020-02-23 14:17 UTC (permalink / raw
  To: gentoo-commits

commit:     24d75f9c5369eceacf7fd61ea241f21934545d6b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 14:16:51 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 14:16:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24d75f9c

*/*: [QA] Remove redundant --docdir/--htmldir

Closes: https://github.com/gentoo/gentoo/pull/14742
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-admin/clsync/clsync-0.4.2.ebuild                           |  3 +--
 app-backup/bacula/bacula-9.0.8-r1.ebuild                       |  5 +----
 app-backup/bacula/bacula-9.2.2-r2.ebuild                       |  5 +----
 app-backup/bacula/bacula-9.4.1-r2.ebuild                       |  5 +----
 app-backup/bacula/bacula-9.4.2-r1.ebuild                       |  5 +----
 app-backup/bacula/bacula-9.4.3-r1.ebuild                       |  5 +----
 app-backup/bacula/bacula-9.4.4-r1.ebuild                       |  5 +----
 app-backup/bacula/bacula-9.4.4-r2.ebuild                       |  3 ---
 app-backup/bareos/bareos-16.2.7-r1.ebuild                      |  3 +--
 app-backup/bareos/bareos-17.2.6.ebuild                         |  6 +-----
 app-backup/bareos/bareos-17.2.7-r1.ebuild                      |  6 +-----
 app-backup/snapper/snapper-0.5.6-r1.ebuild                     |  3 +--
 app-backup/snapper/snapper-0.8.4.ebuild                        |  3 +--
 app-backup/snapper/snapper-0.8.5.ebuild                        |  3 +--
 app-backup/snapper/snapper-0.8.6.ebuild                        |  1 -
 app-editors/vis/vis-0.5.ebuild                                 |  4 ++--
 app-editors/vis/vis-9999.ebuild                                |  4 ++--
 app-editors/zile/zile-2.4.14.ebuild                            |  1 -
 app-emacs/auctex/auctex-11.92.ebuild                           |  4 ++--
 app-emacs/auctex/auctex-12.1-r1.ebuild                         |  4 ++--
 app-emacs/auctex/auctex-12.2.ebuild                            |  4 ++--
 .../ganeti-instance-debootstrap-0.11-r1.ebuild                 |  6 +-----
 .../ganeti-instance-debootstrap-0.16.ebuild                    |  6 +-----
 app-emulation/wine-staging/wine-staging-4.19.ebuild            |  2 --
 app-emulation/wine-staging/wine-staging-4.20.ebuild            |  2 --
 app-emulation/wine-staging/wine-staging-4.21.ebuild            |  2 --
 app-emulation/wine-staging/wine-staging-5.0.ebuild             |  2 --
 app-emulation/wine-staging/wine-staging-5.1.ebuild             |  2 --
 app-emulation/wine-staging/wine-staging-5.2.ebuild             |  2 --
 app-emulation/wine-staging/wine-staging-9999.ebuild            |  2 --
 app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild           |  2 --
 app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild           |  2 --
 app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild           |  2 --
 app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild             |  2 --
 app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild            |  2 --
 app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild            |  2 --
 app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild            |  2 --
 app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild             |  2 --
 app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild             |  2 --
 app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild             |  2 --
 app-emulation/wine-vanilla/wine-vanilla-9999.ebuild            |  2 --
 app-misc/dateutils/dateutils-0.4.6.ebuild                      |  6 +-----
 app-shells/bash/bash-4.4_p23-r1.ebuild                         |  2 --
 app-shells/bash/bash-5.0_p11.ebuild                            |  2 --
 app-shells/bash/bash-5.0_p16.ebuild                            |  2 --
 .../groonga-normalizer-mysql-1.1.1.ebuild                      |  4 +---
 app-text/groonga/groonga-6.1.2.ebuild                          |  3 +--
 app-text/groonga/groonga-8.0.2.ebuild                          |  5 ++---
 dev-db/pgbouncer/pgbouncer-1.10.0.ebuild                       |  3 +--
 dev-db/pgbouncer/pgbouncer-1.11.0.ebuild                       |  3 +--
 dev-db/pgbouncer/pgbouncer-1.12.0.ebuild                       |  3 +--
 dev-db/pgbouncer/pgbouncer-1.9.0.ebuild                        |  3 +--
 dev-db/postgresql/postgresql-10.10.ebuild                      |  1 -
 dev-db/postgresql/postgresql-10.11.ebuild                      |  1 -
 dev-db/postgresql/postgresql-10.12.ebuild                      |  1 -
 dev-db/postgresql/postgresql-10.9.ebuild                       |  1 -
 dev-db/postgresql/postgresql-11.4.ebuild                       |  1 -
 dev-db/postgresql/postgresql-11.5.ebuild                       |  1 -
 dev-db/postgresql/postgresql-11.6.ebuild                       |  1 -
 dev-db/postgresql/postgresql-11.7.ebuild                       |  1 -
 dev-db/postgresql/postgresql-12.0.ebuild                       |  1 -
 dev-db/postgresql/postgresql-12.1.ebuild                       |  1 -
 dev-db/postgresql/postgresql-12.2.ebuild                       |  1 -
 dev-db/postgresql/postgresql-9.4.22-r1.ebuild                  |  1 -
 dev-db/postgresql/postgresql-9.4.22.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.4.23.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.4.24.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.4.25.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.4.26.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.5.17-r1.ebuild                  |  1 -
 dev-db/postgresql/postgresql-9.5.17.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.5.18.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.5.19.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.5.20.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.5.21.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.6.13-r1.ebuild                  |  1 -
 dev-db/postgresql/postgresql-9.6.13.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.6.14.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.6.15.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.6.16.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9.6.17.ebuild                     |  1 -
 dev-db/postgresql/postgresql-9999.ebuild                       |  1 -
 dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild                         |  1 -
 dev-embedded/sdcc/sdcc-4.0.0.ebuild                            |  1 -
 dev-embedded/sdcc/sdcc-9999.ebuild                             |  1 -
 dev-java/icedtea/icedtea-3.15.0.ebuild                         |  2 --
 dev-java/tijmp/tijmp-0.8-r1.ebuild                             |  6 +-----
 dev-lang/R/R-3.4.1.ebuild                                      |  1 -
 dev-lang/R/R-3.5.3.ebuild                                      |  1 -
 dev-lang/R/R-3.6.0.ebuild                                      |  1 -
 dev-lang/R/R-3.6.2.ebuild                                      |  1 -
 dev-lang/ruby/ruby-2.4.9.ebuild                                |  1 -
 dev-lang/ruby/ruby-2.5.7.ebuild                                |  1 -
 dev-lang/ruby/ruby-2.6.5.ebuild                                |  1 -
 dev-lang/ruby/ruby-2.7.0.ebuild                                |  1 -
 dev-libs/libatasmart/libatasmart-0.19_p5.ebuild                |  6 +-----
 dev-libs/libclsync/libclsync-0.4.2.ebuild                      |  1 -
 dev-libs/libdaemon/libdaemon-0.14-r3.ebuild                    |  1 -
 dev-libs/libpcre2/libpcre2-10.32.ebuild                        |  1 -
 dev-libs/libpcre2/libpcre2-10.33-r1.ebuild                     |  1 -
 dev-libs/libpcre2/libpcre2-10.34.ebuild                        |  1 -
 dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild            |  6 +++---
 dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild            |  6 +++---
 dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild            |  6 +++---
 dev-libs/mpfr/mpfr-4.0.0-r1.ebuild                             |  6 ++----
 dev-libs/mpfr/mpfr-4.0.1.ebuild                                |  6 ++----
 dev-libs/mpfr/mpfr-4.0.2.ebuild                                |  4 +---
 dev-libs/openct/openct-0.6.20-r4.ebuild                        |  2 --
 dev-libs/ppl/ppl-1.2-r1.ebuild                                 |  3 +--
 dev-libs/uriparser/uriparser-0.9.1.ebuild                      |  5 ++---
 dev-python/dbus-python/dbus-python-1.2.4.ebuild                |  1 -
 dev-scheme/gambit/gambit-4.8.8-r1.ebuild                       |  6 +++---
 dev-scheme/gambit/gambit-4.8.8-r2.ebuild                       |  6 +++---
 dev-scheme/gambit/gambit-4.9.3.ebuild                          |  6 +++---
 dev-scheme/racket/racket-7.2.ebuild                            |  3 +--
 dev-scheme/racket/racket-7.3.ebuild                            |  3 +--
 dev-util/cpptest/cpptest-2.0.0.ebuild                          |  6 ++----
 dev-util/cunit/cunit-2.1_p3.ebuild                             |  1 -
 dev-util/gengetopt/gengetopt-2.23.ebuild                       |  6 +-----
 dev-util/google-perftools/google-perftools-2.6.2.ebuild        |  2 --
 dev-util/google-perftools/google-perftools-2.7-r1.ebuild       |  1 -
 dev-util/google-perftools/google-perftools-2.7.ebuild          |  1 -
 dev-util/gperf/gperf-3.1.ebuild                                |  4 ----
 dev-util/lttng-tools/lttng-tools-2.10.9.ebuild                 |  6 ++----
 dev-util/lttng-tools/lttng-tools-2.11.0.ebuild                 |  6 ++----
 dev-util/lttng-ust/lttng-ust-2.10.6.ebuild                     |  6 +-----
 dev-util/lttng-ust/lttng-ust-2.11.0.ebuild                     |  4 +---
 dev-util/systemtap/systemtap-3.1-r1.ebuild                     |  1 -
 games-misc/typespeed/typespeed-0.6.5-r1.ebuild                 |  3 +--
 games-mud/kildclient/kildclient-3.0.1-r1.ebuild                |  4 +---
 games-simulation/crrcsim/crrcsim-0.9.13.ebuild                 |  6 +-----
 games-strategy/naev/naev-0.6.1-r1.ebuild                       |  3 +--
 games-strategy/warzone2100/warzone2100-3.2.3.ebuild            |  3 +--
 mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild                |  4 +---
 mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild                |  2 --
 mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild                |  4 +---
 .../mate-session-manager/mate-session-manager-1.22.0.ebuild    |  3 +--
 .../mate-session-manager/mate-session-manager-1.22.1.ebuild    |  3 +--
 media-gfx/gqview/gqview-2.1.5-r2.ebuild                        |  4 +---
 media-gfx/mscgen/mscgen-0.20.ebuild                            |  6 ++----
 media-libs/libmpd/libmpd-11.8.17-r1.ebuild                     |  6 ++----
 media-libs/libogg/libogg-1.3.3.ebuild                          |  6 +-----
 media-libs/libogg/libogg-1.3.4.ebuild                          |  8 ++------
 media-libs/opusfile/opusfile-0.11.ebuild                       |  1 -
 media-radio/tlf/tlf-1.3.2.ebuild                               |  4 ++--
 media-radio/tlf/tlf-1.4.0.ebuild                               |  4 ++--
 media-radio/xlog/xlog-2.0.15.ebuild                            |  5 ++---
 media-radio/xlog/xlog-2.0.17.ebuild                            |  5 ++---
 media-sound/ezstream/ezstream-0.6.0-r1.ebuild                  |  7 ++-----
 media-sound/moc/moc-2.5.2.ebuild                               |  1 -
 media-sound/moc/moc-2.6_alpha3.ebuild                          |  1 -
 media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild                       |  1 -
 media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild                    |  3 +--
 media-sound/ncmpcpp/ncmpcpp-9999.ebuild                        |  5 ++---
 media-sound/pavucontrol/pavucontrol-4.0.ebuild                 |  3 +--
 media-sound/vimpc/vimpc-0.09.2-r1.ebuild                       |  5 ++---
 media-sound/vimpc/vimpc-0.09.2.ebuild                          |  5 ++---
 media-sound/vimpc/vimpc-9999.ebuild                            |  5 ++---
 media-video/bino/bino-1.6.7.ebuild                             |  6 ++----
 media-video/dvdbackup/dvdbackup-0.4.2.ebuild                   |  5 ++---
 media-video/mpv/mpv-0.31.0.ebuild                              |  2 --
 media-video/mpv/mpv-0.32.0.ebuild                              |  2 --
 media-video/mpv/mpv-9999.ebuild                                |  2 --
 net-analyzer/bmon/bmon-4.0.ebuild                              |  6 ++----
 net-analyzer/bmon/bmon-999.ebuild                              |  6 ++----
 net-dns/updatedd/updatedd-2.6-r5.ebuild                        |  4 ++--
 net-firewall/sanewall/sanewall-1.1.6-r2.ebuild                 |  6 +-----
 net-libs/libasyncns/libasyncns-0.8-r4.ebuild                   |  2 --
 net-libs/neon/neon-0.30.2.ebuild                               |  1 -
 net-misc/bfgminer/bfgminer-5.4.2.ebuild                        |  3 +--
 net-misc/bfgminer/bfgminer-5.5.0.ebuild                        |  3 +--
 net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild            |  1 -
 net-misc/lldpd/lldpd-1.0.3.ebuild                              |  1 -
 net-misc/lldpd/lldpd-1.0.4.ebuild                              |  3 +--
 net-misc/ntp/ntp-4.2.8_p13-r1.ebuild                           |  4 +---
 net-misc/ntp/ntp-4.2.8_p13-r2.ebuild                           |  2 --
 net-misc/ntp/ntp-4.2.8_p13.ebuild                              |  2 --
 net-proxy/privoxy/privoxy-3.0.26.ebuild                        |  1 -
 net-proxy/privoxy/privoxy-3.0.28.ebuild                        |  1 -
 net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild       |  1 -
 net-wireless/blueman/blueman-2.1.1-r1.ebuild                   |  1 -
 net-wireless/blueman/blueman-2.1.2.ebuild                      |  1 -
 net-wireless/blueman/blueman-9999.ebuild                       |  1 -
 sci-astronomy/cpl/cpl-6.6.1.ebuild                             |  1 -
 sci-astronomy/cpl/cpl-7.0.ebuild                               |  1 -
 sci-astronomy/wcslib/wcslib-5.16.ebuild                        |  1 -
 .../chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild     |  8 ++------
 .../chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild     |  3 +--
 sci-electronics/geda/geda-1.9.2-r1.ebuild                      |  3 +--
 sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild           |  6 ++----
 sci-libs/med/med-4.0.0-r1.ebuild                               |  1 -
 sci-mathematics/rw/rw-0.8-r1.ebuild                            | 10 ++++------
 sys-apps/dbus/dbus-1.12.16.ebuild                              |  2 --
 sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild          |  4 +---
 sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild             |  3 +--
 sys-apps/kmscon/kmscon-8-r1.ebuild                             |  3 +--
 sys-apps/kmscon/kmscon-8_p20180906.ebuild                      |  3 +--
 sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild                      |  4 ++--
 sys-block/partimage/partimage-0.6.9-r1.ebuild                  |  2 --
 sys-boot/grub/grub-2.02-r4.ebuild                              |  1 -
 sys-boot/grub/grub-2.04-r1.ebuild                              |  1 -
 sys-boot/grub/grub-2.05_alpha20200110.ebuild                   |  1 -
 sys-boot/grub/grub-9999.ebuild                                 |  1 -
 sys-cluster/corosync/corosync-2.3.5.ebuild                     |  3 +--
 sys-cluster/corosync/corosync-2.4.2.ebuild                     |  3 +--
 sys-cluster/glusterfs/glusterfs-4.1.8.ebuild                   |  1 -
 sys-cluster/glusterfs/glusterfs-6.5.ebuild                     |  1 -
 sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild                  |  1 -
 sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild                  |  1 -
 sys-cluster/glusterfs/glusterfs-9999.ebuild                    |  1 -
 sys-cluster/mpich/mpich-3.3.ebuild                             |  3 +--
 sys-cluster/slurm/slurm-19.05.4.1.ebuild                       |  5 ++---
 sys-cluster/slurm/slurm-19.05.5.1.ebuild                       |  5 ++---
 sys-devel/automake/automake-1.10.3-r3.ebuild                   |  4 ----
 sys-devel/automake/automake-1.11.6-r3.ebuild                   |  4 ----
 sys-devel/automake/automake-1.12.6-r2.ebuild                   |  4 ----
 sys-devel/automake/automake-1.13.4-r2.ebuild                   |  4 ----
 sys-devel/automake/automake-1.14.1-r2.ebuild                   |  4 ----
 sys-devel/bison/bison-3.1.ebuild                               |  1 -
 sys-devel/bison/bison-3.3.2.ebuild                             |  3 +--
 sys-devel/bison/bison-3.4.2.ebuild                             |  3 +--
 sys-devel/bison/bison-3.5.1.ebuild                             |  1 -
 sys-devel/bison/bison-3.5.2.ebuild                             |  1 -
 sys-devel/flex/flex-2.6.4-r1.ebuild                            |  3 +--
 sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild                       |  4 +++-
 sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild                       |  5 +++--
 sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild                       |  5 +++--
 sys-power/suspend/suspend-1.0_p20190605.ebuild                 |  3 +--
 sys-process/procps/procps-3.3.15-r1.ebuild                     |  1 -
 sys-process/procps/procps-3.3.16-r1.ebuild                     |  1 -
 sys-process/procps/procps-3.3.16.ebuild                        |  3 +--
 www-client/dillo/dillo-3.0.5-r3.ebuild                         |  3 +--
 www-client/dillo/dillo-3.1_p20181005.ebuild                    |  3 +--
 www-client/dillo/dillo-9999.ebuild                             |  3 +--
 www-client/httrack/httrack-3.49.2-r2.ebuild                    |  6 ++----
 x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild             |  2 --
 x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild             |  2 --
 x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild             |  2 --
 x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild             |  2 --
 x11-libs/libvdpau/libvdpau-1.2.ebuild                          |  5 ++---
 x11-misc/spacefm/spacefm-1.0.6.ebuild                          |  3 +--
 x11-misc/spacefm/spacefm-9999.ebuild                           |  3 +--
 x11-wm/fvwm/fvwm-2.6.8-r2.ebuild                               |  3 +--
 x11-wm/fvwm/fvwm-2.6.9.ebuild                                  |  1 -
 x11-wm/openbox/openbox-3.6.1-r1.ebuild                         |  1 -
 x11-wm/openbox/openbox-3.6.1-r3.ebuild                         |  1 -
 x11-wm/openbox/openbox-9999.ebuild                             |  1 -
 247 files changed, 172 insertions(+), 532 deletions(-)

diff --git a/app-admin/clsync/clsync-0.4.2.ebuild b/app-admin/clsync/clsync-0.4.2.ebuild
index ed88b00512a..d40e8568b97 100644
--- a/app-admin/clsync/clsync-0.4.2.ebuild
+++ b/app-admin/clsync/clsync-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,7 +55,6 @@ src_configure() {
 	use extra-debug && debug_level=2
 
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-socket-library \
 		--enable-clsync \
 		--enable-debug=${debug_level} \

diff --git a/app-backup/bacula/bacula-9.0.8-r1.ebuild b/app-backup/bacula/bacula-9.0.8-r1.ebuild
index 14a98bb221b..952cb1667a9 100644
--- a/app-backup/bacula/bacula-9.0.8-r1.ebuild
+++ b/app-backup/bacula/bacula-9.0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -229,9 +229,6 @@ src_configure() {
 		$(use_with tcpd tcp-wrappers)"
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/bacula \
 		--with-subsys-dir=/var/lock/subsys \

diff --git a/app-backup/bacula/bacula-9.2.2-r2.ebuild b/app-backup/bacula/bacula-9.2.2-r2.ebuild
index ebf161bc408..7137d55ca7b 100644
--- a/app-backup/bacula/bacula-9.2.2-r2.ebuild
+++ b/app-backup/bacula/bacula-9.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -231,9 +231,6 @@ src_configure() {
 		$(use_with tcpd tcp-wrappers)"
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/bacula \
 		--with-archivedir=/var/lib/bacula/tmp \

diff --git a/app-backup/bacula/bacula-9.4.1-r2.ebuild b/app-backup/bacula/bacula-9.4.1-r2.ebuild
index 371d229b4fd..1833beec7e7 100644
--- a/app-backup/bacula/bacula-9.4.1-r2.ebuild
+++ b/app-backup/bacula/bacula-9.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -234,9 +234,6 @@ src_configure() {
 		$(use_with tcpd tcp-wrappers)"
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/bacula \
 		--with-archivedir=/var/lib/bacula/tmp \

diff --git a/app-backup/bacula/bacula-9.4.2-r1.ebuild b/app-backup/bacula/bacula-9.4.2-r1.ebuild
index 0d8fb950266..c2f2b3eb4f7 100644
--- a/app-backup/bacula/bacula-9.4.2-r1.ebuild
+++ b/app-backup/bacula/bacula-9.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -231,9 +231,6 @@ src_configure() {
 		$(use_with tcpd tcp-wrappers)"
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/bacula \
 		--with-archivedir=/var/lib/bacula/tmp \

diff --git a/app-backup/bacula/bacula-9.4.3-r1.ebuild b/app-backup/bacula/bacula-9.4.3-r1.ebuild
index 0d8fb950266..c2f2b3eb4f7 100644
--- a/app-backup/bacula/bacula-9.4.3-r1.ebuild
+++ b/app-backup/bacula/bacula-9.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -231,9 +231,6 @@ src_configure() {
 		$(use_with tcpd tcp-wrappers)"
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/bacula \
 		--with-archivedir=/var/lib/bacula/tmp \

diff --git a/app-backup/bacula/bacula-9.4.4-r1.ebuild b/app-backup/bacula/bacula-9.4.4-r1.ebuild
index 0d8fb950266..c2f2b3eb4f7 100644
--- a/app-backup/bacula/bacula-9.4.4-r1.ebuild
+++ b/app-backup/bacula/bacula-9.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -231,9 +231,6 @@ src_configure() {
 		$(use_with tcpd tcp-wrappers)"
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/bacula \
 		--with-archivedir=/var/lib/bacula/tmp \

diff --git a/app-backup/bacula/bacula-9.4.4-r2.ebuild b/app-backup/bacula/bacula-9.4.4-r2.ebuild
index cc89bff9d0a..1abaa55baab 100644
--- a/app-backup/bacula/bacula-9.4.4-r2.ebuild
+++ b/app-backup/bacula/bacula-9.4.4-r2.ebuild
@@ -214,9 +214,6 @@ src_configure() {
 		$(use_with tcpd tcp-wrappers)"
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/var/run \
 		--sysconfdir=/etc/bacula \
 		--with-archivedir=/var/lib/bacula/tmp \

diff --git a/app-backup/bareos/bareos-16.2.7-r1.ebuild b/app-backup/bareos/bareos-16.2.7-r1.ebuild
index efeb4ae8479..abcf5bd35bc 100644
--- a/app-backup/bareos/bareos-16.2.7-r1.ebuild
+++ b/app-backup/bareos/bareos-16.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -190,7 +190,6 @@ src_configure() {
 		--docdir=/usr/share/doc/${PF} \
 		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/run/bareos \
-		--sysconfdir=/etc \
 		--with-subsys-dir=/run/lock/subsys \
 		--with-working-dir=/var/lib/bareos \
 		--with-logdir=/var/log/bareos \

diff --git a/app-backup/bareos/bareos-17.2.6.ebuild b/app-backup/bareos/bareos-17.2.6.ebuild
index 25469bc0f10..487c29eb98e 100644
--- a/app-backup/bareos/bareos-17.2.6.ebuild
+++ b/app-backup/bareos/bareos-17.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -180,11 +180,7 @@ src_configure() {
 		"
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/run/bareos \
-		--sysconfdir=/etc \
 		--with-subsys-dir=/run/lock/subsys \
 		--with-working-dir=/var/lib/bareos \
 		--with-logdir=/var/log/bareos \

diff --git a/app-backup/bareos/bareos-17.2.7-r1.ebuild b/app-backup/bareos/bareos-17.2.7-r1.ebuild
index 482b98f1f33..625e9459f11 100644
--- a/app-backup/bareos/bareos-17.2.7-r1.ebuild
+++ b/app-backup/bareos/bareos-17.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -180,11 +180,7 @@ src_configure() {
 		"
 
 	econf \
-		--libdir=/usr/$(get_libdir) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-pid-dir=/run/bareos \
-		--sysconfdir=/etc \
 		--with-subsys-dir=/run/lock/subsys \
 		--with-working-dir=/var/lib/bareos \
 		--with-logdir=/var/log/bareos \

diff --git a/app-backup/snapper/snapper-0.5.6-r1.ebuild b/app-backup/snapper/snapper-0.5.6-r1.ebuild
index 9401b250071..c6f5ffca2a5 100644
--- a/app-backup/snapper/snapper-0.5.6-r1.ebuild
+++ b/app-backup/snapper/snapper-0.5.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,6 @@ src_configure() {
 	# snapper does not build without btrfs
 	local myeconfargs=(
 		--with-conf="/etc/conf.d"
-		--docdir="/usr/share/doc/${PF}"
 		--disable-zypp
 		--enable-rollback
 		--disable-ext4

diff --git a/app-backup/snapper/snapper-0.8.4.ebuild b/app-backup/snapper/snapper-0.8.4.ebuild
index 90bf21dacc2..1fcb91d4236 100644
--- a/app-backup/snapper/snapper-0.8.4.ebuild
+++ b/app-backup/snapper/snapper-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,7 +48,6 @@ src_configure() {
 	# snapper does not build without btrfs
 	local myeconfargs=(
 		--with-conf="/etc/conf.d"
-		--docdir="/usr/share/doc/${PF}"
 		--disable-zypp
 		--enable-rollback
 		--disable-ext4

diff --git a/app-backup/snapper/snapper-0.8.5.ebuild b/app-backup/snapper/snapper-0.8.5.ebuild
index 90bf21dacc2..1fcb91d4236 100644
--- a/app-backup/snapper/snapper-0.8.5.ebuild
+++ b/app-backup/snapper/snapper-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -48,7 +48,6 @@ src_configure() {
 	# snapper does not build without btrfs
 	local myeconfargs=(
 		--with-conf="/etc/conf.d"
-		--docdir="/usr/share/doc/${PF}"
 		--disable-zypp
 		--enable-rollback
 		--disable-ext4

diff --git a/app-backup/snapper/snapper-0.8.6.ebuild b/app-backup/snapper/snapper-0.8.6.ebuild
index cbaeda59655..1fcb91d4236 100644
--- a/app-backup/snapper/snapper-0.8.6.ebuild
+++ b/app-backup/snapper/snapper-0.8.6.ebuild
@@ -48,7 +48,6 @@ src_configure() {
 	# snapper does not build without btrfs
 	local myeconfargs=(
 		--with-conf="/etc/conf.d"
-		--docdir="/usr/share/doc/${PF}"
 		--disable-zypp
 		--enable-rollback
 		--disable-ext4

diff --git a/app-editors/vis/vis-0.5.ebuild b/app-editors/vis/vis-0.5.ebuild
index 8c74395178d..08274f3b376 100644
--- a/app-editors/vis/vis-0.5.ebuild
+++ b/app-editors/vis/vis-0.5.ebuild
@@ -43,8 +43,8 @@ src_prepare() {
 
 src_configure() {
 	./configure \
-		--prefix="${EROOT}usr" \
-		--docdir="${EROOT}usr/share/doc/${PF}" \
+		--prefix="${EPREFIX}"/usr \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
 		$(use_enable tre) || die

diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index b6c9bf46531..72ff783c840 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -35,8 +35,8 @@ src_prepare() {
 
 src_configure() {
 	./configure \
-		--prefix="${EROOT}usr" \
-		--docdir="${EROOT}usr/share/doc/${PF}" \
+		--prefix="${EPREFIX}"/usr \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable ncurses curses) \
 		$(use_enable selinux) \
 		$(use_enable tre) || die

diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild
index 19840271797..06dc725535f 100644
--- a/app-editors/zile/zile-2.4.14.ebuild
+++ b/app-editors/zile/zile-2.4.14.ebuild
@@ -28,7 +28,6 @@ QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
 src_configure() {
 	# --without-emacs to suppress tests for GNU Emacs #630652
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--without-emacs \
 		--disable-valgrind-tests \
 		$(use_enable acl) \

diff --git a/app-emacs/auctex/auctex-11.92.ebuild b/app-emacs/auctex/auctex-11.92.ebuild
index 0aebf21be4b..6838c569831 100644
--- a/app-emacs/auctex/auctex-11.92.ebuild
+++ b/app-emacs/auctex/auctex-11.92.ebuild
@@ -24,13 +24,13 @@ RDEPEND="${DEPEND}"
 TEXMF="/usr/share/texmf-site"
 
 src_configure() {
-	econf --with-emacs \
+	econf \
+		--with-emacs \
 		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
 		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
 		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
 		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
 		--with-texmf-dir="${EPREFIX}${TEXMF}" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-build-dir-test \
 		$(use_enable preview-latex preview)
 }

diff --git a/app-emacs/auctex/auctex-12.1-r1.ebuild b/app-emacs/auctex/auctex-12.1-r1.ebuild
index fb86bce9225..8a04c96704d 100644
--- a/app-emacs/auctex/auctex-12.1-r1.ebuild
+++ b/app-emacs/auctex/auctex-12.1-r1.ebuild
@@ -26,13 +26,13 @@ ELISP_PATCHES="${P}-autoload.patch"
 TEXMF="/usr/share/texmf-site"
 
 src_configure() {
-	econf --with-emacs \
+	econf \
+		--with-emacs \
 		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
 		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
 		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
 		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
 		--with-texmf-dir="${EPREFIX}${TEXMF}" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-build-dir-test \
 		$(use_enable preview-latex preview)
 }

diff --git a/app-emacs/auctex/auctex-12.2.ebuild b/app-emacs/auctex/auctex-12.2.ebuild
index e3c8b0f8852..5097ded47a7 100644
--- a/app-emacs/auctex/auctex-12.2.ebuild
+++ b/app-emacs/auctex/auctex-12.2.ebuild
@@ -25,13 +25,13 @@ BDEPEND="${RDEPEND}"
 TEXMF="/usr/share/texmf-site"
 
 src_configure() {
-	econf --with-emacs \
+	econf \
+		--with-emacs \
 		--with-auto-dir="${EPREFIX}/var/lib/auctex" \
 		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
 		--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
 		--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
 		--with-texmf-dir="${EPREFIX}${TEXMF}" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-build-dir-test \
 		$(use_enable preview-latex preview)
 }

diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
index 1a4184f43e4..d164143bdc9 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,10 +21,6 @@ RDEPEND="app-arch/dpkg
 	sys-apps/util-linux
 	sys-fs/e2fsprogs"
 
-src_configure() {
-	econf --docdir=/usr/share/doc/${P}
-}
-
 src_install() {
 	default
 	insinto /etc/ganeti/instance-debootstrap/hooks

diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
index a5a08c013e8..29e713715a4 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,10 +33,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf --docdir=/usr/share/doc/${P}
-}
-
 src_install() {
 	default
 

diff --git a/app-emulation/wine-staging/wine-staging-4.19.ebuild b/app-emulation/wine-staging/wine-staging-4.19.ebuild
index f9bb56131a8..bb4fe01b5c3 100644
--- a/app-emulation/wine-staging/wine-staging-4.19.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.19.ebuild
@@ -307,7 +307,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-staging/wine-staging-4.20.ebuild b/app-emulation/wine-staging/wine-staging-4.20.ebuild
index 4332ff005a6..6ba111b452e 100644
--- a/app-emulation/wine-staging/wine-staging-4.20.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.20.ebuild
@@ -307,7 +307,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-staging/wine-staging-4.21.ebuild b/app-emulation/wine-staging/wine-staging-4.21.ebuild
index 4332ff005a6..6ba111b452e 100644
--- a/app-emulation/wine-staging/wine-staging-4.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.21.ebuild
@@ -307,7 +307,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-staging/wine-staging-5.0.ebuild b/app-emulation/wine-staging/wine-staging-5.0.ebuild
index d34f7cf13bf..3b0db1275b4 100644
--- a/app-emulation/wine-staging/wine-staging-5.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.0.ebuild
@@ -307,7 +307,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-staging/wine-staging-5.1.ebuild b/app-emulation/wine-staging/wine-staging-5.1.ebuild
index 1ca4f55540c..2213437b7d5 100644
--- a/app-emulation/wine-staging/wine-staging-5.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.1.ebuild
@@ -307,7 +307,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-staging/wine-staging-5.2.ebuild b/app-emulation/wine-staging/wine-staging-5.2.ebuild
index 1de280d8335..8c609466794 100644
--- a/app-emulation/wine-staging/wine-staging-5.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.2.ebuild
@@ -307,7 +307,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index 1ca4f55540c..2213437b7d5 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -307,7 +307,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
index 40099e36b32..4f522c6c80e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.1.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
index 40099e36b32..4f522c6c80e 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.2.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
index 57ac9d517e4..f4c82a817bd 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
index dd594852087..52f615df89f 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
index 438bc6d053a..877fa2af634 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.19.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
index 6478ce87239..0e637219f91 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.20.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
index 6478ce87239..0e637219f91 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.21.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
index 18bdbc0c756..152d8c0b6dd 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
index f43c8882d2f..ce3a2cfa381 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.1.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild
index ab4b0c11da2..e7c7d4d37c7 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.2.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index f43c8882d2f..ce3a2cfa381 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -272,7 +272,6 @@ pkg_setup() {
 	MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
 	MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
 	MY_DATADIR="${MY_DATAROOTDIR}"
-	MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 	MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
 	MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
 	MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -362,7 +361,6 @@ multilib_src_configure() {
 		--prefix="${MY_PREFIX}"
 		--datarootdir="${MY_DATAROOTDIR}"
 		--datadir="${MY_DATADIR}"
-		--docdir="${MY_DOCDIR}"
 		--includedir="${MY_INCLUDEDIR}"
 		--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
 		--libexecdir="${MY_LIBEXECDIR}"

diff --git a/app-misc/dateutils/dateutils-0.4.6.ebuild b/app-misc/dateutils/dateutils-0.4.6.ebuild
index 56f3fe7bcb2..0c4b76cb20e 100644
--- a/app-misc/dateutils/dateutils-0.4.6.ebuild
+++ b/app-misc/dateutils/dateutils-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,10 +17,6 @@ DEPEND="app-arch/xz-utils
 # bug 429810
 RDEPEND="!sys-fabric/dapl"
 
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF}
-}
-
 src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }

diff --git a/app-shells/bash/bash-4.4_p23-r1.ebuild b/app-shells/bash/bash-4.4_p23-r1.ebuild
index 7f7ec01858e..867a266dbcd 100644
--- a/app-shells/bash/bash-4.4_p23-r1.ebuild
+++ b/app-shells/bash/bash-4.4_p23-r1.ebuild
@@ -106,8 +106,6 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--disable-profiling
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
 		--with-curses
 		$(use_enable mem-scramble)
 		$(use_enable net net-redirections)

diff --git a/app-shells/bash/bash-5.0_p11.ebuild b/app-shells/bash/bash-5.0_p11.ebuild
index 514ef9e6aaa..bdce76098cb 100644
--- a/app-shells/bash/bash-5.0_p11.ebuild
+++ b/app-shells/bash/bash-5.0_p11.ebuild
@@ -110,8 +110,6 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--disable-profiling
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
 		--with-curses
 		$(use_enable mem-scramble)
 		$(use_enable net net-redirections)

diff --git a/app-shells/bash/bash-5.0_p16.ebuild b/app-shells/bash/bash-5.0_p16.ebuild
index 514ef9e6aaa..bdce76098cb 100644
--- a/app-shells/bash/bash-5.0_p16.ebuild
+++ b/app-shells/bash/bash-5.0_p16.ebuild
@@ -110,8 +110,6 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--disable-profiling
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
 		--with-curses
 		$(use_enable mem-scramble)
 		$(use_enable net net-redirections)

diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
index 5bdce94124c..d61e4f8126b 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
@@ -25,9 +25,7 @@ src_prepare() {
 
 src_configure() {
 	# ruby is only uses for tests
-	econf \
-		--without-ruby \
-		--docdir="${EROOT}usr/share/doc/${P}"
+	econf --without-ruby
 }
 
 src_install() {

diff --git a/app-text/groonga/groonga-6.1.2.ebuild b/app-text/groonga/groonga-6.1.2.ebuild
index 8e0f8d56442..144873b934c 100644
--- a/app-text/groonga/groonga-6.1.2.ebuild
+++ b/app-text/groonga/groonga-6.1.2.ebuild
@@ -49,8 +49,7 @@ src_configure() {
 		--without-pcre \
 		--without-kytea \
 		--without-libstemmer \
-		--with-log-path="${EROOT}var/log/${PN}.log" \
-		--docdir="${EROOT}usr/share/doc/${P}" \
+		--with-log-path="${EPREFIX}"/var/log/${PN}.log \
 		--without-ruby \
 		$(use_enable abort) \
 		$(use_enable benchmark) \

diff --git a/app-text/groonga/groonga-8.0.2.ebuild b/app-text/groonga/groonga-8.0.2.ebuild
index c628d1b0675..c429f681ca0 100644
--- a/app-text/groonga/groonga-8.0.2.ebuild
+++ b/app-text/groonga/groonga-8.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,8 +53,7 @@ src_configure() {
 		--without-kytea
 		--without-libstemmer
 		--disable-arrow
-		--with-log-path="${EROOT%/}/var/log/${PN}.log"
-		--docdir="${EROOT%/}/usr/share/doc/${P}"
+		--with-log-path="${EPREFIX}"/var/log/${PN}.log
 		--without-ruby
 		--with-shared-onigmo
 		--with-onigmo=system

diff --git a/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild
index e10c0a287d8..7a8301aab37 100644
--- a/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,6 @@ src_prepare() {
 src_configure() {
 	# --enable-debug is only used to disable stripping
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--enable-debug \
 		$(use_with c-ares cares) \
 		$(use_enable debug cassert) \

diff --git a/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild
index 1492a74c6e8..65c33e53faa 100644
--- a/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,6 @@ src_prepare() {
 src_configure() {
 	# --enable-debug is only used to disable stripping
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--enable-debug \
 		$(use_with c-ares cares) \
 		$(use_enable debug cassert) \

diff --git a/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild
index 5d41644f4c4..3e1f0046c6e 100644
--- a/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,7 +46,6 @@ src_prepare() {
 src_configure() {
 	# --enable-debug is only used to disable stripping
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--enable-debug \
 		$(use_with c-ares cares) \
 		$(use_enable debug cassert) \

diff --git a/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
index 67cf28b802d..51abcc975d8 100644
--- a/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
+++ b/dev-db/pgbouncer/pgbouncer-1.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -42,7 +42,6 @@ src_prepare() {
 src_configure() {
 	# --enable-debug is only used to disable stripping
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--enable-debug \
 		$(use_with c-ares cares) \
 		$(use_enable debug cassert) \

diff --git a/dev-db/postgresql/postgresql-10.10.ebuild b/dev-db/postgresql/postgresql-10.10.ebuild
index e52794e837d..6c03bb2241b 100644
--- a/dev-db/postgresql/postgresql-10.10.ebuild
+++ b/dev-db/postgresql/postgresql-10.10.ebuild
@@ -148,7 +148,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-10.11.ebuild b/dev-db/postgresql/postgresql-10.11.ebuild
index bd7fac0fb3b..9f3d5ddf573 100644
--- a/dev-db/postgresql/postgresql-10.11.ebuild
+++ b/dev-db/postgresql/postgresql-10.11.ebuild
@@ -148,7 +148,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-10.12.ebuild b/dev-db/postgresql/postgresql-10.12.ebuild
index 9f30a59bc64..69f7420b961 100644
--- a/dev-db/postgresql/postgresql-10.12.ebuild
+++ b/dev-db/postgresql/postgresql-10.12.ebuild
@@ -148,7 +148,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-10.9.ebuild b/dev-db/postgresql/postgresql-10.9.ebuild
index bfeb46d7c2b..940433efaf4 100644
--- a/dev-db/postgresql/postgresql-10.9.ebuild
+++ b/dev-db/postgresql/postgresql-10.9.ebuild
@@ -148,7 +148,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-11.4.ebuild b/dev-db/postgresql/postgresql-11.4.ebuild
index f0f63a2d677..cf90681a368 100644
--- a/dev-db/postgresql/postgresql-11.4.ebuild
+++ b/dev-db/postgresql/postgresql-11.4.ebuild
@@ -149,7 +149,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-11.5.ebuild b/dev-db/postgresql/postgresql-11.5.ebuild
index 6b5733b5761..8ebae4b309d 100644
--- a/dev-db/postgresql/postgresql-11.5.ebuild
+++ b/dev-db/postgresql/postgresql-11.5.ebuild
@@ -149,7 +149,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-11.6.ebuild b/dev-db/postgresql/postgresql-11.6.ebuild
index 7a06aa0c09d..e702844d73e 100644
--- a/dev-db/postgresql/postgresql-11.6.ebuild
+++ b/dev-db/postgresql/postgresql-11.6.ebuild
@@ -149,7 +149,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-11.7.ebuild b/dev-db/postgresql/postgresql-11.7.ebuild
index 879e576f56e..a11ab4d272f 100644
--- a/dev-db/postgresql/postgresql-11.7.ebuild
+++ b/dev-db/postgresql/postgresql-11.7.ebuild
@@ -149,7 +149,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-12.0.ebuild b/dev-db/postgresql/postgresql-12.0.ebuild
index 126840b3d52..08c2785b3cc 100644
--- a/dev-db/postgresql/postgresql-12.0.ebuild
+++ b/dev-db/postgresql/postgresql-12.0.ebuild
@@ -149,7 +149,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-12.1.ebuild b/dev-db/postgresql/postgresql-12.1.ebuild
index cd199332c1e..2bd65b5c4eb 100644
--- a/dev-db/postgresql/postgresql-12.1.ebuild
+++ b/dev-db/postgresql/postgresql-12.1.ebuild
@@ -149,7 +149,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-12.2.ebuild b/dev-db/postgresql/postgresql-12.2.ebuild
index 43b0b4634c2..5002979dee9 100644
--- a/dev-db/postgresql/postgresql-12.2.ebuild
+++ b/dev-db/postgresql/postgresql-12.2.ebuild
@@ -149,7 +149,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
index 0108773c823..f2d7377aa7a 100644
--- a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild
index 2de7ac9d889..823e2994450 100644
--- a/dev-db/postgresql/postgresql-9.4.22.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.22.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.4.23.ebuild b/dev-db/postgresql/postgresql-9.4.23.ebuild
index af2e5cbfc5e..c15fb2d1335 100644
--- a/dev-db/postgresql/postgresql-9.4.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.23.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.4.24.ebuild b/dev-db/postgresql/postgresql-9.4.24.ebuild
index 0108773c823..f2d7377aa7a 100644
--- a/dev-db/postgresql/postgresql-9.4.24.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.24.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.4.25.ebuild b/dev-db/postgresql/postgresql-9.4.25.ebuild
index c243a5ff114..cd7aa335a25 100644
--- a/dev-db/postgresql/postgresql-9.4.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.25.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.4.26.ebuild b/dev-db/postgresql/postgresql-9.4.26.ebuild
index edf5af70b27..f324c7f92bf 100644
--- a/dev-db/postgresql/postgresql-9.4.26.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.26.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
index 19566040ab2..e6b0669554f 100644
--- a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild
index 04b8485b94c..354fc7b272e 100644
--- a/dev-db/postgresql/postgresql-9.5.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.17.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.5.18.ebuild b/dev-db/postgresql/postgresql-9.5.18.ebuild
index 0a8e5066a37..41d7c9a608c 100644
--- a/dev-db/postgresql/postgresql-9.5.18.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.18.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.5.19.ebuild b/dev-db/postgresql/postgresql-9.5.19.ebuild
index 19566040ab2..e6b0669554f 100644
--- a/dev-db/postgresql/postgresql-9.5.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.19.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.5.20.ebuild b/dev-db/postgresql/postgresql-9.5.20.ebuild
index c3374ebe511..d0f85a5e61b 100644
--- a/dev-db/postgresql/postgresql-9.5.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.20.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.5.21.ebuild b/dev-db/postgresql/postgresql-9.5.21.ebuild
index 19566040ab2..e6b0669554f 100644
--- a/dev-db/postgresql/postgresql-9.5.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.21.ebuild
@@ -143,7 +143,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
index 0aac8dd1aa2..89c5a79f5ba 100644
--- a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild
@@ -147,7 +147,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild
index 2ca03de3a2c..f5aa0ed6754 100644
--- a/dev-db/postgresql/postgresql-9.6.13.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.13.ebuild
@@ -147,7 +147,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.6.14.ebuild b/dev-db/postgresql/postgresql-9.6.14.ebuild
index 3a608b2ef11..93826bb9f95 100644
--- a/dev-db/postgresql/postgresql-9.6.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.14.ebuild
@@ -147,7 +147,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.6.15.ebuild b/dev-db/postgresql/postgresql-9.6.15.ebuild
index 0aac8dd1aa2..89c5a79f5ba 100644
--- a/dev-db/postgresql/postgresql-9.6.15.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.15.ebuild
@@ -147,7 +147,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.6.16.ebuild b/dev-db/postgresql/postgresql-9.6.16.ebuild
index 33bb16a1957..d8d9249313a 100644
--- a/dev-db/postgresql/postgresql-9.6.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.16.ebuild
@@ -147,7 +147,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9.6.17.ebuild b/dev-db/postgresql/postgresql-9.6.17.ebuild
index 45ce6b6b57d..3b1d96f55f2 100644
--- a/dev-db/postgresql/postgresql-9.6.17.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.17.ebuild
@@ -147,7 +147,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild
index afbfa7686f9..200ad41f243 100644
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@@ -174,7 +174,6 @@ src_configure() {
 	econf \
 		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
 		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
 		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
 		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
 		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \

diff --git a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
index b756e19cec4..c4850e61728 100644
--- a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
@@ -111,7 +111,6 @@ src_configure() {
 		$(use_enable z180 z180-port) \
 		$(use_enable z80 z80-port) \
 		--disable-doc \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache
 }
 

diff --git a/dev-embedded/sdcc/sdcc-4.0.0.ebuild b/dev-embedded/sdcc/sdcc-4.0.0.ebuild
index 010160b22da..42f67b831e1 100644
--- a/dev-embedded/sdcc/sdcc-4.0.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-4.0.0.ebuild
@@ -130,7 +130,6 @@ src_configure() {
 		$(use_enable pdk16 pdk16-port) \
 		\
 		--disable-doc \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache
 }
 

diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 010160b22da..42f67b831e1 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -130,7 +130,6 @@ src_configure() {
 		$(use_enable pdk16 pdk16-port) \
 		\
 		--disable-doc \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-ccache
 }
 

diff --git a/dev-java/icedtea/icedtea-3.15.0.ebuild b/dev-java/icedtea/icedtea-3.15.0.ebuild
index 73ff69662c2..c6bcefc57e6 100644
--- a/dev-java/icedtea/icedtea-3.15.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.15.0.ebuild
@@ -308,8 +308,6 @@ src_configure() {
 		--with-jdk-home="$(java-config -O)" \
 		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
 		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--with-pkgversion="Gentoo ${PF}" \
 		--disable-ccache \
 		--disable-downloading --disable-Werror --disable-tests \

diff --git a/dev-java/tijmp/tijmp-0.8-r1.ebuild b/dev-java/tijmp/tijmp-0.8-r1.ebuild
index a6e2774efc3..dfe78930f1a 100644
--- a/dev-java/tijmp/tijmp-0.8-r1.ebuild
+++ b/dev-java/tijmp/tijmp-0.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,10 +29,6 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
-}
-
 src_install() {
 	emake DESTDIR="${D}" jardir="/usr/share/${PN}/lib/" install
 	java-pkg_regjar "${D}/usr/share/${PN}/lib/${PN}.jar"

diff --git a/dev-lang/R/R-3.4.1.ebuild b/dev-lang/R/R-3.4.1.ebuild
index 7c3401e2fc9..ae5fc62ba09 100644
--- a/dev-lang/R/R-3.4.1.ebuild
+++ b/dev-lang/R/R-3.4.1.ebuild
@@ -133,7 +133,6 @@ src_configure() {
 		--enable-R-shlib \
 		--disable-R-framework \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable java) \
 		$(use_enable nls) \

diff --git a/dev-lang/R/R-3.5.3.ebuild b/dev-lang/R/R-3.5.3.ebuild
index 35f7ce8af6b..66c38fbe2f1 100644
--- a/dev-lang/R/R-3.5.3.ebuild
+++ b/dev-lang/R/R-3.5.3.ebuild
@@ -134,7 +134,6 @@ src_configure() {
 		--enable-R-shlib \
 		--disable-R-framework \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable java) \
 		$(use_enable nls) \

diff --git a/dev-lang/R/R-3.6.0.ebuild b/dev-lang/R/R-3.6.0.ebuild
index 35f7ce8af6b..66c38fbe2f1 100644
--- a/dev-lang/R/R-3.6.0.ebuild
+++ b/dev-lang/R/R-3.6.0.ebuild
@@ -134,7 +134,6 @@ src_configure() {
 		--enable-R-shlib \
 		--disable-R-framework \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable java) \
 		$(use_enable nls) \

diff --git a/dev-lang/R/R-3.6.2.ebuild b/dev-lang/R/R-3.6.2.ebuild
index f3312585e0c..d9a391d0f87 100644
--- a/dev-lang/R/R-3.6.2.ebuild
+++ b/dev-lang/R/R-3.6.2.ebuild
@@ -136,7 +136,6 @@ src_configure() {
 		--enable-R-shlib \
 		--disable-R-framework \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		rdocdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable java) \
 		$(use_enable nls) \

diff --git a/dev-lang/ruby/ruby-2.4.9.ebuild b/dev-lang/ruby/ruby-2.4.9.ebuild
index 50a46ca5fd7..a50be1bcc73 100644
--- a/dev-lang/ruby/ruby-2.4.9.ebuild
+++ b/dev-lang/ruby/ruby-2.4.9.ebuild
@@ -129,7 +129,6 @@ src_configure() {
 	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
 		--program-suffix=${MY_SUFFIX} \
 		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
 		--enable-shared \
 		--enable-pthread \
 		--disable-rpath \

diff --git a/dev-lang/ruby/ruby-2.5.7.ebuild b/dev-lang/ruby/ruby-2.5.7.ebuild
index 2167019a7e9..afecac45abe 100644
--- a/dev-lang/ruby/ruby-2.5.7.ebuild
+++ b/dev-lang/ruby/ruby-2.5.7.ebuild
@@ -124,7 +124,6 @@ src_configure() {
 	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
 		--program-suffix=${MY_SUFFIX} \
 		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
 		--enable-shared \
 		--enable-pthread \
 		--disable-rpath \

diff --git a/dev-lang/ruby/ruby-2.6.5.ebuild b/dev-lang/ruby/ruby-2.6.5.ebuild
index 19cc249e9c0..0c21ba4a05f 100644
--- a/dev-lang/ruby/ruby-2.6.5.ebuild
+++ b/dev-lang/ruby/ruby-2.6.5.ebuild
@@ -127,7 +127,6 @@ src_configure() {
 	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
 		--program-suffix=${MY_SUFFIX} \
 		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
 		--enable-shared \
 		--enable-pthread \
 		--disable-rpath \

diff --git a/dev-lang/ruby/ruby-2.7.0.ebuild b/dev-lang/ruby/ruby-2.7.0.ebuild
index c99c9fc7a13..a19fc97ffdf 100644
--- a/dev-lang/ruby/ruby-2.7.0.ebuild
+++ b/dev-lang/ruby/ruby-2.7.0.ebuild
@@ -130,7 +130,6 @@ src_configure() {
 	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
 		--program-suffix=${MY_SUFFIX} \
 		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
 		--enable-shared \
 		--enable-pthread \
 		--disable-rpath \

diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
index 3a1a984b101..449170f1955 100644
--- a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -31,11 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
+	econf $(use_enable static-libs static)
 }
 
 src_install() {

diff --git a/dev-libs/libclsync/libclsync-0.4.2.ebuild b/dev-libs/libclsync/libclsync-0.4.2.ebuild
index 0da70660b85..0dac4bb0c59 100644
--- a/dev-libs/libclsync/libclsync-0.4.2.ebuild
+++ b/dev-libs/libclsync/libclsync-0.4.2.ebuild
@@ -40,7 +40,6 @@ src_configure() {
 	use extra-debug && debug_level=2
 
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-socket-library \
 		--disable-clsync \
 		--enable-debug=${debug_level} \

diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 3caddc39ff6..8afbb96151d 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -30,7 +30,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--localstatedir=/var \
 		--disable-examples \
 		--disable-lynx \

diff --git a/dev-libs/libpcre2/libpcre2-10.32.ebuild b/dev-libs/libpcre2/libpcre2-10.32.ebuild
index ecbe29ffaa0..9b45a0539d3 100644
--- a/dev-libs/libpcre2/libpcre2-10.32.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.32.ebuild
@@ -46,7 +46,6 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--enable-pcre2-8
 		--enable-shared
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
 		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
 		$(multilib_native_use_enable libedit pcre2test-libedit)

diff --git a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
index 5dc625424a0..e8f61f2b351 100644
--- a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
@@ -51,7 +51,6 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--enable-pcre2-8
 		--enable-shared
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
 		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
 		$(multilib_native_use_enable libedit pcre2test-libedit)

diff --git a/dev-libs/libpcre2/libpcre2-10.34.ebuild b/dev-libs/libpcre2/libpcre2-10.34.ebuild
index 91c82fa3b0a..c04bb553139 100644
--- a/dev-libs/libpcre2/libpcre2-10.34.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.34.ebuild
@@ -59,7 +59,6 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--enable-pcre2-8
 		--enable-shared
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
 		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
 		$(multilib_native_use_enable libedit pcre2test-libedit)

diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
index f66b7f0c74b..574171d957f 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,11 +42,11 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-libbson=system \
+	econf \
+		--with-libbson=system \
 		--disable-optimizations \
 		--disable-shm-counters \
 		--disable-examples \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
 		$(use_enable sasl) \
 		$(use_enable ssl ssl $(usex libressl libressl openssl)) \
 		$(use_enable debug) \

diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
index 1c81a8f60b9..044a3720061 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,13 +43,13 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-libbson=system \
+	econf \
+		--with-libbson=system \
 		--with-snappy=system \
 		--with-zlib=system \
 		--disable-optimizations \
 		--disable-shm-counters \
 		--disable-examples \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
 		$(use_enable sasl) \
 		$(use_enable ssl ssl $(usex libressl libressl openssl)) \
 		$(use_enable debug) \

diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
index ab6b5baaaf3..9bc7a5d5f33 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,13 +43,13 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-libbson=system \
+	econf \
+		--with-libbson=system \
 		--with-snappy=system \
 		--with-zlib=system \
 		--disable-optimizations \
 		--disable-shm-counters \
 		--disable-examples \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
 		$(use_enable sasl) \
 		$(use_enable ssl ssl $(usex libressl libressl openssl)) \
 		$(use_enable debug) \

diff --git a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
index e17798a663b..578353773d4 100644
--- a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,9 +41,7 @@ multilib_src_configure() {
 	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
 	ECONF_SOURCE=${S} \
 	user_redefine_cc=yes \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		$(use_enable static-libs static)
+	econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {

diff --git a/dev-libs/mpfr/mpfr-4.0.1.ebuild b/dev-libs/mpfr/mpfr-4.0.1.ebuild
index e17798a663b..578353773d4 100644
--- a/dev-libs/mpfr/mpfr-4.0.1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,9 +41,7 @@ multilib_src_configure() {
 	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
 	ECONF_SOURCE=${S} \
 	user_redefine_cc=yes \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		$(use_enable static-libs static)
+	econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {

diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
index eccdc09a8c6..d20f026b1fe 100644
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -41,9 +41,7 @@ multilib_src_configure() {
 	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
 	ECONF_SOURCE=${S} \
 	user_redefine_cc=yes \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		$(use_enable static-libs static)
+	econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {

diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index a56bda771cc..fbc214e2fde 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -30,8 +30,6 @@ src_configure() {
 	use debug && append-cppflags -DDEBUG_IFDH
 
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}/html" \
 		--localstatedir=/var \
 		--with-udev="$(get_udevdir)" \
 		--enable-non-privileged \

diff --git a/dev-libs/ppl/ppl-1.2-r1.ebuild b/dev-libs/ppl/ppl-1.2-r1.ebuild
index f522c2384bc..12b2ca6d037 100644
--- a/dev-libs/ppl/ppl-1.2-r1.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -24,7 +24,6 @@ src_configure() {
 	local interfaces=( c )
 	use cxx && interfaces+=( cxx )
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--disable-debugging \
 		--disable-optimization \
 		$(use_enable doc documentation) \

diff --git a/dev-libs/uriparser/uriparser-0.9.1.ebuild b/dev-libs/uriparser/uriparser-0.9.1.ebuild
index b7f5ae2164e..e5976afb480 100644
--- a/dev-libs/uriparser/uriparser-0.9.1.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,8 +28,7 @@ src_configure() {
 		$(use_enable test) \
 		--enable-char \
 		$(use_enable unicode wchar_t) \
-		$(use_enable doc) \
-		--docdir=/usr/share/doc/${PF}/
+		$(use_enable doc)
 }
 
 src_install() {

diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
index 68619725196..22592fd9a38 100644
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -50,7 +50,6 @@ src_configure() {
 		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
 
 		econf \
-			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 			--disable-html-docs \
 			${apidocs} \
 			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \

diff --git a/dev-scheme/gambit/gambit-4.8.8-r1.ebuild b/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
index 841070ee792..a67ad21131e 100644
--- a/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
+++ b/dev-scheme/gambit/gambit-4.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,9 +29,9 @@ S="${WORKDIR}/${MY_P}" #-devel
 IUSE="emacs ssl static"
 
 src_configure() {
-	econf $(use_enable !static shared) \
+	econf \
+		$(use_enable !static shared) \
 		$(use_enable ssl openssl) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--enable-gnu-gcc-specific-options \
 		--enable-gnu-gcc-no-strict-aliasing \
 		--enable-single-host \

diff --git a/dev-scheme/gambit/gambit-4.8.8-r2.ebuild b/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
index 1b865cf41e1..35bae56cf61 100644
--- a/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
+++ b/dev-scheme/gambit/gambit-4.8.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,9 +32,9 @@ S="${WORKDIR}/${MY_P}" #-devel
 IUSE="emacs libressl ssl static"
 
 src_configure() {
-	econf $(use_enable !static shared) \
+	econf \
+		$(use_enable !static shared) \
 		$(use_enable ssl openssl) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--enable-gnu-gcc-specific-options \
 		--enable-gnu-gcc-no-strict-aliasing \
 		--enable-single-host \

diff --git a/dev-scheme/gambit/gambit-4.9.3.ebuild b/dev-scheme/gambit/gambit-4.9.3.ebuild
index e0242a86fef..d6ec8786e27 100644
--- a/dev-scheme/gambit/gambit-4.9.3.ebuild
+++ b/dev-scheme/gambit/gambit-4.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,9 +32,9 @@ S="${WORKDIR}/${MY_P}" #-devel
 IUSE="emacs libressl ssl static"
 
 src_configure() {
-	econf $(use_enable !static shared) \
+	econf \
+		$(use_enable !static shared) \
 		$(use_enable ssl openssl) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--enable-gnu-gcc-specific-options \
 		--enable-gnu-gcc-no-strict-aliasing \
 		--enable-single-host \

diff --git a/dev-scheme/racket/racket-7.2.ebuild b/dev-scheme/racket/racket-7.2.ebuild
index 6c313c38b06..c3285920c11 100644
--- a/dev-scheme/racket/racket-7.2.ebuild
+++ b/dev-scheme/racket/racket-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,6 @@ src_configure() {
 	# such that we don't preclude cross-compile. Thus don't use
 	# --enable-lt=/usr/bin/libtool
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--enable-shared \
 		--enable-float \
 		--enable-libffi \

diff --git a/dev-scheme/racket/racket-7.3.ebuild b/dev-scheme/racket/racket-7.3.ebuild
index 6c313c38b06..c3285920c11 100644
--- a/dev-scheme/racket/racket-7.3.ebuild
+++ b/dev-scheme/racket/racket-7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,6 @@ src_configure() {
 	# such that we don't preclude cross-compile. Thus don't use
 	# --enable-lt=/usr/bin/libtool
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--enable-shared \
 		--enable-float \
 		--enable-libffi \

diff --git a/dev-util/cpptest/cpptest-2.0.0.ebuild b/dev-util/cpptest/cpptest-2.0.0.ebuild
index 8369dad2328..3d5f2ce9f6a 100644
--- a/dev-util/cpptest/cpptest-2.0.0.ebuild
+++ b/dev-util/cpptest/cpptest-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,9 +18,7 @@ RDEPEND="!dev-util/cpptest:0"
 DOCS=( AUTHORS BUGS NEWS README )
 
 src_configure() {
-	econf \
-		$(use_enable doc) \
-		--htmldir=/usr/share/doc/${PF}/html/
+	econf $(use_enable doc)
 }
 
 src_install() {

diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index ec60b09e6e4..9a51cda1919 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -45,7 +45,6 @@ multilib_src_configure() {
 	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
 
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable static-libs static) \
 		--disable-debug \
 		$(use_enable ncurses curses)

diff --git a/dev-util/gengetopt/gengetopt-2.23.ebuild b/dev-util/gengetopt/gengetopt-2.23.ebuild
index a11ba32f0ad..0077d081830 100644
--- a/dev-util/gengetopt/gengetopt-2.23.ebuild
+++ b/dev-util/gengetopt/gengetopt-2.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,3 @@ src_prepare() {
 
 	eautoreconf
 }
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}

diff --git a/dev-util/google-perftools/google-perftools-2.6.2.ebuild b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
index 44f0d543dc3..9d067957568 100644
--- a/dev-util/google-perftools/google-perftools-2.6.2.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.6.2.ebuild
@@ -52,8 +52,6 @@ multilib_src_configure() {
 	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
 	econf \
-		--htmldir=${EPREFIX}/usr/share/doc/${PF}/html \
-		--docdir=${EPREFIX}/usr/share/doc/${PF} \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable debug debugalloc) \

diff --git a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
index bafdc431a0d..3e177a9c1d8 100644
--- a/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7-r1.ebuild
@@ -53,7 +53,6 @@ multilib_src_configure() {
 	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
 	econf \
-		--docdir=${EPREFIX}/usr/share/doc/${PF} \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable debug debugalloc) \

diff --git a/dev-util/google-perftools/google-perftools-2.7.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
index 8d7bcf2c2cc..b120b338e57 100644
--- a/dev-util/google-perftools/google-perftools-2.7.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7.ebuild
@@ -51,7 +51,6 @@ multilib_src_configure() {
 	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
 	econf \
-		--docdir=${EPREFIX}/usr/share/doc/${PF} \
 		--enable-shared \
 		$(use_enable static-libs static) \
 		$(use_enable debug debugalloc) \

diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index d1eb1218883..1a06518f0b7 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -21,7 +21,3 @@ src_prepare() {
 
 	eapply_user
 }
-
-src_configure() {
-	econf --htmldir='$(datarootdir)/doc/'"${PF}/html"
-}

diff --git a/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild b/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild
index 671fae56339..3797560c35e 100644
--- a/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,5 @@ pkg_pretend() {
 }
 
 src_configure() {
-	econf \
-		$(usex ust "" --without-lttng-ust) \
-		--docdir=/usr/share/doc/${PF}
+	econf $(usex ust "" --without-lttng-ust)
 }

diff --git a/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
index 671fae56339..3797560c35e 100644
--- a/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,5 @@ pkg_pretend() {
 }
 
 src_configure() {
-	econf \
-		$(usex ust "" --without-lttng-ust) \
-		--docdir=/usr/share/doc/${PF}
+	econf $(usex ust "" --without-lttng-ust)
 }

diff --git a/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild b/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
index ead5c2518d1..d7181325dce 100644
--- a/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,3 @@ src_prepare() {
 	fi
 	eautoreconf
 }
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF}
-}

diff --git a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
index a3aa0dbf6f7..5c31aecfe56 100644
--- a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
@@ -36,7 +36,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable numa) \
-		--docdir=/usr/share/doc/${PF}
+	econf $(use_enable numa)
 }

diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index 3f29609d218..68d0985a32e 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -71,7 +71,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--without-rpm \
 		--disable-server \
 		--disable-docs \

diff --git a/games-misc/typespeed/typespeed-0.6.5-r1.ebuild b/games-misc/typespeed/typespeed-0.6.5-r1.ebuild
index 354c9eba5a3..9e0c90a21b2 100644
--- a/games-misc/typespeed/typespeed-0.6.5-r1.ebuild
+++ b/games-misc/typespeed/typespeed-0.6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		--localedir=/usr/share/locale \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable nls)
 }
 

diff --git a/games-mud/kildclient/kildclient-3.0.1-r1.ebuild b/games-mud/kildclient/kildclient-3.0.1-r1.ebuild
index 2840e201783..0722a19dc53 100644
--- a/games-mud/kildclient/kildclient-3.0.1-r1.ebuild
+++ b/games-mud/kildclient/kildclient-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,8 +39,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		--localedir=/usr/share/locale \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		$(use_with spell gtkspell) \
 		$(use_with gnutls libgnutls) \
 		$(use_with doc docs)

diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
index 4ed127716d8..ab91e997d49 100644
--- a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
+++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
@@ -35,11 +35,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--datadir="/usr/share" \
-		--datarootdir="${EPREFIX}/usr/share" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_with portaudio)
+	econf $(use_with portaudio)
 }
 
 src_install() {

diff --git a/games-strategy/naev/naev-0.6.1-r1.ebuild b/games-strategy/naev/naev-0.6.1-r1.ebuild
index c8999020f3f..aaf01693585 100644
--- a/games-strategy/naev/naev-0.6.1-r1.ebuild
+++ b/games-strategy/naev/naev-0.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,7 +38,6 @@ src_unpack() {
 
 src_configure() {
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--enable-lua=shared \
 		$(use_enable debug) \
 		$(use_with openal) \

diff --git a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
index 5e292dc3dc7..56daf63618e 100644
--- a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -75,7 +75,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}
 		--localedir=/usr/share/locale
 		--with-distributor="Gentoo ${PF}"
 		--with-icondir=/usr/share/icons/hicolor/128x128/apps

diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
index cd314a38aa7..35988944a84 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -38,8 +38,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		$(use_with spf) \
 		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
 		$(use_with spf spf2-lib "${EPREFIX}"/usr/lib)

diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
index 2e8161266b9..98462ace561 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
@@ -38,8 +38,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		$(use_with spf) \
 		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
 		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \

diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
index b796ba77335..54d0eaccc93 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,8 +42,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		$(use_with spf) \
 		$(use_with spf spf2-include "${EPREFIX}"/usr/include/spf2) \
 		$(use_with spf spf2-lib "${EPREFIX}"/usr/$(get_libdir)) \

diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild
index 0550bb93150..cd3dabdc030 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -69,7 +69,6 @@ MATE_FORCE_AUTORECONF=true
 
 src_configure() {
 	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_with elogind) \
 		$(use_with systemd) \
 		$(use_with xtrans)  \

diff --git a/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild
index e42570ea404..d37cc16b4be 100644
--- a/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -64,7 +64,6 @@ MATE_FORCE_AUTORECONF=true
 
 src_configure() {
 	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_with elogind) \
 		$(use_with systemd) \
 		$(use_with xtrans)  \

diff --git a/media-gfx/gqview/gqview-2.1.5-r2.ebuild b/media-gfx/gqview/gqview-2.1.5-r2.ebuild
index f64729a5a87..a05ba726943 100644
--- a/media-gfx/gqview/gqview-2.1.5-r2.ebuild
+++ b/media-gfx/gqview/gqview-2.1.5-r2.ebuild
@@ -42,9 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--without-lcms
+	econf --without-lcms
 }
 
 src_install() {

diff --git a/media-gfx/mscgen/mscgen-0.20.ebuild b/media-gfx/mscgen/mscgen-0.20.ebuild
index 8d84d1356b3..974df47549b 100644
--- a/media-gfx/mscgen/mscgen-0.20.ebuild
+++ b/media-gfx/mscgen/mscgen-0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,5 @@ src_configure() {
 		myconf="--without-png"
 	fi
 
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		${myconf}
+	econf ${myconf}
 }

diff --git a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
index cd7942f7a70..896019b910a 100644
--- a/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
+++ b/media-libs/libmpd/libmpd-11.8.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,9 +22,7 @@ RDEPEND="${DEPEND}"
 PATCHES=( "${FILESDIR}"/${P}-remove-strndup.patch )
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+	econf $(use_enable static-libs static)
 }
 
 src_compile() {

diff --git a/media-libs/libogg/libogg-1.3.3.ebuild b/media-libs/libogg/libogg-1.3.3.ebuild
index 02d8b4443f0..9e9954f814c 100644
--- a/media-libs/libogg/libogg-1.3.3.ebuild
+++ b/media-libs/libogg/libogg-1.3.3.ebuild
@@ -20,11 +20,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 multilib_src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		$(use_enable static-libs static)
-		)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {

diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
index f4e3f98c047..201b09e29f1 100644
--- a/media-libs/libogg/libogg-1.3.4.ebuild
+++ b/media-libs/libogg/libogg-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,11 +20,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 multilib_src_configure() {
-	local myeconfargs=(
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		$(use_enable static-libs static)
-		)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {

diff --git a/media-libs/opusfile/opusfile-0.11.ebuild b/media-libs/opusfile/opusfile-0.11.ebuild
index ad156369cce..ae2c53f3f59 100644
--- a/media-libs/opusfile/opusfile-0.11.ebuild
+++ b/media-libs/opusfile/opusfile-0.11.ebuild
@@ -28,7 +28,6 @@ PATCHES=( "${FILESDIR}/opusfile-0.11-libressl.patch" )
 
 src_configure() {
 	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable doc)
 		$(use_enable fixed-point)\
 		$(use_enable float)

diff --git a/media-radio/tlf/tlf-1.3.2.ebuild b/media-radio/tlf/tlf-1.3.2.ebuild
index ae139df1f82..e118aafaaee 100644
--- a/media-radio/tlf/tlf-1.3.2.ebuild
+++ b/media-radio/tlf/tlf-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -26,5 +26,5 @@ DEPEND="
 
 src_configure() {
 	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf --docdir=/usr/share/doc/${PF} --enable-hamlib --enable-fldigi-xmlrpc
+	econf --enable-hamlib --enable-fldigi-xmlrpc
 }

diff --git a/media-radio/tlf/tlf-1.4.0.ebuild b/media-radio/tlf/tlf-1.4.0.ebuild
index bdd2cd0c114..23bc6b749b8 100644
--- a/media-radio/tlf/tlf-1.4.0.ebuild
+++ b/media-radio/tlf/tlf-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -27,5 +27,5 @@ DEPEND="
 
 src_configure() {
 	append-ldflags -L/usr/$(get_libdir)/hamlib
-	econf --docdir=/usr/share/doc/${PF} --enable-fldigi-xmlrpc
+	econf --enable-fldigi-xmlrpc
 }

diff --git a/media-radio/xlog/xlog-2.0.15.ebuild b/media-radio/xlog/xlog-2.0.15.ebuild
index 41a2bb14fd6..c87300418dd 100644
--- a/media-radio/xlog/xlog-2.0.15.ebuild
+++ b/media-radio/xlog/xlog-2.0.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,8 +53,7 @@ src_prepare() {
 
 src_configure() {
 	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update \
-		--docdir=/usr/share/doc/${PF}
+	econf --disable-mime-update --disable-desktop-update
 }
 
 src_compile() {

diff --git a/media-radio/xlog/xlog-2.0.17.ebuild b/media-radio/xlog/xlog-2.0.17.ebuild
index 6410fdaf4f6..c87300418dd 100644
--- a/media-radio/xlog/xlog-2.0.17.ebuild
+++ b/media-radio/xlog/xlog-2.0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,8 +53,7 @@ src_prepare() {
 
 src_configure() {
 	# mime-update causes file collisions if enabled
-	econf --disable-mime-update --disable-desktop-update \
-		--docdir=/usr/share/doc/${PF}
+	econf --disable-mime-update --disable-desktop-update
 }
 
 src_compile() {

diff --git a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild b/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
index 59af61c756c..ddde77ac0d5 100644
--- a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
+++ b/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,11 +22,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 src_configure() {
-	local docdir=/usr/share/doc/${PF}
-
 	econf \
-		--docdir=${docdir} \
-		--enable-examplesdir=${docdir}/examples \
+		--enable-examplesdir='$(docdir)/examples' \
 		$(use_with taglib taglib "/usr")
 }
 

diff --git a/media-sound/moc/moc-2.5.2.ebuild b/media-sound/moc/moc-2.5.2.ebuild
index 920e1caa471..339165d14fa 100644
--- a/media-sound/moc/moc-2.5.2.ebuild
+++ b/media-sound/moc/moc-2.5.2.ebuild
@@ -46,7 +46,6 @@ S=${WORKDIR}/${MY_P}
 
 src_configure() {
 	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable debug)
 		$(use_enable cache)
 		$(use_with oss)

diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index 15f4735b5c5..0c8e6e51c1a 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -61,7 +61,6 @@ PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
 
 src_configure() {
 	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--without-rcc
 		$(use_enable debug)
 		$(use_enable cache)

diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
index 05a8aed52ab..ec608f309a9 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7.7.ebuild
@@ -44,7 +44,6 @@ src_configure() {
 		$(use_with curl) \
 		$(use_with taglib) \
 		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF} \
 		--enable-unicode
 }
 

diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index e67aa622354..9731b864cd9 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -41,8 +41,7 @@ src_configure() {
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
 		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
+		$(use_with visualizer fftw)
 }
 
 src_install() {

diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 5074e746006..0be8bf6df0b 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,8 +44,7 @@ src_configure() {
 		$(use_enable outputs) \
 		$(use_enable visualizer) \
 		$(use_with taglib) \
-		$(use_with visualizer fftw) \
-		--docdir=/usr/share/doc/${PF}
+		$(use_with visualizer fftw)
 }
 
 src_install() {

diff --git a/media-sound/pavucontrol/pavucontrol-4.0.ebuild b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
index 182d6ce2c56..3a675042aec 100644
--- a/media-sound/pavucontrol/pavucontrol-4.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,6 @@ src_configure() {
 	append-cxxflags -std=c++11 #567216
 	local myeconfargs=(
 		--disable-lynx
-		--docdir=/usr/share/doc/${PF}
 		$(use_enable nls)
 	)
 	econf "${myeconfargs[@]}"

diff --git a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild b/media-sound/vimpc/vimpc-0.09.2-r1.ebuild
index 0250e3c5969..427022a706f 100644
--- a/media-sound/vimpc/vimpc-0.09.2-r1.ebuild
+++ b/media-sound/vimpc/vimpc-0.09.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,8 +31,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable boost) \
-		$(use_enable taglib) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable taglib)
 }
 
 src_install() {

diff --git a/media-sound/vimpc/vimpc-0.09.2.ebuild b/media-sound/vimpc/vimpc-0.09.2.ebuild
index a8dc8d3d487..e6968fffae9 100644
--- a/media-sound/vimpc/vimpc-0.09.2.ebuild
+++ b/media-sound/vimpc/vimpc-0.09.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,8 +31,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable boost) \
-		$(use_enable taglib) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable taglib)
 }
 
 src_install() {

diff --git a/media-sound/vimpc/vimpc-9999.ebuild b/media-sound/vimpc/vimpc-9999.ebuild
index c019bc10618..5d7ee52d0a6 100644
--- a/media-sound/vimpc/vimpc-9999.ebuild
+++ b/media-sound/vimpc/vimpc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,8 +30,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable boost) \
-		$(use_enable taglib) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable taglib)
 }
 
 src_install() {

diff --git a/media-video/bino/bino-1.6.7.ebuild b/media-video/bino/bino-1.6.7.ebuild
index 5f658de3ca8..59ecc6ed03f 100644
--- a/media-video/bino/bino-1.6.7.ebuild
+++ b/media-video/bino/bino-1.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,9 +55,7 @@ src_configure() {
 		$(use_with lirc) \
 		$(use_enable debug) \
 		--without-equalizer \
-		--with-qt-version=5 \
-		--htmldir=/usr/share/doc/${PF}/html
-
+		--with-qt-version=5
 }
 
 src_install() {

diff --git a/media-video/dvdbackup/dvdbackup-0.4.2.ebuild b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
index 5580d11d6df..f4dfc5d11ca 100644
--- a/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
+++ b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,5 @@ DEPEND="${RDEPEND}
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		--disable-rpath \
-		--docdir=/usr/share/doc/${PF}
+		--disable-rpath
 }

diff --git a/media-video/mpv/mpv-0.31.0.ebuild b/media-video/mpv/mpv-0.31.0.ebuild
index fd5e769b136..e95d246f1d1 100644
--- a/media-video/mpv/mpv-0.31.0.ebuild
+++ b/media-video/mpv/mpv-0.31.0.ebuild
@@ -152,8 +152,6 @@ src_configure() {
 
 	local mywafargs=(
 		--confdir="${EPREFIX}/etc/${PN}"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 
 		$(usex cli '' '--disable-cplayer')
 		$(use_enable libmpv libmpv-shared)

diff --git a/media-video/mpv/mpv-0.32.0.ebuild b/media-video/mpv/mpv-0.32.0.ebuild
index 0b5fa6961e1..404b09b47a9 100644
--- a/media-video/mpv/mpv-0.32.0.ebuild
+++ b/media-video/mpv/mpv-0.32.0.ebuild
@@ -153,8 +153,6 @@ src_configure() {
 
 	local mywafargs=(
 		--confdir="${EPREFIX}/etc/${PN}"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 
 		$(usex cli '' '--disable-cplayer')
 		$(use_enable libmpv libmpv-shared)

diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 0b5fa6961e1..404b09b47a9 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -153,8 +153,6 @@ src_configure() {
 
 	local mywafargs=(
 		--confdir="${EPREFIX}/etc/${PN}"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 
 		$(usex cli '' '--disable-cplayer')
 		$(use_enable libmpv libmpv-shared)

diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild
index 95e18c2a29a..01d01f88612 100644
--- a/net-analyzer/bmon/bmon-4.0.ebuild
+++ b/net-analyzer/bmon/bmon-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,7 +42,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
-		--docdir="/usr/share/doc/${PF}"
+	econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }

diff --git a/net-analyzer/bmon/bmon-999.ebuild b/net-analyzer/bmon/bmon-999.ebuild
index cabc2a78161..1939b19057e 100644
--- a/net-analyzer/bmon/bmon-999.ebuild
+++ b/net-analyzer/bmon/bmon-999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,7 +39,5 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
-		--docdir="/usr/share/doc/${PF}"
+	econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }

diff --git a/net-dns/updatedd/updatedd-2.6-r5.ebuild b/net-dns/updatedd/updatedd-2.6-r5.ebuild
index 341328f5421..681a56e9575 100644
--- a/net-dns/updatedd/updatedd-2.6-r5.ebuild
+++ b/net-dns/updatedd/updatedd-2.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,5 +24,5 @@ PATCHES=(
 )
 
 src_configure() {
-	econf --disable-static --docdir="/usr/share/doc/${PF}"
+	econf --disable-static
 }

diff --git a/net-firewall/sanewall/sanewall-1.1.6-r2.ebuild b/net-firewall/sanewall/sanewall-1.1.6-r2.ebuild
index 5c45521aa61..61fc3947d9d 100644
--- a/net-firewall/sanewall/sanewall-1.1.6-r2.ebuild
+++ b/net-firewall/sanewall/sanewall-1.1.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -40,10 +40,6 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
-}
-
 src_install() {
 	default
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}

diff --git a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
index 105505eb5ab..954f4a89c02 100644
--- a/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
+++ b/net-libs/libasyncns/libasyncns-0.8-r4.ebuild
@@ -33,8 +33,6 @@ multilib_src_configure() {
 
 	ECONF_SOURCE=${S} \
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		--disable-lynx \
 		--disable-static
 }

diff --git a/net-libs/neon/neon-0.30.2.ebuild b/net-libs/neon/neon-0.30.2.ebuild
index 3f180c142ab..f1b70455989 100644
--- a/net-libs/neon/neon-0.30.2.ebuild
+++ b/net-libs/neon/neon-0.30.2.ebuild
@@ -85,7 +85,6 @@ multilib_src_configure() {
 	fi
 
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-shared \
 		$(use_with kerberos gssapi) \
 		$(use_with libproxy) \

diff --git a/net-misc/bfgminer/bfgminer-5.4.2.ebuild b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
index 93d5146abac..2ecd1c526ca 100644
--- a/net-misc/bfgminer/bfgminer-5.4.2.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -138,7 +138,6 @@ src_configure() {
 
 	CFLAGS="${CFLAGS}" \
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
 		$(use_enable adl) \
 		$(use_enable antminer) \
 		$(use_enable avalon) \

diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
index 6d7f7cea5ea..457913d67bb 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -138,7 +138,6 @@ src_configure() {
 
 	CFLAGS="${CFLAGS}" \
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
 		$(use_enable adl) \
 		$(use_enable alchemist)\
 		$(use_enable avalon) \

diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
index b8c39e9d66a..7b8e8421b75 100644
--- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
+++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild
@@ -39,7 +39,6 @@ multilib_src_configure() {
 	append-flags -fno-strict-aliasing
 
 	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--enable-shared
 		$(use_enable static-libs static)
 	)

diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild
index 48ccb73bd03..2ecf7a75569 100644
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild
@@ -62,7 +62,6 @@ src_configure() {
 		--with-privsep-chroot=/run/${PN} \
 		--with-lldpd-ctl-socket=/run/${PN}.socket \
 		--with-lldpd-pid-file=/run/${PN}.pid \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable cdp) \
 		$(use_enable doc doxygen-man) \
 		$(use_enable doc doxygen-pdf) \

diff --git a/net-misc/lldpd/lldpd-1.0.4.ebuild b/net-misc/lldpd/lldpd-1.0.4.ebuild
index b3e6c9c49fb..92e05bbf144 100644
--- a/net-misc/lldpd/lldpd-1.0.4.ebuild
+++ b/net-misc/lldpd/lldpd-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,7 +61,6 @@ src_configure() {
 		--with-privsep-chroot=/run/${PN} \
 		--with-lldpd-ctl-socket=/run/${PN}.socket \
 		--with-lldpd-pid-file=/run/${PN}.pid \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable cdp) \
 		$(use_enable doc doxygen-man) \
 		$(use_enable doc doxygen-pdf) \

diff --git a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
index 0f2889cf8ba..d3cc13c5046 100644
--- a/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -72,8 +72,6 @@ src_configure() {
 		--with-lineeditlibs=readline,edit,editline
 		--with-yielding-select
 		--disable-local-libevent
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
 		--with-memlock=256
 		$(use_enable caps linuxcaps)
 		$(use_enable parse-clocks)

diff --git a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
index f08b75b5409..2150ef08bd9 100644
--- a/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13-r2.ebuild
@@ -72,8 +72,6 @@ src_configure() {
 		--with-lineeditlibs=readline,edit,editline
 		--with-yielding-select
 		--disable-local-libevent
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
 		--with-memlock=256
 		$(use_enable caps linuxcaps)
 		$(use_enable parse-clocks)

diff --git a/net-misc/ntp/ntp-4.2.8_p13.ebuild b/net-misc/ntp/ntp-4.2.8_p13.ebuild
index a78a3be4276..1a92b7b4bce 100644
--- a/net-misc/ntp/ntp-4.2.8_p13.ebuild
+++ b/net-misc/ntp/ntp-4.2.8_p13.ebuild
@@ -72,8 +72,6 @@ src_configure() {
 		--with-lineeditlibs=readline,edit,editline
 		--with-yielding-select
 		--disable-local-libevent
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
 		--with-memlock=256
 		$(use_enable caps linuxcaps)
 		$(use_enable parse-clocks)

diff --git a/net-proxy/privoxy/privoxy-3.0.26.ebuild b/net-proxy/privoxy/privoxy-3.0.26.ebuild
index 724cfe25ac6..1eec1ca7ab7 100644
--- a/net-proxy/privoxy/privoxy-3.0.26.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.26.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 	# --with-docbook and --with-db2html and their deps are useless,
 	#	since docs are already pregenerated in the source tarball
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--sysconfdir=/etc/privoxy \
 		--enable-dynamic-pcre \
 		--with-user=privoxy \

diff --git a/net-proxy/privoxy/privoxy-3.0.28.ebuild b/net-proxy/privoxy/privoxy-3.0.28.ebuild
index fc3e335d52c..361254fd124 100644
--- a/net-proxy/privoxy/privoxy-3.0.28.ebuild
+++ b/net-proxy/privoxy/privoxy-3.0.28.ebuild
@@ -71,7 +71,6 @@ src_configure() {
 	# --with-docbook and --with-db2html and their deps are useless,
 	#	since docs are already pregenerated in the source tarball
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		--sysconfdir=/etc/privoxy \
 		--enable-dynamic-pcre \
 		--with-user=privoxy \

diff --git a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
index 38c30973189..3f568babb3e 100644
--- a/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
+++ b/net-voip/telepathy-salut/telepathy-salut-0.8.1-r2.ebuild
@@ -68,7 +68,6 @@ src_configure() {
 		--disable-Werror \
 		--disable-static \
 		--disable-avahi-tests \
-		--docdir=/usr/share/doc/${PF} \
 		--with-tls=$(usex gnutls gnutls openssl)
 		#$(use_enable test avahi-tests)
 

diff --git a/net-wireless/blueman/blueman-2.1.1-r1.ebuild b/net-wireless/blueman/blueman-2.1.1-r1.ebuild
index 36efcd261c6..af14a0fe84e 100644
--- a/net-wireless/blueman/blueman-2.1.1-r1.ebuild
+++ b/net-wireless/blueman/blueman-2.1.1-r1.ebuild
@@ -94,7 +94,6 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		--docdir=/usr/share/doc/${PF}
 		--disable-runtime-deps-check
 		--disable-static
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"

diff --git a/net-wireless/blueman/blueman-2.1.2.ebuild b/net-wireless/blueman/blueman-2.1.2.ebuild
index 36efcd261c6..af14a0fe84e 100644
--- a/net-wireless/blueman/blueman-2.1.2.ebuild
+++ b/net-wireless/blueman/blueman-2.1.2.ebuild
@@ -94,7 +94,6 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		--docdir=/usr/share/doc/${PF}
 		--disable-runtime-deps-check
 		--disable-static
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"

diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 36efcd261c6..af14a0fe84e 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -94,7 +94,6 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		--docdir=/usr/share/doc/${PF}
 		--disable-runtime-deps-check
 		--disable-static
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"

diff --git a/sci-astronomy/cpl/cpl-6.6.1.ebuild b/sci-astronomy/cpl/cpl-6.6.1.ebuild
index a345ee03634..cd258816467 100644
--- a/sci-astronomy/cpl/cpl-6.6.1.ebuild
+++ b/sci-astronomy/cpl/cpl-6.6.1.ebuild
@@ -42,7 +42,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		--disable-ltdl-install
 		--without-included-ltdl
 		--with-cfitsio="${EPREFIX}/usr"

diff --git a/sci-astronomy/cpl/cpl-7.0.ebuild b/sci-astronomy/cpl/cpl-7.0.ebuild
index 083456654a5..eaafe47a267 100644
--- a/sci-astronomy/cpl/cpl-7.0.ebuild
+++ b/sci-astronomy/cpl/cpl-7.0.ebuild
@@ -42,7 +42,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		--disable-ltdl-install
 		--without-included-ltdl
 		--with-cfitsio="${EPREFIX}/usr"

diff --git a/sci-astronomy/wcslib/wcslib-5.16.ebuild b/sci-astronomy/wcslib/wcslib-5.16.ebuild
index b0ca93d9851..31cf8e9f6f9 100644
--- a/sci-astronomy/wcslib/wcslib-5.16.ebuild
+++ b/sci-astronomy/wcslib/wcslib-5.16.ebuild
@@ -25,7 +25,6 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local myconf=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		--htmldir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable fortran)
 		$(use_enable tools utils)

diff --git a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild
index a25326ccb70..7989cf9ef6d 100644
--- a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild
+++ b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,9 +41,5 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		--disable-update-database
-		--htmldir=/usr/share/doc/${PF}/html
-		)
-	econf ${myeconfargs[@]}
+	econf --disable-update-database
 }

diff --git a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
index eda45195289..3abec36ba7d 100644
--- a/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
+++ b/sci-chemistry/chemical-mime-data/chemical-mime-data-0.1.94-r4.ebuild
@@ -48,6 +48,5 @@ src_configure() {
 		--disable-update-database \
 		--without-gnome-mime \
 		--without-pixmaps \
-		--without-kde-mime \
-		--htmldir=/usr/share/doc/${PF}/html
+		--without-kde-mime
 }

diff --git a/sci-electronics/geda/geda-1.9.2-r1.ebuild b/sci-electronics/geda/geda-1.9.2-r1.ebuild
index 08129958fc6..b0b3ffbf999 100644
--- a/sci-electronics/geda/geda-1.9.2-r1.ebuild
+++ b/sci-electronics/geda/geda-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -70,7 +70,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable threads threads posix) \
 		$(use_with stroke libstroke) \
 		$(use_enable nls) \

diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
index fda2bd508a4..63f13d8b864 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,5 @@ src_prepare() {
 }
 
 src_configure() {
-	gnome2_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
+	gnome2_src_configure $(use_enable static-libs static)
 }

diff --git a/sci-libs/med/med-4.0.0-r1.ebuild b/sci-libs/med/med-4.0.0-r1.ebuild
index d7a73bc8812..267105d848a 100644
--- a/sci-libs/med/med-4.0.0-r1.ebuild
+++ b/sci-libs/med/med-4.0.0-r1.ebuild
@@ -65,7 +65,6 @@ src_configure() {
 		--disable-api23
 		--disable-installtest
 		--disable-static
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-hdf5="${EPREFIX}"/usr
 		--with-hdf5-lib="${EPREFIX}"/usr/$(get_libdir)
 		$(use_enable fortran)

diff --git a/sci-mathematics/rw/rw-0.8-r1.ebuild b/sci-mathematics/rw/rw-0.8-r1.ebuild
index b4fe3468daa..4ccfc56281e 100644
--- a/sci-mathematics/rw/rw-0.8-r1.ebuild
+++ b/sci-mathematics/rw/rw-0.8-r1.ebuild
@@ -20,25 +20,23 @@ DEPEND="executable? ( >=dev-libs/igraph-0.6 )"
 RDEPEND="${DEPEND}
 	!media-gfx/xpaint"
 
-DOCDIR="/usr/share/doc/${PF}"
-
 src_prepare() {
 	# The upstream tarball for v0.8 contains SYMLINKS to ar-lib,
 	# compile, install-sh, ltmain.sh, etc. And those symlinks don't
 	# always point to a working location for us, so we have to
 	# (re)generate actual files for that stuff. Bug 696986.
-	eautoreconf
 	default
+	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable executable) --docdir="${EPREFIX}${DOCDIR}"
+	econf $(use_enable executable)
 }
 
 src_install() {
+	default
 	# The examples graphs are meant to be fed uncompressed into the 'rw'
 	# program. The rest of the docs are small so just leave everything
 	# uncompressed.
-	docompress -x "${DOCDIR}"
-	default
+	docompress -x /usr/share/doc/${PF}
 }

diff --git a/sys-apps/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild
index 7a9f46fbf42..66161f460be 100644
--- a/sys-apps/dbus/dbus-1.12.16.ebuild
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -114,8 +114,6 @@ multilib_src_configure() {
 	# not on an SELinux profile.
 	myconf=(
 		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		$(use_enable static-libs static)
 		$(use_enable debug verbose-mode)
 		--disable-asserts

diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
index 0cd44b693c7..b1aae3c00da 100644
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable apparmor) \
 		$(use_enable globalcfg) \
 		$(use_enable network) \
@@ -46,5 +45,4 @@ src_configure() {
 		$(use_enable suid) \
 		$(use_enable userns) \
 		$(use_enable whitelist)
-
 }

diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
index 7ded7fe5ced..b2a3e4c3d74 100644
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable apparmor) \
 		$(use_enable globalcfg) \
 		$(use_enable network) \

diff --git a/sys-apps/kmscon/kmscon-8-r1.ebuild b/sys-apps/kmscon/kmscon-8-r1.ebuild
index 0266f4a63a2..31ab17695d0 100644
--- a/sys-apps/kmscon/kmscon-8-r1.ebuild
+++ b/sys-apps/kmscon/kmscon-8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -125,7 +125,6 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable optimizations) \
 		$(use_enable systemd multi-seat) \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-video=${VIDEO} \
 		--with-fonts=${FONTS} \
 		--with-renderers=${RENDER} \

diff --git a/sys-apps/kmscon/kmscon-8_p20180906.ebuild b/sys-apps/kmscon/kmscon-8_p20180906.ebuild
index e74c5c761b7..ad7c9809336 100644
--- a/sys-apps/kmscon/kmscon-8_p20180906.ebuild
+++ b/sys-apps/kmscon/kmscon-8_p20180906.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -123,7 +123,6 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable optimizations) \
 		$(use_enable systemd multi-seat) \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-video=${VIDEO} \
 		--with-fonts=${FONTS} \
 		--with-renderers=${RENDER} \

diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
index 563968c6477..c8cf9d128bb 100644
--- a/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
+++ b/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,5 +37,5 @@ src_prepare() {
 src_configure() {
 	# acinclude.m4 is broken and environment flags override these:
 	append-cxxflags -fexceptions -frtti -fsigned-char -fno-check-new -pthread
-	econf --docdir=/usr/share/doc/${PF}
+	econf
 }

diff --git a/sys-block/partimage/partimage-0.6.9-r1.ebuild b/sys-block/partimage/partimage-0.6.9-r1.ebuild
index 2a66b55d97f..60d1e2982bd 100644
--- a/sys-block/partimage/partimage-0.6.9-r1.ebuild
+++ b/sys-block/partimage/partimage-0.6.9-r1.ebuild
@@ -54,8 +54,6 @@ src_configure() {
 	fi
 
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--sysconfdir="${EPREFIX}"/etc \
 		$(use_enable nls) \
 		$(use_enable ssl) \
 		--disable-pam \

diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
index 71b3ef340d0..7cbac60a898 100644
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -208,7 +208,6 @@ grub_configure() {
 		--disable-werror
 		--program-prefix=
 		--libdir="${EPREFIX}"/usr/lib
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		$(use_enable device-mapper)
 		$(use_enable mount grub-mount)
 		$(use_enable nls)

diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index b7569f41dca..1076dff5072 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -201,7 +201,6 @@ grub_configure() {
 		--disable-werror
 		--program-prefix=
 		--libdir="${EPREFIX}"/usr/lib
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		$(use_enable device-mapper)
 		$(use_enable mount grub-mount)
 		$(use_enable nls)

diff --git a/sys-boot/grub/grub-2.05_alpha20200110.ebuild b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
index 8a7a3e9847e..fa6feb071bb 100644
--- a/sys-boot/grub/grub-2.05_alpha20200110.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
@@ -192,7 +192,6 @@ grub_configure() {
 		--disable-werror
 		--program-prefix=
 		--libdir="${EPREFIX}"/usr/lib
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		$(use_enable device-mapper)
 		$(use_enable mount grub-mount)
 		$(use_enable nls)

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 96bf1230f63..11169247dcc 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -200,7 +200,6 @@ grub_configure() {
 		--disable-werror
 		--program-prefix=
 		--libdir="${EPREFIX}"/usr/lib
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		$(use_enable device-mapper)
 		$(use_enable mount grub-mount)
 		$(use_enable nls)

diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index 089004f78b9..3e4bf6a0f56 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,7 +48,6 @@ src_configure() {
 	# FIXME: install just shared libs --disable-static does not work
 	econf_opts=(
 		--localstatedir=/var \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable infiniband rdma) \
 		$(use_enable systemd) \
 		$(use_enable xml xmlconf)

diff --git a/sys-cluster/corosync/corosync-2.4.2.ebuild b/sys-cluster/corosync/corosync-2.4.2.ebuild
index be1d2139373..49840bb0216 100644
--- a/sys-cluster/corosync/corosync-2.4.2.ebuild
+++ b/sys-cluster/corosync/corosync-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,7 +44,6 @@ src_configure() {
 	# FIXME: install just shared libs --disable-static does not work
 	econf_opts=(
 		--localstatedir=/var \
-		--docdir=/usr/share/doc/${PF} \
 		$(use_enable infiniband rdma) \
 		$(use_enable systemd) \
 		$(use_enable xml xmlconf)

diff --git a/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild b/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
index 26ef2c631b2..351790fe5a7 100644
--- a/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.1.8.ebuild
@@ -120,7 +120,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 

diff --git a/sys-cluster/glusterfs/glusterfs-6.5.ebuild b/sys-cluster/glusterfs/glusterfs-6.5.ebuild
index 85b6bebf711..895462bd41a 100644
--- a/sys-cluster/glusterfs/glusterfs-6.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.5.ebuild
@@ -104,7 +104,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 

diff --git a/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild
index 9635d27bb15..210f6b936ef 100644
--- a/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild
@@ -111,7 +111,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 

diff --git a/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild
index ea9901f6f53..a70a74de42e 100644
--- a/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild
@@ -108,7 +108,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 

diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index f4f0006ebc6..544b9e693be 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -120,7 +120,6 @@ src_configure() {
 		$(use libtirpc || echo --without-libtirpc) \
 		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
 }
 

diff --git a/sys-cluster/mpich/mpich-3.3.ebuild b/sys-cluster/mpich/mpich-3.3.ebuild
index 8eeb7b552f0..7f8f685b41a 100644
--- a/sys-cluster/mpich/mpich-3.3.ebuild
+++ b/sys-cluster/mpich/mpich-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -89,7 +89,6 @@ multilib_src_configure() {
 	fi
 
 	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
-	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
 
 	export MPICHLIB_CFLAGS="${CFLAGS}"
 	export MPICHLIB_CPPFLAGS="${CPPFLAGS}"

diff --git a/sys-cluster/slurm/slurm-19.05.4.1.ebuild b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
index f9a659b1dc9..e412669c3ed 100644
--- a/sys-cluster/slurm/slurm-19.05.4.1.ebuild
+++ b/sys-cluster/slurm/slurm-19.05.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -113,8 +113,7 @@ src_configure() {
 	local myconf=(
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--with-hwloc="${EPREFIX}/usr"
-		--docdir="${EPREFIX}/usr/share/doc/${P}"
-		--htmldir="${EPREFIX}/usr/share/doc/${P}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
 	)
 	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql || myconf+=( --without-mysql_config )

diff --git a/sys-cluster/slurm/slurm-19.05.5.1.ebuild b/sys-cluster/slurm/slurm-19.05.5.1.ebuild
index c7cb6c9ce41..770a3e53390 100644
--- a/sys-cluster/slurm/slurm-19.05.5.1.ebuild
+++ b/sys-cluster/slurm/slurm-19.05.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -113,8 +113,7 @@ src_configure() {
 	local myconf=(
 		--sysconfdir="${EPREFIX}/etc/${PN}"
 		--with-hwloc="${EPREFIX}/usr"
-		--docdir="${EPREFIX}/usr/share/doc/${P}"
-		--htmldir="${EPREFIX}/usr/share/doc/${P}"
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}"
 	)
 	use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
 	use mysql || myconf+=( --without-mysql_config )

diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild b/sys-devel/automake/automake-1.10.3-r3.ebuild
index 20eb8f341ca..bdd8de5ea1d 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -41,10 +41,6 @@ src_prepare() {
 	chmod a+rx tests/*.test
 }
 
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {

diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild b/sys-devel/automake/automake-1.11.6-r3.ebuild
index 52ab09e9d26..34609c5553f 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -44,10 +44,6 @@ src_prepare() {
 	export TZ="UTC"  #589138
 }
 
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
 src_compile() {
 	default
 

diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild b/sys-devel/automake/automake-1.12.6-r2.ebuild
index 12c389bf89f..4dffe576f56 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -40,10 +40,6 @@ src_prepare() {
 	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
 }
 
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {

diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 278818a4035..7f0cdd6e98f 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -42,10 +42,6 @@ src_prepare() {
 	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
 }
 
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {

diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild b/sys-devel/automake/automake-1.14.1-r2.ebuild
index 3a6a2589666..9ec6d887711 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -59,10 +59,6 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
-	econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {

diff --git a/sys-devel/bison/bison-3.1.ebuild b/sys-devel/bison/bison-3.1.ebuild
index 4aa6ec0ab83..862b16ed7c7 100644
--- a/sys-devel/bison/bison-3.1.ebuild
+++ b/sys-devel/bison/bison-3.1.ebuild
@@ -53,7 +53,6 @@ src_configure() {
 	use static && append-ldflags -static
 
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		$(use_enable examples)
 		$(use_enable nls)
 	)

diff --git a/sys-devel/bison/bison-3.3.2.ebuild b/sys-devel/bison/bison-3.3.2.ebuild
index e1a98b18d8b..1c864d8b237 100644
--- a/sys-devel/bison/bison-3.3.2.ebuild
+++ b/sys-devel/bison/bison-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -56,7 +56,6 @@ src_configure() {
 	use static && append-ldflags -static
 
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		$(use_enable examples)
 		$(use_enable nls)
 	)

diff --git a/sys-devel/bison/bison-3.4.2.ebuild b/sys-devel/bison/bison-3.4.2.ebuild
index 017e3599a18..55c19a6514d 100644
--- a/sys-devel/bison/bison-3.4.2.ebuild
+++ b/sys-devel/bison/bison-3.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -57,7 +57,6 @@ src_configure() {
 	use static && append-ldflags -static
 
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		$(use_enable examples)
 		$(use_enable nls)
 	)

diff --git a/sys-devel/bison/bison-3.5.1.ebuild b/sys-devel/bison/bison-3.5.1.ebuild
index 60e7b20d2a6..6c9a25cfeca 100644
--- a/sys-devel/bison/bison-3.5.1.ebuild
+++ b/sys-devel/bison/bison-3.5.1.ebuild
@@ -59,7 +59,6 @@ src_configure() {
 	use static && append-ldflags -static
 
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		$(use_enable examples)
 		$(use_enable nls)
 	)

diff --git a/sys-devel/bison/bison-3.5.2.ebuild b/sys-devel/bison/bison-3.5.2.ebuild
index 60e7b20d2a6..6c9a25cfeca 100644
--- a/sys-devel/bison/bison-3.5.2.ebuild
+++ b/sys-devel/bison/bison-3.5.2.ebuild
@@ -59,7 +59,6 @@ src_configure() {
 	use static && append-ldflags -static
 
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		$(use_enable examples)
 		$(use_enable nls)
 	)

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
index 18940acd6a1..1357a7c0cd2 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -51,8 +51,7 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-shared \
-		$(use_enable nls) \
-		--docdir='$(datarootdir)/doc/'${PF}
+		$(use_enable nls)
 }
 
 multilib_src_compile() {

diff --git a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
index fbc0aa7cfe4..6d2c789ca34 100644
--- a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
@@ -65,8 +65,10 @@ src_prepare() {
 
 src_configure() {
 	tc-ld-disable-gold
+	# passing --exec-prefix is needed as the build system is trying to be clever
+	# and install itself into / instead of /usr in order to be compatible with
+	# separate-/usr setups (which we don't support without an initrd).
 	econf \
-		--prefix="${EPREFIX}"/usr \
 		--exec-prefix="${EPREFIX}"/usr \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable debug) \

diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
index 41b17fedcc7..d73ec168776 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
@@ -63,10 +63,11 @@ src_prepare() {
 
 src_configure() {
 	tc-ld-disable-gold
+	# passing --exec-prefix is needed as the build system is trying to be clever
+	# and install itself into / instead of /usr in order to be compatible with
+	# separate-/usr setups (which we don't support without an initrd).
 	econf \
-		--prefix="${EPREFIX}"/usr \
 		--exec-prefix="${EPREFIX}"/usr \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable debug) \
 		--enable-ldscript \
 		--disable-ldconfig \

diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
index efe3fcc71a7..83370cc1123 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
@@ -71,10 +71,11 @@ src_configure() {
 	# disable hd library until we have the right library in the tree and
 	# don't links to hwinfo one causing issues like bug #602360
 	tc-ld-disable-gold
+	# passing --exec-prefix is needed as the build system is trying to be clever
+	# and install itself into / instead of /usr in order to be compatible with
+	# separate-/usr setups (which we don't support without an initrd).
 	econf \
-		--prefix="${EPREFIX}"/usr \
 		--exec-prefix="${EPREFIX}"/usr \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable debug) \
 		--enable-ldscript \
 		--disable-ldconfig \

diff --git a/sys-power/suspend/suspend-1.0_p20190605.ebuild b/sys-power/suspend/suspend-1.0_p20190605.ebuild
index 9ade9df39d9..68a9887f529 100644
--- a/sys-power/suspend/suspend-1.0_p20190605.ebuild
+++ b/sys-power/suspend/suspend-1.0_p20190605.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,7 +41,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
 		--disable-fbsplash \
 		$(use_enable crypt encrypt) \
 		$(use_enable lzo compress) \

diff --git a/sys-process/procps/procps-3.3.15-r1.ebuild b/sys-process/procps/procps-3.3.15-r1.ebuild
index d3e3ac0f623..d1b833ff9f1 100644
--- a/sys-process/procps/procps-3.3.15-r1.ebuild
+++ b/sys-process/procps/procps-3.3.15-r1.ebuild
@@ -48,7 +48,6 @@ src_configure() {
 	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
 	append-lfs-flags #471102
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		$(use_with elogind)
 		$(use_enable kill)
 		$(use_enable modern-top)

diff --git a/sys-process/procps/procps-3.3.16-r1.ebuild b/sys-process/procps/procps-3.3.16-r1.ebuild
index 0693c7fc4d7..b7c8b18e232 100644
--- a/sys-process/procps/procps-3.3.16-r1.ebuild
+++ b/sys-process/procps/procps-3.3.16-r1.ebuild
@@ -49,7 +49,6 @@ multilib_src_configure() {
 	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
 	append-lfs-flags #471102
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		$(multilib_native_use_with elogind) # No elogind multilib support
 		$(multilib_native_use_enable kill)
 		$(multilib_native_use_enable modern-top)

diff --git a/sys-process/procps/procps-3.3.16.ebuild b/sys-process/procps/procps-3.3.16.ebuild
index 5938d58d4a0..520b8f0d950 100644
--- a/sys-process/procps/procps-3.3.16.ebuild
+++ b/sys-process/procps/procps-3.3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,6 @@ src_configure() {
 	# http://www.freelists.org/post/procps/PATCH-enable-transparent-large-file-support
 	append-lfs-flags #471102
 	local myeconfargs=(
-		--docdir='$(datarootdir)'/doc/${PF}
 		$(use_with elogind)
 		$(use_enable kill)
 		$(use_enable modern-top)

diff --git a/www-client/dillo/dillo-3.0.5-r3.ebuild b/www-client/dillo/dillo-3.0.5-r3.ebuild
index f2cd65be706..956787d22bf 100644
--- a/www-client/dillo/dillo-3.0.5-r3.ebuild
+++ b/www-client/dillo/dillo-3.0.5-r3.ebuild
@@ -48,8 +48,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable jpeg) \
 		$(use_enable png) \
-		$(use_enable ssl) \
-		--docdir="/usr/share/doc/${PF}"
+		$(use_enable ssl)
 }
 
 src_compile() {

diff --git a/www-client/dillo/dillo-3.1_p20181005.ebuild b/www-client/dillo/dillo-3.1_p20181005.ebuild
index 80b64368557..f918f45287e 100644
--- a/www-client/dillo/dillo-3.1_p20181005.ebuild
+++ b/www-client/dillo/dillo-3.1_p20181005.ebuild
@@ -45,8 +45,7 @@ src_configure() {
 		$(use_enable jpeg) \
 		$(use_enable png) \
 		$(use_enable ssl) \
-		$(use_enable xembed) \
-		--docdir="/usr/share/doc/${PF}"
+		$(use_enable xembed)
 }
 
 src_compile() {

diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild
index 7269ff96157..0f9bf5b7124 100644
--- a/www-client/dillo/dillo-9999.ebuild
+++ b/www-client/dillo/dillo-9999.ebuild
@@ -43,8 +43,7 @@ src_configure() {
 		$(use_enable jpeg) \
 		$(use_enable png) \
 		$(use_enable ssl) \
-		$(use_enable xembed) \
-		--docdir="/usr/share/doc/${PF}"
+		$(use_enable xembed)
 }
 
 src_compile() {

diff --git a/www-client/httrack/httrack-3.49.2-r2.ebuild b/www-client/httrack/httrack-3.49.2-r2.ebuild
index 353f6e428cd..11539e76c33 100644
--- a/www-client/httrack/httrack-3.49.2-r2.ebuild
+++ b/www-client/httrack/httrack-3.49.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -27,9 +27,7 @@ PATCHES=(
 )
 
 src_configure() {
-	econf $(use_enable static-libs static) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+	econf $(use_enable static-libs static)
 }
 
 src_install() {

diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild
index 8cbd0df50da..3cb2a188c99 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.33.ebuild
@@ -30,8 +30,6 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with gtk) \
 		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--without-guile
 }
 

diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
index 8a1ca115682..3d40232d770 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.34.ebuild
@@ -29,8 +29,6 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with gtk) \
 		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--without-guile
 }
 

diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild
index 6536b9f9ef6..0a96955cf37 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.18.ebuild
@@ -30,8 +30,6 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with gtk) \
 		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--without-guile
 }
 

diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild
index d025f98f106..b990bfb6365 100644
--- a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.19.ebuild
@@ -29,8 +29,6 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with gtk) \
 		$(use_enable static-libs static) \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--without-guile
 }
 

diff --git a/x11-libs/libvdpau/libvdpau-1.2.ebuild b/x11-libs/libvdpau/libvdpau-1.2.ebuild
index 14027d0ac57..ae3a69df818 100644
--- a/x11-libs/libvdpau/libvdpau-1.2.ebuild
+++ b/x11-libs/libvdpau/libvdpau-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,8 +41,7 @@ multilib_src_configure() {
 	append-cppflags -D_GNU_SOURCE
 	econf \
 		$(use dri || echo --disable-dri2) \
-		$(use_enable doc documentation) \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable doc documentation)
 }
 
 multilib_src_test() {

diff --git a/x11-misc/spacefm/spacefm-1.0.6.ebuild b/x11-misc/spacefm/spacefm-1.0.6.ebuild
index b550eec8205..f1c2cea9d53 100644
--- a/x11-misc/spacefm/spacefm-1.0.6.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,7 +42,6 @@ PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
 
 src_configure() {
 	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
 		$(use_enable startup-notification) \
 		$(use_enable video-thumbnails) \
 		--disable-hal \

diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index d7f32ee9c49..31647a6d0f8 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,7 +42,6 @@ PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
 
 src_configure() {
 	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
 		$(use_enable startup-notification) \
 		$(use_enable video-thumbnails) \
 		--disable-hal \

diff --git a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
index b5e6d590794..f72e00f3023 100644
--- a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -86,7 +86,6 @@ src_configure() {
 		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
 		--enable-iconv
 		--enable-package-subdirs
-		--docdir="/usr/share/doc/${P}"
 		$(use_enable bidi)
 		$(use_enable debug debug-msgs)
 		$(use_enable debug command-log)

diff --git a/x11-wm/fvwm/fvwm-2.6.9.ebuild b/x11-wm/fvwm/fvwm-2.6.9.ebuild
index 3d7394dc032..f72e00f3023 100644
--- a/x11-wm/fvwm/fvwm-2.6.9.ebuild
+++ b/x11-wm/fvwm/fvwm-2.6.9.ebuild
@@ -86,7 +86,6 @@ src_configure() {
 		--with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
 		--enable-iconv
 		--enable-package-subdirs
-		--docdir="/usr/share/doc/${P}"
 		$(use_enable bidi)
 		$(use_enable debug debug-msgs)
 		$(use_enable debug command-log)

diff --git a/x11-wm/openbox/openbox-3.6.1-r1.ebuild b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
index 30f1883b2a3..7866f2eda02 100644
--- a/x11-wm/openbox/openbox-3.6.1-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
@@ -62,7 +62,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
 		$(use_enable nls) \

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 87f93920849..ac111903327 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -68,7 +68,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
 		$(use_enable nls) \

diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 658500bbf76..75bd3b71f0f 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -62,7 +62,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
 		$(use_enable nls) \


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2020-02-23 14:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-23 14:17 [gentoo-commits] repo/gentoo:master commit in: x11-misc/spacefm/, sys-cluster/corosync/, sys-process/procps/, David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox