Version bump

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

3 files changed, 102 insertions, 15 deletions

diff --git a/x11-misc/i3status/ChangeLog b/x11-misc/i3status/ChangeLog
index 422057e80eff..f269b7f7642c 100644
--- a/x11-misc/i3status/ChangeLog
+++ b/x11-misc/i3status/ChangeLog
@@ -1,6 +1,11 @@
 # 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.11 2012/08/21 08:15:35 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3status/ChangeLog,v 1.12 2012/10/03 15:28:52 xarthisius Exp $
+
+*i3status-2.6 (03 Oct 2012)
+
+  03 Oct 2012; Kacper Kowalik <xarthisius@gentoo.org> +i3status-2.6.ebuild:
+  Version bump
 
   21 Aug 2012; Kacper Kowalik <xarthisius@gentoo.org> -i3status-2.4.ebuild,
   -i3status-2.5.ebuild:
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index 78f2d902211b..3c8cab5befec 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 DIST i3status-2.5.1.tar.bz2 30956 SHA256 7734efdf79a77617023f1e6d80080251eab3a05defb67313283568511d3e58f2
+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
-MISC ChangeLog 1665 SHA256 0e0aa0e47ae290dade8c9e135276c8618c5dcf58e324518fc39311d30a59e375 SHA512 6c49654178e553cebfea7a4d155af34216b4876c11f49bc0c74b776856c992ea9299c15408a42a43a365cbeee48f615fbbb00f9ac4d46f2defa163d22fc8a0c3 WHIRLPOOL 6b8af43598663f1dd5378f1c72ee700a0d67d6a5b6981cca5a890eead6804c15883b9422cd112d0b5d485f76bd158ca3aa9d88317d6b0c4ae6b7f97864119de1
+EBUILD i3status-2.6.ebuild 2196 SHA256 cec7aeca4da81684db456b31538e1d0c2b1b9bb115f2ead12477981177bb6b4c SHA512 4c395d57e69591cf1ce2c44ba9279ce30299ce586058faefc9c81c3d252437da4e5858f07b2a9b22ebeaffda6b6d10523150b976c7d3a0e59c6769495621e707 WHIRLPOOL 002623dacd1f9467991cfca045923ccbc6925036aec6b4f7eed677fac03b64d3333e294e87a57e39f566932ddfec2fb348ca205ceef94235b4d322a357ec54df
+MISC ChangeLog 1786 SHA256 467946f63425c6ecd5d03addeb62b7e8b82890bef2dc22f135da0920d1bb64b0 SHA512 bed93f7b8d78b1a37499cdc3111575207a622280e474c9f1b33b413ce7b655831bc0876214df3e10576d9b6b4bffd7b06ec8b59b643bf0eb28b6d28232ed9627 WHIRLPOOL 20bdc95fda997addb6ad843a1d743713d08d2dff2a57d2ba04596f2cdedf0762d84e2f93748c7d492a4af01fc94fa567befed94e5aca6d31646e9e35cedd3094
 MISC metadata.xml 781 SHA256 97cc7157bfe2d05a4c77793b89190fef0f94d1decd52e41c717c37583696f3f4 SHA512 1fa33ce63392d97d5cc27df6810a0a3893408a22869ab18bc8d45d4ec984b56041b901d2091b3b8d82b96c3c265ead3f0a375c3850f6530cbce64dcbd20dc946 WHIRLPOOL c4bd22b3b96b4eb896bebc68586bc9a5bb5f3f4639a13582583d668c0c91207f65d01a75409d2bb7c5d8a3c72858f75a1674c78f1be2bf5afa8393c3972ab5c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQM0PKAAoJEF0huFKJUZL5m5kP/Rob1hEdf2J2ihRgoDeBD2M4
-BPInGhwcaJZicTZ7LvDDQHDD3oVG+p5qigfmWrc4XbFHVDY1S23AvHXjNQB52YSv
-AYZHE7rpXYNzYjWJz8XWa76SSsNF6e5GtGCUNnD4mOgHRhEwMtqru5Gj73/h5I8w
-I/AJUlZxGa1lyAU/N6uoBKOq41FE2IJ/VIT4ai0UhQGHUmxy0r938Bxb1FRdaKgQ
-+YAoU/2vfId1M6I3guHalHqtYJb0DhRIS6IwevKxiRnGbCbhuXo6sMLC7d90xOSQ
-v72Q55M7GgeqS+tUgQ+viwxJw3VGBnXZJCB569xA2tcq4ktSH7f6y7zdxO0Y2UbN
-ivY80jyiidU0ROHqhaugRIb0GefdueOQpiHl0Y/cc7QruTr1jB/Ujxl5htz2rL2k
-q7JmTQ3Z0Tvqv2lyzcrABzbrD0Z9P4RK5IaayedWmpoASNu0f5Tqm0vZeFnxi8C4
-WWyyEqLXvkZVmK+KF90yR0tR0n7m694/+hflgNNDqlQoDADdgW8OKEIvLhDAR1R3
-6+0dXbxpNka4kJs0xikos8ZsKmBdEvAHP89/RGTmYDvP6ZmWRyZmhUH68x6BmQ6c
-U0RQYPkAsjaZqE3GnivVaTjNJKOUCFELg2/nMARHk9ntYl2891dyORoNDMCjnSR2
-e+V62wIGntwQ8wpLwbw/
-=ulEE
+iQIcBAEBCAAGBQJQbFm5AAoJEF0huFKJUZL5tekP/06L4MQMREaYY/zuaV5outYv
+iFtaKjTTwJejXseAyqk+vi//vi9nz7fc4gWgHLutv0k3Y9jYYPg/Uw/7oDVI5suF
+fAM/YX5n9rKogyBB/xUR1OA8/hhvMpub/FgnUsGBJ6bD1tyHYjwdSc4RZj0EdxSx
+8A89UuA7FFW64ecQKurCfgG1kX+VsvGeuiBSWkhsZMv/GXGFyY0EHvXl8gxuc4cv
+lFT1rKO3WpzN0QlWTVJFZmgioYdDppefzlNA9BafSKactIG0dxuvJHpfrw5IuI/Z
+yZgJxIdvQunoNeByqrWZ93eWhaGy4ULPkXI354jgCNUTfbFG0KCIT9jaXKvX4vI/
+9VxMb7fm8/DxzvLvK4ONFmgKrcz/ZFPEXcvFLCfg0n+AYzGurqJQ65aPSfmJeTkg
+DF1k+gTFsCQm98AGgzJJFhs9Cnle5nD+qFb+c1fijf1gfkcd9/1PEfHRP2CSZRfC
+MZwyBkApHhu18+9sj6HR/cQYFVyLE1YoFJigIE0wTrRYQy6Ojjbr2NH9jNJZet/j
+z1Grls94r8tEaDCFLHcu3+oHKKZHBLKVZK+V9iDUEgiWm0ZEsX4+7Kj9E0dInMaf
+vaLzbR4UUNrHsZMqya0Xmsd5XuZGnzP9uOD+styMiLMPbVn6oL8C620czG90iB24
+cT6B5qXreLQiIIIDVYze
+=FJ27
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/i3status/i3status-2.6.ebuild b/x11-misc/i3status/i3status-2.6.ebuild
new file mode 100644
index 000000000000..abbd00c250e4
--- /dev/null
+++ b/x11-misc/i3status/i3status-2.6.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/x11-misc/i3status/i3status-2.6.ebuild,v 1.1 2012/10/03 15:28:52 xarthisius 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}"
+}