Add a caps USE flag to avoid automagic dependency over libcap-ng. Thanks to Joost Ruis and Rafał Mużyło in bug #348951.

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

4 files changed, 51 insertions, 10 deletions

diff --git a/sys-apps/smartmontools/ChangeLog b/sys-apps/smartmontools/ChangeLog
index f24c8eb0f561..a22879ec174b 100644
--- a/sys-apps/smartmontools/ChangeLog
+++ b/sys-apps/smartmontools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/smartmontools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.93 2010/11/13 16:09:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.94 2010/12/17 15:05:43 flameeyes Exp $
+
+  17 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  smartmontools-5.40.ebuild, smartmontools-9999.ebuild:
+  Add a caps USE flag to avoid automagic dependency over libcap-ng. Thanks to
+  Joost Ruis and Rafał Mużyło in bug #348951.
 
   13 Nov 2010; Raúl Porcel <armin76@gentoo.org>
   smartmontools-5.39.1.ebuild:
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 0201be9431ce..269fc286abf4 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX smartd.confd 107 RMD160 e43d345af53217e6c944a3ce5cd03a98895b7c32 SHA1 3d19bde080fabaf2702087c82bdbd3c43cc1c6a6 SHA256 714cc1b253e1f59b884be89693757fec91ca878c62f37451a49ef6bb72263e85
 AUX smartd.rc 1026 RMD160 521c5825cd9f37185ae164bbea86ba6bc0347556 SHA1 8d112c781971520ce1c8faff5de657fd67f3f89c SHA256 e77730e87b7714beae60626de365d15bc540bd8cccb8d4f9652a3be613aa7d66
 DIST smartmontools-5.38.tar.gz 617326 RMD160 6fcca6e18b14a14b579e8484c769f36b3ce238ea SHA1 90e36f46af7a35336c63868176aa71deef4c9e66 SHA256 b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8
@@ -5,7 +8,14 @@ DIST smartmontools-5.39.1.tar.gz 659335 RMD160 2adb8c43eb0f23711efce423c22281240
 DIST smartmontools-5.40.tar.gz 705592 RMD160 ff2ebfd130182ba721248ebfebd9d4d5cc325ff4 SHA1 08a86a939a2e2cd85d2c88c09188d494f06ce050 SHA256 2a68ed20d5d6bd198e1aa6bf0b6037f0f216e3b14da022115244f1af9d248bfd
 EBUILD smartmontools-5.38.ebuild 1447 RMD160 9cdd7a8c2801aaac718ec8c4971e7dab180226f1 SHA1 58d2015010e0a109f121656d2266cab160827e64 SHA256 c8ad8cbb28334263f46ab1f900ae44ef0100697cbb2e4fe3b7bf47d04129f47f
 EBUILD smartmontools-5.39.1.ebuild 1537 RMD160 e8a371f211fe8d11f76a75c80554f0b4b5b07739 SHA1 a074f0ccc4ee65970965bdb712b35a7986ac5862 SHA256 8c2d393dc5158d5e64342d367f92f5bea1b478e219361f29d3e1fcf65069ba43
