Version bump (#458822 by Manuel Rüger (mrueg))

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 84 insertions, 5 deletions

diff --git a/x11-misc/bumblebee/ChangeLog b/x11-misc/bumblebee/ChangeLog
index f0ec931e381d..90d6f14ebe77 100644
--- a/x11-misc/bumblebee/ChangeLog
+++ b/x11-misc/bumblebee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/bumblebee
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.11 2013/01/21 21:19:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.12 2013/02/26 19:57:39 pacho Exp $
+
+*bumblebee-3.1 (26 Feb 2013)
+
+  26 Feb 2013; Pacho Ramos <pacho@gentoo.org> +bumblebee-3.1.ebuild:
+  Version bump (#458822 by Manuel Rüger (mrueg))
 
 *bumblebee-3.0.1-r2 (21 Jan 2013)
 
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 1ca141a88e22..2978ebe5590e 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -7,13 +7,15 @@ AUX bumblebee.confd 60 SHA256 9e0287f542cff0fd3452a0c3d6d427a3404706c93ac9a00f4d
 AUX bumblebee.envd 127 SHA256 fd6c2719f8268a03fe01df6f9ead660faa3f7aa2a63230d5a7e923a190077437 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af WHIRLPOOL dc5d9dffd2b5219f7c6f11a917cbab004fa3ed89005357dbc1dd1eb3833d4243209c71ccc0b3abc6163c1c192e1a7de8dc1b7ce137ba43aa8f0157ecfd78857c
 AUX bumblebee.initd 598 SHA256 8dd0ea64c084a6e4daac3b8da043ff16d87ec2ba44c63e9965a2e8c9382dc639 SHA512 f39792f6711433f63adbb940f61e013bd8c8e72ea263e97a47bf470c3745ecfb0c28c04192f36dd6a133c5824d3830b1c9be8800da3b4510372518d2976bc350 WHIRLPOOL 008bd1451a1e5252e1a6d97a96bd9722fc43599aec596d1839136c645f9c135a2218942f1c7b58a0ee3ffd4cc05b9da33d427b0ea2340e753cd475386748124d
 DIST bumblebee-3.0.1.tar.gz 137534 SHA256 447eebbcfbc8877a7a15126b492f07b9186428e75c768b1eeb86ce71076f3e60 SHA512 4b1b37c4b6bef9ea2b91bcfdacf5a2dea18fc4ed245d9881f93454d5e23bb07d4048114ec79c143f82504e20526e7b55e5b8d3a1b83c08340c244ea93fbef150 WHIRLPOOL cf93188d39d2449a2410005649f26c5462a0610bd6c616052cbbb9e27f253cbc2ad394dd737fc963b956298ae6d706c0adf587aebd102a46e82bbe13a7549535
+DIST bumblebee-3.1.tar.gz 144108 SHA256 586214b17072cadd0d9e2851c58e01763c1251231672d05297a2916f8dba76cc SHA512 b6f767892d6f6ce3787ce94c065dccd4744908919aa4eb9489bb9c7b61ab585553152b3c14da0acb91bf72982ad1478b725a2b8952e0970ca255e1c7b4562dd6 WHIRLPOOL 73dc18ca0274bbbdaaf11bd398c253eaebdfc39b00a11537e310f0a22ffeabcc6246c66b038cbca902631a2dab34143a77b63cc659c674809aa048b7d738c119
 EBUILD bumblebee-3.0.1-r2.ebuild 2468 SHA256 028abb738cb13ca2a700813c7ab4a38ad161f81562b1f25f8a97d05b4d01e32d SHA512 3059c471191bb356cb595193fd06e9d59268436e60ad6cfbcf260493270e3185a585ecbce49b5db709152f603d5f4dddab5894fb8a7c73784f08b3ed7d257f3c WHIRLPOOL 3c0b54ad8223e145662c30c27ead3f1afcdca8cf8420db9aaf5c0cec56fc062818aeed3265bfe495bbdfcb92fdf199ac3bfca5907171ff569daa22f6cfb69fee
-MISC ChangeLog 2678 SHA256 6296cf2fe57d7cba32eabdbde00cac0ec273c092e84fd61829ee70c5daa2fb3b SHA512 a6521a49ed06572d16ec4eedda4a442ed93463dd7d935fe5e1962456881277b22dbf81f43d1153d07fcf6b86257a92525006008ed45e511612cb210a67757f42 WHIRLPOOL 412a0c7caa351cd5a3ec6a6e28764e541712800884909f9de2f8ba5fcd23f96aa944bcc0bfcc7d5d569d999ce30d5fb213206e207c861f36f7253e208a7d042f
+EBUILD bumblebee-3.1.ebuild 2132 SHA256 635817628653aa5bb21eb6c2cd1b7adff26d93563f66c733e751424416fa80f8 SHA512 7f3d3843b1f7522521d13218c1f06843836d7791e2d2880ccf5f46b6e4a77d0235cb757643930372ab4cecb5d6bab98f3be36f6d91818e85fe47d2b3718e9115 WHIRLPOOL e557dd7b12dda80ead3d92f35805157347cf2b610496e6c099ea43379f6fda994c7fc6eb407600b05b55c51c7e4bafb036fea0e48dae2191e30fdf576a4ae7e6
+MISC ChangeLog 2828 SHA256 13d98117b3f3d27719e6c780a73636f3a5ceed57ddb79d6bbb01561badb602aa SHA512 7467a456fbe56381d4f999742e9678e4b021588b5170370369b16680009148a2a639d6591b481b6f0b44cfee34dbabf720d1067019a59e69aaef5cbcf2eb8e59 WHIRLPOOL bfb70b44348ebe6985f64417ab8d672c6aedcaabe170716a861d4fd830018bd3b01cca6660fdb64555b70f0b8fcae37f21ede99ed4c91e34ac486cf90326fb07
 MISC metadata.xml 850 SHA256 402fc01c90d3969d01b8567a53a8af406087118382ef02f158b009b927014c14 SHA512 5d4fde7b767cc3cd27246ac19173d61f6cc0cea08dc6e810e0bfdc557d86b6286aa24bdf6e70fe488adbd4e866188d20182c07df39ad8731c24edb19657db387 WHIRLPOOL 7a7485591af12c10c7073deb8267d346c5efc2684df270c5a455de98302e0cdca8205c93d367c6058b8721de3a6fd307b875b052417c9a392db6b211a75a7d79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD9sNUACgkQCaWpQKGI+9RbAgCeMtjYjFs9BaLe04UZfB4GW/2u
-dX0An2FSRmiJQTtp48HVqugEq0KTo5BE
-=w9OI
+iEYEAREIAAYFAlEtE7UACgkQCaWpQKGI+9QtQQCffq2vTvnW5m0WuM+esCSB1pbo
+TWsAn1vC6HZFfUcYtksXhnTb5geH8vQ6
+=K7mW
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/bumblebee/bumblebee-3.1.ebuild b/x11-misc/bumblebee/bumblebee-3.1.ebuild
new file mode 100644
index 000000000000..464f63b14120
--- /dev/null
+++ b/x11-misc/bumblebee/bumblebee-3.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.1.ebuild,v 1.1 2013/02/26 19:57:39 pacho Exp $
+
+EAPI=5
+inherit eutils multilib readme.gentoo systemd user
+
+DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
+HOMEPAGE="http://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
+SRC_URI="http://bumblebee-project.org/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
+
+RDEPEND="x11-misc/virtualgl:=
+	bbswitch? ( sys-power/bbswitch )
+	virtual/opengl
+	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]"
+DEPEND=">=sys-devel/autoconf-2.68
+	sys-devel/automake
+	sys-devel/gcc
+	virtual/pkgconfig
+	dev-libs/glib:2
+	x11-libs/libX11
+	dev-libs/libbsd
+	sys-apps/help2man"
+
+REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
+
+src_configure() {
+	DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
+		You may need to setup your /etc/bumblebee/bumblebee.conf"
+
+	if use video_cards_nvidia ; then
+		# Get paths to GL libs for all ABIs
+		local nvlib=""
+		for i in  $(get_all_libdirs) ; do
+			nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib"
+		done
+
+		local nvpref="/usr/$(get_libdir)/opengl/nvidia"
+		local xorgpref="/usr/$(get_libdir)/xorg/modules"
+		ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \
+			CONF_LDPATH_NVIDIA=${nvlib#:} \
+			CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
+	fi
+
+	econf \
+		--docdir=/usr/share/doc/"${PF}" \
+		${ECONF_PARAMS}
+}
+
+src_install() {
+	newconfd "${FILESDIR}"/bumblebee.confd bumblebee
+	newinitd "${FILESDIR}"/bumblebee.initd bumblebee
+	newenvd  "${FILESDIR}"/bumblebee.envd 99bumblebee
+	systemd_dounit scripts/systemd/bumblebeed.service
+
+	readme.gentoo_create_doc
+
+	default
+}
+
+pkg_preinst() {
+	use video_cards_nvidia || rm "${ED}"/etc/bumblebee/xorg.conf.nvidia
+	use video_cards_nouveau || rm "${ED}"/etc/bumblebee/xorg.conf.nouveau
+
+	enewgroup bumblebee
+}