diff options
| author | BlackNoxis <steven.darklight@gmail.com> | 2015-06-15 19:44:58 +0300 |
|---|---|---|
| committer | BlackNoxis <steven.darklight@gmail.com> | 2015-06-15 19:44:58 +0300 |
| commit | a91f585ba88c932f5574db6bff12ced4007e042c (patch) | |
| tree | e100cb3b1623ed2dcf505061e58d05d5bbbd7fe9 | |
| parent | 0aa456284fc7d5914d07ed4c86a40a5da4d3340e (diff) | |
| parent | 9cf1d3f29cb62a15311fcefee66691e264fb35bf (diff) | |
Merge branch 'master' of github.com:Rogentos/kogaion-desktop
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.2-r1.ebuild | 2 | ||||
| -rw-r--r-- | sys-kernel/genkernel-next/genkernel-next-63.ebuild | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/sys-apps/baselayout/baselayout-2.2-r1.ebuild b/sys-apps/baselayout/baselayout-2.2-r1.ebuild index b0c72ebe..d6ce4d73 100644 --- a/sys-apps/baselayout/baselayout-2.2-r1.ebuild +++ b/sys-apps/baselayout/baselayout-2.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" IUSE="build kernel_linux" pkg_setup() { diff --git a/sys-kernel/genkernel-next/genkernel-next-63.ebuild b/sys-kernel/genkernel-next/genkernel-next-63.ebuild index 9ed0fc8c..d7c304e8 100644 --- a/sys-kernel/genkernel-next/genkernel-next-63.ebuild +++ b/sys-kernel/genkernel-next/genkernel-next-63.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-60.ebuild,v 1.1 2015/01/20 08:25:58 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-63.ebuild,v 1.3 2015/05/24 20:51:45 zlogene Exp $ EAPI=5 @@ -15,7 +15,7 @@ inherit bash-completion-r1 eutils if [[ "${PV}" == "9999" ]]; then KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86" + KEYWORDS="~alpha amd64 ~arm ~ia64 x86" fi DESCRIPTION="Gentoo automatic kernel building scripts, reloaded" @@ -24,7 +24,7 @@ HOMEPAGE="http://www.gentoo.org" LICENSE="GPL-2" SLOT="0" RESTRICT="" -IUSE="cryptsetup dmraid gpg iscsi plymouth selinux" +IUSE="cryptsetup dmraid gpg iscsi mdadm plymouth selinux" DEPEND="app-text/asciidoc sys-fs/e2fsprogs @@ -33,10 +33,11 @@ DEPEND="app-text/asciidoc RDEPEND="${DEPEND} !sys-kernel/genkernel cryptsetup? ( sys-fs/cryptsetup ) - dmraid? ( >=sys-fs/dmraid-1.0.0_rc14 ) + dmraid? ( >=sys-fs/dmraid-1.0.0_rc16 ) gpg? ( app-crypt/gnupg ) iscsi? ( sys-block/open-iscsi ) - plymouth? ( sys-boot/plymouth ) + mdadm? ( sys-fs/mdadm ) + plymouth? ( sys-boot/plymouth[libkms] ) app-portage/portage-utils app-arch/cpio >=app-misc/pax-utils-0.6 @@ -48,6 +49,8 @@ RDEPEND="${DEPEND} src_prepare() { sed -i "/^GK_V=/ s:GK_V=.*:GK_V=${PV}:g" "${S}/genkernel" || \ die "Could not setup release" + + epatch_user } src_install() { |