Fix styles menus. Bug #12194.

Package-Manager: portage-2.1_pre4-r1 Can't sleep

7 files changed, 52 insertions, 22 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 87c43d3a9531..8ffb145b64c2 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.179 2006/02/06 00:27:54 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.180 2006/02/07 20:14:34 ciaranm Exp $
+
+  07 Feb 2006; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/styles-menu-commonbox, +files/styles-menu-fluxbox,
+  +files/styles-menu-user, fluxbox-0.9.13-r1.ebuild,
+  fluxbox-0.9.14-r1.ebuild:
+  Fix styles menus. Bug #12194.
 
   06 Feb 2006; Ciaran McCreesh <ciaranm@gentoo.org>
   -files/fluxbox-0.9.9-gcc3.4.patch,
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 4529a69b58e8..b78416733662 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0b88d9df051fb0de78ef1720b208f90e ChangeLog 33313
-RMD160 d77ff044064a3b0f0531bb8dcadf73752c2f4d30 ChangeLog 33313
-SHA256 51bb83cef34084440998436f79a54b38a46f5d61e828b9c850baad271a8780dc ChangeLog 33313
+MD5 51e3904ee8453236acef563db6f88010 ChangeLog 33539
+RMD160 b7a383e455bb3c2b0f9130713bf840bfda61ba5e ChangeLog 33539
+SHA256 5020d5d1711f31b08fd760ffab524367bb7a0327e3802e0f802f7d5a46ec5604 ChangeLog 33539
 MD5 36db5c88337dd805a65f485604e321d6 files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829
 RMD160 3b6347fb7545e1651287e076aaad099a762b6af0 files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829
 SHA256 74191692966d89b2a94d66501bd88a4f76d286b86d840d2bcaa073f754d28d4a files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829
@@ -19,19 +19,28 @@ SHA256 2cd35a39b2287d5f1c3952f7d428788059e73dc2125325000e1cbc8a29dbe5c3 files/di
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a files/fluxbox.desktop 202
 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834 files/fluxbox.desktop 202
