diff options
| author |   Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2013-07-06 21:13:41 +0000 |
|---|---|---|
| committer | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2013-07-06 21:13:41 +0000 |
| commit | 69fae99766629ac14024aa21a5c275a34a82b7e4 (patch) | |
| tree | bbfadf13fa0ec743b3ed9faf0cf899772847ec75 /sys-kernel | |
| parent | Fix compile failure, bug 395897 comment #1. Remove old. (diff) | |
| download | gentoo-2-69fae99766629ac14024aa21a5c275a34a82b7e4.tar.gz gentoo-2-69fae99766629ac14024aa21a5c275a34a82b7e4.tar.bz2 gentoo-2-69fae99766629ac14024aa21a5c275a34a82b7e4.zip | |
Use get_bashcompdir() of bash-completion-r1 eclass.
(Portage version: 2.1.12.11/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/dracut/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-kernel/dracut/dracut-027-r3.ebuild | 13 | ||||
| -rw-r--r-- | sys-kernel/dracut/dracut-029.ebuild | 13 |
3 files changed, 11 insertions, 21 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 9ef96eb95140..1f827f4dda90 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-kernel/dracut # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.123 2013/06/23 09:51:50 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.124 2013/07/06 21:13:41 aidecoe Exp $ + + 06 Jul 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-027-r3.ebuild, + dracut-029.ebuild: + Use get_bashcompdir() of bash-completion-r1 eclass. 23 Jun 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-014-r3.ebuild, -dracut-018-r3.ebuild, -dracut-019-r6.ebuild, -dracut-022-r6.ebuild, diff --git a/sys-kernel/dracut/dracut-027-r3.ebuild b/sys-kernel/dracut/dracut-027-r3.ebuild index bf677dfdc76d..56104a577dd0 100644 --- a/sys-kernel/dracut/dracut-027-r3.ebuild +++ b/sys-kernel/dracut/dracut-027-r3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027-r3.ebuild,v 1.1 2013/05/20 18:22:56 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027-r3.ebuild,v 1.2 2013/07/06 21:13:41 aidecoe Exp $ EAPI=4 -inherit eutils linux-info systemd +inherit bash-completion-r1 eutils linux-info systemd add_req_use_for() { local dep="$1"; shift @@ -175,14 +175,7 @@ src_prepare() { src_configure() { local myconf="--libdir='${MY_LIBDIR}'" - local bashcompletiondir=/usr/share/bash-completion - - if $(tc-getPKG_CONFIG) bash-completion --exists; then - bashcompletiondir="$($(tc-getPKG_CONFIG) bash-completion \ - --variable=completionsdir)" - fi - - myconf+=" --bashcompletiondir=${bashcompletiondir}" + myconf+=" --bashcompletiondir=$(get_bashcompdir)" if use dracut_modules_systemd; then myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" diff --git a/sys-kernel/dracut/dracut-029.ebuild b/sys-kernel/dracut/dracut-029.ebuild index c489d55c4749..4fda15f361c1 100644 --- a/sys-kernel/dracut/dracut-029.ebuild +++ b/sys-kernel/dracut/dracut-029.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-029.ebuild,v 1.1 2013/06/23 09:43:16 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-029.ebuild,v 1.2 2013/07/06 21:13:41 aidecoe Exp $ EAPI=4 -inherit eutils linux-info systemd +inherit bash-completion-r1 eutils linux-info systemd add_req_use_for() { local dep="$1"; shift @@ -173,14 +173,7 @@ src_prepare() { src_configure() { local myconf="--libdir='${MY_LIBDIR}'" - local bashcompletiondir=/usr/share/bash-completion - - if $(tc-getPKG_CONFIG) bash-completion --exists; then - bashcompletiondir="$($(tc-getPKG_CONFIG) bash-completion \ - --variable=completionsdir)" - fi - - myconf+=" --bashcompletiondir=${bashcompletiondir}" + myconf+=" --bashcompletiondir=$(get_bashcompdir)" if use dracut_modules_systemd; then myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" |