Revbump to replace files/.desktop file with make_session_desktop

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

5 files changed, 19 insertions, 20 deletions

diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog
index 6357a86b635f..b412c5576b23 100644
--- a/x11-wm/cwm/ChangeLog
+++ b/x11-wm/cwm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/cwm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.25 2011/09/26 06:53:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.26 2011/10/06 00:00:59 xmw Exp $
+
+*cwm-20110913-r1 (05 Oct 2011)
+*cwm-20110908-r1 (05 Oct 2011)
+
+  05 Oct 2011; Michael Weber <xmw@gentoo.org> -cwm-20110908.ebuild,
+  +cwm-20110908-r1.ebuild, -cwm-20110913.ebuild, +cwm-20110913-r1.ebuild,
+  -files/cwm.desktop:
+  Revbump to replace files/.desktop file with make_session_desktop
 
 *cwm-20110913 (26 Sep 2011)
 
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 3898a3e609e7..4e64926fff8e 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -4,22 +4,21 @@ Hash: SHA256
 AUX cwm-20110213-Makefile.patch 1008 RMD160 b8724869e963a8f616561bb7145a4d27a5c19749 SHA1 372bc3937dcaceba47851c0d81338d165b82c40c SHA256 6836c13889a824a289baaafe259e5069a1e2375d8152d15741c523d990385a64
 AUX cwm-20110323-Makefile.patch 1003 RMD160 2ddcfe55b9f035f4e67a99382ebf38f735120d4e SHA1 2c6dea6b063f374685f29650d31c8ddc510b543c SHA256 652026a0c2291669cb26a1aa472534fd666a998bc6c6c693619eefd14786c427
 AUX cwm-20110726-Makefile.patch 1056 RMD160 802c37b1363d1afa7ca9242cb4749d2068a209e0 SHA1 c7a6a191d1b6d469a0153ee39d22de8f48d2acd7 SHA256 c1753ebcdd9997687bfce528ec0e007c8af858df84b4432e9ab9cd8ef2ea2efd
-AUX cwm.desktop 149 RMD160 66aba796dd4bfebc655544e516824bba560efa3b SHA1 713c6867e89faeaa557a8c460e2fcc5aa5fa52f2 SHA256 f6b48d9b863a0e4cbe84f654873b56a368710c29de52ad5e5f2dc9ed4ade4d28
 DIST cwm-20110515.tar.gz 42654 RMD160 f5e758efbda70aeac94778327c57b294572c64ec SHA1 7a4093320222753a8210b8a3cc1eddd49ff915fc SHA256 52b639938d8450507f4188f91629fb6df6fe4f3f7f6dd517bfc827c401fdc0d9
 DIST cwm-20110726.tar.bz2 37059 RMD160 d816f2a5dca44b5591a63b1e447b0993322e7c39 SHA1 16fe93f7a1d5948380ad6112c5ab7aa52f58d010 SHA256 c307f8dbb904ab6722f84f46d689b69d66d12ddfadf95a6fcfe905c2b2fcb138
 DIST cwm-20110908.tar.bz2 37208 RMD160 571175bc02226e871c259e053bd484d204f7a8e5 SHA1 e41cf453757df4da45b354dcc6b4a5b9e515cf41 SHA256 20f815def53e86ff87dafa7e00766b3a4a8aac76d136576d01be01fb50b3333f
 DIST cwm-20110913.tar.bz2 45196 RMD160 b97c91d6c8e7339694e423ca5aec58a153857378 SHA1 83428bec28792e401c45fac0303ebc4d0aa700be SHA256 2ac522d4cdd1df2265f13eb4a020c27cb365d97d5a86c5a59f402e90a5fcba84
 EBUILD cwm-20110515.ebuild 859 RMD160 8e8898664f34dcf1e54191f7d4b4429c826ce9a2 SHA1 c35e8c08593f044177d55650c79ba136c9794163 SHA256 fa2c87ce1560a6325bea2296ee96f2b02e4d200b9c99ee8013c15a8490125113
 EBUILD cwm-20110726.ebuild 820 RMD160 3ffc17af6811c18b37fb8ae9b3b9d6fe36ccc564 SHA1 bab1ec91c11c99465258d3ab6defd8c00e1ddc39 SHA256 e92a6528d28abaef549f5f9981917b19d055cc01286566dc21bd99dad48a856d
