diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-05-26 18:55:33 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-05-26 18:55:33 +0000 |
| commit | b42f80ffec38c6861498c7c137ce00af89d67613 (patch) | |
| tree | 4b0808c9ab21bcad18654342b207d7f8a9ec4df6 /x11-misc | |
| parent | Fix running with gdm-3 (#469928, thanks a lot to Vadim A. Misbakh-Soloviov (m... (diff) | |
| download | historical-b42f80ffec38c6861498c7c137ce00af89d67613.tar.gz historical-b42f80ffec38c6861498c7c137ce00af89d67613.tar.bz2 historical-b42f80ffec38c6861498c7c137ce00af89d67613.zip | |
Version bump, drop old
Package-Manager: portage-2.1.12.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/bumblebee/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/bumblebee/Manifest | 26 | ||||
| -rw-r--r-- | x11-misc/bumblebee/bumblebee-3.2.1.ebuild (renamed from x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild) | 39 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/99-remove-nvidia-dev.rules | 3 | ||||
| -rw-r--r-- | x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch | 12 |
5 files changed, 29 insertions, 60 deletions
diff --git a/x11-misc/bumblebee/ChangeLog b/x11-misc/bumblebee/ChangeLog index 0a08a322f832..62ccd5bcad00 100644 --- a/x11-misc/bumblebee/ChangeLog +++ b/x11-misc/bumblebee/ChangeLog @@ -1,6 +1,13 @@ # 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.13 2013/03/17 16:14:12 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/ChangeLog,v 1.14 2013/05/26 18:55:23 pacho Exp $ + +*bumblebee-3.2.1 (26 May 2013) + + 26 May 2013; Pacho Ramos <pacho@gentoo.org> +bumblebee-3.2.1.ebuild, + -bumblebee-3.0.1-r2.ebuild, -files/99-remove-nvidia-dev.rules, + -files/bumblebee-3.0.1-remove-wait.patch: + Version bump, drop old 17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml: Add proxy-maintainers to metadata.xml diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest index cdf47438f8a7..f91b46e5ad41 100644 --- a/x11-misc/bumblebee/Manifest +++ b/x11-misc/bumblebee/Manifest @@ -1,33 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX 99-remove-nvidia-dev.rules 215 SHA256 bd8d8ae490171a9302f85c07e7fc95522dc71615779304f05a01588ae96508cb SHA512 d5596d9acdbabc2f6aedd367a0a0a99548dc130a552d5bc730df1f0e0da57b5c2071a99b2c6c70cab0c9cabf75e36c3494ff286f43637a9799744f9611db98ec WHIRLPOOL 79fb113a7131dc426bec176013d9c235dcd065b608183eb040c9408754306a9136503f34bfb47aa70c9cd6c8bda944df465aaa0751e25d2142734cf48a8f06b0 -AUX bumblebee-3.0.1-remove-wait.patch 310 SHA256 fcf54d27c10c45d9810c23fecdbd1bf120b58a8e968c35702f00c7b6976854ac SHA512 f226773f28bacce98c4655444fce3e931355d68f0bbc0d85365b8ecc0ac8748894132cd74f90b05e5609269c80681b46bee17de841aa3387d81ccc608af8cdb8 WHIRLPOOL dd0b4703f4a05e6e34adf03014cfdb91571d0c48e49c89e178d031760a80988228c3d088132327a4a29c96090eea232622d43c1b8c1b4c6dc5ae3e45752af6ad AUX bumblebee.confd 60 SHA256 9e0287f542cff0fd3452a0c3d6d427a3404706c93ac9a00f4d99fe52ed596d75 SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251 WHIRLPOOL 53e0f7efcf8ceb1990feccabb2050a440ea5e279703c70c896ced4a0a042c191c4ef6c5096dd237af86ca2bcc8d61782cf057f56b6f21983dd642832f314bfbd 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 +DIST bumblebee-3.2.1.tar.gz 143110 SHA256 1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e SHA512 6f016f75d199577215ff00c059e196829e9d3efeb0fb6eebe6c3fad6176e330332e1ef25875a22ac9892895683d95899ea44f1ec1f85d31300ad83cb1fe0310a WHIRLPOOL 0d59b205f3c57afbf3fa6c8a55964afed8684e57db045e4c333c8e94f0b5d91637963a0b9f386eb6fe655716b8854e82ae5724dacdc76a34de6eb1f99ffc4908 EBUILD bumblebee-3.1.ebuild 2132 SHA256 635817628653aa5bb21eb6c2cd1b7adff26d93563f66c733e751424416fa80f8 SHA512 7f3d3843b1f7522521d13218c1f06843836d7791e2d2880ccf5f46b6e4a77d0235cb757643930372ab4cecb5d6bab98f3be36f6d91818e85fe47d2b3718e9115 WHIRLPOOL e557dd7b12dda80ead3d92f35805157347cf2b610496e6c099ea43379f6fda994c7fc6eb407600b05b55c51c7e4bafb036fea0e48dae2191e30fdf576a4ae7e6 -MISC ChangeLog 2939 SHA256 f8d750105d0f61bd70f7b57919a99781cca97c912e219a707a08932f81043a35 SHA512 0ac2b511c6c7e5798863e7342a9f38d1e75d10903d2d14511f440b70449f0f6d8fd3919c3fd877120e87c8e455eaa118aff8bf810d1d557266215abb321c133b WHIRLPOOL cf6ff50aa62675c2daa543a9046c20b3fc21f2eb9e66ad3682bc88036df42955b0b6ab2c76b2f7215affb733453c54f3fd8b88cc94204c15364baa8e6dfe9473 +EBUILD bumblebee-3.2.1.ebuild 2088 SHA256 a2ead815c15c1627d6af4afcd4831bf34065f2a5946649b4f8c6a6966ed5aa21 SHA512 f9021966c53e8283e499df772fb240b8e8e02093301b9b28ae76a77e8d47c8575c8b52144821df4d524c3848f2c43668b09f1a0efbd82f800b839a77de6452c8 WHIRLPOOL f307eeec783573d1d81b515a4f656697af2ce27f1367f4971f0fcfbd64b74eb2b935a3eddf837755570fb9f117ad16492498bacbad592ef02808a8c31ebb3312 +MISC ChangeLog 3174 SHA256 15b698bead00d7927e8e420019f11de5537c15ead992c1d4b81c3ef89c943a47 SHA512 30ae0db993d53d5ed08ee75ead0c168cf1c172cc8660da148c15e32e0cd27ddf5f599d9501f360bc4a9001ad647b607ac71b820682e6f4e7b44fe970ef01a13b WHIRLPOOL 2e63defca42ab77e8b62678e7473ecfb054c10418bd915972f00aa78c46a7eda97b916909bc8e5ded3ab0d7faf4da195d87b7b67285727f03c441891afc1b552 MISC metadata.xml 881 SHA256 043f63246b0c6b152c465659d05863de9419579a94be531d4b3dd97ef5b954dc SHA512 05f8e830aeeda455b29824b24d48984807f97d876121126122c12c4c676d80616cee4586914fd266cb234001bca75e4ee9416790f8564475403c3f538455052f WHIRLPOOL 019c250fadbd23a1096c0a1ac1709c374d4881977ea8e4d652205b81843ffb17f713759bec95c555fde9a5a3071813d03b518dd1c2027535eda1ebc7a64f9989 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQJ8BAEBCABmBQJRRevVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88oqkQAIB2JUUYszlsbIGSFart+eYL -oj3bUoIHyIPFmx6AN3CfQVHdkgfWwZidGEh88eollg/CVtRuO+P4RcMcrYHkZHa+ -XGWiHnQ5h39bimsUZvCpxXxUAFsutI7IdEIG0AY0kbNkVrKTeq2p5/tAUOO3nuoH -eeBF0fugegpygfvvkHdPWpQxeESlKj4ZuoAYPhKyeYXWbiyCf4UEoBOjjzN4wz3a -69SJ+Qrq1Re/0tJ3ighAveCayu1atnBo5EO1bsoC0ESDXBdQUAqNaJoMcEydD2Gi -xZKna0x7INC/oGxbKKMR6ONBIUHMS5cNHT4wbAkLvxb92kJAFw4da16F9rNI0/O8 -AljwGi0KcjZupJ/cLUWywQCtPQtR6pIBGpTWbrVMAN4PM0HgiG4AYIb1mXo8F4lA -gpKh0e5mXdCYmXggrckv54eeoJ2v1fLvLoMGbdqelP792K33sh6SXw3k1YVdr5nC -jX4CL6ELHeRaavigoIY2axwk2s+eKnSE0ud9B2EuFul+zT7GRIDSAGKG3cbdapaH -Ma9ss1f9maT+t2JbE+L4ulc4l8H0w6Nrf3PALoqR3oaMcBLDYw22dXCoEYnab5u/ -Sfh+AiET5Yj0wiNHPhBwurUTId3GAfVxREbc3MkwGKt3UqfSgvFwpMv/kdooloJC -AdICTqC1rLWf/8/JD0rM -=nniT +iEYEAREIAAYFAlGiWpwACgkQCaWpQKGI+9SJFACgh8kaTwnWg1rwi6lMkgX2Z9bp +fZAAnAmYQmQgCcciRo9FCH4tGFx4WCsR +=6tlE -----END PGP SIGNATURE----- diff --git a/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild index ce9f29954455..9ff92ad23e82 100644 --- a/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild +++ b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild @@ -1,13 +1,13 @@ # 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-r2.ebuild,v 1.1 2013/01/21 21:19:16 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.2.1.ebuild,v 1.1 2013/05/26 18:55:23 pacho Exp $ EAPI=5 -inherit eutils multilib readme.gentoo systemd udev user +inherit eutils multilib readme.gentoo 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" +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" @@ -15,31 +15,26 @@ KEYWORDS="~amd64 ~x86" IUSE="+bbswitch video_cards_nouveau video_cards_nvidia" -RDEPEND="x11-misc/virtualgl:= - bbswitch? ( sys-power/bbswitch ) +RDEPEND=" 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 + x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?] + x11-misc/virtualgl:= + bbswitch? ( sys-power/bbswitch ) +" +DEPEND="${RDEPEND} dev-libs/glib:2 - x11-libs/libX11 dev-libs/libbsd - sys-apps/help2man" + sys-apps/help2man + virtual/pkgconfig + x11-libs/libX11 +" REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )" -src_prepare() { +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" - # --wait option for rmmod is deprecated: - # https://github.com/Bumblebee-Project/Bumblebee/issues/283 - epatch "${FILESDIR}/${P}-remove-wait.patch" -} - -src_configure() { if use video_cards_nvidia ; then # Get paths to GL libs for all ABIs local nvlib="" @@ -65,10 +60,6 @@ src_install() { newenvd "${FILESDIR}"/bumblebee.envd 99bumblebee systemd_dounit scripts/systemd/bumblebeed.service - # Install udev rule to handle nvidia card switching, - # https://github.com/Bumblebee-Project/Bumblebee/issues/283 - udev_dorules "${FILESDIR}"/99-remove-nvidia-dev.rules - readme.gentoo_create_doc default diff --git a/x11-misc/bumblebee/files/99-remove-nvidia-dev.rules b/x11-misc/bumblebee/files/99-remove-nvidia-dev.rules deleted file mode 100644 index 3f7f67f48c5b..000000000000 --- a/x11-misc/bumblebee/files/99-remove-nvidia-dev.rules +++ /dev/null @@ -1,3 +0,0 @@ -# Put this file in /lib/udev/rules.d or /etc/udev/rules.d -# Prevent the nvidia card from "randomly" turning on -DEVPATH=="/module/nvidia", ACTION=="remove", RUN+="/bin/rm -f /dev/nvidiactl /dev/nvidia0 /dev/nvidia1" diff --git a/x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch b/x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch deleted file mode 100644 index 06adda989458..000000000000 --- a/x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/module.c b/src/module.c -index 06f8872..55fa70e 100644 ---- a/src/module.c -+++ b/src/module.c -@@ -96,7 +96,6 @@ int module_unload(char *driver) { - bb_log(LOG_INFO, "Unloading %s driver\n", driver); - char *mod_argv[] = { - "rmmod", -- "--wait", - driver, - NULL - };
\ No newline at end of file |