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

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

10 files changed, 7 insertions, 17 deletions

diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index 089004f78b9f..3e4bf6a0f565 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 be1d2139373a..49840bb0216f 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 26ef2c631b2b..351790fe5a70 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 85b6bebf7113..895462bd41ab 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 9635d27bb15d..210f6b936ef1 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 ea9901f6f53e..a70a74de42e4 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 f4f0006ebc66..544b9e693be5 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 8eeb7b552f05..7f8f685b41ad 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 f9a659b1dc90..e412669c3edf 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 c7cb6c9ce414..770a3e533907 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 )