summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-06-20 12:49:22 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-06-20 12:49:22 +0000
commit00ec1925d9509510af9475be22788e59c3db3cc9 (patch)
treea0d06cf19e5cd774ac3284ed199a1f48a37d4de0 /x11-misc/bumblebee
parentapp-misc/regex-markup: Fix missing declerations, #240044; bump EAPI=4; add mi... (diff)
downloadgentoo-2-00ec1925d9509510af9475be22788e59c3db3cc9.tar.gz
gentoo-2-00ec1925d9509510af9475be22788e59c3db3cc9.tar.bz2
gentoo-2-00ec1925d9509510af9475be22788e59c3db3cc9.zip
Trivial commit, sort the logic and use ED instead of D.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/bumblebee')
-rw-r--r--x11-misc/bumblebee/ChangeLog5
-rw-r--r--x11-misc/bumblebee/bumblebee-3.0-r2.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/x11-misc/bumblebee/ChangeLog b/x11-misc/bumblebee/ChangeLog
index 3c1ae2972711..28cc8790d6bb 100644
--- a/x11-misc/bumblebee/ChangeLog
+++ b/x11-misc/bumblebee/ChangeLog
@@ -1,6 +1,9 @@
# 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.7 2012/06/05 08:45:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.8 2012/06/20 12:49:22 scarabeus Exp $
+
+ 20 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org> bumblebee-3.0-r2.ebuild:
+ Trivial commit, sort the logic and use ED instead of D.
05 Jun 2012; Pacho Ramos <pacho@gentoo.org> bumblebee-3.0-r2.ebuild:
Fix typo in systemd service installation, bug #419675 by decker49.
diff --git a/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild b/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild
index 070a46606db6..2ad0c5a3b4f1 100644
--- a/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild
@@ -1,6 +1,6 @@
# 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-r2.ebuild,v 1.2 2012/06/05 08:45:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.0-r2.ebuild,v 1.3 2012/06/20 12:49:22 scarabeus Exp $
EAPI="4"
@@ -58,8 +58,8 @@ src_install() {
}
pkg_preinst() {
- ! use video_cards_nvidia && rm "${D}"/etc/bumblebee/xorg.conf.nvidia
- ! use video_cards_nouveau && rm "${D}"/etc/bumblebee/xorg.conf.nouveau
+ use video_cards_nvidia || rm "${ED}"/etc/bumblebee/xorg.conf.nvidia
+ use video_cards_nouveau || rm "${ED}"/etc/bumblebee/xorg.conf.nouveau
enewgroup bumblebee
}