-MD5 b75091771835d3197ea941ceed0efcf4 fluxbox-0.9.13-r1.ebuild 4160
-RMD160 78236bfbaa6315b900e0d2b8d4b55c8199ba1501 fluxbox-0.9.13-r1.ebuild 4160
-SHA256 4c6a95e8446f8196593b4ffdb09b8eca57ada1cb4a08b4f4ca8d5b90d065f62d fluxbox-0.9.13-r1.ebuild 4160
-MD5 28baf0bb2a98327160f79db1ab5a3974 fluxbox-0.9.14-r1.ebuild 4662
-RMD160 6f0d0c36013c82794c2e2ff923e45daf3b640b12 fluxbox-0.9.14-r1.ebuild 4662
-SHA256 e863624c541700fd5fe10e8c6cb5458c27bae5fad9c5c304004e66dcb9a30459 fluxbox-0.9.14-r1.ebuild 4662
+MD5 9f6f105cbf9396f450e77dbf885b0a02 files/styles-menu-commonbox 127
+RMD160 e5668235e10ffa8fa73683d23d4483c85bf4296e files/styles-menu-commonbox 127
+SHA256 44a56b182b0da9bf26ac41ff7e5ea8da3ddb7c5cbca0f554e3c74f15c72a3d98 files/styles-menu-commonbox 127
+MD5 4db83b69b94628dc9f05c797bd01c95b files/styles-menu-fluxbox 117
+RMD160 a2f3ced8acd6bd9057aea30b6ca374cff7d3db3e files/styles-menu-fluxbox 117
+SHA256 f5829a442d8653941e2741ab73f49e9d9c95fc8129531e4197730c0bbb2f2989 files/styles-menu-fluxbox 117
+MD5 9ae40c5c7aebae1c5919adbd888710b4 files/styles-menu-user 93
+RMD160 2a6831b45ce1d655586b699d16c0547de201d187 files/styles-menu-user 93
+SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 files/styles-menu-user 93
+MD5 488a91821a96adb830661f46ba1a4306 fluxbox-0.9.13-r1.ebuild 4138
+RMD160 789e0880aa20033d91b6eb5ba08a47b5c780f100 fluxbox-0.9.13-r1.ebuild 4138
+SHA256 1a9a0313262d3c52aeb2e613258a0be490a8f3ac90111e39f8663022f4c331c8 fluxbox-0.9.13-r1.ebuild 4138
+MD5 da4cfd6e8c955de3cde390f10b3043ef fluxbox-0.9.14-r1.ebuild 4641
+RMD160 924586eb41894e546b81d9b8978a437fc6bb021e fluxbox-0.9.14-r1.ebuild 4641
+SHA256 da09674f71d72e70ee134306deaf59bf20502d8171cb3708298218749e7ac2e4 fluxbox-0.9.14-r1.ebuild 4641
 MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
 RMD160 1c198987d6abdcb951db81ebababdc94e38a7777 metadata.xml 437
 SHA256 8f273f84a44b75f0f0bb6873a621693bfa95b0c4d80f51cf6a56d0aef3e88a06 metadata.xml 437
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD5pgXLLFUmVNQ7rkRAnWhAJ98c1zPaJH1IDHrNxG3XJE5kqi+YgCgqgtf
-NzJXCUMLey3VqbPhkpE8QR0=
-=aKVH
+iD8DBQFD6P+5LLFUmVNQ7rkRAgdOAJwMc8BK+GUCCDVOjyAdFjHuZ8JFJACcDhts
+hSM8BcVklkK3RQ4EEVldxhM=
+=rm2P
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/files/styles-menu-commonbox b/x11-wm/fluxbox/files/styles-menu-commonbox
new file mode 100644
index 000000000000..742e587e4f48
--- /dev/null
+++ b/x11-wm/fluxbox/files/styles-menu-commonbox
@@ -0,0 +1,5 @@
+[begin] (Legacy Commonbox Styles)
+[submenu] (Legacy Commonbox Styles)
+   [stylesdir] (/usr/share/commonbox/styles)
+[end]
+[end]
diff --git a/x11-wm/fluxbox/files/styles-menu-fluxbox b/x11-wm/fluxbox/files/styles-menu-fluxbox
new file mode 100644
index 000000000000..d2e0d580339f
--- /dev/null
+++ b/x11-wm/fluxbox/files/styles-menu-fluxbox
@@ -0,0 +1,5 @@
+[begin] (Fluxbox Core Styles)
+[submenu] (Fluxbox Core Styles)
+   [stylesdir] (/usr/share/fluxbox/styles)
+[end]
+[end]
diff --git a/x11-wm/fluxbox/files/styles-menu-user b/x11-wm/fluxbox/files/styles-menu-user
new file mode 100644
index 000000000000..3d011d27ed23
--- /dev/null
+++ b/x11-wm/fluxbox/files/styles-menu-user
@@ -0,0 +1,5 @@
+[begin] (User Styles)
+[submenu] (User Styles)
+   [stylesdir] (~/.fluxbox/styles)
+[end]
+[end]
diff --git a/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild
index fd10e8c03a63..f03fdfb95326 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild,v 1.11 2005/08/23 22:01:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild,v 1.12 2006/02/07 20:14:34 ciaranm Exp $
 
 inherit eutils
 
@@ -100,9 +100,9 @@ src_install() {
 	# Styles menu framework
 	dodir /usr/share/fluxbox/menu.d/styles
 	insinto /usr/share/fluxbox/menu.d/styles
-	doins ${FILESDIR}/0.9.10/styles-menu-fluxbox || die
-	doins ${FILESDIR}/0.9.10/styles-menu-commonbox || die
-	doins ${FILESDIR}/0.9.10/styles-menu-user || die
+	doins ${FILESDIR}/styles-menu-fluxbox || die
+	doins ${FILESDIR}/styles-menu-commonbox || die
+	doins ${FILESDIR}/styles-menu-user || die
 }
 
 pkg_postinst() {
diff --git a/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild
index 2357c2e7d2ae..fe607fc8aa01 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild,v 1.12 2006/01/23 19:35:10 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild,v 1.13 2006/02/07 20:14:34 ciaranm Exp $
 
 inherit eutils
 
@@ -116,9 +116,9 @@ src_install() {
 	# Styles menu framework
 	dodir /usr/share/fluxbox/menu.d/styles
 	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}/0.9.10/styles-menu-fluxbox" || die
-	doins "${FILESDIR}/0.9.10/styles-menu-commonbox" || die
-	doins "${FILESDIR}/0.9.10/styles-menu-user" || die
+	doins "${FILESDIR}/styles-menu-fluxbox" || die
+	doins "${FILESDIR}/styles-menu-commonbox" || die
+	doins "${FILESDIR}/styles-menu-user" || die
 }
 
 pkg_postinst() {