Version bump. Use prune_libtool_files from eutils.eclass.

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

4 files changed, 110 insertions, 20 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 5715bdbce699..0120f4e37296 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,5 +1,11 @@
 # ChangeLog for sys-apps/kmod
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.48 2012/07/23 14:20:12 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.49 2012/09/08 17:35:44 ssuominen Exp $
+
+*kmod-10 (08 Sep 2012)
+
+  08 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> +kmod-10.ebuild,
+  kmod-9999.ebuild:
+  Version bump. Use prune_libtool_files from eutils.eclass.
 
   23 Jul 2012; William Hubbs <williamh@gentoo.org> -kmod-7.ebuild,
   -kmod-8.ebuild, -kmod-9.ebuild:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 7e2dfd3919e6..db9e5a5bee0c 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,15 +2,21 @@
 Hash: SHA256
 
 AUX kmod-8-gc-sections.patch 3167 SHA256 d0f9a28f01b3ab7a00f53a97f8d1596977c945f9125e884e9eaa850e1f433281 SHA512 da6f05d784028536e5861c84add81b54f4e6338672aa576c92b95555dc75d18bdd5d6d689d7cc9ba0526866c23913e9bfbbccf3888e376fbaabd9053021e6a36 WHIRLPOOL ef143dd901a8b2dd46cbd45bfd030fb44ae67b7c333ae10dd7761ec5b12e3c7e93cc4e343c9c9642b410eef67051fe2a6542bab20418c805f526e9465ee5dfcf
+DIST kmod-10.tar.xz 1125436 SHA256 deb80df9e6aa34f965ecf329fd07db462b57ce515b9077eae5cdfac5197a7bff SHA512 eb3a875db0ee6882a5b91f0202060a7589048eba0a6ba6627c7640dfde3e74b8bfa631f32cabf9b9c690358e3d61930300d0893ad29ea9a69a22ec609aefdb2e WHIRLPOOL d4ccd0ad341c65cdbb608e93b0bff576d049321258beaac55b285c4ee1c4b6b32dd7aaf0121920a38a0412cfefbb091b98e288fb4239692135c2cad1bf53eefc
 DIST kmod-9.tar.xz 1122668 SHA256 0607267cb62dbc9009d0719f442a56f97f64d9983e20dbcaedfff9073abdcecf SHA512 912404830d46ab27f9472a4ce0272c03b16b36291069f9cf1a51bc533429fe8f46d7a749edc399fb1631a435dea4077728d0a5b16961603fdde339d3e2b14f1f WHIRLPOOL 1f769b640b97aa248dcf8b0360f6733ce498bdac571b8710154c455d9971367c1d16204fd4acf1d898d4e0af93892c0f4c6e23ff62d50d96b75b69d5668ffb9b
+EBUILD kmod-10.ebuild 1980 SHA256 7f90c2581028737fcbbe7d7e334de1a920d4d08adb2b09bb8e9448fb4dce0482 SHA512 f2cd59ebfd65b1b85c3c516512461f9e07f60320868f44cd76fe159c56f21f417e6c3dc8393946a144e8640e7ba1744e86c1cc7ba109fdb83de526c5201bb366 WHIRLPOOL e325d1e071a866a08bcfc7b6f696274f6f7d4972d9f6d2d953ec300e318669456d9c742782348aec2d68190120fe4f02c568fa2ff5a13b72a51b000b13a67f55
 EBUILD kmod-9-r3.ebuild 2081 SHA256 12c580ecd3d18f264e1529d71d00be986239f6b47fdf2c03eaaebba843c965b1 SHA512 2b3f6a95e16dbd43bab3c221157384ebecd55be2572f1eb45f2ec91c45d067c95b6d81cbb49519e68387549ec5728342ee3dee80f109a0f32a6540e18ce616d5 WHIRLPOOL e03c95cf0983b47c1353e8b10fda9f97b1a28e98429ab2172fbf7f9aa7da64fe392246b64335c89eacb21294ced38887bbf688a3d585acfd4ae5694f5155d0e4
