From: William Hubbs Date: Thu, 5 Jan 2012 15:55:52 +0000 (+0000) Subject: version bump, remove old version and remove the rootfs-install use flag description. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dae579b15b0319026e51c962019b742b71a120bd;p=gentoo.git version bump, remove old version and remove the rootfs-install use flag description. Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686 --- diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog index cd2f89f0a32a..835c5459bf15 100644 --- a/sys-apps/kmod/ChangeLog +++ b/sys-apps/kmod/ChangeLog @@ -1,6 +1,13 @@ # 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.7 2012/01/02 19:59:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.8 2012/01/05 15:55:52 williamh Exp $ + +*kmod-3 (05 Jan 2012) + + 05 Jan 2012; William Hubbs +kmod-3.ebuild, + -kmod-2.ebuild, metadata.xml: + version bump, remove old version and remove the rootfs-install use flag + description. 02 Jan 2012; Mike Frysinger kmod-9999.ebuild: Always delete .la since we have a .pc file, and restore /bin and /sbin split. diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest index bb66fadbdb01..7697ea7661d2 100644 --- a/sys-apps/kmod/Manifest +++ b/sys-apps/kmod/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST kmod-2.tar.xz 262484 RMD160 50df74d66a3b30200f0c827c0e72520ae6ebb384 SHA1 ece8e658434190e8be3efae187c8276447701e2e SHA256 33edf14f28ef9b51d893e6167d846d23fc572f6ba634acf0ad9a6e3925ff55c0 -EBUILD kmod-2.ebuild 1228 RMD160 5d8ec58560fe387ba8924e029da12115609d1668 SHA1 2c355fdd56d23542750d603e5575fa6cd720162a SHA256 8f85a956c829a69a40576158bc3c4d6337d4673d41221816c1cfa459c08e847a +DIST kmod-3.tar.xz 285512 RMD160 98c7ef530c2ecf682042ea4d4ade1f30587347e6 SHA1 41f6d6082f72d2c4869f51844d7e9212c8091033 SHA256 4b32439703ab2837e81ae80f527f9e964ecb5883a9e80d1cc7518cf6e8593ad9 +EBUILD kmod-3.ebuild 1298 RMD160 22c12a92e1fed57fec0088f49dccd6366780cddb SHA1 25565a0440894c1c2f0d9490dd018bec50784b20 SHA256 bfc9e2a1f50db042b188a70803eab36e9be01f32df82f84a45a938761586fdc6 EBUILD kmod-9999.ebuild 1366 RMD160 38eabeb78efae5754a5c51257e4d63012538e78b SHA1 d39ae670c96be1825f883b3bf1e876b27167f978 SHA256 90a8a8ddca5d4551be19c26bb8bad2429a4becd53be31934fcca55e6b9cbeda2 -MISC ChangeLog 1368 RMD160 2516e227da4d5ca52825773cca9cf4c10ced715b SHA1 b1b5a79945ffafab2570d5b11544d8b73b9a6960 SHA256 e3ed2f0d725473efb1ef1b859e249c4548c1ebae23d5a638005459519037452d -MISC metadata.xml 448 RMD160 1e7484f4c20f117e87c84e52e03c0fa2db0a88aa SHA1 a7abcde4120f83eec76a5bae60b39d93ac745999 SHA256 6d9837a18e91a9851f56c04468ee90582d891d46f6b3704d942e4fa2c4b6c8e2 +MISC ChangeLog 1582 RMD160 e23bfa0859f96dc95357896280d54537d4ecd2ab SHA1 84063539cab17f0871a03a53a5b07d2ee6400092 SHA256 2b9e82a72f808b8efcb9143f8525bb876acba657dfea1b049e92fc45e9f9dcd4 +MISC metadata.xml 317 RMD160 be31ecaa465b63dc5589669b36f431e05b878afe SHA1 4837b60e64a9a06be18dffb0f31b2ba5cb6bc2aa SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk8E5kQACgkQblQW9DDEZTjbgACgtak/1+5bPZQNc5waicFZM2SX -Fo8AoKETWTBUIoZ79f16A/lHXvSW3mH0 -=36OL +iEYEARECAAYFAk8FxssACgkQblQW9DDEZTg0YACeIWCg8YH7tMNT72us0RvcLUS4 +YfQAn0h30RHTkN4jqMT9LuWeirTVqZHp +=RPJ/ -----END PGP SIGNATURE----- diff --git a/sys-apps/kmod/kmod-2.ebuild b/sys-apps/kmod/kmod-2.ebuild deleted file mode 100644 index d9441cbee888..000000000000 --- a/sys-apps/kmod/kmod-2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-2.ebuild,v 1.1 2011/12/25 21:21:40 mgorny Exp $ - -EAPI=4 - -inherit autotools-utils multilib toolchain-funcs - -DESCRIPTION="Library and utilities for kernel module loading" -HOMEPAGE="http://git.profusion.mobi/cgit.cgi/kmod.git/" # XXX -SRC_URI="http://packages.profusion.mobi/kmod/${P}.tar.xz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug static-libs +rootfs-install +tools zlib" - -RDEPEND="zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND}" - -src_configure() { - myeconfargs=( - $(use rootfs-install && echo --exec-prefix=/) - - $(use_enable zlib) - $(use_enable debug) - $(use_enable tools) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - if use rootfs-install; then - dodir /usr/$(get_libdir) - # move pkg-config file and static libs to /usr - if use static-libs; then - mv "${D}"/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ || die - gen_usr_ldscript libkmod.so - sed -i -e 's:/lib:/usr/lib:' \ - "${D}"/$(get_libdir)/pkgconfig/*.pc || die - fi - mv "${D}"/$(get_libdir)/pkgconfig "${D}"/usr/$(get_libdir)/ || die - fi -} diff --git a/sys-apps/kmod/kmod-3.ebuild b/sys-apps/kmod/kmod-3.ebuild new file mode 100644 index 000000000000..7b52c435fced --- /dev/null +++ b/sys-apps/kmod/kmod-3.ebuild @@ -0,0 +1,61 @@ +# 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-3.ebuild,v 1.1 2012/01/05 15:55:52 williamh Exp $ + +EAPI=4 + +EGIT_REPO_URI="git://git.profusion.mobi/${PN}.git" + +[[ "${PV}" == "9999" ]] && vcs=git-2 +inherit ${vcs} autotools eutils toolchain-funcs +unset vcs + +if [[ "${PV}" != "9999" ]] ; then + SRC_URI="http://packages.profusion.mobi/kmod/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="library and tools for managing linux kernel modules" +HOMEPAGE="http://git.profusion.mobi/cgit.cgi/kmod.git" + +LICENSE="LGPL-2" +SLOT="0" +IUSE="debug lzma static-libs +tools zlib" + +DEPEND="zlib? ( sys-libs/zlib ) + lzma? ( app-arch/xz-utils )" +RDEPEND="${DEPEND}" + +src_prepare() +{ + if [ ! -e configure ]; then + eautoreconf + else + elibtoolize + fi +} + +src_configure() +{ + econf \ + $(use_enable debug) \ + $(use_with lzma xz) \ + $(use_enable static-libs static) \ + $(use_enable tools) \ + $(use_with zlib) +} + +src_install() +{ + default + + # we have a .pc file for people to use + find "${D}" -name libkmod.la -delete + + # If the tools are installed, add compatibility symbolic links + if use tools; then + for cmd in depmod insmod lsmod modinfo modprobe rmmod; do + dosym kmod /usr/bin/$cmd + done + fi +} diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml index b117a62c987c..67a87a1c10df 100644 --- a/sys-apps/kmod/metadata.xml +++ b/sys-apps/kmod/metadata.xml @@ -7,8 +7,6 @@ - Install the library into rootfs, - to satisfy dependencies of udev when using separate /usr. Install module loading/unloading tools.