Live ebuild updates:

- Remove the usage of autotools-utils from the live ebuild since we can
  do the static libs handling in the ebuild.
- Pass --bindir=/sbin to the configure script for now to install the
  binaries in /sbin.
  - call portage's default src_install function in src_install.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index df631d5321f36b7190216b92e91f233604632c53..c8bbfa7b3505050850efda49a0feb05ea248f453 100644 (file)
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.4 2011/12/31 08:08:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.5 2011/12/31 23:57:23 williamh Exp $
+
+  31 Dec 2011; William Hubbs <williamh@gentoo.org> kmod-9999.ebuild:
+  Live ebuild updates: - Remove the usage of autotools-utils from the live
+  ebuild since we can   do the static libs handling in the ebuild. - Pass
+  --bindir=/sbin to the configure script for now to install the   binaries in
+  /sbin.   - call portage's default src_install function in src_install.
 
 *kmod-9999 (31 Dec 2011)
 

diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 59da277f4b29c024753375a2303d96bde16aef06..3953569b1d4e1987a6333dfd9456b45e673d80a8 100644 (file)
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,23 +3,13 @@ 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
-EBUILD kmod-9999.ebuild 1300 RMD160 f37551cc74d46c8a1cc5d8f2dd880e6af041049a SHA1 fcfe160646f72783451f3dafc7dfcfae76ac5fbd SHA256 9025fab9293f7648e52fb699285ef063f6a45e359ac904f25cf7b04625058162
-MISC ChangeLog 765 RMD160 f8bab761197bbe5999c0b571397ece78488e68ab SHA1 0d1a2304913e147491a3cd45112bc25c5dca2ff8 SHA256 4b5b5d2c94d7fc2849dbd06d7d0b93026a32857ef2f518d20f5769765605dd31
+EBUILD kmod-9999.ebuild 1295 RMD160 e123f10c9ad667ed4a6464e8444e58e92a2e3dfd SHA1 0e8ce4ccc242845cb2c283bd2d8d93e3e4d5fe5d SHA256 4456935a21496a6c85d1df4eba6261d9c63f117fdee76496ebc85578efa53209
+MISC ChangeLog 1137 RMD160 b666e4bf8ad853f3084c02ff76d96b799bb44d85 SHA1 a973d664d29ca9fef95321cf344990c6b44d8920 SHA256 252f9bbe2e12c3d949a33de7a3b358bbe54c13081d159e3c729a4cfd2e27469c
 MISC metadata.xml 542 RMD160 8f4c2e562573a651a296e9ca58aae092ea47515c SHA1 8f286b9ce62cced60cc75c396fcd839e015fcff7 SHA256 ef914832e9d769b0e5556013f4a48a600ccd203cd05f215220a57f914478ad5c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO/sMUAAoJELEHsLL7fEFWIk4P/RZem7WEGH2qdG82mXCPoxJI
-lSf38wmHkDAl/DKhXzbsf+U5oXGAGWmNPSCJ+E3gsmp2A39CU40etzK7T9Nb5VMI
-OdybStKR5TpDZKiTF+MhPw8JJuRUAbY5fvQwFeTYbGQxdkKCWP8ype0kZnxkeh2X
-MvBs1/1EE+x2Tbd//eTl1R5Wpk7smR8E2l77teNW+hYgIy+IEkzVUUdu5kEZYLB/
-QhvImfJmpRfHvW9RGbOzwFQ3v0UpxXupA+RI1JHeE+dHISFAvA+m93vhUKhz/vAQ
-xMwGqRCYBpRCENG/1etJQjvXfOJi65am9Vra6f1hRdbytUBIEcnKlIplVaRrgAM8
-H4vDAx7iooU+e3hyGRljEBSW+cuxx96FnG3OJCX67JCZgj6pWwPlrdjyMdG1II++
-QBZ8SLbd+ZM8aQJn+K1LKF2YqtBPjQ0rLsuCNSGqv2bc62Ka0FgoM9GZ8xmjcflB
-lOnLP4MdPqmwLkUuR//Ri4uwvIlwD74Obb5mc9qU4sUrMqiwjPS9uGdkKGWgd6iI
-pDsQMSxfWC+q5CNN4+ZCBotlAkLPj4TusBD64AfxxviQLk1LCDIgd5r6hCTKFRR6
-QTaTUyrzbsAZAlpUSjZG0W/6a2zwkmgDIuY0NX9k7jQBD6iSVchHCpqA224y2rZI
-px0sVAM8cM6Vmy4facZd
-=8ezm
+iEYEARECAAYFAk7/oGoACgkQblQW9DDEZTj5EQCfX3fb6Ruyv7OD5Q28rQ5UmN9W
+EI8An2tJarAn60RCBlrenUfhvI5COWOh
+=TF5p
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 70816daa1ae72db15111da04e288fa89ad35d4d4..27e3d7a25a78dfa99b0a56314c76cfa305ab6b37 100644 (file)
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,54 +1,59 @@
 # 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-9999.ebuild,v 1.1 2011/12/31 08:08:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.2 2011/12/31 23:57:23 williamh Exp $
 
-EAPI="4"
+EAPI=4
 
-inherit autotools-utils toolchain-funcs
+EGIT_REPO_URI="git://git.profusion.mobi/${PN}.git"
 
-if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="git://git.profusion.mobi/kmod.git"
-       inherit git-2 autotools
-else
+[[ "${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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
 
-DESCRIPTION="Library and utilities for kernel module loading"
-HOMEPAGE="http://git.profusion.mobi/cgit.cgi/kmod.git/" # XXX
+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"
 
-RDEPEND="zlib? ( sys-libs/zlib )
+DEPEND="zlib? ( sys-libs/zlib )
        lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
+
+src_prepare()
+{
+       # Apply patches with epatch if necessary.
 
-src_prepare() {
-       if [[ ! -e configure ]] ; then
+       # Allow user patches to be applied without modifying the ebuild.
+       epatch_user
+
+       if [ ! -e configure ]; then
                eautoreconf
-               AT_NOELIBTOOLIZE=yes # autotools-utils calls this
+       else
+               elibtoolize
        fi
-       autotools-utils_src_prepare
 }
 
-src_configure() {
-       myeconfargs=(
-               $(use_enable debug)
-               $(use_with lzma xz)
-               $(use_enable tools)
+src_configure()
+{
+       econf \
+               --bindir=/sbin \
+               --with-rootprefix=/ \
+               $(use_enable debug) \
+               $(use_with lzma xz) \
+       $(use_enable static-libs static) \
+               $(use_enable tools) \
                $(use_with zlib)
-               --bindir=/bin
-               --with-rootprefix=/
-       )
-
-       autotools-utils_src_configure
 }
 
-src_install() {
-       autotools-utils_src_install
+src_install()
+{
+       default
        gen_usr_ldscript -a kmod
-       dodir /sbin
-       mv "${D}"/bin/kmod-{{ins,rm}mod,modprobe} "${D}"/sbin/ || die
 }