Fix udev rules installation dir (#453316 by Maciej Piechotka), doc files installation and use readme.gentoo.eclass to install configuration information.

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

4 files changed, 25 insertions, 86 deletions

diff --git a/x11-misc/bumblebee/ChangeLog b/x11-misc/bumblebee/ChangeLog
index 092fca36c6a4..f0ec931e381d 100644
--- a/x11-misc/bumblebee/ChangeLog
+++ b/x11-misc/bumblebee/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2013/01/03 20:37:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.11 2013/01/21 21:19:16 pacho Exp $
+
+*bumblebee-3.0.1-r2 (21 Jan 2013)
+
+  21 Jan 2013; Pacho Ramos <pacho@gentoo.org> +bumblebee-3.0.1-r2.ebuild,
+  -bumblebee-3.0.1-r1.ebuild, -bumblebee-3.0.1.ebuild:
+  Fix udev rules installation dir (#453316 by Maciej Piechotka), doc files
+  installation and use readme.gentoo.eclass to install configuration
+  information.
 
 *bumblebee-3.0.1-r1 (03 Jan 2013)
 
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 9c4c00fbb670..1ca141a88e22 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -7,14 +7,13 @@ 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
-EBUILD bumblebee-3.0.1-r1.ebuild 2425 SHA256 52b24af429d11bc27bad3e4d835eff9e92c6bc7289dca081d6bcb9b892954774 SHA512 4d2200c445aba682402154cc1c9379ba4b9d5e38047947d7c9f80dd1898b1b3b8017926c450812cf325724712b5b1079a9abe0fa9cffe3720d1ccff0b666a21b WHIRLPOOL 51904e4480ad67aea4a4dfac150975cf7d45bdc446bedd76f3b53e695e49c41f8c3ea92904cb97784946f046a8b4636a163192ccfd8fdd823c0709309e2e07cf
-EBUILD bumblebee-3.0.1.ebuild 2050 SHA256 2d8a23d485ce97cee1839dc46158585b231ba0ba2f5b302620dd7945a64d6bc4 SHA512 46a04a68992aa4ce03e7f39bda363bc9de67238ec72574759906391cb0a9521602ac17ca7cf7b5c2fe4213c1fe7bbf72079364d138cc2b413e539153a35947f0 WHIRLPOOL 9acb50877b420acc1880cf6f6b9bc298b39dc3c8926ebd1eaa17bd757288b4cbd49a8c985cabbb0d3d0502a631d4a04d0328d10b5824429123bef7b32c84e6e4
-MISC ChangeLog 2354 SHA256 ebb67359b5817817abf43c99d670595fe573637ff5881ff55eab2a12f2eb82a7 SHA512 01a5adec0910ee3641280cf70eb6bf167c67d7d9773d7c51ab11f680f278c760ce0393a67e5dd21876ced6e6e53eb7762ff7b96f664327056332ce4cadaa489c WHIRLPOOL d70a934bac44efcb745a861cfffc5b61d29dfdd8c5fd3e9ae8426f9be9201c60c4ec55625a9cbdc65bb99740b844c9454f3051a07134a01383c3d6e9718d75bc
+EBUILD bumblebee-3.0.1-r2.ebuild 2468 SHA256 028abb738cb13ca2a700813c7ab4a38ad161f81562b1f25f8a97d05b4d01e32d SHA512 3059c471191bb356cb595193fd06e9d59268436e60ad6cfbcf260493270e3185a585ecbce49b5db709152f603d5f4dddab5894fb8a7c73784f08b3ed7d257f3c WHIRLPOOL 3c0b54ad8223e145662c30c27ead3f1afcdca8cf8420db9aaf5c0cec56fc062818aeed3265bfe495bbdfcb92fdf199ac3bfca5907171ff569daa22f6cfb69fee
+MISC ChangeLog 2678 SHA256 6296cf2fe57d7cba32eabdbde00cac0ec273c092e84fd61829ee70c5daa2fb3b SHA512 a6521a49ed06572d16ec4eedda4a442ed93463dd7d935fe5e1962456881277b22dbf81f43d1153d07fcf6b86257a92525006008ed45e511612cb210a67757f42 WHIRLPOOL 412a0c7caa351cd5a3ec6a6e28764e541712800884909f9de2f8ba5fcd23f96aa944bcc0bfcc7d5d569d999ce30d5fb213206e207c861f36f7253e208a7d042f
 MISC metadata.xml 850 SHA256 402fc01c90d3969d01b8567a53a8af406087118382ef02f158b009b927014c14 SHA512 5d4fde7b767cc3cd27246ac19173d61f6cc0cea08dc6e810e0bfdc557d86b6286aa24bdf6e70fe488adbd4e866188d20182c07df39ad8731c24edb19657db387 WHIRLPOOL 7a7485591af12c10c7073deb8267d346c5efc2684df270c5a455de98302e0cdca8205c93d367c6058b8721de3a6fd307b875b052417c9a392db6b211a75a7d79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDl7AIACgkQCaWpQKGI+9RwDQCfU8QzWu0ya1vtjNRrvPN5PdQl
-f+kAn3bxq1w4DufE0CcB74qdXsvVKqKz
-=FYdZ
+iEYEAREIAAYFAlD9sNUACgkQCaWpQKGI+9RbAgCeMtjYjFs9BaLe04UZfB4GW/2u
+dX0An2FSRmiJQTtp48HVqugEq0KTo5BE
+=w9OI
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/bumblebee/bumblebee-3.0.1-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild
index bb151726d90c..ce9f29954455 100644
--- a/x11-misc/bumblebee/bumblebee-3.0.1-r1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild
@@ -1,9 +1,9 @@
 # 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.0.1-r1.ebuild,v 1.1 2013/01/03 20:37:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild,v 1.1 2013/01/21 21:19:16 pacho Exp $
 
 EAPI=5
-inherit eutils multilib systemd user
+inherit eutils multilib readme.gentoo systemd udev user
 
 DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
 HOMEPAGE="https://github.com/Bumblebee-Project/Bumblebee"
@@ -31,6 +31,9 @@ DEPEND=">=sys-devel/autoconf-2.68
 REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
 
 src_prepare() {
+	DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
+		You may need to setup your /etc/bumblebee/bumblebee.conf"
+
 	# --wait option for rmmod is deprecated:
 	# https://github.com/Bumblebee-Project/Bumblebee/issues/283
 	epatch "${FILESDIR}/${P}-remove-wait.patch"
@@ -51,7 +54,9 @@ src_configure() {
 			CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
 	fi
 
-	econf ${ECONF_PARAMS}
+	econf \
+		--docdir=/usr/share/doc/"${PF}" \
+		${ECONF_PARAMS}
 }
 
 src_install() {
@@ -62,8 +67,9 @@ src_install() {
 
 	# Install udev rule to handle nvidia card switching,
 	# https://github.com/Bumblebee-Project/Bumblebee/issues/283
-	insinto /usr/lib/udev/rules.d
-	doins "${FILESDIR}"/99-remove-nvidia-dev.rules
+	udev_dorules "${FILESDIR}"/99-remove-nvidia-dev.rules
+
+	readme.gentoo_create_doc
 
 	default
 }
@@ -74,8 +80,3 @@ pkg_preinst() {
 
 	enewgroup bumblebee
 }
-
-pkg_postinst() {
-	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.1.ebuild b/x11-misc/bumblebee/bumblebee-3.0.1.ebuild
deleted file mode 100644
index 6d80803b675e..000000000000
--- a/x11-misc/bumblebee/bumblebee-3.0.1.ebuild
+++ /dev/null
@@ -1,69 +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.1.ebuild,v 1.1 2012/09/14 20:24:21 pacho Exp $
-
-EAPI=4
-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}.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() {
-	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() {
-	newconfd "${FILESDIR}"/bumblebee.confd bumblebee
-	newinitd "${FILESDIR}"/bumblebee.initd bumblebee
-	newenvd  "${FILESDIR}"/bumblebee.envd 99bumblebee
-	systemd_dounit scripts/systemd/bumblebeed.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
-
-	enewgroup bumblebee
-}
-
-pkg_postinst() {
-	ewarn "In order to use Bumblebee, add your user to 'bumblebee' group."
-	ewarn "You may need to setup your /etc/bumblebee/bumblebee.conf"
-}