Skip to content

Commit 24d75f9

Browse files
committed
*/*: [QA] Remove redundant --docdir/--htmldir
Closes: gentoo#14742 Signed-off-by: David Seifert <[email protected]>
1 parent 5b6a443 commit 24d75f9

File tree

247 files changed

+172
-532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+172
-532
lines changed

app-admin/clsync/clsync-0.4.2.ebuild

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=6
@@ -55,7 +55,6 @@ src_configure() {
5555
use extra-debug && debug_level=2
5656

5757
econf \
58-
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
5958
--disable-socket-library \
6059
--enable-clsync \
6160
--enable-debug=${debug_level} \

app-backup/bacula/bacula-9.0.8-r1.ebuild

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI="6"
@@ -229,9 +229,6 @@ src_configure() {
229229
$(use_with tcpd tcp-wrappers)"
230230

231231
econf \
232-
--libdir=/usr/$(get_libdir) \
233-
--docdir=/usr/share/doc/${PF} \
234-
--htmldir=/usr/share/doc/${PF}/html \
235232
--with-pid-dir=/var/run \
236233
--sysconfdir=/etc/bacula \
237234
--with-subsys-dir=/var/lock/subsys \

app-backup/bacula/bacula-9.2.2-r2.ebuild

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=6
@@ -231,9 +231,6 @@ src_configure() {
231231
$(use_with tcpd tcp-wrappers)"
232232

233233
econf \
234-
--libdir=/usr/$(get_libdir) \
235-
--docdir=/usr/share/doc/${PF} \
236-
--htmldir=/usr/share/doc/${PF}/html \
237234
--with-pid-dir=/var/run \
238235
--sysconfdir=/etc/bacula \
239236
--with-archivedir=/var/lib/bacula/tmp \

app-backup/bacula/bacula-9.4.1-r2.ebuild

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=6
@@ -234,9 +234,6 @@ src_configure() {
234234
$(use_with tcpd tcp-wrappers)"
235235

236236
econf \
237-
--libdir=/usr/$(get_libdir) \
238-
--docdir=/usr/share/doc/${PF} \
239-
--htmldir=/usr/share/doc/${PF}/html \
240237
--with-pid-dir=/var/run \
241238
--sysconfdir=/etc/bacula \
242239
--with-archivedir=/var/lib/bacula/tmp \

app-backup/bacula/bacula-9.4.2-r1.ebuild

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=6
@@ -231,9 +231,6 @@ src_configure() {
231231
$(use_with tcpd tcp-wrappers)"
232232

233233
econf \
234-
--libdir=/usr/$(get_libdir) \
235-
--docdir=/usr/share/doc/${PF} \
236-
--htmldir=/usr/share/doc/${PF}/html \
237234
--with-pid-dir=/var/run \
238235
--sysconfdir=/etc/bacula \
239236
--with-archivedir=/var/lib/bacula/tmp \

app-backup/bacula/bacula-9.4.3-r1.ebuild

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=6
@@ -231,9 +231,6 @@ src_configure() {
231231
$(use_with tcpd tcp-wrappers)"
232232

233233
econf \
234-
--libdir=/usr/$(get_libdir) \
235-
--docdir=/usr/share/doc/${PF} \
236-
--htmldir=/usr/share/doc/${PF}/html \
237234
--with-pid-dir=/var/run \
238235
--sysconfdir=/etc/bacula \
239236
--with-archivedir=/var/lib/bacula/tmp \

app-backup/bacula/bacula-9.4.4-r1.ebuild

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=6
@@ -231,9 +231,6 @@ src_configure() {
231231
$(use_with tcpd tcp-wrappers)"
232232

233233
econf \
234-
--libdir=/usr/$(get_libdir) \
235-
--docdir=/usr/share/doc/${PF} \
236-
--htmldir=/usr/share/doc/${PF}/html \
237234
--with-pid-dir=/var/run \
238235
--sysconfdir=/etc/bacula \
239236
--with-archivedir=/var/lib/bacula/tmp \

app-backup/bacula/bacula-9.4.4-r2.ebuild

-3
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,6 @@ src_configure() {
214214
$(use_with tcpd tcp-wrappers)"
215215

216216
econf \
217-
--libdir=/usr/$(get_libdir) \
218-
--docdir=/usr/share/doc/${PF} \
219-
--htmldir=/usr/share/doc/${PF}/html \
220217
--with-pid-dir=/var/run \
221218
--sysconfdir=/etc/bacula \
222219
--with-archivedir=/var/lib/bacula/tmp \

app-backup/bareos/bareos-16.2.7-r1.ebuild

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2018 Gentoo Foundation
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI="5"
@@ -190,7 +190,6 @@ src_configure() {
190190
--docdir=/usr/share/doc/${PF} \
191191
--htmldir=/usr/share/doc/${PF}/html \
192192
--with-pid-dir=/run/bareos \
193-
--sysconfdir=/etc \
194193
--with-subsys-dir=/run/lock/subsys \
195194
--with-working-dir=/var/lib/bareos \
196195
--with-logdir=/var/log/bareos \

app-backup/bareos/bareos-17.2.6.ebuild

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2018 Gentoo Foundation
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI="6"
@@ -180,11 +180,7 @@ src_configure() {
180180
"
181181

182182
econf \
183-
--libdir=/usr/$(get_libdir) \
184-
--docdir=/usr/share/doc/${PF} \
185-
--htmldir=/usr/share/doc/${PF}/html \
186183
--with-pid-dir=/run/bareos \
187-
--sysconfdir=/etc \
188184
--with-subsys-dir=/run/lock/subsys \
189185
--with-working-dir=/var/lib/bareos \
190186
--with-logdir=/var/log/bareos \

app-backup/bareos/bareos-17.2.7-r1.ebuild

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI="6"
@@ -180,11 +180,7 @@ src_configure() {
180180
"
181181

182182
econf \
183-
--libdir=/usr/$(get_libdir) \
184-
--docdir=/usr/share/doc/${PF} \
185-
--htmldir=/usr/share/doc/${PF}/html \
186183
--with-pid-dir=/run/bareos \
187-
--sysconfdir=/etc \
188184
--with-subsys-dir=/run/lock/subsys \
189185
--with-working-dir=/var/lib/bareos \
190186
--with-logdir=/var/log/bareos \

app-backup/snapper/snapper-0.5.6-r1.ebuild

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=6
@@ -49,7 +49,6 @@ src_configure() {
4949
# snapper does not build without btrfs
5050
local myeconfargs=(
5151
--with-conf="/etc/conf.d"
52-
--docdir="/usr/share/doc/${PF}"
5352
--disable-zypp
5453
--enable-rollback
5554
--disable-ext4

app-backup/snapper/snapper-0.8.4.ebuild

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=7
@@ -48,7 +48,6 @@ src_configure() {
4848
# snapper does not build without btrfs
4949
local myeconfargs=(
5050
--with-conf="/etc/conf.d"
51-
--docdir="/usr/share/doc/${PF}"
5251
--disable-zypp
5352
--enable-rollback
5453
--disable-ext4

app-backup/snapper/snapper-0.8.5.ebuild

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=7
@@ -48,7 +48,6 @@ src_configure() {
4848
# snapper does not build without btrfs
4949
local myeconfargs=(
5050
--with-conf="/etc/conf.d"
51-
--docdir="/usr/share/doc/${PF}"
5251
--disable-zypp
5352
--enable-rollback
5453
--disable-ext4

app-backup/snapper/snapper-0.8.6.ebuild

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ src_configure() {
4848
# snapper does not build without btrfs
4949
local myeconfargs=(
5050
--with-conf="/etc/conf.d"
51-
--docdir="/usr/share/doc/${PF}"
5251
--disable-zypp
5352
--enable-rollback
5453
--disable-ext4

app-editors/vis/vis-0.5.ebuild

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ src_prepare() {
4343

4444
src_configure() {
4545
./configure \
46-
--prefix="${EROOT}usr" \
47-
--docdir="${EROOT}usr/share/doc/${PF}" \
46+
--prefix="${EPREFIX}"/usr \
47+
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
4848
$(use_enable ncurses curses) \
4949
$(use_enable selinux) \
5050
$(use_enable tre) || die

app-editors/vis/vis-9999.ebuild

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ src_prepare() {
3535

3636
src_configure() {
3737
./configure \
38-
--prefix="${EROOT}usr" \
39-
--docdir="${EROOT}usr/share/doc/${PF}" \
38+
--prefix="${EPREFIX}"/usr \
39+
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
4040
$(use_enable ncurses curses) \
4141
$(use_enable selinux) \
4242
$(use_enable tre) || die

app-editors/zile/zile-2.4.14.ebuild

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ QA_AM_MAINTAINER_MODE=".*help2man.*" #450278
2828
src_configure() {
2929
# --without-emacs to suppress tests for GNU Emacs #630652
3030
econf \
31-
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
3231
--without-emacs \
3332
--disable-valgrind-tests \
3433
$(use_enable acl) \

app-emacs/auctex/auctex-11.92.ebuild

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ RDEPEND="${DEPEND}"
2424
TEXMF="/usr/share/texmf-site"
2525

2626
src_configure() {
27-
econf --with-emacs \
27+
econf \
28+
--with-emacs \
2829
--with-auto-dir="${EPREFIX}/var/lib/auctex" \
2930
--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
3031
--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
3132
--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
3233
--with-texmf-dir="${EPREFIX}${TEXMF}" \
33-
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
3434
--disable-build-dir-test \
3535
$(use_enable preview-latex preview)
3636
}

app-emacs/auctex/auctex-12.1-r1.ebuild

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ ELISP_PATCHES="${P}-autoload.patch"
2626
TEXMF="/usr/share/texmf-site"
2727

2828
src_configure() {
29-
econf --with-emacs \
29+
econf \
30+
--with-emacs \
3031
--with-auto-dir="${EPREFIX}/var/lib/auctex" \
3132
--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
3233
--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
3334
--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
3435
--with-texmf-dir="${EPREFIX}${TEXMF}" \
35-
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
3636
--disable-build-dir-test \
3737
$(use_enable preview-latex preview)
3838
}

app-emacs/auctex/auctex-12.2.ebuild

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ BDEPEND="${RDEPEND}"
2525
TEXMF="/usr/share/texmf-site"
2626

2727
src_configure() {
28-
econf --with-emacs \
28+
econf \
29+
--with-emacs \
2930
--with-auto-dir="${EPREFIX}/var/lib/auctex" \
3031
--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
3132
--with-packagelispdir="${EPREFIX}${SITELISP}/${PN}" \
3233
--with-packagedatadir="${EPREFIX}${SITEETC}/${PN}" \
3334
--with-texmf-dir="${EPREFIX}${TEXMF}" \
34-
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
3535
--disable-build-dir-test \
3636
$(use_enable preview-latex preview)
3737
}

app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11-r1.ebuild

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=7
@@ -21,10 +21,6 @@ RDEPEND="app-arch/dpkg
2121
sys-apps/util-linux
2222
sys-fs/e2fsprogs"
2323

24-
src_configure() {
25-
econf --docdir=/usr/share/doc/${P}
26-
}
27-
2824
src_install() {
2925
default
3026
insinto /etc/ganeti/instance-debootstrap/hooks

app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.16.ebuild

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1999-2019 Gentoo Authors
1+
# Copyright 1999-2020 Gentoo Authors
22
# Distributed under the terms of the GNU General Public License v2
33

44
EAPI=6
@@ -33,10 +33,6 @@ src_prepare() {
3333
eautoreconf
3434
}
3535

36-
src_configure() {
37-
econf --docdir=/usr/share/doc/${P}
38-
}
39-
4036
src_install() {
4137
default
4238

app-emulation/wine-staging/wine-staging-4.19.ebuild

-2
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ pkg_setup() {
307307
MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
308308
MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
309309
MY_DATADIR="${MY_DATAROOTDIR}"
310-
MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
311310
MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
312311
MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
313312
MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
427426
--prefix="${MY_PREFIX}"
428427
--datarootdir="${MY_DATAROOTDIR}"
429428
--datadir="${MY_DATADIR}"
430-
--docdir="${MY_DOCDIR}"
431429
--includedir="${MY_INCLUDEDIR}"
432430
--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
433431
--libexecdir="${MY_LIBEXECDIR}"

app-emulation/wine-staging/wine-staging-4.20.ebuild

-2
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ pkg_setup() {
307307
MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
308308
MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
309309
MY_DATADIR="${MY_DATAROOTDIR}"
310-
MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
311310
MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
312311
MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
313312
MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
427426
--prefix="${MY_PREFIX}"
428427
--datarootdir="${MY_DATAROOTDIR}"
429428
--datadir="${MY_DATADIR}"
430-
--docdir="${MY_DOCDIR}"
431429
--includedir="${MY_INCLUDEDIR}"
432430
--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
433431
--libexecdir="${MY_LIBEXECDIR}"

app-emulation/wine-staging/wine-staging-4.21.ebuild

-2
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ pkg_setup() {
307307
MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
308308
MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
309309
MY_DATADIR="${MY_DATAROOTDIR}"
310-
MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
311310
MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
312311
MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
313312
MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
427426
--prefix="${MY_PREFIX}"
428427
--datarootdir="${MY_DATAROOTDIR}"
429428
--datadir="${MY_DATADIR}"
430-
--docdir="${MY_DOCDIR}"
431429
--includedir="${MY_INCLUDEDIR}"
432430
--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
433431
--libexecdir="${MY_LIBEXECDIR}"

app-emulation/wine-staging/wine-staging-5.0.ebuild

-2
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ pkg_setup() {
307307
MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
308308
MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
309309
MY_DATADIR="${MY_DATAROOTDIR}"
310-
MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
311310
MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
312311
MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
313312
MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
@@ -427,7 +426,6 @@ multilib_src_configure() {
427426
--prefix="${MY_PREFIX}"
428427
--datarootdir="${MY_DATAROOTDIR}"
429428
--datadir="${MY_DATADIR}"
430-
--docdir="${MY_DOCDIR}"
431429
--includedir="${MY_INCLUDEDIR}"
432430
--libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
433431
--libexecdir="${MY_LIBEXECDIR}"

0 commit comments

Comments
 (0)