Fix desktop file (bug #510818 by Kris Scott).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 78 insertions, 10 deletions

diff --git a/x11-wm/bspwm/ChangeLog b/x11-wm/bspwm/ChangeLog
index bce4edfec4b6..f997b7eb6b6f 100644
--- a/x11-wm/bspwm/ChangeLog
+++ b/x11-wm/bspwm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/bspwm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/bspwm/ChangeLog,v 1.1 2014/01/24 08:20:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/bspwm/ChangeLog,v 1.2 2014/06/25 05:40:38 radhermit Exp $
+
+*bspwm-0.8.8-r1 (25 Jun 2014)
+
+  25 Jun 2014; Tim Harder <radhermit@gentoo.org> +bspwm-0.8.8-r1.ebuild,
+  +files/bspwm-0.8.8-desktop.patch:
+  Fix desktop file (bug #510818 by Kris Scott).
 
 *bspwm-0.8.8 (24 Jan 2014)
 
diff --git a/x11-wm/bspwm/Manifest b/x11-wm/bspwm/Manifest
index d99cf04e6164..28d8ed850a7d 100644
--- a/x11-wm/bspwm/Manifest
+++ b/x11-wm/bspwm/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bspwm-0.8.8-desktop.patch 242 SHA256 63a7f038e7786a96bfe0abe22f1c7455869da13e1edf18e3f846507ec9ed0387 SHA512 925325181191c92bece249dd68788ada1e4449e0c259497a94fb0240ed7bdb5e0bded78500e0a7315b102427526afdebc7d256fc95de58cb4175d63f0bcfd9b8 WHIRLPOOL 13941d84c7e5bff6417e0d78079f9097363a634806c70b2e66571e034c259b9757203e778ffb18e3c0c510b6c4c97baece57b25df8ebbd946cb54d2057c253c6
 AUX bspwm-0.8.8-flags.patch 283 SHA256 1e5540739f889cad855e88ee5f6803a9fbb48e9916d892d1649cd5f7f27763b5 SHA512 735bd3a5bb5789dfb81e35c273e565c192c99b7661355055b86a9af64da42018c74052c89c77d51889bcc52438afedc3202bfae79b124e9ffb4dc358b7e70c59 WHIRLPOOL 0dc4318ff96da169523a588835e69d5d4354c41442e5ae2641fe9df15e9c27adaeaf5a4c4f11c520f3ccf917e7f152be845a48e43abd40db513631900c070a0c
 AUX bspwm-session 1876 SHA256 5ebb14b8c96b720f220e709e67c3b37d6880019a6c1d005414654463acdbee21 SHA512 04d89bdd5ca5a9163e576c41dee9420fff8c51ab4a53aca179060b9f6b348537ad96d4257964e7bc4422d836a21c52f82fdc30a6b7b07c229c9934d7620d90ee WHIRLPOOL 9a3929ff7f0a2dd39627b88f6866b268f4f9d588791ac7f45c63014f3b0a4a19e092069796a49bed40e70444c0ada4b0b6b3798eefea61683718e4a3ba1a1c48
 DIST bspwm-0.8.8.tar.gz 66159 SHA256 378c5e42e9058a22e519a8f727e7d078eb5945915adb6edb17e2471310e73790 SHA512 09614549410d2f6bd58d1190e8008256077433481bb4f91426fbf14ef74c3bff92f3b2d2c72476b6439ad83807c7368591af46a0c34ec658bcc5b9c6f940ca55 WHIRLPOOL 331d089c7545a5fe6325e42aa9603f9dcb81d28fd9182329dbc50a0828fafa661ce12885894d728ad99f0d04ca5a2773de257b91f62e1be3f272e0ee8a7b5674
+EBUILD bspwm-0.8.8-r1.ebuild 1151 SHA256 d93f96ea6b3864f4952ee367ff91b0698fc0494fc3e0db4f91360fdbb0667a0e SHA512 e9e7c1af1ca0635e498a54c0859f0f4eea6fe220f0280879fff0661bcbcebbdaf7e7cbe5ae61d73b373e3a7405180f00c339e584f392d6fc142e7661906154df WHIRLPOOL 743344f949cecbd2306dacff463ea94ccbdcb9fb23eae497324b4b9eac30f2086064203f79c5f4a89ca1b12108ff911bd97ba87f05310348665c9154cdfa4e04
 EBUILD bspwm-0.8.8.ebuild 1107 SHA256 9dad0d14e744e47b6e1ca1e275bb7be21621aa37a39c1e61c6fb789f9bbdf1df SHA512 ff72d7ebc8bb297e69a5d44b5b28e5ef2e1b356f53a1ff9f669af171d23570073432c29e841601c6da7aabead405509dce96ad39033dd06f3d9f0db242cfe0cd WHIRLPOOL 59809853ac5f2e6ee4ca90df7d31da0cdec9a646188394b07246ba80d991664b109a68c1d1b663bd4f8b513a9fcee3e1ccce7b3e1b58214158f45ee5ed0da5c9
-MISC ChangeLog 402 SHA256 7e8609bae7efacbd463b557aa7f01ac88c823cda3022201312329aa6a5b44c25 SHA512 9f4ccff42474e0f50dea8f54765e6adc83c0237c35c560cebca4df9cc28048e2bfee7d1eca8e695dfca2ea7ed4c7363d2738d3c4d460389afb7c3167c7598059 WHIRLPOOL 4775ee4bd4166ef647947b621babe331f4071c1a91682af3150840c49a77bd14b881c6d677e649e380a9adb2da3f4cdaae7444a9f323d7a7074348dde51199b7
+MISC ChangeLog 591 SHA256 038d197e4445fe3176d3c92aca576b2d0dd4a7338b5be7bfd0cf00393cfbed2e SHA512 7e90acc74bc68324050a47148694aa1adf296fcc1e7e5ff823efab6c878d0a32c3d2e30304b7a68c4fc642b52bf410f4a1f9a2fbd4e2e17a8407a5af968118a3 WHIRLPOOL b7a62cdef80b128565f8da569f58cae2125088f628c0e6dab7a19f84adaa7a34a64552f32f20ec2108f1b689943a6b5f06a4437c4a099262ab9d8c8b90163c61
 MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJS4iJqAAoJEEqz6FtPBkyjh8sIAK29UEZJHquE7rBxv0XvyR+k
-OdKhP1JKYLEL9ziLeKUaU4H5Cs8bwLYSOExcDexjrHIEAVAa+WXZ5eOFm8CDZA4O
-RTyomkeqG8+Nd6VPriRmQp+Yd7eTwL7p4M4CrgjniKQv9uKfPva/8854C8n7LnC/
-GRjCncQaJWBKPUWTl0MIag0OpEVOQz0cx7tFUkng4by/30l6xhoeKmFHtNQFMGCI
-5LYEq92gSTuv70PO2Jy4BVwbd/RieCK9rrgezeJUdW1XFe9D39HP2SG/cQZf651Y
-oukLgOwG0KXjevImLGmNttUN8lUn15Lmmn8Gh50bbHzHmQHi0tCjC4minoS3HBs=
-=J7z8
+iQEcBAEBCAAGBQJTqmDXAAoJEEqz6FtPBkyj7KgH/A/MDio+aEz+yZ6m3/24XE01
+hikpDGyv6PiNPYmjktRpuHMsQQB7MNf5bEsrz7DMvh83Bg8X8V4NQ0sDhfVjK4jE
+koWhWzIedOYZPFVvs+NoRMCs/5o0n+AeMteWRYEdwFcyKOwbUXJiRtnrXD6KBwBR
++QyBfkr/268XAcoWwuedjPS7tzdTKjT4Ov+TY4w4TlzE8vQ3wSYHMIKDyiec3Bzo
+3NAbM46nvD37Xb14DxEbKV9FaLeik3D+cXjbBUl2revnsGGpaNVYDn4xs8ProOLY
+8ZEu35xWoQZ79Ehw7XFAS97SoOpfpINE6/boxbKiDrwuBjYhTxHDHtFjPLoLPJA=
+=vUea
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/bspwm/bspwm-0.8.8-r1.ebuild b/x11-wm/bspwm/bspwm-0.8.8-r1.ebuild
new file mode 100644
index 000000000000..c86e956491b3
--- /dev/null
+++ b/x11-wm/bspwm/bspwm-0.8.8-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/bspwm/bspwm-0.8.8-r1.ebuild,v 1.1 2014/06/25 05:40:38 radhermit Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tiling window manager based on binary space partitioning"
+HOMEPAGE="https://github.com/baskerville/bspwm/"
+SRC_URI="https://github.com/baskerville/bspwm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	x11-libs/libxcb
+	x11-libs/xcb-util-wm
+"
+RDEPEND="${DEPEND}
+	x11-misc/sxhkd
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+	epatch "${FILESDIR}"/${P}-desktop.patch
+}
+
+src_compile() {
+	emake PREFIX=/usr CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+	dodoc doc/{CONTRIBUTING,MISC,TODO}.md
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN}
+
+	insinto /usr/share/xsessions
+	doins contrib/lightdm/bspwm.desktop
+
+	insinto /etc/xdg/sxhkd
+	doins examples/sxhkdrc
+
+	if use examples ; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/x11-wm/bspwm/files/bspwm-0.8.8-desktop.patch b/x11-wm/bspwm/files/bspwm-0.8.8-desktop.patch
new file mode 100644
index 000000000000..589a5abed893
--- /dev/null
+++ b/x11-wm/bspwm/files/bspwm-0.8.8-desktop.patch
@@ -0,0 +1,9 @@
+--- bspwm-0.8.8/contrib/lightdm/bspwm.desktop
++++ bspwm-0.8.8/contrib/lightdm/bspwm.desktop
+@@ -2,5 +2,5 @@
+ Encoding=UTF-8
+ Name=bspwm
+ Comment=Launch a bspwm session
+-Exec=/usr/bin/bspwm-session
++Exec=/etc/X11/Sessions/bspwm
+ Type=XSession