-EBUILD smartmontools-5.40.ebuild 1538 RMD160 363e01e2a56aad995fa1d4eef3ba39594a5634b2 SHA1 f86453c8cf3b83abee7073053b657db927cf98ac SHA256 7b40590f035f865dc8c959815578aef1ffbf762ff052fdc7a18fdca5497d97f7
-EBUILD smartmontools-9999.ebuild 1536 RMD160 46d4749f73eeb6914473ee4ffec88e845c0e3c8b SHA1 4f5d9d44e91cb8dd707efb0eacb27b1d5c351f8d SHA256 9cf94157fb61b80c0059f76df1cbb02fbba0ae2cde9bebc8d835dbce24a4f40e
-MISC ChangeLog 11934 RMD160 c8483a409bf3e398c21d4e1f9b46661c16ad5d69 SHA1 0fceaded4e0918e7f990fd2cfe509dec4c048889 SHA256 d0f5268ffbf395f64f843e0df1ed0a9d5214eb9c6d353118c4aa828053b32155
+EBUILD smartmontools-5.40.ebuild 1772 RMD160 0828874c6679d98fa24dd7d9a549273c2038120e SHA1 99a582b3484f40ac9ef9aeb21077727584c9edc8 SHA256 2689ab98a4029daa5b0d6c494dae5d3811e0ad58fe4c449fca41f79475eecaad
+EBUILD smartmontools-9999.ebuild 1767 RMD160 16585c0ebea268480f3e766a1374b9f48caadb67 SHA1 39b3e82248a7eb9eb4e971a9c72f4af0170289e2 SHA256 e52e99abec91d64b3dfe6c3afb3d45af053be5abfef0bcb247c5fb559c79ca8c
+MISC ChangeLog 12176 RMD160 93aebf219926292c3f38a0f8f5bf9697f8a11e61 SHA1 18049d214e190b9b4ab7dc8200f8eae100171dba SHA256 8e77f5c44f753dfbdd4da65732cbed6bf58743eaaf7f06fd303ca4f1141b6b55
 MISC metadata.xml 266 RMD160 d60cb888a5e13f1656de16d13b38e60e909fca14 SHA1 ddaa4497088bd48456301b7ab7115928713fa882 SHA256 bdf7da32dcd39df0f58aa02c64dfd1c5dda0ca1080c9b1001d8e110881a364eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0LfUYACgkQAiZjviIA2Xjv9gCaA3f55WgSeg0sBJR39bTvAMBt
+WxkAoIphV88fAY5i0KAhHZrfVnjMBw7c
+=9YDC
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/smartmontools/smartmontools-5.40.ebuild b/sys-apps/smartmontools/smartmontools-5.40.ebuild
index 3c9230672cfa..98d56168a72a 100644
--- a/sys-apps/smartmontools/smartmontools-5.40.ebuild
+++ b/sys-apps/smartmontools/smartmontools-5.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.40.ebuild,v 1.2 2010/10/27 14:37:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.40.ebuild,v 1.3 2010/12/17 15:05:43 flameeyes Exp $
 
 EAPI="2"
 
@@ -20,9 +20,12 @@ HOMEPAGE="http://smartmontools.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="static minimal"
+IUSE="static minimal caps"
 
-RDEPEND="!minimal? ( virtual/mailx )"
+RDEPEND="!minimal? (
+		virtual/mailx
+		caps? ( sys-libs/libcap-ng )
+	)"
 DEPEND=""
 
 src_unpack() {
@@ -41,11 +44,21 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf
 	use minimal && einfo "Skipping the monitoring daemon for minimal build."
 	use static && append-ldflags -static
+
+	if ! use minimal; then
+		myconf="${myconf} $(use_with caps libcap-ng)"
+	else
+		# disable it so that we stay safe
+		myconf="${myconf} --without-libcap-ng"
+	fi
+
 	econf \
 		--with-docdir="/usr/share/doc/${PF}" \
 		--with-initscriptdir="/toss-it-away" \
+		${myconf} \
 		|| die
 }
 
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 0eb01ab6d028..2ad3a162f88e 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.2 2010/01/05 03:44:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-9999.ebuild,v 1.3 2010/12/17 15:05:43 flameeyes Exp $
 
 EAPI="2"
 
@@ -20,9 +20,12 @@ HOMEPAGE="http://smartmontools.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="static minimal"
+IUSE="static minimal caps"
 
-RDEPEND="!minimal? ( virtual/mailx )"
+RDEPEND="!minimal? (
+		virtual/mailx
+		caps? ( sys-libs/libcap-ng )
+	)"
 DEPEND=""
 
 src_unpack() {
@@ -41,11 +44,21 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf
 	use minimal && einfo "Skipping the monitoring daemon for minimal build."
 	use static && append-ldflags -static
+
+	if ! use minimal; then
+		myconf="${myconf} $(use_with caps libcap-ng)"
+	else
+		# disable it so that we stay safe
+		myconf="${myconf} --without-libcap-ng"
+	fi
+
 	econf \
 		--with-docdir="/usr/share/doc/${PF}" \
 		--with-initscriptdir="/toss-it-away" \
+		${myconf} \
 		|| die
 }