Drop old. Use new fcaps.eclass

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x895192F9

5 files changed, 38 insertions, 136 deletions

diff --git a/x11-misc/i3status/ChangeLog b/x11-misc/i3status/ChangeLog
index 56fb36270a1c..9a5ad0f197c1 100644
--- a/x11-misc/i3status/ChangeLog
+++ b/x11-misc/i3status/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/i3status
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/ChangeLog,v 1.14 2012/12/16 16:33:16 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/ChangeLog,v 1.15 2013/01/27 18:31:04 xarthisius Exp $
+
+  27 Jan 2013; Kacper Kowalik <xarthisius@gentoo.org> -i3status-2.5.1.ebuild,
+  i3status-2.6.ebuild, metadata.xml:
+  Drop old. Use new fcaps.eclass
 
   16 Dec 2012; Agostino Sarubbo <ago@gentoo.org> i3status-2.6.ebuild:
   Stable for x86, wrt bug #446950
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 42c839b1e4bb..4515c22cd9ee 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,6 +1,24 @@
-DIST i3status-2.5.1.tar.bz2 30956 SHA256 7734efdf79a77617023f1e6d80080251eab3a05defb67313283568511d3e58f2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST i3status-2.6.tar.bz2 34896 SHA256 e7e710cc271887bcd22757269e1b00a5618fb53abdb3455140116b3d38797bce SHA512 c5bd3f8944eeede81350a39df4b258a81ced6db21b7f502112c959488c28589c549d0b580197090df3c0d26a36157c75acf6f916abd436eaf57abee48cf399ef WHIRLPOOL e76561f07a2e41da40729b03e057391dc610d4d49d474aab2ab30b8186b8c9c9da5a3cba2528d441ed99a85d5c792956ffa43b02ef2e70f4fc730cb8c8491d90
-EBUILD i3status-2.5.1.ebuild 2192 SHA256 c1e2600c1979abce3281f7652673a6300254ded43c9bff3c8d41270e32d07098 SHA512 13e484d5d30bfb6a39a2e0124bf3aed5b2984c938f85dec774e4ab05b4ceb3fcda00b4b332c1ee4b23d097459b9abb823ce6e3251af9ce9032134adb89ff2996 WHIRLPOOL 339437ef10c06b32bcddb689f719df612daf51d81d434be5f13c4259728a1c1c1d64d27872053ff4f4b51339247570aeec0bc475f191fbac705d34ba842965b5
-EBUILD i3status-2.6.ebuild 2187 SHA256 404eee586095d90104a4faafffc249236e91c11bcea390accb8b15d6a4b4199d SHA512 f001c93ebc64e7f170ada040ede66fd18a08126e25852d1cfbd98f2222d3d7984ce0f4b43268ba76fa4588863b27a8402e81abb31cd0501c411377feacfff34b WHIRLPOOL a8882d9918ecedb145f4a878cd242bf836066bef5ee4ea178d3d1af2dc19cafd258434a0f6bc352c157b78b3b7681be93d667253c7ca1812805e920d9945c583
-MISC ChangeLog 1991 SHA256 16d78a5a1bb386e3334d2e31b482e849d6b3d5fdbbfd53750b244ad31fbb01bf SHA512 c9b4758e89ed497dc03f0b769ed7c0100393acfc87bfaa0ee5302959bb5eb03e8338190a83fc7cd441cbcf5c451df93a0027bbb6d21e4856bc5e6ddbc398bca4 WHIRLPOOL 42cdf849b061769ca2ac486e16a24b22fbe69542247620216c98a311ca2dfc59a14a743e3e167747b888490415e71a43dbc99b6b94e547bc75a59be347975e66
-MISC metadata.xml 781 SHA256 97cc7157bfe2d05a4c77793b89190fef0f94d1decd52e41c717c37583696f3f4 SHA512 1fa33ce63392d97d5cc27df6810a0a3893408a22869ab18bc8d45d4ec984b56041b901d2091b3b8d82b96c3c265ead3f0a375c3850f6530cbce64dcbd20dc946 WHIRLPOOL c4bd22b3b96b4eb896bebc68586bc9a5bb5f3f4639a13582583d668c0c91207f65d01a75409d2bb7c5d8a3c72858f75a1674c78f1be2bf5afa8393c3972ab5c2
+EBUILD i3status-2.6.ebuild 913 SHA256 f90ed0018741ffbfd3cc610abb6c5676efa2b954777600f2c65c0c4228fc6d67 SHA512 e1bf4317c44d32633fef2e44bcc96af8645ec7a10e3fa9c2957edf122a2a916bff66c09e92ea4f455583c4129e3114caa8e432fccb81f84c80eec891181fc12b WHIRLPOOL 869ed51a7bb212b721585e9f23a92498d77765f2cac644c203e7c8fe20cff7651798fc6ec6c4f2e4314fb0796de0ab55b1a089da2b9a871b1cb4ba8a284c8d8d
+MISC ChangeLog 2147 SHA256 7e24b58dbe4bd77a7acfba971276a1b6654a778107a8990de49975f6e6a3c43a SHA512 dc311ec05a57743ad4ce310c957b34156e36e50dfd558953700fe7fb5449f30593c5968d46a8e52535dafc73220b38f3188b36f12a8286581540a01f7e084c04 WHIRLPOOL b0068fb125aa8a67a789ee36d1ba803c19f1f9f3880f591513e6dbc525fd4a038f1df4228332a04d3e4217ad15d3cf04b947f707a9d8951cef4af3b7226c3d02
+MISC metadata.xml 911 SHA256 72331a2e5f11e985a3d563fbf8e997f0a30e09b2a16baa72a1f6e288c9c16132 SHA512 3ed1d0899dd10583de089c964f6297d0c2888df5112297b85e8a016b3ac04fbca6d8859229df24d6a5260f72d88f887db7e6869afa2c41f63873c41a63d7d574 WHIRLPOOL b90b503fe1280d0f669ac7ae22208dcf03ba703ee8bdc6499880067619a7424f8108ee39242b049358447c9ff02ed79a1229a80166553792844526678f59b186
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJRBXJpAAoJEF0huFKJUZL54WwP/04fZYALct5rpswOXw5XDsfV
+c2Gommwo1n8o0Z9TNvmcxUFplIptV0pquiKrmxJpymikaFUEjGvjUJ6OBqEQd8rL
+lMDST1IhdTF1eFUHlBqD9fLxCdRRb+T/I2GBLaMlVZpr85C3ZA5E+frw8RQ9VBTX
+KbWc30t8k8HjUXkSSNe/hWC06lJq4cRy45K0OfCzy052u/nthip9/qYirEcRGFiO
+rmxT368pOSsxAX9GXKDAOHu+IPGn+INn6eJNs4rIpNguokoY6wGA1JIdG1c5mtGD
+x1kJUAtaesDDrmeFPoRwXkWDTFBfnkpEF6b7+FSeX6nLCQgryoh9gHZFIoIA1q74
+ILnArVRCUfmECKJjgN8qFj+aePtv+JetT7AHInQwp3sTWLiJceAdJJC4iUidQjkO
+ASCcof1RAOwmSfM1hpYlKRGMLY27qJm+CuYqtWd7uHjALUmy1AG47+Dq3pKqLvpZ
+/mmEM2aTNc42TICxVh65Wj3776eM7jA0ZGzWMEL95oChq6U05BCIdcOIPxo5dzaY
+/x7fzKJx4ovs+0o9ew4Z16arfxvE7jNSsXrCR+EEbNO3+0vtWr1u4NyjrZhtc0qu
+DD4DYJneWhEui+kFfH+6DpUQCEw4wlvdFPzUTf46AlNg1jWy3yP3TMBMgpIrBBdv
+3Gxzx+E/HpkOQGhqLobm
+=Fbpi
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/i3status/i3status-2.5.1.ebuild b/x11-misc/i3status/i3status-2.5.1.ebuild
deleted file mode 100644
index db4fc630a0ab..000000000000
--- a/x11-misc/i3status/i3status-2.5.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/i3status-2.5.1.ebuild,v 1.3 2012/06/26 07:25:44 jdhore Exp $
-
-EAPI=4
-
-inherit toolchain-funcs versionator
-
-DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
-HOMEPAGE="http://i3wm.org/i3status/"
-SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+caps"
-
-RDEPEND="dev-libs/confuse
-	>=dev-libs/yajl-2.0.2
-	media-libs/alsa-lib
-	net-wireless/wireless-tools"
-DEPEND="${RDEPEND}
-	caps? ( sys-libs/libcap )"
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-# Requires versionator.eclass
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missing kernel support."
-		ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
-		ewarn "where <FS> is the filesystem to store ${path}"
-		if ! version_is_at_least 2.6.33 "$(uname -r)"; then
-			ewarn "For kernel 2.6.32 or older, you will also need to enable"
-			ewarn "SECURITY_FILE_CAPABILITIES."
-		fi
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \
-		-e '/CFLAGS+=-g/d' -i Makefile || die
-}
-
-pkg_postinst() {
-	fcaps 0:users 550 cap_net_admin "${ROOT}"/usr/bin/${PN}
-	elog "You need to install x11-misc/xmobar or x11-misc/dzen to use ${PN}."
-	elog "Please refer to manual: man ${PN}"
-}
diff --git a/x11-misc/i3status/i3status-2.6.ebuild b/x11-misc/i3status/i3status-2.6.ebuild
index 2b8b55e329a6..425e920daa27 100644
--- a/x11-misc/i3status/i3status-2.6.ebuild
+++ b/x11-misc/i3status/i3status-2.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/i3status-2.6.ebuild,v 1.3 2012/12/16 16:33:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/i3status-2.6.ebuild,v 1.4 2013/01/27 18:31:04 xarthisius Exp $
 
 EAPI=4
 
