libbsd is also a RDEPEND (#509870 by cyberbat), drop old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 7 insertions, 75 deletions

diff --git a/x11-misc/bumblebee/ChangeLog b/x11-misc/bumblebee/ChangeLog
index 643e98adbeee..623c88f4e4ab 100644
--- a/x11-misc/bumblebee/ChangeLog
+++ b/x11-misc/bumblebee/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/bumblebee
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.16 2014/01/26 11:41:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.17 2014/05/10 17:46:23 pacho Exp $
+
+  10 May 2014; Pacho Ramos <pacho@gentoo.org> -bumblebee-3.1.ebuild,
+  bumblebee-3.2.1.ebuild:
+  libbsd is also a RDEPEND (#509870 by cyberbat), drop old.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> bumblebee-3.2.1.ebuild:
   Stable for x86, wrt bug #480128
diff --git a/x11-misc/bumblebee/bumblebee-3.1.ebuild b/x11-misc/bumblebee/bumblebee-3.1.ebuild
deleted file mode 100644
index 464f63b14120..000000000000
--- a/x11-misc/bumblebee/bumblebee-3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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
-}
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
index 07b3309e3b06..2476c539b1c4 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.2.1.ebuild,v 1.3 2014/01/26 11:41:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.2.1.ebuild,v 1.4 2014/05/10 17:46:23 pacho Exp $
 
 EAPI=5
 inherit eutils multilib readme.gentoo systemd user
@@ -16,6 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
 
 RDEPEND="
+	dev-libs/libbsd
 	virtual/opengl
 	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]
 	x11-misc/virtualgl:=
@@ -23,7 +24,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/glib:2
-	dev-libs/libbsd
 	sys-apps/help2man
 	virtual/pkgconfig
 	x11-libs/libX11