diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-02-05 09:46:31 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-02-05 09:46:31 +0000 |
| commit | 63111b45f9c95b6487bc986f0c624b3f7259aa86 (patch) | |
| tree | 99e6b2baedd8a51e529aa2367ee8821ad2201d07 /sys-apps | |
| parent | Stable for amd64 wrt bug #495824 (diff) | |
| download | gentoo-2-63111b45f9c95b6487bc986f0c624b3f7259aa86.tar.gz gentoo-2-63111b45f9c95b6487bc986f0c624b3f7259aa86.tar.bz2 gentoo-2-63111b45f9c95b6487bc986f0c624b3f7259aa86.zip | |
Fix bash-completion directory by using bash-completion-r1.eclass. Temporarily run non-9999 ebuilds as -j1 because of the -15-dynamic-kmod.patch wrt #494806
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/kmod/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-16.ebuild | 17 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-9999.ebuild | 17 |
3 files changed, 34 insertions, 7 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index a74c6874c57e..e7d904c999bf 100644 --- a/sys-apps/kmod/ChangeLog +++ b/sys-apps/kmod/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/kmod # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.127 2014/02/02 20:01:48 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.128 2014/02/05 09:46:31 ssuominen Exp $ + + 05 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-16.ebuild, + kmod-9999.ebuild: + Fix bash-completion directory by using bash-completion-r1.eclass. Temporarily + run non-9999 ebuilds as -j1 because of the -15-dynamic-kmod.patch wrt #494806 02 Feb 2014; Jeroen Roovers <jer@gentoo.org> kmod-16.ebuild: Stable for HPPA (bug #500106). diff --git a/sys-apps/kmod/kmod-16.ebuild b/sys-apps/kmod/kmod-16.ebuild index 4a70792e651b..285aaba19a15 100644 --- a/sys-apps/kmod/kmod-16.ebuild +++ b/sys-apps/kmod/kmod-16.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.3 2014/02/02 20:01:48 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-16.ebuild,v 1.4 2014/02/05 09:46:31 ssuominen Exp $ EAPI=5 -inherit eutils multilib +inherit bash-completion-r1 eutils multilib if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -67,7 +67,18 @@ src_configure() { $(use_enable debug) \ $(use_enable doc gtk-doc) \ $(use_with lzma xz) \ - $(use_with zlib) + $(use_with zlib) \ + --with-bashcompletiondir="$(get_bashcompdir)" +} + +src_compile() { + if [[ ${PV} == 9999* ]]; then + default + else + # Force -j1 because of -15-dynamic-kmod.patch, likely caused by lack of eautoreconf + # wrt #494806 + emake -j1 + fi } src_install() { diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 2cb8c2cbafe5..b03870d217d6 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.67 2014/01/18 04:33:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.68 2014/02/05 09:46:31 ssuominen Exp $ EAPI=5 -inherit eutils multilib +inherit bash-completion-r1 eutils multilib if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" @@ -67,7 +67,18 @@ src_configure() { $(use_enable debug) \ $(use_enable doc gtk-doc) \ $(use_with lzma xz) \ - $(use_with zlib) + $(use_with zlib) \ + --with-bashcompletiondir="$(get_bashcompdir)" +} + +src_compile() { + if [[ ${PV} == 9999* ]]; then + default + else + # Force -j1 because of -15-dynamic-kmod.patch, likely caused by lack of eautoreconf + # wrt #494806 + emake -j1 + fi } src_install() { |