-inherit toolchain-funcs versionator
+inherit toolchain-funcs versionator fcaps
 
 DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
 HOMEPAGE="http://i3wm.org/i3status/"
@@ -13,56 +13,13 @@ SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+caps"
+IUSE=""
 
 RDEPEND="dev-libs/confuse
 	>=dev-libs/yajl-2.0.2
 	media-libs/alsa-lib
 	net-wireless/wireless-tools"
-DEPEND="${RDEPEND}
-	caps? ( sys-libs/libcap )"
-
-# borrowed from GSoC2010_Gentoo_Capabilities by constanze and flameyeys
-# @FUNCTION: fcaps
-# @USAGE: fcaps {uid:gid} {file-mode} {cap1[,cap2,...]} {file}
-# @RETURN: 0 if all okay; non-zero if failure and fallback
-# @DESCRIPTION:
-# fcaps sets the specified capabilities in the effective and permitted set of
-# the given file. In case of failure fcaps sets the given file-mode.
-# Requires versionator.eclass
-fcaps() {
-	local uid_gid=$1
-	local perms=$2
-	local capset=$3
-	local path=$4
-	local res
-
-	chmod $perms $path && \
-	chown $uid_gid $path
-	res=$?
-
-	use caps || return $res
-
-	#set the capability
-	setcap "$capset=ep" "$path" &> /dev/null
-	#check if the capabilitiy got set correctly
-	setcap -v "$capset=ep" "$path" &> /dev/null
-	res=$?
-
-	if [ $res -ne 0 ]; then
-		ewarn "Failed to set capabilities. Probable reason is missing kernel support."
-		ewarn "Your kernel must have <FS>_FS_SECURITY enabled (e.g. EXT4_FS_SECURITY)"
-		ewarn "where <FS> is the filesystem to store ${path}"
-		if ! version_is_at_least 2.6.33 "$(uname -r)"; then
-			ewarn "For kernel 2.6.32 or older, you will also need to enable"
-			ewarn "SECURITY_FILE_CAPABILITIES."
-		fi
-		ewarn
-		ewarn "Falling back to suid now..."
-		chmod u+s ${path}
-	fi
-	return $res
-}
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	tc-export CC
@@ -74,7 +31,7 @@ src_prepare() {
 }
 
 pkg_postinst() {
-	fcaps 0:users 550 cap_net_admin "${ROOT}"/usr/bin/${PN}
+	fcaps cap_net_admin usr/bin/${PN}
 	elog "You need to install x11-misc/xmobar or x11-misc/dzen to use ${PN}."
 	elog "Please refer to manual: man ${PN}"
 }
diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml
index f2ab65f7a817..29dbb30b93cd 100644
--- a/x11-misc/i3status/metadata.xml
+++ b/x11-misc/i3status/metadata.xml
@@ -14,4 +14,7 @@
 		status bar is updated correctly. Also, it saves a bit of energy by not hogging
 		your CPU as much as spawning the corresponding amount of shell commands would.
 	</longdescription>
+	<use>
+		<flag name="filecaps">Linux capabilities library is required for i3status to be able to read net bandwith</flag>
+	</use>
 </pkgmetadata>