diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2014-04-08 09:08:23 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-04-08 09:08:23 +0000 |
commit | 578c7439cfb4a8b14a5a01205e4ae767b20f8198 (patch) | |
tree | bbcb4161ab0799ba3049f9d93f014fa9700a5bbd /sys-apps/kmod | |
parent | Temporarily pass --disable-python until the ebuild has been ported over to py... (diff) | |
download | gentoo-2-578c7439cfb4a8b14a5a01205e4ae767b20f8198.tar.gz gentoo-2-578c7439cfb4a8b14a5a01205e4ae767b20f8198.tar.bz2 gentoo-2-578c7439cfb4a8b14a5a01205e4ae767b20f8198.zip |
Avoid reverting changes, meh, a mistake.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'sys-apps/kmod')
-rw-r--r-- | sys-apps/kmod/ChangeLog | 10 | ||||
-rw-r--r-- | sys-apps/kmod/kmod-9999.ebuild | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index 244516c5225a..3635311c7059 100644 --- a/sys-apps/kmod/ChangeLog +++ b/sys-apps/kmod/ChangeLog @@ -1,19 +1,15 @@ # 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.142 2014/04/08 09:05:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.143 2014/04/08 09:08:23 ssuominen Exp $ 08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-9999.ebuild: Temporarily pass --disable-python until the ebuild has been ported over to python-r1.eclass. Also, nothing in gentoo-x86 is requiring python-kmod yet. - - 08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-9999.ebuild: Move dev-libs/libxslt behind ifdef based on 9999 because it's no longer required for released tarballs as per NEWS. - 08 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-9999.ebuild: - Push last change to -16 also to -9999. - - 05 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-16.ebuild: + 05 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> kmod-16.ebuild, + kmod-9999.ebuild: If /etc/runlevels/sysinit is missing when we are installing for the first time, create the directory. This way we don't have to pull in sys-apps/openrc as a dependency. This bug was reported against sys-fs/udev-init-scripts wrt diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index 9827f882e380..c9baa55feeaf 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,6 +1,6 @@ # 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.71 2014/04/08 09:05:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.72 2014/04/08 09:08:23 ssuominen Exp $ EAPI=5 inherit bash-completion-r1 eutils multilib @@ -33,10 +33,13 @@ RDEPEND="!sys-apps/module-init-tools openrc? ( !<sys-apps/openrc-0.12 ) zlib? ( >=sys-libs/zlib-1.2.6 )" #427130 DEPEND="${RDEPEND} - dev-libs/libxslt doc? ( dev-util/gtk-doc ) lzma? ( virtual/pkgconfig ) zlib? ( virtual/pkgconfig )" +if [[ ${PV} == 9999* ]]; then + DEPEND="${DEPEND} + dev-libs/libxslt" +fi src_prepare() { if [ ! -e configure ]; then |