Gentoo Archives: gentoo-commits

From: "William Hubbs (williamh)" <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild ChangeLog
Date: Sat, 31 Dec 2011 23:57:37
Message-Id: 20111231235723.6F9A92004B@flycatcher.gentoo.org
1 williamh 11/12/31 23:57:23
2
3 Modified: kmod-9999.ebuild ChangeLog
4 Log:
5 Live ebuild updates:
6 - Remove the usage of autotools-utils from the live ebuild since we can
7 do the static libs handling in the ebuild.
8 - Pass --bindir=/sbin to the configure script for now to install the
9 binaries in /sbin.
10 - call portage's default src_install function in src_install.
11
12 (Portage version: 2.2.0_alpha84/cvs/Linux i686)
13
14 Revision Changes Path
15 1.2 sys-apps/kmod/kmod-9999.ebuild
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.2&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.2&content-type=text/plain
19 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.1&r2=1.2
20
21 Index: kmod-9999.ebuild
22 ===================================================================
23 RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
24 retrieving revision 1.1
25 retrieving revision 1.2
26 diff -u -r1.1 -r1.2
27 --- kmod-9999.ebuild 31 Dec 2011 08:08:46 -0000 1.1
28 +++ kmod-9999.ebuild 31 Dec 2011 23:57:23 -0000 1.2
29 @@ -1,54 +1,59 @@
30 # Copyright 1999-2011 Gentoo Foundation
31 # Distributed under the terms of the GNU General Public License v2
32 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.1 2011/12/31 08:08:46 vapier Exp $
33 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.2 2011/12/31 23:57:23 williamh Exp $
34
35 -EAPI="4"
36 +EAPI=4
37
38 -inherit autotools-utils toolchain-funcs
39 +EGIT_REPO_URI="git://git.profusion.mobi/${PN}.git"
40
41 -if [[ ${PV} == "9999" ]] ; then
42 - EGIT_REPO_URI="git://git.profusion.mobi/kmod.git"
43 - inherit git-2 autotools
44 -else
45 +[[ "${PV}" == "9999" ]] && vcs=git-2
46 +inherit ${vcs} autotools eutils toolchain-funcs
47 +unset vcs
48 +
49 +if [[ "${PV}" != "9999" ]] ; then
50 SRC_URI="http://packages.profusion.mobi/kmod/${P}.tar.xz"
51 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
52 fi
53
54 -DESCRIPTION="Library and utilities for kernel module loading"
55 -HOMEPAGE="http://git.profusion.mobi/cgit.cgi/kmod.git/" # XXX
56 +DESCRIPTION="library and tools for managing linux kernel modules"
57 +HOMEPAGE="http://git.profusion.mobi/cgit.cgi/kmod.git"
58
59 LICENSE="LGPL-2"
60 SLOT="0"
61 IUSE="debug lzma static-libs +tools zlib"
62
63 -RDEPEND="zlib? ( sys-libs/zlib )
64 +DEPEND="zlib? ( sys-libs/zlib )
65 lzma? ( app-arch/xz-utils )"
66 -DEPEND="${RDEPEND}"
67 +RDEPEND="${DEPEND}"
68 +
69 +src_prepare()
70 +{
71 + # Apply patches with epatch if necessary.
72
73 -src_prepare() {
74 - if [[ ! -e configure ]] ; then
75 + # Allow user patches to be applied without modifying the ebuild.
76 + epatch_user
77 +
78 + if [ ! -e configure ]; then
79 eautoreconf
80 - AT_NOELIBTOOLIZE=yes # autotools-utils calls this
81 + else
82 + elibtoolize
83 fi
84 - autotools-utils_src_prepare
85 }
86
87 -src_configure() {
88 - myeconfargs=(
89 - $(use_enable debug)
90 - $(use_with lzma xz)
91 - $(use_enable tools)
92 +src_configure()
93 +{
94 + econf \
95 + --bindir=/sbin \
96 + --with-rootprefix=/ \
97 + $(use_enable debug) \
98 + $(use_with lzma xz) \
99 + $(use_enable static-libs static) \
100 + $(use_enable tools) \
101 $(use_with zlib)
102 - --bindir=/bin
103 - --with-rootprefix=/
104 - )
105 -
106 - autotools-utils_src_configure
107 }
108
109 -src_install() {
110 - autotools-utils_src_install
111 +src_install()
112 +{
113 + default
114 gen_usr_ldscript -a kmod
115 - dodir /sbin
116 - mv "${D}"/bin/kmod-{{ins,rm}mod,modprobe} "${D}"/sbin/ || die
117 }
118
119
120
121 1.5 sys-apps/kmod/ChangeLog
122
123 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.5&view=markup
124 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.5&content-type=text/plain
125 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.4&r2=1.5
126
127 Index: ChangeLog
128 ===================================================================
129 RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
130 retrieving revision 1.4
131 retrieving revision 1.5
132 diff -u -r1.4 -r1.5
133 --- ChangeLog 31 Dec 2011 08:08:46 -0000 1.4
134 +++ ChangeLog 31 Dec 2011 23:57:23 -0000 1.5
135 @@ -1,6 +1,12 @@
136 # ChangeLog for sys-apps/kmod
137 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
138 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.4 2011/12/31 08:08:46 vapier Exp $
139 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.5 2011/12/31 23:57:23 williamh Exp $
140 +
141 + 31 Dec 2011; William Hubbs <williamh@g.o> kmod-9999.ebuild:
142 + Live ebuild updates: - Remove the usage of autotools-utils from the live
143 + ebuild since we can do the static libs handling in the ebuild. - Pass
144 + --bindir=/sbin to the configure script for now to install the binaries in
145 + /sbin. - call portage's default src_install function in src_install.
146
147 *kmod-9999 (31 Dec 2011)