-EBUILD cwm-20110908.ebuild 905 RMD160 186048d4d47b8095536851c43e0c65c4539da1ab SHA1 fe70e4dda1805fc293e6b615c2af446353e246b5 SHA256 fc8a668a5bd726efb08caaaf64867fc695c0270ed24ecf153a38dfdef2e554cc
-EBUILD cwm-20110913.ebuild 905 RMD160 afeab38223041e56b235759a7c73a95cca42f6b1 SHA1 4b6931771759041234a6ff56c3b9274aef84401e SHA256 0b6d48c7ec4b3566bfc91653ede91a585fa01759e89c3ae3489c4a9e7385347b
+EBUILD cwm-20110908-r1.ebuild 867 RMD160 5bdb1290b1c7112e7b2b0f4f86bfae835acbae13 SHA1 ec6bc3e30a036dfed80b408790f9f7caee819b0a SHA256 967310fe01dcc110521501df6d62f09e84f9da782453a3e4229803b8fd32f01d
+EBUILD cwm-20110913-r1.ebuild 867 RMD160 02677583bde80fb1233217fad8d919c9d0e2bcfd SHA1 44c644497fff459060bc90bbba7f3ca5638ef612 SHA256 c812fedd5e8fb1ea51e37e43db6496b25964af24bf40dcf977fe46e33f180ec1
 EBUILD cwm-99999999.ebuild 933 RMD160 607745f69854d68625238dae38509ff349ec06b6 SHA1 0dc371e29d3ced06a35119a51b21531da24eca6e SHA256 205cd6d895bb92a6dc6a2e56cf62708aa41de718128664b0249dd60f24883de0
-MISC ChangeLog 3290 RMD160 cecdb82f09feb7fa7a3faec5b8eda6379ac21443 SHA1 66732b0bf69eef0cc832f84188ad7ec2659c35ff SHA256 90709eeca28a4fdc892fc6ce95cdc9768bab407fc23967e364b2d321ba3969ba
+MISC ChangeLog 3585 RMD160 c0440d616c0564cdbac1cdc9ab0b5fde69fa5460 SHA1 a13626f31189dfeeb47b4103542a3d4eb1092b31 SHA256 17100663b85576219e0b6be1225e494a33ab9765ab84ed7523aab1ed15394a61
 MISC metadata.xml 223 RMD160 ece0d9320b4ad1fdb29d1dec4f85e84ffda0d863 SHA1 325a16f4c96d533e8642c26ab395b06ab42f51b5 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6AIYUACgkQknrdDGLu8JARNQD/YNzpZ0iT9rgAH3ZFMkaEKser
-tfqLADcovNNlNCRpsroA/2Lg+j69DpOVjRpPuOjEZpw96z0wuz5zo2FdznZfSjYh
-=t6KX
+iF4EAREIAAYFAk6M78wACgkQknrdDGLu8JAHzwD/YTuJtgB5TE+IIdmN/z1cJ0Qb
+/Q5qcbMVN6bpcd0NvEoA/3TJ3Fsuwv/s7cpAXCJisoXvyh7TKAppYG8TwosGt98Z
+=tp6J
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/cwm/cwm-20110908.ebuild b/x11-wm/cwm/cwm-20110908-r1.ebuild
index 2f99dd9a0095..ddd9bebb18dc 100644
--- a/x11-wm/cwm/cwm-20110908.ebuild
+++ b/x11-wm/cwm/cwm-20110908-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20110908.ebuild,v 1.2 2011/09/11 22:03:09 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20110908-r1.ebuild,v 1.1 2011/10/06 00:00:59 xmw Exp $
 
 EAPI=2
 
@@ -31,6 +31,5 @@ src_prepare() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop || die
+	make_session_desktop ${PN} ${PN}
 }
diff --git a/x11-wm/cwm/cwm-20110913.ebuild b/x11-wm/cwm/cwm-20110913-r1.ebuild
index 65a99b398498..3ad67a279b76 100644
--- a/x11-wm/cwm/cwm-20110913.ebuild
+++ b/x11-wm/cwm/cwm-20110913-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20110913.ebuild,v 1.1 2011/09/26 06:53:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-20110913-r1.ebuild,v 1.1 2011/10/06 00:00:59 xmw Exp $
 
 EAPI=2
 
@@ -31,6 +31,5 @@ src_prepare() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop || die
+	make_session_desktop ${PN} ${PN}
 }
diff --git a/x11-wm/cwm/files/cwm.desktop b/x11-wm/cwm/files/cwm.desktop
deleted file mode 100644
index 9aab653744c4..000000000000
--- a/x11-wm/cwm/files/cwm.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=cwm
-Comment=OpenBSD fork of calmwm, a clean and lightweight window manager
-Exec=/usr/bin/cwm
-TryExec=/usr/bin/cwm
-Type=XSession