diff options
| -rw-r--r-- | sys-apps/kmod/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-10.ebuild | 13 | ||||
| -rw-r--r-- | sys-apps/kmod/kmod-9999.ebuild | 13 |
3 files changed, 17 insertions, 15 deletions
diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index 0120f4e37296..93340e0811b1 100644 --- a/sys-apps/kmod/ChangeLog +++ b/sys-apps/kmod/ChangeLog @@ -1,5 +1,9 @@ # ChangeLog for sys-apps/kmod -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.49 2012/09/08 17:35:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.50 2012/09/09 17:38:10 williamh Exp $ + + 09 Sep 2012; William Hubbs <williamh@gentoo.org> kmod-10.ebuild, + kmod-9999.ebuild: + clean up the live portion of the ebuild using multiple inherits *kmod-10 (08 Sep 2012) diff --git a/sys-apps/kmod/kmod-10.ebuild b/sys-apps/kmod/kmod-10.ebuild index afd9e97a364e..86c2ba8613f6 100644 --- a/sys-apps/kmod/kmod-10.ebuild +++ b/sys-apps/kmod/kmod-10.ebuild @@ -1,16 +1,15 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-10.ebuild,v 1.1 2012/09/08 17:35:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-10.ebuild,v 1.2 2012/09/09 17:38:10 williamh Exp $ EAPI=4 -EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" +inherit autotools eutils toolchain-funcs libtool -[[ ${PV} == 9999 ]] && vcs=git-2 -inherit ${vcs} autotools eutils toolchain-funcs libtool -unset vcs - -if [[ ${PV} != 9999 ]] ; then +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" + inherit git-2 +else SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index ed1442d5613b..1f6fbdbec248 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -1,16 +1,15 @@ # Copyright 1999-2012 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.32 2012/09/08 17:35:44 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.33 2012/09/09 17:38:10 williamh Exp $ EAPI=4 -EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" +inherit autotools eutils toolchain-funcs libtool -[[ ${PV} == 9999 ]] && vcs=git-2 -inherit ${vcs} autotools eutils toolchain-funcs libtool -unset vcs - -if [[ ${PV} != 9999 ]] ; then +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git" + inherit git-2 +else SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi |