* [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild ChangeLog kmod-7.ebuild
@ 2012-03-19 13:47 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-03-19 13:47 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/03/19 13:47:07
Modified: kmod-9999.ebuild ChangeLog
Added: kmod-7.ebuild
Log:
Version bump.
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Revision Changes Path
1.15 sys-apps/kmod/kmod-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.14&r2=1.15
Index: kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kmod-9999.ebuild 9 Mar 2012 23:51:10 -0000 1.14
+++ kmod-9999.ebuild 19 Mar 2012 13:47:06 -0000 1.15
@@ -1,16 +1,16 @@
# 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.14 2012/03/09 23:51:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.15 2012/03/19 13:47:06 ssuominen Exp $
EAPI=4
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-[[ "${PV}" == "9999" ]] && vcs=git-2
-inherit ${vcs} autotools eutils toolchain-funcs
+[[ ${PV} == "9999" ]] && vcs=git-2
+inherit ${vcs} autotools eutils toolchain-funcs
unset vcs
-if [[ "${PV}" != "9999" ]] ; then
+if [[ ${PV} != "9999" ]] ; then
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
@@ -20,22 +20,20 @@
LICENSE="LGPL-2"
SLOT="0"
-IUSE="doc debug lzma static-libs +tools zlib"
+IUSE="debug doc lzma static-libs +tools zlib"
COMMON_DEPEND="!sys-apps/module-init-tools
!sys-apps/modutils
lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib )"
-
+RDEPEND="${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}
doc? ( dev-util/gtk-doc )"
-RDEPEND="${COMMON_DEPEND}"
-src_prepare()
-{
+src_prepare() {
if [ ! -e configure ]; then
if use doc; then
- gtkdocize --copy --docdir libkmod/docs || die "gtkdocize failed"
+ gtkdocize --copy --docdir libkmod/docs || die
else
touch libkmod/docs/gtk-doc.make
fi
@@ -45,30 +43,31 @@
fi
}
-src_configure()
-{
+src_configure() {
+ local myconf
+ [[ ${PV} == *9999* ]] && myconf="$(use_enable doc gtk-doc)"
+
econf \
- $(use_enable debug) \
- $(use_enable doc gtk-doc) \
- $(use_with lzma xz) \
$(use_enable static-libs static) \
$(use_enable tools) \
- $(use_with zlib)
+ $(use_enable debug) \
+ $(use_with lzma xz) \
+ $(use_with zlib) \
+ ${myconf}
}
-src_install()
-{
+src_install() {
default
- # we have a .pc file for people to use
- find "${D}" -name libkmod.la -delete
+ find "${D}" -name libkmod.la -exec rm -f {} +
if use tools; then
- dodir /bin
-dosym /usr/bin/kmod /bin/lsmod
+ dodir /bin
+ dosym /usr/bin/kmod /bin/lsmod
dodir /sbin
+ local cmd
for cmd in depmod insmod modinfo modprobe rmmod; do
- dosym /usr/bin/kmod /sbin/$cmd
+ dosym /usr/bin/kmod /sbin/${cmd}
done
fi
}
1.27 sys-apps/kmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.26&r2=1.27
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog 9 Mar 2012 23:51:10 -0000 1.26
+++ ChangeLog 19 Mar 2012 13:47:06 -0000 1.27
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/kmod
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.26 2012/03/09 23:51:10 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.27 2012/03/19 13:47:06 ssuominen Exp $
+
+*kmod-7 (19 Mar 2012)
+
+ 19 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> +kmod-7.ebuild,
+ kmod-9999.ebuild:
+ Version bump.
09 Mar 2012; William Hubbs <williamh@gentoo.org> kmod-6.ebuild,
kmod-9999.ebuild, metadata.xml:
1.1 sys-apps/kmod/kmod-7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?rev=1.1&content-type=text/plain
Index: kmod-7.ebuild
===================================================================
# 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-7.ebuild,v 1.1 2012/03/19 13:47:06 ssuominen Exp $
EAPI=4
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
[[ ${PV} == "9999" ]] && vcs=git-2
inherit ${vcs} autotools eutils toolchain-funcs
unset vcs
if [[ ${PV} != "9999" ]] ; then
SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="library and tools for managing linux kernel modules"
HOMEPAGE="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
LICENSE="LGPL-2"
SLOT="0"
IUSE="debug doc lzma static-libs +tools zlib"
COMMON_DEPEND="!sys-apps/module-init-tools
!sys-apps/modutils
lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib )"
RDEPEND="${COMMON_DEPEND}"
DEPEND="${COMMON_DEPEND}
doc? ( dev-util/gtk-doc )"
src_prepare() {
if [ ! -e configure ]; then
if use doc; then
gtkdocize --copy --docdir libkmod/docs || die
else
touch libkmod/docs/gtk-doc.make
fi
eautoreconf
else
elibtoolize
fi
}
src_configure() {
local myconf
[[ ${PV} == *9999* ]] && myconf="$(use_enable doc gtk-doc)"
econf \
$(use_enable static-libs static) \
$(use_enable tools) \
$(use_enable debug) \
$(use_with lzma xz) \
$(use_with zlib) \
${myconf}
}
src_install() {
default
find "${D}" -name libkmod.la -exec rm -f {} +
if use tools; then
dodir /bin
dosym /usr/bin/kmod /bin/lsmod
dodir /sbin
local cmd
for cmd in depmod insmod modinfo modprobe rmmod; do
dosym /usr/bin/kmod /sbin/${cmd}
done
fi
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild ChangeLog kmod-7.ebuild
@ 2012-04-02 12:40 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-04-02 12:40 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/04/02 12:40:54
Modified: kmod-9999.ebuild ChangeLog kmod-7.ebuild
Log:
Remove temporary COMMON_DEPEND variable usage to simplify dependencies.
(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
Revision Changes Path
1.22 sys-apps/kmod/kmod-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.21&r2=1.22
Index: kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kmod-9999.ebuild 2 Apr 2012 03:56:00 -0000 1.21
+++ kmod-9999.ebuild 2 Apr 2012 12:40:54 -0000 1.22
@@ -1,6 +1,6 @@
# 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.21 2012/04/02 03:56:00 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.22 2012/04/02 12:40:54 ssuominen Exp $
EAPI=4
@@ -22,16 +22,14 @@
SLOT="0"
IUSE="debug doc lzma static-libs +tools zlib"
-COMMON_DEPEND="!sys-apps/module-init-tools
- !sys-apps/modutils"
-
-DEPEND="${COMMON_DEPEND}
- doc? ( dev-util/gtk-doc )
- lzma? ( app-arch/xz-utils dev-util/pkgconfig )
- zlib? ( sys-libs/zlib dev-util/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
-lzma? ( app-arch/xz-utils )
+RDEPEND="!sys-apps/module-init-tools
+ !sys-apps/modutils
+ lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ doc? ( dev-util/gtk-doc )
+ lzma? ( dev-util/pkgconfig )
+ zlib? ( dev-util/pkgconfig )"
# Upstream does not support running the test suite with custom configure flags.
# I was also told that the test suite is intended for kmod developers.
1.33 sys-apps/kmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.32&r2=1.33
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog 2 Apr 2012 03:56:00 -0000 1.32
+++ ChangeLog 2 Apr 2012 12:40:54 -0000 1.33
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/kmod
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.32 2012/04/02 03:56:00 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.33 2012/04/02 12:40:54 ssuominen Exp $
+
+ 02 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> kmod-7.ebuild,
+ kmod-9999.ebuild:
+ Remove temporary COMMON_DEPEND variable usage to simplify dependencies.
02 Apr 2012; William Hubbs <williamh@gentoo.org> kmod-7.ebuild,
kmod-9999.ebuild:
1.8 sys-apps/kmod/kmod-7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?r1=1.7&r2=1.8
Index: kmod-7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmod-7.ebuild 2 Apr 2012 03:56:00 -0000 1.7
+++ kmod-7.ebuild 2 Apr 2012 12:40:54 -0000 1.8
@@ -1,6 +1,6 @@
# 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-7.ebuild,v 1.7 2012/04/02 03:56:00 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v 1.8 2012/04/02 12:40:54 ssuominen Exp $
EAPI=4
@@ -22,16 +22,14 @@
SLOT="0"
IUSE="debug doc lzma static-libs +tools zlib"
-COMMON_DEPEND="!sys-apps/module-init-tools
- !sys-apps/modutils"
-
-DEPEND="${COMMON_DEPEND}
- doc? ( dev-util/gtk-doc )
- lzma? ( app-arch/xz-utils dev-util/pkgconfig )
- zlib? ( sys-libs/zlib dev-util/pkgconfig )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="!sys-apps/module-init-tools
+ !sys-apps/modutils
lzma? ( app-arch/xz-utils )
zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ doc? ( dev-util/gtk-doc )
+ lzma? ( dev-util/pkgconfig )
+ zlib? ( dev-util/pkgconfig )"
# Upstream does not support running the test suite with custom configure flags.
# I was also told that the test suite is intended for kmod developers.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild ChangeLog kmod-7.ebuild
@ 2012-04-06 21:04 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2012-04-06 21:04 UTC (permalink / raw
To: gentoo-commits
ssuominen 12/04/06 21:04:02
Modified: kmod-9999.ebuild ChangeLog kmod-7.ebuild
Log:
Use zlib_CFLAGS and zlib_LIBS because zlib.pc pkg-config file is present only in sys-libs/zlib >= 1.2.6 wrt #410865
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64)
Revision Changes Path
1.23 sys-apps/kmod/kmod-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild?r1=1.22&r2=1.23
Index: kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- kmod-9999.ebuild 2 Apr 2012 12:40:54 -0000 1.22
+++ kmod-9999.ebuild 6 Apr 2012 21:04:02 -0000 1.23
@@ -1,6 +1,6 @@
# 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.22 2012/04/02 12:40:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.23 2012/04/06 21:04:02 ssuominen Exp $
EAPI=4
@@ -53,6 +53,12 @@
src_configure()
{
+ # http://bugs.gentoo.org/410865
+ if has_version '<sys-libs/zlib-1.2.6'; then
+ export zlib_CFLAGS="-I/usr/include"
+ export zlib_LIBS="-lz"
+ fi
+
local myconf
[[ ${PV} == 9999 ]] && myconf="$(use_enable doc gtk-doc)"
1.34 sys-apps/kmod/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/ChangeLog?r1=1.33&r2=1.34
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog 2 Apr 2012 12:40:54 -0000 1.33
+++ ChangeLog 6 Apr 2012 21:04:02 -0000 1.34
@@ -1,6 +1,11 @@
# ChangeLog for sys-apps/kmod
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.33 2012/04/02 12:40:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.34 2012/04/06 21:04:02 ssuominen Exp $
+
+ 06 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> kmod-7.ebuild,
+ kmod-9999.ebuild:
+ Use zlib_CFLAGS and zlib_LIBS because zlib.pc pkg-config file is present only
+ in sys-libs/zlib >= 1.2.6 wrt #410865
02 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> kmod-7.ebuild,
kmod-9999.ebuild:
1.9 sys-apps/kmod/kmod-7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/kmod/kmod-7.ebuild?r1=1.8&r2=1.9
Index: kmod-7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kmod-7.ebuild 2 Apr 2012 12:40:54 -0000 1.8
+++ kmod-7.ebuild 6 Apr 2012 21:04:02 -0000 1.9
@@ -1,6 +1,6 @@
# 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-7.ebuild,v 1.8 2012/04/02 12:40:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v 1.9 2012/04/06 21:04:02 ssuominen Exp $
EAPI=4
@@ -53,6 +53,12 @@
src_configure()
{
+ # http://bugs.gentoo.org/410865
+ if has_version '<sys-libs/zlib-1.2.6'; then
+ export zlib_CFLAGS="-I/usr/include"
+ export zlib_LIBS="-lz"
+ fi
+
local myconf
[[ ${PV} == 9999 ]] && myconf="$(use_enable doc gtk-doc)"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-06 21:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-02 12:40 [gentoo-commits] gentoo-x86 commit in sys-apps/kmod: kmod-9999.ebuild ChangeLog kmod-7.ebuild Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2012-04-06 21:04 Samuli Suominen (ssuominen)
2012-03-19 13:47 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox