Fix linux-info eclass usage by calling its pkg_setup method. Don't install empty dir.

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0xAE9C1E30!

3 files changed, 23 insertions, 17 deletions

diff --git a/net-fs/cifs-utils/ChangeLog b/net-fs/cifs-utils/ChangeLog
index d442285afcbf..62801e380bbf 100644
--- a/net-fs/cifs-utils/ChangeLog
+++ b/net-fs/cifs-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/cifs-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.41 2012/12/01 16:21:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/ChangeLog,v 1.42 2012/12/04 07:23:02 dev-zero Exp $
+
+*cifs-utils-5.8-r1 (04 Dec 2012)
+
+  04 Dec 2012; Tiziano Müller <dev-zero@gentoo.org> +cifs-utils-5.8-r1.ebuild,
+  -cifs-utils-5.8.ebuild:
+  Fix linux-info eclass usage by calling its pkg_setup method. Don't install
+  empty dir.
 
   01 Dec 2012; Anthony G. Basile <blueness@gentoo.org> cifs-utils-5.6-r1.ebuild:
   stable arm ppc64, bug #444672
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index a01aefdcaf84..0229d6cbd4d3 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -7,23 +7,13 @@ DIST cifs-utils-5.6.tar.bz2 381098 SHA256 f1501a26a800a336baf53ba0ea383274361c86
 DIST cifs-utils-5.8.tar.bz2 383272 SHA256 aae107f4d7f39b9374e2a60a48796c5c7b5c88bf0a5e0281799aff2345e51e82 SHA512 32b1094f4c5dd6d93c0d3a6c00ea29e52b82c82582378a228b8a68ff0ed50fdfcef6019641ccabc3a666452bd97393ecca4355e3370d2d0b7287109ed7f34c3b WHIRLPOOL 29f6d74a21ca77e39bf0d9b27b177eae27d33684ed383303996ece32a69a49cba92aa3dcd2e700c9fff471543d6e4b7804135145208d2336b84df7e88ec135e3
 EBUILD cifs-utils-5.5-r1.ebuild 2594 SHA256 5f2120914f8661d811eb73c8e590bfcf88f84c0d2f1b721344e02fc863ef5dbe SHA512 6c0369dc553584508a27b12ec8b0e4395a56f3a991a0f464e9f074348b057c3b728807ec9a22af5429cb6c432cf113b9a265c53334c5b1ccd3a3f04d098a9e13 WHIRLPOOL 5bea6c86c4f0fda2177a02313b79b73b764efa1f549cd60d98dc092f22f7309a9a30ff499a6a970b55d6667f19b094e72794d163dc4f702102098a3838ed2478
 EBUILD cifs-utils-5.6-r1.ebuild 2247 SHA256 2a0ac0b4c0ea40bbc5bbe82db9d2dcc8bffeaaa7fd55e96eb6455dedb4ef1508 SHA512 1d50fe6fdecb9192539ed309dabf565fa358af81225f9a6eb95601f29a729dd69f15522d9a94769ac54861776095224eecdb20403c7968fcebb3bab6f87583a2 WHIRLPOOL 2dcb5f8d6aeb787dcba609501cf669de912c30c28f2c0db33f8222c7164be9c746d550138d32f7e4a091870bc0918d6f81c5c022fd59e0b996485c0bf8637814
-EBUILD cifs-utils-5.8.ebuild 2253 SHA256 07003fb99b774c619469dfd95d2641de8b89404734bf9e76f7e2274bbb692592 SHA512 3fdef8334324a24b4f4aca7cecee4bf3ffa52f2807eed5407e05b21b873a469578639145f8b30cd0089422fe6dcb4a9cc08cfe1719e6f1ed6af5e72c51fa5afe WHIRLPOOL 385ed0d8c100f89a9972724ce4d435d231e74d6b2eaad7b21a19810b319304f5a25a5e17f3e851ff6bee926a68c53108b2e5f45a8fa20eb89d9161e988edc559
-MISC ChangeLog 6311 SHA256 1f81d1f9e0d9b7434bbb54bcce83a3de038b4034c95b0b125b495c7dcdca9eb4 SHA512 7b275185054347cdbaf25e42a735a6f1ddb4ae03a9f23f7b72967157c85519d0e9d93142b807143aaae2dc45cbf8caf85bf508bf8bdcf566d0fad9b5b020f69a WHIRLPOOL ecf08ba077cf0cb3b610c083678bc0496fc0a02f237dfd70dd281a4d8529a64cb44771585f6ee59adb3049f8dfafbda316aa7d5c84ada683045c490307318845
+EBUILD cifs-utils-5.8-r1.ebuild 2367 SHA256 b0ac678447be1658813d2b355d39daf0bf1c0091a9e2f59f8afcd89da7c6fe92 SHA512 4d93a63d8064ae62879871280a63ec4bd888e696c8fa68849342aad5c874039cf0ba03b9f6db447ea42bd12cd031ab649126fb6928873d3d6ac9498c3a230314 WHIRLPOOL ed259e4b264e6950a74722444df300dcbad70d101055ba6e869fe1139bad647b8dcb00d6068d9ce5a1b112f429a259ed9b27f12d632070f4f589a7ab8aa023a3
+MISC ChangeLog 6542 SHA256 8e7db5b28909a1c7a7d5f66eebe1975bd6d126c8ac105eb46d16196739f6046c SHA512 24d0a3a75cc25aab45c89f7acd69a6cb810d9ddaa80baa5c863313a4470dbd32d92c5777ae4982731c61eaaa6c88255bc199b3204d128a498e83dd7f4c693e35 WHIRLPOOL 2a6e1c1b0d0f023bc85dc32224a08ea592d896211152115468015d77317b5da98a7230bdca9a09fc32d72f870f14a22b6a58b1c2daffec15c8c39e848042154e
 MISC metadata.xml 918 SHA256 8fe5c71fc397f06fa69022fe53352645a4e2c5743a290991eff6a08b70f83eb9 SHA512 cc02e740b458ddea020545a60ad8689027d3380fdceb64b50a8e120aad7c3293368aff072eae69e2892fab1e0a2d665b8292eb665ae55bc289f2d71999fba7ec WHIRLPOOL ba3913f7a3a782b8a7674e613e147f2bc8dee7e84c658d01214c9fb05be995da2cb797d292cf965d81da9bf0e03b53a007440df8c1a401365dfbc9832042f343
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQui5tAAoJEJOE+m71LUu6oVAP/jBpbBjroVg8OilwiUo66THp
-7AawnSaWtUYJ6sM+vNbzfqYX5v1h887VT56H3NYopISLSqgSSZG+MheAJtshBqEM
-S9GDIWbSERL568GEG2GGo3LKKJAZrHahAfq4o8ZvoezTjJC3CEIaiHf1JAFfPjeE
-xesfaLjrHadwzyjAUm6bkGslKGgZ8WJ2B43kTvPZayy5psF+oGfD3mqfown5EBy4
-2+iwvwVoQ0i6DFey8By3CTDQQ0iwoa6ORwtDm37qdBhY86RuJCc0LRbFgvfNE148
-KYU14mzWjj7cDCJyQFdYDmPng12PAJkSa9fSgpIRABeXLK/H5HqvWpHXalrVeRj9
-1Nr/WBmVq6dkvOXf8bXSc+Ch5wK5igpgPAMIZDggoYJXQbWTpH0hJexqmyBNMQpG
-f4u4RiDH1S8QuqQgDCZilC+Vfz0HRLFA9tm0kj6HgsKa2NR7fF9c+2eDeA+JZMda
-BmE16o1gTty7/W5XAibQCmWHy/tpJ3FQVBURb4eDpcdHghxhoM+Dj3njEjqI5brQ
-X0CVdxwnGcDtJKCtMdNugLfbMpJo9ivaw5L8P+iKiC5PRbo/+nQwtdQfuq47QfVA
-eMbYgopB/CVUHlHFjjJ6MEIKdUKEPKmjAwlK0lNWIu+83clkVcV/C3jT8fCGFe3d
-0VLjV7vvO0VFfLKYb8FC
-=lG1S
+iEYEAREIAAYFAlC9pNwACgkQGwVqY66cHjCu4gCeLazdLZ0jp/4+pTDAuGAxkS0c
+hPoAn3xBELRsg9VP1FYCnf9DRfMi9yC8
+=VO5C
 -----END PGP SIGNATURE-----
diff --git a/net-fs/cifs-utils/cifs-utils-5.8.ebuild b/net-fs/cifs-utils/cifs-utils-5.8-r1.ebuild
index 1f9f22e8e039..ba21c951a3db 100644
--- a/net-fs/cifs-utils/cifs-utils-5.8.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-5.8-r1.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/net-fs/cifs-utils/cifs-utils-5.8.ebuild,v 1.1 2012/11/25 12:24:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cifs-utils/cifs-utils-5.8-r1.ebuild,v 1.1 2012/12/04 07:23:02 dev-zero Exp $
 
 EAPI=4
 
@@ -29,6 +29,8 @@ REQUIRED_USE="^^ ( caps caps-ng )"
 DOCS="doc/linux-cifs-client-guide.odt"
 
 pkg_setup() {
+	linux-info_pkg_setup
+
 	confutils_use_conflict caps caps-ng
 	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
 		ewarn "You must enable CIFS support in your kernel config, "
@@ -54,6 +56,13 @@ src_configure() {
 		--disable-cifsacl
 }
 
+src_install() {
+	default
+
+	# remove empty directory
+	use upcall || rmdir "${D}/usr/sbin"
+}
+
 pkg_postinst() {
 	# Inform about set-user-ID bit of mount.cifs
 	ewarn "setuid use flag was dropped due to multiple security implications"