Fix metadata, sync with bumblebee overlay changes, apply Michał Górny's patch to support systemd (bug #418627). Drop old.

(Portage version: 2.1.10.64/cvs/Linux x86_64)

8 files changed, 25 insertions, 88 deletions

diff --git a/x11-misc/bumblebee/ChangeLog b/x11-misc/bumblebee/ChangeLog
index 528e2f739caa..595cecf604af 100644
--- a/x11-misc/bumblebee/ChangeLog
+++ b/x11-misc/bumblebee/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/bumblebee
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.5 2012/05/05 04:53:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.6 2012/06/04 19:46:25 pacho Exp $
+
+*bumblebee-3.0-r2 (04 Jun 2012)
+
+  04 Jun 2012; Pacho Ramos <pacho@gentoo.org> +bumblebee-3.0-r2.ebuild,
+  +files/bumblebee.confd, +files/bumblebee.envd, -bumblebee-3.0-r1.ebuild,
+  -bumblebee-3.0.ebuild, -files/bumblebee.nouveau-confd,
+  -files/bumblebee.nvidia-confd, files/bumblebee.initd, metadata.xml:
+  Fix metadata, sync with bumblebee overlay changes, apply Michał Górny's patch
+  to support systemd (bug #418627). Drop old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> bumblebee-3.0.ebuild,
   bumblebee-3.0-r1.ebuild:
diff --git a/x11-misc/bumblebee/bumblebee-3.0-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild
index 2db0dfdc0f5b..2c4fc660c47c 100644
--- a/x11-misc/bumblebee/bumblebee-3.0-r1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.0-r1.ebuild,v 1.4 2012/05/05 04:53:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild,v 1.1 2012/06/04 19:46:25 pacho Exp $
 
 EAPI="4"
 
-inherit multilib user
+inherit multilib systemd user
 
 DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
 HOMEPAGE="https://github.com/Bumblebee-Project/Bumblebee"
-SRC_URI="mirror://github/Bumblebee-Project/${PN/bu/Bu}/${P/bu/Bu}.tar.gz"
+SRC_URI="mirror://github/Bumblebee-Project/${PN/bu/Bu}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-3"
@@ -50,21 +50,21 @@ src_configure() {
 }
 
 src_install() {
-	newconfd "${FILESDIR}"/bumblebee.nouveau-confd bumblebee # The same conf.d file can be used for nvidia also
+	newconfd "${FILESDIR}"/bumblebee.confd bumblebee
 	newinitd "${FILESDIR}"/bumblebee.initd bumblebee
+	newenvd  "${FILESDIR}"/bumblebee.envd 99bumblebee
+	systemd_dounit scripts/systemd/bumblebee.service
 	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
+	! use video_cards_nvidia && rm "${D}"/etc/bumblebee/xorg.conf.nvidia
+	! use video_cards_nouveau && rm "${D}"/etc/bumblebee/xorg.conf.nouveau
 
 	enewgroup bumblebee
 }
 
 pkg_postinst() {
-	ewarn "This is *NOT* all! Bumblebee still *NOT* ready to use."
-	ewarn "You may need to setup your /etc/bumblebee/bumblebee.conf!"
-	ewarn "For example, default config suggests you have bbswitch installed."
-	ewarn "Also you should add your user to 'bumblebee' group."
+	ewarn "In order to use Bumblebee, add your user to 'bumblebee' group."
+	ewarn "You may need to setup your /etc/bumblebee/bumblebee.conf"
 }
diff --git a/x11-misc/bumblebee/bumblebee-3.0.ebuild b/x11-misc/bumblebee/bumblebee-3.0.ebuild
deleted file mode 100644
index 05fc4735a925..000000000000
--- a/x11-misc/bumblebee/bumblebee-3.0.ebuild
+++ /dev/null
@@ -1,72 +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/bumblebee/bumblebee-3.0.ebuild,v 1.3 2012/05/05 04:53:52 jdhore Exp $
-
-EAPI="4"
-
-inherit multilib eutils
-
-DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
-HOMEPAGE="https://github.com/Bumblebee-Project/Bumblebee"
-SRC_URI="mirror://github/Bumblebee-Project/${PN/bu/Bu}/${P/bu/Bu}.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"
-
-# FIXME: move from ^^ to || once both VIDEO_CARDS are supported at the same time
-REQUIRED_USE="^^ ( video_cards_nouveau video_cards_nvidia )"
-
-src_configure() {
-	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 ${ECONF_PARAMS}
-}
-
-src_install() {
-	use video_cards_nvidia && newconfd "${FILESDIR}"/bumblebee.nvidia-confd bumblebee
-	use video_cards_nouveau && newconfd "${FILESDIR}"/bumblebee.nouveau-confd bumblebee
-	newinitd "${FILESDIR}"/bumblebee.initd bumblebee
-	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
-}
-
-pkg_postinst() {
-	ewarn "This is *NOT* all! Bumblebee still *NOT* ready to use."
-	ewarn "You may need to setup your /etc/bumblebee/bumblebee.conf!"
-	ewarn "For example, default config suggests you have bbswitch installed."
-	ewarn "Also you should add your user to 'bumblebee' group."
-}
diff --git a/x11-misc/bumblebee/files/bumblebee.nouveau-confd b/x11-misc/bumblebee/files/bumblebee.confd
index 1c70206da6bf..1c70206da6bf 100644
--- a/x11-misc/bumblebee/files/bumblebee.nouveau-confd
+++ b/x11-misc/bumblebee/files/bumblebee.confd
diff --git a/x11-misc/bumblebee/files/bumblebee.envd b/x11-misc/bumblebee/files/bumblebee.envd
new file mode 100644
index 000000000000..e19cc56a1303
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.envd
@@ -0,0 +1,3 @@
+# Comment this out if you are using VirtualGL also for other purposes and this
+# slows down things for you.
+VGL_READBACK="pbo"
diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd
index e9c9c29a64e1..0a9fbb79b0d6 100644
--- a/x11-misc/bumblebee/files/bumblebee.initd
+++ b/x11-misc/bumblebee/files/bumblebee.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/files/bumblebee.initd,v 1.1 2012/04/21 13:26:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/files/bumblebee.initd,v 1.2 2012/06/04 19:46:24 pacho Exp $
 
 depend() {
 	need xdm vgl
diff --git a/x11-misc/bumblebee/files/bumblebee.nvidia-confd b/x11-misc/bumblebee/files/bumblebee.nvidia-confd
deleted file mode 100644
index 53d2006af3eb..000000000000
--- a/x11-misc/bumblebee/files/bumblebee.nvidia-confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/conf.d/bumblebee
-
-BUMBLEBEE_EXTRA_OPTS="--use-syslog -l /usr/lib/opengl/nvidia/lib:/usr/lib/opengl/nvidia/extensions:/usr/lib64/opengl/nvidia/lib:/usr/lib32/opengl/nvidia/lib:/usr/lib64/opengl/nvidia/extensions:/usr/lib32/opengl/nvidia/extensions"
\ No newline at end of file
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
index 633263d82c8f..eb12f657284e 100644
--- a/x11-misc/bumblebee/metadata.xml
+++ b/x11-misc/bumblebee/metadata.xml
@@ -7,7 +7,7 @@
 </maintainer>
 <maintainer>
 	<email>mva@mva.name</email>
-	<name>Vadim A. Misbakh-Soloviev</name>
+	<name>Vadim A. Misbakh-Soloviov</name>
 </maintainer>
 <maintainer>
 	<email>rei4dan@gmail.com</email>