-EBUILD kmod-9999.ebuild 2084 SHA256 a6fe6b8c00317ef3ae715e08af4b2b66ab9672e2d1d4361afd0ff3ffcbd1449e SHA512 c95e330723da11eea6bc81e6aaed75dbfb166a84cbf9403f037626d0fe323b281cfe6d6b723f98bd7ad5a85171b73a22fda27d690c21487135ec0b1610df5639 WHIRLPOOL 2165aff84d41b75c80a1bf21b429cfe402cef60a632fa5fe19cac8483093d209dd3e6242d65b57acf8edff2c874286843e9c2f045da8ded143a946bb1bf3bb86
-MISC ChangeLog 6890 SHA256 7034cd7c44fa5613d30261c7a81bdd3de68c967f7518ff667824fe862bb62ae7 SHA512 881305b961e2dd651701ca63ff14d2d2fa28f499cce83ffb182febc8be4696cf475242163f2260e47dfa5fb9cb8762ee91aba163ae3b9b5b339c122b541dee17 WHIRLPOOL d0b9452beb8344fedc66ccfd549dd112e4915ee912dd1f30bbf31169bea65c88caa453c6a18fb771219967922c1443181d5ea7c69f58c25815bcc750c672d51d
+EBUILD kmod-9999.ebuild 1983 SHA256 d018e8485ff43453437e333efa394d1be3d6dfb0b65d8868a17e393e76ad3e3e SHA512 be0daea811e5ea1ffe6a50448150b31f7949768643603efea0d2158b080cd51110864267b07086e3a3935aa7621ab967b014bb91cc1cd8ec33292192210b2073 WHIRLPOOL 4adc18c2925376e426ca890b3879c43788dd8a8336644e84b172c14a00a8f06ad2843ee814217f5001d18d656bbdb7c9c5f1a7478df46339fbaeb3570134e4ea
+MISC ChangeLog 7067 SHA256 f7092447bd41a5a71a6113e9a9e498d8016991dc183a8743347370b96ae80c75 SHA512 5db46e3471255f05ed093a9d3525af16167445b9d074efd25fd79795722252c927f8faabd06ea38ae9a1363909da531dbb31be55321c954e7ea0eef2009d6a13 WHIRLPOOL 0f0a19d9bcacead2e85e21ec99de28a4e2e560b5804eb2b6260c9cca1d7c14fde29a106fd598cb8390dce4fcac68dc3f15bf041aa1b5be6d011bf1bbf099bfac
 MISC metadata.xml 317 SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4 SHA512 0bc79bc83389f92e10f16b206d78331ed202132ed5648f299443ff4f912b68f753563e040d933deafb1b96e45a9f0212af50475e091c87921e67bcb814e2b881 WHIRLPOOL 57ce9247535050840bc4bfed021fa883e31ad4f24b2f3629416bf73e069f0848a99280c66b42457566138c24ce1274b3e41ef4bb89f387ddf713a6dac79a33c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlANXaoACgkQblQW9DDEZTgUPQCaA2DbOs6GFCmEeVU4R19vcEy7
-I2kAniw9kzL4mSAIWs7XW5e2soJO7sum
-=qPHE
+iQEcBAEBCAAGBQJQS4GoAAoJEEdUh39IaPFNPEQH/1/jxyBRF6VThxVgiir9LZcv
+9kv0LjmPcNjp1zOniZnhAZTWe8yrTG5Kg0t/ZOHObEBor4yj9Ia/xbpt81oHeu4Z
+jsqcMPECCT/EozoKihoditdC8+owpyVu9CkhE0j1fDdibmgitnrTP93vweggxB0Q
+7HsopT8/80kdf2zLT9Ggjk/ztHiCjKpy6uEFwnqSgd20SjSRoj8+fyAuQLUhowJ+
+JtQdqA0KlZ7hSQSzQCutyTTDeQJfFNFCo29MI/+/dANgb/z8NbaKLpzJFoATZ0Oa
+H0h7M88SNuWf7znDtwlfbnI9M9zZAdV+Uu9wATtYl3B9P5w8JFUDgZEV3Ncd0O4=
+=R4uG
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-10.ebuild b/sys-apps/kmod/kmod-10.ebuild
new file mode 100644
index 000000000000..afd9e97a364e
--- /dev/null
+++ b/sys-apps/kmod/kmod-10.ebuild
@@ -0,0 +1,80 @@
+# 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 $
+
+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 libtool
+unset vcs
+
+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
+
+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"
+
+# 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.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	lzma? ( app-arch/xz-utils )
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}
+	doc? ( dev-util/gtk-doc )
+	lzma? ( virtual/pkgconfig )
+	zlib? ( virtual/pkgconfig )"
+
+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()
+{
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable tools) \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_with lzma xz) \
+		$(use_with zlib)
+}
+
+src_install()
+{
+	default
+	prune_libtool_files
+
+	if use tools; then
+		local cmd
+		for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
+			dosym kmod /usr/bin/${cmd}
+		done
+		# Compability symlink(s):
+		# These are both hardcoded in the Linux kernel source tree wrt #426698
+		dosym /usr/bin/kmod /sbin/depmod
+		dosym /usr/bin/kmod /sbin/modprobe
+	fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index a184c7bf4ce7..ed1442d5613b 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -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.31 2012/07/20 16:36:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.32 2012/09/08 17:35:44 ssuominen Exp $
 
 EAPI=4
 
@@ -22,6 +22,12 @@ LICENSE="LGPL-2"
 SLOT="0"
 IUSE="debug doc lzma static-libs +tools zlib"
 
+# 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.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
 	lzma? ( app-arch/xz-utils )
@@ -31,12 +37,6 @@ DEPEND="${RDEPEND}
 	lzma? ( virtual/pkgconfig )
 	zlib? ( virtual/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.
-# So we have to restrict it.
-# See bug #408915.
-RESTRICT="test"
-
 src_prepare()
 {
 	if [ ! -e configure ]; then
@@ -65,18 +65,16 @@ src_configure()
 src_install()
 {
 	default
-
-	find "${D}" -name libkmod.la -exec rm -f {} +
+	prune_libtool_files
 
 	if use tools; then
 		local cmd
-		for cmd in insmod lsmod modinfo rmmod; do
+		for cmd in depmod insmod lsmod modinfo modprobe rmmod; do
 			dosym kmod /usr/bin/${cmd}
 		done
-		# according to upstream, modprobe can be called directly by the kernel,
-		# so it cannot be moved to /usr/bin at this time.
-		dosym /usr/bin/kmod /sbin/modprobe
-		# another hardcoded path in the Linux source tree, bug #426698
+		# Compability symlink(s):
+		# These are both hardcoded in the Linux kernel source tree wrt #426698
 		dosym /usr/bin/kmod /sbin/depmod
+		dosym /usr/bin/kmod /sbin/modprobe
 	fi
 }