summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/fluxbox')
-rw-r--r--x11-wm/fluxbox/ChangeLog33
-rw-r--r--x11-wm/fluxbox/Manifest75
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-all-about-me.patch16
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch15
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch39
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-editor-thingies.patch16
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch24
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch12
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch42
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-misc-updates.patch450
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch26
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch18
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch69
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch181
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch63
-rw-r--r--x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch88
-rw-r--r--x11-wm/fluxbox/files/0.9.10/styles-menu-commonbox5
-rw-r--r--x11-wm/fluxbox/files/0.9.10/styles-menu-fluxbox5
-rw-r--r--x11-wm/fluxbox/files/0.9.10/styles-menu-user5
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch16
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch11
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch15
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch13
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch18
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch43
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch11
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch16
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-you-got-mail.patch12
-rw-r--r--x11-wm/fluxbox/files/digest-fluxbox-0.9.111
-rw-r--r--x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r11
-rw-r--r--x11-wm/fluxbox/files/digest-fluxbox-0.9.131
-rw-r--r--x11-wm/fluxbox/files/digest-fluxbox-0.9.91
-rw-r--r--x11-wm/fluxbox/files/fluxbox-0.9.9-gcc3.4.patch18
-rw-r--r--x11-wm/fluxbox/fluxbox-0.9.11.ebuild146
-rw-r--r--x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild155
-rw-r--r--x11-wm/fluxbox/fluxbox-0.9.13.ebuild124
-rw-r--r--x11-wm/fluxbox/fluxbox-0.9.9.ebuild61
37 files changed, 66 insertions, 1779 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 416ebd75be79..87c43d3a9531 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,37 @@
# 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.178 2006/01/23 19:35:10 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.179 2006/02/06 00:27:54 ciaranm Exp $
+
+ 06 Feb 2006; Ciaran McCreesh <ciaranm@gentoo.org>
+ -files/fluxbox-0.9.9-gcc3.4.patch,
+ -files/0.9.10/fluxbox-0.9.10-all-about-me.patch,
+ -files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch,
+ -files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch,
+ -files/0.9.10/fluxbox-0.9.10-editor-thingies.patch,
+ -files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch,
+ -files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch,
+ -files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch,
+ -files/0.9.10/fluxbox-0.9.10-misc-updates.patch,
+ -files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch,
+ -files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch,
+ -files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch,
+ -files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch,
+ -files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch,
+ -files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch,
+ -files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch,
+ -files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch,
+ -files/0.9.10/styles-menu-commonbox,
+ -files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch,
+ -files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch,
+ -files/0.9.10/styles-menu-fluxbox,
+ -files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch,
+ -files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch,
+ -files/0.9.10/styles-menu-user,
+ -files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch,
+ -files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch,
+ -files/0.9.12/fluxbox-0.9.12-you-got-mail.patch, -fluxbox-0.9.9.ebuild,
+ -fluxbox-0.9.11.ebuild, -fluxbox-0.9.12-r1.ebuild, -fluxbox-0.9.13.ebuild:
+ Tidy up
23 Jan 2006; Fabian Groffen <grobian@gentoo.org> fluxbox-0.9.14-r1.ebuild:
Marked ppc-macos stable (bug #120081)
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index ecad32a8414f..4529a69b58e8 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,44 +1,37 @@
-MD5 ba3c40b11884514f9fa692fd8e9788b4 fluxbox-0.9.9.ebuild 1700
-MD5 28baf0bb2a98327160f79db1ab5a3974 fluxbox-0.9.14-r1.ebuild 4662
-MD5 66b6f17a72007858528df08e2f9ae678 fluxbox-0.9.11.ebuild 4783
-MD5 dd94d6b0f9297b6fd140373fd7652cd5 fluxbox-0.9.13.ebuild 4022
-MD5 b75091771835d3197ea941ceed0efcf4 fluxbox-0.9.13-r1.ebuild 4160
-MD5 f0673831a34a6e8b30893b8a1b92782e ChangeLog 31676
-MD5 335240c333191381fae47a37c9f9f0e8 fluxbox-0.9.12-r1.ebuild 5120
-MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
-MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65
-MD5 e5c69e225b86ee6f1491b9970d22153f files/digest-fluxbox-0.9.12-r1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0b88d9df051fb0de78ef1720b208f90e ChangeLog 33313
+RMD160 d77ff044064a3b0f0531bb8dcadf73752c2f4d30 ChangeLog 33313
+SHA256 51bb83cef34084440998436f79a54b38a46f5d61e828b9c850baad271a8780dc ChangeLog 33313
+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
+MD5 17110f6fe071a751aaa29832e92832fd files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653
+RMD160 32e2d79cf651073efffb3f27aa54fa8b1738e98f files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653
+SHA256 699f2e563f582362b0ed9d4f53a20fa930abfca1262bb0fb71e7f738e8eadcc4 files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653
MD5 477fd294ad2a81438ea97da4a48cbd41 files/digest-fluxbox-0.9.13-r1 67
+RMD160 bc1142b499a22b6a227d87816733ccf90b6551c4 files/digest-fluxbox-0.9.13-r1 67
+SHA256 f30ae303e129d788eb1dc0fb8f40860b6f1cac480d19e1c3d5341441a6f45b19 files/digest-fluxbox-0.9.13-r1 67
MD5 dfa28a0b7c21fa818670b20865976738 files/digest-fluxbox-0.9.14-r1 67
-MD5 4bafaa2a6712efa9f0c040b6072c8169 files/fluxbox-0.9.9-gcc3.4.patch 527
-MD5 d4702d1ea0037c658b15b9a4af27cf4a files/digest-fluxbox-0.9.11 67
-MD5 477fd294ad2a81438ea97da4a48cbd41 files/digest-fluxbox-0.9.13 67
+RMD160 13b702a6d21ce19e3835e7a92e5545fddcfce78f files/digest-fluxbox-0.9.14-r1 67
+SHA256 2cd35a39b2287d5f1c3952f7d428788059e73dc2125325000e1cbc8a29dbe5c3 files/digest-fluxbox-0.9.14-r1 67
MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
-MD5 9f6f105cbf9396f450e77dbf885b0a02 files/0.9.10/styles-menu-commonbox 127
-MD5 33fa4c925ae4fe1b5797673a4508c548 files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch 2616
-MD5 9ae40c5c7aebae1c5919adbd888710b4 files/0.9.10/styles-menu-user 93
-MD5 61d8fb7f72eb34b75cbf5c2e9b291fa3 files/0.9.10/fluxbox-0.9.10-misc-updates.patch 13915
-MD5 ee36523cd5cf3281d0261244260840c9 files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch 774
-MD5 b5f651453c6bbf6089cf65ec5cd83722 files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch 563
-MD5 48b051c794986e9acb73631e0642e2d9 files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch 3203
-MD5 4db83b69b94628dc9f05c797bd01c95b files/0.9.10/styles-menu-fluxbox 117
-MD5 8b288a50d112b48b73c791893dac61f9 files/0.9.10/fluxbox-0.9.10-editor-thingies.patch 804
-MD5 97574b9984c119ced3c259bd8c314588 files/0.9.10/fluxbox-0.9.10-all-about-me.patch 674
-MD5 b285687968580fa55ffcf5e586426ee7 files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch 889
-MD5 71a4dfce6e2832c47b9191caab6e3d35 files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch 2510
-MD5 6c400d01c4fe9bea1d751ea6cbc718b5 files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch 1295
-MD5 05e049a3f92497ddb1cf615abfdc5f35 files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch 946
-MD5 a39d5b26fb1695fd9264cca078ad0d58 files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch 7008
-MD5 7295edfc76f1cca87164e419e2d3b637 files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch 1948
-MD5 1c0b2aaf218be67efc82bcb455e713ec files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch 968
-MD5 08670463836eec1499fd48f6cad6a6c9 files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch 432
-MD5 7a34186b1b83746dbc71f0415d5f5a52 files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch 650
-MD5 e56d5d9ab0af15229ed139b1e1f5b3be files/0.9.12/fluxbox-0.9.12-you-got-mail.patch 516
-MD5 b73dd2d75c728d03e9ab973946a6c7fd files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch 394
-MD5 7b8327fc8b73757e8fb506b565d989ea files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch 1008
-MD5 59bfbdb0d951c09db8897948a9796cb9 files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch 741
-MD5 7e577aae2f600bf4ae3ff8d85f044a58 files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch 623
-MD5 6e4f5d9486b1919b3c0fb7356b737966 files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch 647
-MD5 c5dd91e4b4519e3c7363dc76f2cc5f61 files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch 1893
-MD5 36db5c88337dd805a65f485604e321d6 files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829
-MD5 17110f6fe071a751aaa29832e92832fd files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653
+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 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
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-all-about-me.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-all-about-me.patch
deleted file mode 100644
index 819e6b01f2c1..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-all-about-me.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: util/fluxbox-generate_menu.in
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/util/fluxbox-generate_menu.in,v
-retrieving revision 1.29
-diff -u -r1.29 fluxbox-generate_menu.in
---- util/fluxbox-generate_menu.in 9 Sep 2004 15:25:26 -0000 1.29
-+++ util/fluxbox-generate_menu.in 11 Sep 2004 22:23:06 -0000
-@@ -1282,6 +1282,7 @@
- append "[commanddialog] (${FLUXBOXCOMMAND})"
- append "[reconfig] (${RELOADITEM})"
- append "[restart] (${RESTARTITEM})"
-+ append "[exec] (About) {fluxbox -v 2>/dev/null | head -n1 | xmessage -file - -center}"
- append "[separator]"
- append "[exit] (${EXITITEM})"
-
-
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch
deleted file mode 100644
index f4e1e5fd3d10..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/XmbFontImp.cc fluxbox.toolbar/src/FbTk/XmbFontImp.cc
---- fluxbox.real/src/FbTk/XmbFontImp.cc 2004-09-01 01:26:39.000000000 +1000
-+++ fluxbox.toolbar/src/FbTk/XmbFontImp.cc 2004-09-04 03:03:16.000000000 +1000
-@@ -173,9 +173,9 @@
- }
-
- getFontElement(fontname, weight, FONT_ELEMENT_SIZE,
-- "-medium-", "-bold-", "-demibold-", "-regular-", 0);
-+ "-medium-", "-bold-", "-demibold-", "-regular-", NULL);
- getFontElement(fontname, slant, FONT_ELEMENT_SIZE,
-- "-r-", "-i-", "-o-", "-ri-", "-ro-", 0);
-+ "-r-", "-i-", "-o-", "-ri-", "-ro-", NULL);
- getFontSize(fontname, &pixel_size);
-
- if (! strcmp(weight, "*"))
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch
deleted file mode 100644
index b087eedb6d8a..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/XmbFontImp.cc fluxbox.work/src/FbTk/XmbFontImp.cc
---- fluxbox.real/src/FbTk/XmbFontImp.cc 2004-09-12 11:48:46.000000000 +1000
-+++ fluxbox.work/src/FbTk/XmbFontImp.cc 2004-10-02 15:45:32.000000000 +1000
-@@ -117,7 +117,7 @@
- char **missing, *def = "-";
- int nmissing, pixel_size = 0, buf_size = 0;
- char weight[FONT_ELEMENT_SIZE], slant[FONT_ELEMENT_SIZE];
-- char * orig_locale = "";
-+ std::string orig_locale = "";
-
- #ifdef HAVE_SETLOCALE
- if (utf8mode) {
-@@ -131,7 +131,7 @@
- if (fs && (! nmissing)) {
- #ifdef HAVE_SETLOCALE
- if (utf8mode)
-- setlocale(LC_CTYPE, orig_locale);
-+ setlocale(LC_CTYPE, orig_locale.c_str());
- #endif // HAVE_SETLOCALE
- return fs;
- }
-@@ -143,7 +143,7 @@
- setlocale(LC_CTYPE, "C");
- fs = XCreateFontSet(display, fontname,
- &missing, &nmissing, &def);
-- setlocale(LC_CTYPE, orig_locale);
-+ setlocale(LC_CTYPE, orig_locale.c_str());
- }
- #endif // HAVE_SETLOCALE
-
-@@ -189,7 +189,7 @@
-
- #ifdef HAVE_SETLOCALE
- if (utf8mode)
-- setlocale(LC_CTYPE, orig_locale);
-+ setlocale(LC_CTYPE, orig_locale.c_str());
- #endif // HAVE_SETLOCALE
-
- return fs;
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-editor-thingies.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-editor-thingies.patch
deleted file mode 100644
index 589afb43f31e..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-editor-thingies.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: util/fluxbox-generate_menu.in
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/util/fluxbox-generate_menu.in,v
-retrieving revision 1.29
-diff -u -r1.29 fluxbox-generate_menu.in
---- util/fluxbox-generate_menu.in 9 Sep 2004 15:25:26 -0000 1.29
-+++ util/fluxbox-generate_menu.in 11 Sep 2004 15:50:01 -0000
-@@ -1095,7 +1095,7 @@
-
- append_submenu "${EDITORMENU}"
- normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \
-- wings xemacs emacs
-+ wings xemacs emacs kvim cream
- find_it nano append "[exec] (nano) {${DEFAULT_TERM} -e nano}"
- find_it vi append "[exec] (vi) {${DEFAULT_TERM} -e vi}" ||\
- find_it vim append "[exec] (vim) {${DEFAULT_TERM} -e vim}"
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch
deleted file mode 100644
index 2dd70d86e467..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: util/fluxbox-generate_menu.in
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/util/fluxbox-generate_menu.in,v
-retrieving revision 1.29
-diff -u -r1.29 fluxbox-generate_menu.in
---- util/fluxbox-generate_menu.in 9 Sep 2004 15:25:26 -0000 1.29
-+++ util/fluxbox-generate_menu.in 12 Sep 2004 00:16:31 -0000
-@@ -1201,13 +1201,8 @@
- append_submenu "${FBSETTINGSMENU}"
- append "[config] (${CONFIGUREMENU})"
-
-- append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
-- append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
-- append "[stylesdir] (/usr/share/commonbox/styles/)"
-- append_menu_end
--
-- append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
-- append "[stylesdir] (~/.fluxbox/styles)"
-+ append_menu "[submenu] (Styles) {Select a Style}"
-+ append "[include] (/usr/share/fluxbox/menu.d/styles/)"
- append_menu_end
-
- # Backgroundmenu
-
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch
deleted file mode 100644
index 7688f2563761..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- fluxbox.toolbar/src/FbRootWindow.cc 2003-05-13 20:51:39.000000000 +1000
-+++ fluxbox.real/src/FbRootWindow.cc 2004-09-12 00:13:06.000000000 +1000
-@@ -46,7 +46,8 @@
- vinfo_nitems > 0) {
-
- for (int i = 0; i < vinfo_nitems; i++) {
-- if (DefaultDepth(disp, screen_num) < vinfo_return[i].depth)
-+ // We can't handle 32-bit visuals just yet (Composite ARGB)
-+ if (vinfo_return[i].depth != 32 && DefaultDepth(disp, screen_num) < vinfo_return[i].depth)
- m_visual = vinfo_return[i].visual;
- }
-
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch
deleted file mode 100644
index 520370ea272f..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: src/MenuCreator.cc
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/src/MenuCreator.cc,v
-retrieving revision 1.14
-diff -u -r1.14 MenuCreator.cc
---- src/MenuCreator.cc 9 Sep 2004 14:32:56 -0000 1.14
-+++ src/MenuCreator.cc 12 Sep 2004 00:14:03 -0000
-@@ -221,9 +221,31 @@
- } // end of config
- else if (str_key == "include") { // include
- string newfile = FbTk::StringUtil::expandFilename(str_label);
-- // inject this file into the current menu
-- MenuCreator::createFromFile(newfile, menu);
-- Fluxbox::instance()->saveMenuFilename(newfile.c_str());
-+ if (FbTk::Directory::isDirectory(newfile)) {
-+ // inject every file in this directory into the current menu
-+ FbTk::Directory dir(newfile.c_str());
-+
-+ std::vector<std::string> filelist(dir.entries());
-+ for (size_t file_index = 0; file_index < dir.entries(); ++file_index)
-+ filelist[file_index] = dir.readFilename();
-+ std::sort(filelist.begin(), filelist.end(), less<string>());
-+
-+ for (size_t file_index = 0; file_index < dir.entries(); file_index++) {
-+ std::string thisfile(newfile + '/' + filelist[file_index]);
-+
-+ if (FbTk::Directory::isRegularFile(thisfile) &&
-+ (filelist[file_index][0] != '.') &&
-+ (thisfile[thisfile.length() - 1] != '~')) {
-+ MenuCreator::createFromFile(thisfile, menu);
-+ Fluxbox::instance()->saveMenuFilename(thisfile.c_str());
-+ }
-+ }
-+
-+ } else {
-+ // inject this file into the current menu
-+ MenuCreator::createFromFile(newfile, menu);
-+ Fluxbox::instance()->saveMenuFilename(newfile.c_str());
-+ }
- } // end of include
- else if (str_key == "submenu") {
-
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-misc-updates.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-misc-updates.patch
deleted file mode 100644
index 674ca72f5081..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-misc-updates.patch
+++ /dev/null
@@ -1,450 +0,0 @@
-Index: src/FbTk/FbPixmap.cc
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/src/FbTk/FbPixmap.cc,v
-retrieving revision 1.12
-retrieving revision 1.14
-diff -u -r1.12 -r1.14
---- src/FbTk/FbPixmap.cc 6 Jul 2004 10:47:36 -0000 1.12
-+++ src/FbTk/FbPixmap.cc 10 Sep 2004 15:46:08 -0000 1.14
-@@ -30,21 +30,23 @@
-
- #include <X11/Xutil.h>
-+#include <X11/Xatom.h>
- #include <iostream>
- using namespace std;
-
- namespace FbTk {
-
--FbPixmap::FbPixmap():m_pm(0),
-- m_width(0), m_height(0),
-- m_depth(0) { }
--
--FbPixmap::FbPixmap(const FbPixmap &the_copy):m_pm(0),
-- m_width(0), m_height(0),
-- m_depth(0) {
-+FbPixmap::FbPixmap():m_pm(0),
-+ m_width(0), m_height(0),
-+ m_depth(0) {
-+}
-+
-+FbPixmap::FbPixmap(const FbPixmap &the_copy):FbDrawable(), m_pm(0),
-+ m_width(0), m_height(0),
-+ m_depth(0){
- copy(the_copy);
- }
-
--FbPixmap::FbPixmap(Pixmap pm):m_pm(0),
-+FbPixmap::FbPixmap(Pixmap pm):m_pm(0),
- m_width(0), m_height(0),
- m_depth(0) {
- if (pm == 0)
-@@ -50,19 +52,19 @@
- (*this) = pm;
- }
-
--FbPixmap::FbPixmap(const FbDrawable &src,
-+FbPixmap::FbPixmap(const FbDrawable &src,
- unsigned int width, unsigned int height,
-- int depth):m_pm(0),
-- m_width(0), m_height(0),
-+ int depth):m_pm(0),
-+ m_width(0), m_height(0),
- m_depth(0) {
-
- create(src.drawable(), width, height, depth);
- }
-
--FbPixmap::FbPixmap(Drawable src,
-+FbPixmap::FbPixmap(Drawable src,
- unsigned int width, unsigned int height,
-- int depth):m_pm(0),
-- m_width(0), m_height(0),
-+ int depth):m_pm(0),
-+ m_width(0), m_height(0),
- m_depth(0) {
-
- create(src, width, height, depth);
-@@ -87,8 +89,8 @@
- // get width, height and depth for the pixmap
- Window root;
- int x, y;
-- unsigned int border_width, bpp;
-- XGetGeometry(FbTk::App::instance()->display(),
-+ unsigned int border_width, bpp;
-+ XGetGeometry(s_display,
- pm,
- &root,
- &x, &y,
-@@ -112,20 +114,20 @@
- the_copy.depth() != depth() ||
- drawable() == 0)
- create_new = true;
--
-- if (create_new)
-+
-+ if (create_new)
- free();
-
- if (the_copy.drawable() != 0) {
- if (create_new) {
-- create(the_copy.drawable(),
-+ create(the_copy.drawable(),
- the_copy.width(), the_copy.height(),
- the_copy.depth());
- }
--
-+
- if (drawable()) {
- GContext gc(drawable());
--
-+
- copyArea(the_copy.drawable(),
- gc.gc(),
- 0, 0,
-@@ -146,7 +148,7 @@
- unsigned int border_width, bpp;
- unsigned int new_width, new_height;
-
-- XGetGeometry(FbTk::App::instance()->display(),
-+ XGetGeometry(s_display,
- pm,
- &root,
- &x, &y,
-@@ -155,25 +157,21 @@
- &bpp);
- // create new pixmap and copy area
- create(root, new_width, new_height, bpp);
--
-- Display *disp = FbTk::App::instance()->display();
-
-- GC gc = XCreateGC(disp, drawable(), 0, 0);
-+ GC gc = XCreateGC(s_display, drawable(), 0, 0);
-
-- XCopyArea(disp, pm, drawable(), gc,
-+ XCopyArea(s_display, pm, drawable(), gc,
- 0, 0,
- width(), height(),
- 0, 0);
-
-- XFreeGC(disp, gc);
-+ XFreeGC(s_display, gc);
- }
-
- void FbPixmap::rotate() {
-
-- Display *dpy = FbTk::App::instance()->display();
--
- // make an image copy
-- XImage *src_image = XGetImage(dpy, drawable(),
-+ XImage *src_image = XGetImage(s_display, drawable(),
- 0, 0, // pos
- width(), height(), // size
- ~0, // plane mask
-@@ -184,11 +182,11 @@
- GContext gc(drawable());
-
- // copy new area
-- for (int y = 0; y < static_cast<signed>(height()); ++y) {
-- for (int x = 0; x < static_cast<signed>(width()); ++x) {
-+ for (unsigned int y = 0; y < height(); ++y) {
-+ for (unsigned int x = 0; x < width(); ++x) {
- gc.setForeground(XGetPixel(src_image, x, y));
- // revers coordinates
-- XDrawPoint(dpy, new_pm.drawable(), gc.gc(), y, x);
-+ XDrawPoint(s_display, new_pm.drawable(), gc.gc(), y, x);
- }
- }
-
-@@ -203,13 +201,12 @@
- }
-
- void FbPixmap::scale(unsigned int dest_width, unsigned int dest_height) {
-- if (drawable() == 0 ||
-+
-+ if (drawable() == 0 ||
- (dest_width == width() && dest_height == height()))
- return;
-
-- Display *dpy = FbTk::App::instance()->display();
--
-- XImage *src_image = XGetImage(dpy, drawable(),
-+ XImage *src_image = XGetImage(s_display, drawable(),
- 0, 0, // pos
- width(), height(), // size
- ~0, // plane mask
-@@ -227,13 +224,13 @@
-
- // start scaling
- float src_x = 0, src_y = 0;
-- for (int tx=0; tx < static_cast<signed>(dest_width); ++tx, src_x += zoom_x) {
-+ for (unsigned int tx=0; tx < dest_width; ++tx, src_x += zoom_x) {
- src_y = 0;
-- for (int ty=0; ty < static_cast<signed>(dest_height); ++ty, src_y += zoom_y) {
-+ for (unsigned int ty=0; ty < dest_height; ++ty, src_y += zoom_y) {
- gc.setForeground(XGetPixel(src_image,
- static_cast<int>(src_x),
- static_cast<int>(src_y)));
-- XDrawPoint(dpy, new_pm.drawable(), gc.gc(), tx, ty);
-+ XDrawPoint(s_display, new_pm.drawable(), gc.gc(), tx, ty);
- }
- }
-
-@@ -249,23 +246,23 @@
- }
-
- void FbPixmap::tile(unsigned int dest_width, unsigned int dest_height) {
-- if (drawable() == 0 ||
-+ if (drawable() == 0 ||
- (dest_width == width() && dest_height == height()))
- return;
--
-+
- FbPixmap new_pm(drawable(), width(), height(), depth());
-
- new_pm.copy(m_pm);
-
- resize(dest_width, dest_height);
--
-+
- FbTk::GContext gc(*this);
--
-+
- gc.setTile(new_pm);
- gc.setFillStyle(FillTiled);
-
- fillRectangle(gc.gc(), 0, 0, dest_width, dest_height);
--
-+
- }
-
-
-@@ -284,9 +281,61 @@
- return ret;
- }
-
-+Pixmap FbPixmap::getRootPixmap(int screen_num) {
-+
-+ Atom real_type;
-+ int real_format;
-+ unsigned long items_read, items_left;
-+ unsigned int *data;
-+
-+ unsigned int prop = 0;
-+ static const char* prop_ids[] = {
-+ "_XROOTPMAP_ID",
-+ "_XSETROOT_ID",
-+ 0
-+ };
-+ static bool print_error = true; // print error_message only once
-+ static const char* error_message = { "\n\n !!! WARNING WARNING WARNING WARNING !!!!!\n"
-+ " if you experience problems with transparency:\n"
-+ " you are using a wallpapersetter that \n"
-+ " uses _XSETROOT_ID .. which we do not support.\n"
-+ " consult 'fbsetbg -i' or try any other wallpapersetter\n"
-+ " that uses _XROOTPMAP_ID !\n"
-+ " !!! WARNING WARNING WARNING WARNING !!!!!!\n\n"
-+ };
-+
-+ Pixmap root_pm = None;
-+
-+ for (prop = 0; prop_ids[prop]; prop++) {
-+ if (XGetWindowProperty(s_display,
-+ RootWindow(s_display, screen_num),
-+ XInternAtom(s_display, prop_ids[prop], False),
-+ 0L, 4,
-+ False, XA_PIXMAP,
-+ &real_type, &real_format,
-+ &items_read, &items_left,
-+ (unsigned char **) &data) == Success &&
-+ real_format == 32 && items_read == 1) {
-+
-+ if (strcmp(prop_ids[prop], "_XSETROOT_ID") == 0) {
-+ if (print_error) {
-+ fprintf(stderr, "%s", error_message);
-+ print_error = false;
-+ }
-+ } else
-+ root_pm = (Pixmap) (*data);
-+
-+ XFree(data);
-+ break;
-+ }
-+ }
-+
-+ return root_pm;
-+}
-+
- void FbPixmap::free() {
- if (m_pm != 0) {
-- XFreePixmap(FbTk::App::instance()->display(), m_pm);
-+ XFreePixmap(s_display, m_pm);
- m_pm = 0;
- }
- m_width = 0;
-@@ -294,13 +343,13 @@
- m_depth = 0;
- }
-
--void FbPixmap::create(Drawable src,
-- unsigned int width, unsigned int height,
-+void FbPixmap::create(Drawable src,
-+ unsigned int width, unsigned int height,
- int depth) {
- if (src == 0)
- return;
-
-- m_pm = XCreatePixmap(FbTk::App::instance()->display(),
-+ m_pm = XCreatePixmap(s_display,
- src, width, height, depth);
- if (m_pm == 0)
- return;
-Index: src/FbTk/FbPixmap.hh
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/src/FbTk/FbPixmap.hh,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -r1.12 -r1.13
-70a71
-> static Pixmap getRootPixmap(int screen_num);
-Index: src/FbTk/FbWindow.cc
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/src/FbTk/FbWindow.cc,v
-retrieving revision 1.37
-retrieving revision 1.39
-diff -r1.37 -r1.39
-24a25
-> #include "FbPixmap.hh"
-46,73c47
-< namespace {
-< Pixmap getRootPixmap(int screen_num) {
-< Pixmap root_pm = 0;
-< // get root pixmap for transparency
-< Display *disp = FbTk::App::instance()->display();
-< Atom real_type;
-< int real_format;
-< unsigned long items_read, items_left;
-< unsigned int *data;
-< if (XGetWindowProperty(disp, RootWindow(disp, screen_num),
-< XInternAtom(disp, "_XROOTPMAP_ID", false),
-< 0L, 1L,
-< false, XA_PIXMAP, &real_type,
-< &real_format, &items_read, &items_left,
-< (unsigned char **) &data) == Success &&
-< items_read) {
-< root_pm = (Pixmap) (*data);
-< XFree(data);
-< }
-<
-< return root_pm;
-< }
-<
-< }; // end anonymous namespace
-<
-< Display *FbWindow::s_display = 0;
-<
-< FbWindow::FbWindow():m_parent(0), m_screen_num(0), m_window(0), m_x(0), m_y(0),
----
-> FbWindow::FbWindow():FbDrawable(), m_parent(0), m_screen_num(0), m_window(0), m_x(0), m_y(0),
-75c49
-< m_buffer_pm(0) {
----
-> m_buffer_pm(0){
-77,78d50
-< if (s_display == 0)
-< s_display = App::instance()->display();
-88,90d59
-< if (s_display == 0)
-< s_display = App::instance()->display();
-<
-101a71
-> FbDrawable(),
-107c77
-< create(RootWindow(FbTk::App::instance()->display(), screen_num),
----
-> create(RootWindow(s_display, screen_num),
-129c99
-< FbWindow::FbWindow(Window client):m_parent(0),
----
-> FbWindow::FbWindow(Window client):FbDrawable(), m_parent(0),
-139,141d108
-< if (s_display == 0)
-< s_display = App::instance()->display();
-<
-210c177
-< Pixmap root = getRootPixmap(screenNumber());
----
-> Pixmap root = FbPixmap::getRootPixmap(screenNumber());
-248c215
-< m_transparent.reset(new Transparent(getRootPixmap(screenNumber()), window(), alpha, screenNumber()));
----
-> m_transparent.reset(new Transparent(FbPixmap::getRootPixmap(screenNumber()), window(), alpha, screenNumber()));
-285,286d251
-< if (s_display == 0)
-< s_display = App::instance()->display();
-450,452d414
-< if (s_display == 0)
-< s_display = FbTk::App::instance()->display();
-<
-Index: src/FbTk/FbWindow.hh
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/src/FbTk/FbWindow.hh,v
-retrieving revision 1.32
-retrieving revision 1.33
-diff -r1.32 -r1.33
-182d181
-< static Display *s_display; ///< display connection
-Index: src/FbTk/FbDrawable.cc
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/src/FbTk/FbDrawable.cc,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -r1.2 -r1.3
-29a30,38
-> Display *FbDrawable::s_display = 0;
->
-> FbDrawable::FbDrawable() {
->
-> if (s_display == 0) {
-> s_display = FbTk::App::instance()->display();
-> }
-> }
->
-36c45
-< XCopyArea(FbTk::App::instance()->display(),
----
-> XCopyArea(s_display,
-47c56
-< XFillRectangle(FbTk::App::instance()->display(),
----
-> XFillRectangle(s_display,
-57c66
-< XDrawRectangle(FbTk::App::instance()->display(),
----
-> XDrawRectangle(s_display,
-67c76
-< XDrawLine(FbTk::App::instance()->display(),
----
-> XDrawLine(s_display,
-78c87
-< XFillPolygon(FbTk::App::instance()->display(),
----
-> XFillPolygon(s_display,
-86c95
-< XDrawPoint(FbTk::App::instance()->display(), drawable(), gc, x, y);
----
-> XDrawPoint(s_display, drawable(), gc, x, y);
-90c99
-< return XGetImage(FbTk::App::instance()->display(), drawable(),
----
-> return XGetImage(s_display, drawable(),
-Index: src/FbTk/FbDrawable.hh
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/src/FbTk/FbDrawable.hh,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -r1.4 -r1.5
-32a33
-> FbDrawable();
-57a59,60
-> protected:
-> static Display *s_display; // display connection // display connection
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch
deleted file mode 100644
index 9b3dd0be5f16..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: util/fluxbox-generate_menu.in
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/util/fluxbox-generate_menu.in,v
-retrieving revision 1.29
-diff -u -r1.29 fluxbox-generate_menu.in
---- util/fluxbox-generate_menu.in 9 Sep 2004 15:25:26 -0000 1.29
-+++ util/fluxbox-generate_menu.in 11 Sep 2004 15:44:57 -0000
-@@ -960,7 +960,7 @@
- else
- [ -n "$MY_TERM" ] && echo "Warning: you chose an invalid term." >&2
- #The precise order is up for debate.
-- for term in Eterm aterm rxvt wterm xterm konsole gnome-terminal; do
-+ for term in urxvtc urxvt Eterm aterm rxvt wterm konsole gnome-terminal xterm ; do
- if find_it $term; then
- DEFAULT_TERM=$term
- break
-@@ -1038,7 +1038,7 @@
-
-
- append_submenu "${TERMINALMENU}"
-- normal_find xterm gnome-terminal Eterm konsole aterm rxvt
-+ normal_find xterm gnome-terminal Eterm konsole aterm rxvt urxvt urxvtc
- append_menu_end
-
-
-
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch
deleted file mode 100644
index c0bfcea8ed71..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: util/fluxbox-generate_menu.in
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/util/fluxbox-generate_menu.in,v
-retrieving revision 1.29
-diff -u -r1.29 fluxbox-generate_menu.in
---- util/fluxbox-generate_menu.in 9 Sep 2004 15:25:26 -0000 1.29
-+++ util/fluxbox-generate_menu.in 11 Sep 2004 15:40:13 -0000
-@@ -173,8 +173,8 @@
- menu_entry() {
- if [ -f "$1" ]; then
- # space&tab here
-- entry_name=`grep '^[ ]*Name=' "$1" | head -1 | cut -d = -f 2`
-- entry_exec=`grep '^[ ]*Exec=' "$1" | head -1 | cut -d = -f 2`
-+ entry_name=`grep '^[ ]*Name=' "$1" | head -n 1 | cut -d = -f 2`
-+ entry_exec=`grep '^[ ]*Exec=' "$1" | head -n 1 | cut -d = -f 2`
- if [ -n "$entry_name" -a -n "$entry_exec" ]; then
- append "[exec] ($entry_name) {$entry_exec}"
- fi
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch
deleted file mode 100644
index 16d38ddc2070..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude --exclude fluxbox.cc fluxbox.real/src/FbTk/FbWindow.cc fluxbox.composite/src/FbTk/FbWindow.cc
---- fluxbox.real/src/FbTk/FbWindow.cc 2004-09-11 22:33:14.000000000 +1000
-+++ fluxbox.composite/src/FbTk/FbWindow.cc 2004-09-12 01:11:39.000000000 +1000
-@@ -111,6 +111,10 @@
-
- FbWindow::~FbWindow() {
-
-+ // Need to free xrender pics before destroying window
-+ if (m_transparent.get() != 0)
-+ m_transparent.reset(0);
-+
- if (m_window != 0) {
- // so we don't get any dangling eventhandler for this window
- FbTk::EventManager::instance()->remove(m_window);
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude --exclude fluxbox.cc fluxbox.real/src/FbTk/Menu.cc fluxbox.composite/src/FbTk/Menu.cc
---- fluxbox.real/src/FbTk/Menu.cc 2004-09-12 00:12:05.000000000 +1000
-+++ fluxbox.composite/src/FbTk/Menu.cc 2004-09-12 01:45:36.000000000 +1000
-@@ -567,6 +567,8 @@
- m_real_frame_pm = FbTk::FbPixmap(menu.frame.window(),
- menu.frame.width(), menu.frame.height(),
- menu.frame.depth());
-+ if (m_transp.get() != 0)
-+ m_transp->setDest(m_real_frame_pm.drawable(), screenNumber());
-
- menu.frame.setBackgroundPixmap(m_real_frame_pm.drawable());
- GContext def_gc(menu.frame);
-@@ -1385,7 +1387,6 @@
-
- void Menu::reconfigure() {
-
--
- if (alpha() == 255 && m_transp.get() != 0) {
- m_transp.reset(0);
- } else if (alpha () < 255) {
-@@ -1394,8 +1395,13 @@
- m_transp.reset(new Transparent(FbPixmap::getRootPixmap(screenNumber()),
- m_real_frame_pm.drawable(), alpha(),
- screenNumber()));
-- } else
-+ } else {
-+ Pixmap root = FbPixmap::getRootPixmap(screenNumber());
-+ if (m_transp->source() != root)
-+ m_transp->setSource(root, screenNumber());
-+
- m_transp->setAlpha(alpha());
-+ }
- }
-
- m_need_update = true; // redraw items
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude --exclude fluxbox.cc fluxbox.real/src/FbTk/Transparent.cc fluxbox.composite/src/FbTk/Transparent.cc
---- fluxbox.real/src/FbTk/Transparent.cc 2004-09-11 11:41:01.000000000 +1000
-+++ fluxbox.composite/src/FbTk/Transparent.cc 2004-09-12 01:46:20.000000000 +1000
-@@ -60,7 +60,7 @@
- Pixmap alpha_pm = XCreatePixmap(disp, drawable,
- 1, 1, 8);
- if (alpha_pm == 0) {
-- cerr<<"FbTk::Transparent: "<<_FBTKTEXT(Error, NoRenderPixmap, "Warning: Failed to create alpha pixmap.", "XCreatePixmap files for our transparency pixmap")<<endl;
-+ cerr<<"FbTk::Transparent: "<<_FBTKTEXT(Error, NoRenderPixmap, "Warning: Failed to create alpha pixmap.", "XCreatePixmap failed for our transparency pixmap")<<endl;
- return 0;
- }
-
-@@ -131,7 +131,6 @@
- XRenderFindVisualFormat(disp,
- DefaultVisual(disp, screen_num));
-
--
- if (src != 0 && format != 0) {
- m_src_pic = XRenderCreatePicture(disp, src, format,
- 0, 0);
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch
deleted file mode 100644
index a4341ddec362..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/FbPixmap.cc fluxbox.xerrors/src/FbTk/FbPixmap.cc
---- fluxbox.real/src/FbTk/FbPixmap.cc 2004-09-11 11:41:01.000000000 +1000
-+++ fluxbox.xerrors/src/FbTk/FbPixmap.cc 2004-09-11 13:42:24.000000000 +1000
-@@ -305,28 +305,26 @@
- };
-
- Pixmap root_pm = None;
--
- for (prop = 0; prop_ids[prop]; prop++) {
- if (XGetWindowProperty(s_display,
- RootWindow(s_display, screen_num),
- XInternAtom(s_display, prop_ids[prop], False),
-- 0L, 4,
-+ 0l, 4l,
- False, XA_PIXMAP,
- &real_type, &real_format,
- &items_read, &items_left,
-- (unsigned char **) &data) == Success &&
-- real_format == 32 && items_read == 1) {
-+ (unsigned char **) &data) == Success) {
-+ if (real_format == 32 && items_read == 1) {
-
-- if (strcmp(prop_ids[prop], "_XSETROOT_ID") == 0) {
-- if (print_error) {
-+ if (print_error && strcmp(prop_ids[prop], "_XSETROOT_ID") == 0) {
- fprintf(stderr, "%s", error_message);
- print_error = false;
-- }
-- } else
-- root_pm = (Pixmap) (*data);
--
-+ } else
-+ root_pm = (Pixmap) (*data);
-+ }
- XFree(data);
-- break;
-+ if (root_pm != None)
-+ break;
- }
- }
-
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/FbWindow.cc fluxbox.xerrors/src/FbTk/FbWindow.cc
---- fluxbox.real/src/FbTk/FbWindow.cc 2004-09-11 11:41:01.000000000 +1000
-+++ fluxbox.xerrors/src/FbTk/FbWindow.cc 2004-09-11 22:25:01.000000000 +1000
-@@ -315,10 +315,11 @@
- XUndefineCursor(s_display, window());
- }
-
--void FbWindow::reparent(const FbWindow &parent, int x, int y) {
-+void FbWindow::reparent(const FbWindow &parent, int x, int y, bool continuing) {
- XReparentWindow(s_display, window(), parent.window(), x, y);
- m_parent = &parent;
-- updateGeometry();
-+ if (continuing) // we will continue managing this window after reparent
-+ updateGeometry();
- }
-
- std::string FbWindow::textProperty(Atom property) const {
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/FbWindow.hh fluxbox.xerrors/src/FbTk/FbWindow.hh
---- fluxbox.real/src/FbTk/FbWindow.hh 2004-09-11 11:41:01.000000000 +1000
-+++ fluxbox.xerrors/src/FbTk/FbWindow.hh 2004-09-11 22:25:18.000000000 +1000
-@@ -119,7 +119,7 @@
- void setCursor(Cursor cur);
- /// uses the parents cursor instead
- void unsetCursor();
-- void reparent(const FbWindow &parent, int x, int y);
-+ void reparent(const FbWindow &parent, int x, int y, bool continuing = true);
-
- bool property(Atom property,
- long long_offset, long long_length,
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/FbTk/Menu.cc fluxbox.xerrors/src/FbTk/Menu.cc
---- fluxbox.real/src/FbTk/Menu.cc 2004-09-10 01:15:17.000000000 +1000
-+++ fluxbox.xerrors/src/FbTk/Menu.cc 2004-09-11 22:17:55.000000000 +1000
-@@ -433,7 +433,7 @@
- }
-
- int itmp = (theme().itemHeight() * menu.persub);
-- menu.frame_h = itmp < 0 ? 0 : itmp;
-+ menu.frame_h = itmp < 1 ? 1 : itmp;
-
- int new_width = (menu.sublevels * menu.item_w);
- int new_height = menu.frame_h;
-@@ -442,8 +442,12 @@
- new_height += theme().titleHeight() + ((menu.frame_h > 0)?menu.title.borderWidth():0);
-
-
-- if (new_width < 1)
-- new_width = menu.item_w;
-+ if (new_width < 1) {
-+ if (menu.item_w > 0)
-+ new_width = menu.item_w;
-+ else
-+ new_width = 1;
-+ }
-
- if (new_height < 1)
- new_height = 1;
-@@ -548,7 +552,7 @@
- }
-
- menu.frame.moveResize(0, ((title_vis) ? menu.title.y() + menu.title.height() +
-- menu.title.borderWidth()*2 : 0),
-+ menu.title.borderWidth()*2 : 1),
- width(), menu.frame_h);
-
-
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/Window.cc fluxbox.xerrors/src/Window.cc
---- fluxbox.real/src/Window.cc 2004-09-01 01:26:38.000000000 +1000
-+++ fluxbox.xerrors/src/Window.cc 2004-09-11 22:24:20.000000000 +1000
-@@ -3232,7 +3232,7 @@
-
- #endif // DEBUG
- // reparent to root window
-- client->reparent(screen().rootWindow(), frame().x(), frame().y());
-+ client->reparent(screen().rootWindow(), frame().x(), frame().y(), false);
-
- if (!remap)
- client->hide();
-diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox.real/src/fluxbox.cc fluxbox.xerrors/src/fluxbox.cc
---- fluxbox.real/src/fluxbox.cc 2004-09-10 01:15:17.000000000 +1000
-+++ fluxbox.xerrors/src/fluxbox.cc 2004-09-11 22:29:22.000000000 +1000
-@@ -386,18 +386,20 @@
- } // end anonymous
-
- static int handleXErrors(Display *d, XErrorEvent *e) {
-+ if (e->error_code == BadWindow)
-+ last_bad_window = e->resourceid;
- #ifdef DEBUG
-- /*
-- char errtxt[128];
--
-- XGetErrorText(d, e->error_code, errtxt, 128);
-- cerr<<"Fluxbox: X Error: "<<errtxt<<"("<<(int)e->error_code<<") opcodes "<<
-- (int)e->request_code<<"/"<<(int)e->minor_code<<" resource 0x"<<hex<<(int)e->resourceid<<dec<<endl;
-- */
-+ else {
-+ // ignore bad window ones, they happen a lot
-+ // when windows close themselves
-+ char errtxt[128];
-+
-+ XGetErrorText(d, e->error_code, errtxt, 128);
-+ cerr<<"Fluxbox: X Error: "<<errtxt<<"("<<(int)e->error_code<<") opcodes "<<
-+ (int)e->request_code<<"/"<<(int)e->minor_code<<" resource 0x"<<hex<<(int)e->resourceid<<dec<<endl;
-+ }
- #endif // !DEBUG
-
-- if (e->error_code == BadWindow)
-- last_bad_window = e->resourceid;
-
- return False;
- }
-@@ -501,6 +503,7 @@
- m_reconfig_timer.setTimeout(to);
- m_reconfig_timer.setCommand(reconfig_cmd);
- m_reconfig_timer.fireOnce(true);
-+ //XSynchronize(disp, True);
-
- s_singleton = this;
- m_have_shape = false;
-@@ -633,10 +636,11 @@
- FbTk::ThemeManager::instance().load(FbTk::StringUtil::expandFilename(getStyleFilename()));
-
- XSynchronize(disp, False);
-+ //XSynchronize(disp, True);
- sync(false);
-
- m_reconfigure_wait = m_reread_menu_wait = false;
--
-+
- // Create keybindings handler and load keys file
- m_key.reset(new Keys(StringUtil::expandFilename(*m_rc_keyfile).c_str()));
-
-@@ -1813,7 +1817,7 @@
- for (unsigned int i=0; i<paths.size(); ++i)
- FbTk::Image::addSearchPath(paths[i]);
- }
--
-+
- if (!dbfile.empty()) {
- if (!m_screen_rm.load(dbfile.c_str())) {
- cerr<<_FBTEXT(Fluxbox, CantLoadRCFile, "Failed to load database", "Failed trying to read rc file")<<":"<<dbfile<<endl;
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch
deleted file mode 100644
index 55c6d0a9f978..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: src/Remember.cc
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/src/Remember.cc,v
-retrieving revision 1.39
-retrieving revision 1.42
-diff -u -r1.39 -r1.42
---- src/Remember.cc 10 Aug 2004 18:35:05 -0000 1.39
-+++ src/Remember.cc 4 Sep 2004 04:54:38 -0000 1.42
-@@ -79,14 +79,19 @@
- m_win(fbwin), m_attrib(attrib) {}
-
- bool isSelected() const {
-- return m_remember.isRemembered(m_win.winClient(), m_attrib);
-+ if (m_win.numClients()) // ensure it HAS clients
-+ return m_remember.isRemembered(m_win.winClient(), m_attrib);
-+ else
-+ return false;
- }
-
- bool isEnabled() const {
- if (m_attrib != Remember::REM_JUMPWORKSPACE)
- return true;
-- else
-+ else if (m_win.numClients())
- return (m_remember.isRemembered(m_win.winClient(), Remember::REM_WORKSPACE));
-+ else
-+ return false;
- }
-
- void click(int button, int time) {
-@@ -291,8 +296,10 @@
- }
-
- row++;
-- if (line[0] == '#')
-- continue; //the line is commented
-+ FbTk::StringUtil::removeFirstWhitespace(line);
-+ FbTk::StringUtil::removeTrailingWhitespace(line);
-+ if (line.size() == 0 || line[0] == '#')
-+ continue; //the line is commented or blank
- int parse_pos = 0, err = 0;
- string str_key, str_option, str_label;
- err = FbTk::StringUtil::getStringBetween(str_key,
-@@ -333,7 +340,7 @@
- } else if (str_label == "NORMAL") {
- l = Fluxbox::instance()->getNormalLayer();
- } else if (str_label == "TOP") {
-- l = Fluxbox::instance()->getNormalLayer();
-+ l = Fluxbox::instance()->getTopLayer();
- } else if (str_label == "DOCK") {
- l = Fluxbox::instance()->getDockLayer();
- } else if (str_label == "ABOVEDOCK") {
-@@ -454,7 +461,9 @@
- std::list<ClientPattern *> grouped_pats;
- while (getline(apps_file, line) && ! apps_file.eof()) {
- row++;
-- if (line[0] == '#')
-+ FbTk::StringUtil::removeFirstWhitespace(line);
-+ FbTk::StringUtil::removeTrailingWhitespace(line);
-+ if (line.size() == 0 || line[0] == '#')
- continue;
- string key;
- int err=0;
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch
deleted file mode 100644
index 03207cc656b4..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Index: src/Screen.cc
-===================================================================
-RCS file: /cvsroot/fluxbox/fluxbox/src/Screen.cc,v
-retrieving revision 1.286
-retrieving revision 1.288
-diff -u -r1.286 -r1.288
---- src/Screen.cc 30 Aug 2004 11:33:23 -0000 1.286
-+++ src/Screen.cc 6 Sep 2004 13:17:56 -0000 1.288
-@@ -407,11 +407,17 @@
- }
-
- BScreen::~BScreen() {
-+
- if (! managed)
- return;
--
-+
- if (m_rootmenu.get() != 0)
- m_rootmenu->removeAll();
-+
-+ // Since workspacemenu holds client list menus (from workspace)
-+ // we need to destroy it before we destroy workspaces
-+ m_workspacemenu.reset(0);
-+
-
- if (geom_pixmap != None)
- imageControl().removeImage(geom_pixmap);
-@@ -651,7 +657,7 @@
- const Workspace::Windows::iterator win_it_end = (*w_it)->windowList().end();
- for (; win_it != win_it_end; ++win_it) {
- if (*win_it != except)
-- (*win_it)->menu().hide();
-+ (*win_it)->menu().hide();
- }
- }
- }
-@@ -772,7 +778,12 @@
- if (w == 0)
- return;
-
-+ // make sure we have a unique list
-+ if (find(getIconList().begin(), getIconList().end(), w) != getIconList().end())
-+ return;
-+
- m_icon_list.push_back(w);
-+
- // notify listeners
- m_iconlist_sig.notify();
- }
-@@ -782,20 +793,28 @@
- if (w == 0)
- return;
-
-- Icons::iterator erase_it = remove_if(m_icon_list.begin(),
-- m_icon_list.end(),
-+ Icons::iterator erase_it = remove_if(getIconList().begin(),
-+ getIconList().end(),
- bind2nd(equal_to<FluxboxWindow *>(), w));
-- if (erase_it != m_icon_list.end())
-- m_icon_list.erase(erase_it);
--
-- m_iconlist_sig.notify();
-+ // no need to send iconlist signal if we didn't
-+ // change the iconlist
-+ if (erase_it != m_icon_list.end()) {
-+ getIconList().erase(erase_it);
-+ m_iconlist_sig.notify();
-+ }
- }
-
- void BScreen::removeWindow(FluxboxWindow *win) {
-- if (win->isIconic())
-- removeIcon(win);
-- else
-- getWorkspace(win->workspaceNumber())->removeWindow(win, false);
-+#ifdef DEBUG
-+ cerr<<"BScreen::removeWindow("<<win<<")"<<endl;
-+#endif // DEBUG
-+ // extra precaution, if for some reason, the
-+ // icon list should be out of sync
-+ removeIcon(win);
-+ // remove from workspace
-+ Workspace *space = getWorkspace(win->workspaceNumber());
-+ if (space != 0)
-+ space->removeWindow(win, false);
- }
-
-
diff --git a/x11-wm/fluxbox/files/0.9.10/styles-menu-commonbox b/x11-wm/fluxbox/files/0.9.10/styles-menu-commonbox
deleted file mode 100644
index 742e587e4f48..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/styles-menu-commonbox
+++ /dev/null
@@ -1,5 +0,0 @@
-[begin] (Legacy Commonbox Styles)
-[submenu] (Legacy Commonbox Styles)
- [stylesdir] (/usr/share/commonbox/styles)
-[end]
-[end]
diff --git a/x11-wm/fluxbox/files/0.9.10/styles-menu-fluxbox b/x11-wm/fluxbox/files/0.9.10/styles-menu-fluxbox
deleted file mode 100644
index d2e0d580339f..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/styles-menu-fluxbox
+++ /dev/null
@@ -1,5 +0,0 @@
-[begin] (Fluxbox Core Styles)
-[submenu] (Fluxbox Core Styles)
- [stylesdir] (/usr/share/fluxbox/styles)
-[end]
-[end]
diff --git a/x11-wm/fluxbox/files/0.9.10/styles-menu-user b/x11-wm/fluxbox/files/0.9.10/styles-menu-user
deleted file mode 100644
index 3d011d27ed23..000000000000
--- a/x11-wm/fluxbox/files/0.9.10/styles-menu-user
+++ /dev/null
@@ -1,5 +0,0 @@
-[begin] (User Styles)
-[submenu] (User Styles)
- [stylesdir] (~/.fluxbox/styles)
-[end]
-[end]
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch
deleted file mode 100644
index 22733ebe3272..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- /trunk/src/FbCommands.cc 2005/01/18 19:06:04 3852
-+++ trunk/src/FbCommands.cc 2005/01/20 12:30:35 3853
-@@ -131,11 +131,11 @@
- displaystring += intbuff;
- setsid();
- putenv(const_cast<char *>(displaystring.c_str()));
-- execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), 0);
-+ execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), static_cast<void*>(NULL));
- exit(0);
- }
- #else // __EMX__
-- spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", m_cmd.c_str(), 0);
-+ spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", m_cmd.c_str(), static_cast<void*>(NULL));
- #endif // !__EMX__
-
- }
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch
deleted file mode 100644
index 1a54f1e65824..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /trunk/util/fbrun/FbRun.cc 2005/01/18 19:06:04 3852
-+++ trunk/util/fbrun/FbRun.cc 2005/01/20 12:30:35 3853
-@@ -117,7 +117,7 @@
- // fork and execute program
- if (!fork()) {
- setsid();
-- execl("/bin/sh", "/bin/sh", "-c", command.c_str(), 0);
-+ execl("/bin/sh", "/bin/sh", "-c", command.c_str(), static_cast<void*>(NULL));
- exit(0); //exit child
- }
-
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch
deleted file mode 100644
index b208f1a40f60..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- trunk/src/Window.cc 2005/01/20 12:40:02 3855
-+++ trunk/src/Window.cc 2005/01/20 22:41:34 3856
-@@ -3483,9 +3483,10 @@
- detachClient(*old_attached);
- // move window by relative amount of mouse movement
- // since just detached, move relative to old location
-- if (client.m_win != 0)
-+ if (client.m_win != 0) {
- client.m_win->move(frame().x() - m_last_resize_x + x, frame().y() - m_last_resize_y + y);
--
-+ client.m_win->show();
-+ }
- }
- else if(attach_to_win==this && attach_to_win->isTabable()) {
- //reording of tabs within a frame
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch
deleted file mode 100644
index c772ae83e3e6..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /trunk/util/fluxbox-generate_menu.in 2005/01/24 16:27:06 3859
-+++ trunk/util/fluxbox-generate_menu.in 2005/01/24 16:32:57 3860
-@@ -949,8 +949,8 @@
- if [ -f ${MENUFILENAME}.firstbak ]; then
- cp ${MENUFILENAME} ${MENUFILENAME}.firstbak
- fi
-- if [ -s "${MENUFILE}" ]; then
-- mv ${MENUFILE} ${MENUFILE}.bak
-+ if [ -s "${MENUFILENAME}" ]; then
-+ mv ${MENUFILENAME} ${MENUFILENAME}.bak
- fi
- fi
-
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch
deleted file mode 100644
index 36ec68b7440c..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- util/fluxbox-generate_menu.in.orig 2005-01-18 18:45:10.965174784 +0000
-+++ util/fluxbox-generate_menu.in 2005-01-18 18:46:15.197410000 +0000
-@@ -1239,13 +1239,8 @@
- append_submenu "${FBSETTINGSMENU}"
- append "[config] (${CONFIGUREMENU})"
-
-- append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}"
-- append "[stylesdir] (${PREFIX}/share/fluxbox/styles)"
-- append "[stylesdir] (/usr/share/commonbox/styles/)"
-- append_menu_end
--
-- append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
-- append "[stylesdir] (~/.fluxbox/styles)"
-+ append_menu "[submenu] (Styles) {Select a Style}"
-+ append "[include] (/usr/share/fluxbox/menu.d/styles/)"
- append_menu_end
-
- # Backgroundmenu
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch
deleted file mode 100644
index ab9980b70f86..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- util/fluxbox-generate_menu.in.orig 2005-01-24 14:53:07.125141280 +0000
-+++ util/fluxbox-generate_menu.in 2005-01-24 15:07:09.921016832 +0000
-@@ -153,21 +153,25 @@
- if [ -z "${INSTALL}" ]; then
- echo -n " $*" >> ${MENUFILENAME}
- execname="`echo $*|cut -d\( -f2|cut -d\) -f1`"
-- if [ "${PNG_ICONS}" = "no" ]; then
-- if [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
-- echo "<${HOME}/.fluxbox/icons/$execname.xpm>" >> ${MENUFILENAME}
-- else
-- echo >> ${MENUFILENAME}
-- fi
-- else
-- if [ -r "${HOME}/.fluxbox/icons/$execname.png" ]; then
-- echo "<${HOME}/.fluxbox/icons/$execname.png>" >> ${MENUFILENAME}
-- elif [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
-- echo "<${HOME}/.fluxbox/icons/$execname.xpm>" >> ${MENUFILENAME}
-- else
-- echo >> ${MENUFILENAME}
-- fi
-- fi
-+ for P in {${HOME}/.fluxbox,/usr/share,/usr/local/share}/{icons,pixmaps} ; do
-+ for S in "" "-icon" ; do
-+ if [ "${PNG_ICONS}" = "no" ]; then
-+ if [ -r "${P}/$execname${S}.xpm" ]; then
-+ echo -n "<${P}/$execname${S}.xpm>" >> ${MENUFILENAME}
-+ break
-+ fi
-+ else
-+ if [ -r "${P}/$execname${S}.png" ]; then
-+ echo -n "<${P}/$execname${S}.png>" >> ${MENUFILENAME}
-+ break
-+ elif [ -r "${P}/$execname${S}.xpm" ]; then
-+ echo -n "<${P}/$execname${S}.xpm>" >> ${MENUFILENAME}
-+ break
-+ fi
-+ fi
-+ done
-+ done
-+ echo >> ${MENUFILENAME}
- else
- echo " $*" >> ${MENUFILENAME}
- fi
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch
deleted file mode 100644
index 0e26fee346fb..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/fluxbox-generate_menu.in.orig 2005-01-24 14:53:07.125141280 +0000
-+++ util/fluxbox-generate_menu.in 2005-01-24 15:07:09.921016832 +0000
-@@ -1165,6 +1169,8 @@
- find_it cdcd append "[exec] (cdcd) {${DEFAULT_TERM} -e cdcd}"
- find_it cplay append "[exec] (cplay) {${DEFAULT_TERM} -e cplay}"
- find_it alsamixer append "[exec] (AlsaMixer) {${DEFAULT_TERM} -e alsamixer}"
-+ find_it orpheus append "[exec] (orpheus) {${DEFAULT_TERM} -e orpheus}"
-+ find_it mp3blaster append "[exec] (mp3blaster) {${DEFAULT_TERM} -e mp3blaster}"
- append_menu_end
-
-
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch
deleted file mode 100644
index 61cdf4be4871..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- util/fluxbox-generate_menu.in.orig 2005-01-24 14:53:07.125141280 +0000
-+++ util/fluxbox-generate_menu.in 2005-01-24 15:07:09.921016832 +0000
-@@ -1131,10 +1135,10 @@
-
- append_submenu "${EDITORMENU}"
- normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \
-- wings xemacs emacs kvim cream
-+ wings xemacs emacs kvim cream evim
- find_it nano append "[exec] (nano) {${DEFAULT_TERM} -e nano}"
-- find_it vi append "[exec] (vi) {${DEFAULT_TERM} -e vi}" ||\
-- find_it vim append "[exec] (vim) {${DEFAULT_TERM} -e vim}"
-+ find_it vim append "[exec] (vim) {${DEFAULT_TERM} -e vim}" ||\
-+ find_it vi append "[exec] (vi) {${DEFAULT_TERM} -e vi}"
- find_it zile append "[exec] (zile) {${DEFAULT_TERM} -e zile}"
- find_it jed append "[exec] (jed) {${DEFAULT_TERM} -e jed}"
- find_it emacs append "[exec] (emacs-nw) {${DEFAULT_TERM} -e emacs -nw}"
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-you-got-mail.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-you-got-mail.patch
deleted file mode 100644
index a440ea67c677..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-you-got-mail.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- util/fluxbox-generate_menu.in.orig 2005-01-24 14:43:03.503905656 +0000
-+++ util/fluxbox-generate_menu.in 2005-01-24 14:44:17.793611904 +0000
-@@ -1089,7 +1089,9 @@
-
- append_submenu Mail
- normal_find sylpheed kmail evolution thunderbird mozilla-thunderbird
-+ normal_find sylpheed-claws
- find_it mutt append "[exec] (mutt) {${DEFAULT_TERM} -e mutt}"
-+ find_it pine append "[exec] (pine) {${DEFAULT_TERM} -e pine}"
- append_menu_end
-
- append_submenu News
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.11 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.11
deleted file mode 100644
index c9e9304c4f0e..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0ed7d23813fbf1d8e1c7d2d490f9512 fluxbox-0.9.11.tar.bz2 636452
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r1 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r1
deleted file mode 100644
index 9f51ea28b9fd..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 398f4e10d88b47507ea309968340961c fluxbox-0.9.12.tar.bz2 648685
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.13 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.13
deleted file mode 100644
index 2f3981fb7cb2..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9b7b3c3b8e1e9ce3449601b238d4fba fluxbox-0.9.13.tar.bz2 663812
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.9 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.9
deleted file mode 100644
index 88c7a2a769b0..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0c637b1b6baa646f99877321b5d9e53 fluxbox-0.9.9.tar.gz 723342
diff --git a/x11-wm/fluxbox/files/fluxbox-0.9.9-gcc3.4.patch b/x11-wm/fluxbox/files/fluxbox-0.9.9-gcc3.4.patch
deleted file mode 100644
index dd686149d474..000000000000
--- a/x11-wm/fluxbox/files/fluxbox-0.9.9-gcc3.4.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: src/FbTk/FbPixmap.hh
-===================================================================
-RCS file: src/FbTk/FbPixmap.hh,v
-retrieving revision 1.10
-retrieving revision 1.11
-diff -r1.10 -r1.11
-38c38
-< explicit FbPixmap(const FbPixmap &copy);
----
-> FbPixmap(const FbPixmap &copy);
-Index: src/FbTk/Resource.hh
-===================================================================
-RCS file: src/FbTk/Resource.hh,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -r1.7 -r1.8
-34a35
-> #include "XrmDatabaseHelper.hh"
diff --git a/x11-wm/fluxbox/fluxbox-0.9.11.ebuild b/x11-wm/fluxbox/fluxbox-0.9.11.ebuild
deleted file mode 100644
index 76319cbfd22f..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.11.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.11.ebuild,v 1.13 2005/07/09 17:08:12 swegener Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome bigger-fonts disablexmb"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="virtual/x11
- truetype? ( media-libs/freetype )
- nls? ( sys-devel/gettext )
- !<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
- ${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ppc sparc amd64 alpha hppa ~ia64 mips ppc64 ~ppc-macos"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # Some fluxbox-generate_menu things. These are ciaranm's fault...
- epatch ${FILESDIR}/0.9.10/${PN}-0.9.10-posix-on-toast.patch
- epatch ${FILESDIR}/0.9.10/${PN}-0.9.10-my-term-is-better-than-your-term.patch
- epatch ${FILESDIR}/0.9.10/${PN}-0.9.10-editor-thingies.patch
- epatch ${FILESDIR}/0.9.10/${PN}-0.9.10-all-about-me.patch
-
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch ${FILESDIR}/0.9.10/${PN}-0.9.10-fancy-gentoo-styledirs.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-
- # Use a less fugly default theme
- sed -i \
- -e 's~styles/Meta~styles/Emerge~' data/init.in
-
- # Turn on aa by default if possible. Fluxbox fonts are really frickin'
- # broken, we'll do what we can to make it less painful by default.
- use truetype 1>/dev/null && \
- echo "session.screen0.antialias: true" >> data/init.in
-
- ebegin "Fixing style fonts..."
- for style in data/styles/* ; do
- [[ -d "${style}" ]] && style=${style}/theme.cfg
- [[ -f "${style}" ]] || die "waah! ${style} doesn't exist"
-
- # Make fonts more readable if we use bigger-fonts
- if use bigger-fonts 1>/dev/null ; then
- sed -i \
- -e 's~\([fF]ont:[ \t]\+[a-zA-Z]\+-\)[789]~\110~' \
- ${style} || die "sed voodoo failed (insufficient goats?)"
- fi
-
- # We don't have a reliable sans font alias, change it to lucidasans.
- # That might not work either, but it's more likely...
- sed -i \
- -e 's~\([ \t:]\)sans\(-\|$\)~\1lucidasans\2~' \
- ${style} || die "sed voodoo failed (not a full moon)"
- done
- eend $?
-}
-
-src_compile() {
- export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
- econf \
- $(use_enable nls) \
- $(use_enable xinerama) \
- $(use_enable truetype xft) \
- $(use_enable kde) \
- $(use_enable gnome) \
- $(use_enable !disablexmb xmb) \
- --sysconfdir=/etc/X11/${PN} \
- ${myconf} || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- dodir /usr/share/fluxbox
- make DESTDIR=${D} install || die "make install failed"
- dodoc README* AUTHORS TODO* COPYING ChangeLog NEWS
-
- dodir /usr/share/xsessions
- insinto /usr/share/xsessions
- doins ${FILESDIR}/${PN}.desktop
-
- dodir /etc/X11/Sessions
- echo "/usr/bin/startfluxbox" > ${D}/etc/X11/Sessions/fluxbox
- fperms a+x /etc/X11/Sessions/fluxbox
-
- dodir /usr/share/fluxbox/menu.d
-
- # 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
-}
-
-pkg_postinst() {
- einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
- einfo "handling styles in the menu. To take advantage of this, use"
- einfo "the following for your menu styles section:"
- einfo
- einfo " [submenu] (Styles) {Select a Style}"
- einfo " [include] (/usr/share/fluxbox/menu.d/styles/)"
- einfo " [end]"
- einfo
- einfo "If you use fluxbox-generate_menu or the default global fluxbox"
- einfo "menu file, this will already be present."
- einfo
- if has_version '<x11-wm/fluxbox-0.9.10-r3' ; then
- ewarn "You must restart fluxbox before using the [include] /directory/"
- ewarn "feature if you are upgrading from an older fluxbox!"
- ewarn
- fi
- ewarn "Be warned that anything involving XComposite is extremely"
- ewarn "experimental. Please don't report bugs unless they also occur"
- ewarn "with XComposite disabled."
- ewarn
- epause
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild
deleted file mode 100644
index 917fc445d555..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild,v 1.9 2005/07/09 17:08:12 swegener Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib bigger-fonts disablexmb"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-# SourceForge mirrors are broken. Yay!
-# SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-SRC_URI="http://www.fluxbox.org/download/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="virtual/x11
- truetype? ( media-libs/freetype )
- nls? ( sys-devel/gettext )
- imlib? ( >=media-libs/imlib2-1.2.0 )
- !<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
- ${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ppc sparc amd64 alpha hppa ia64 ~mips ppc64 ~ppc-macos"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch ${FILESDIR}/${PV}/${P}-our-styles-go-over-here.patch
-
- # menu generator things
- epatch ${FILESDIR}/${PV}/${P}-you-got-mail.patch
- epatch ${FILESDIR}/${PV}/${P}-sweet-sweet-music.patch
- epatch ${FILESDIR}/${PV}/${P}-vi-sucks-use-vim.patch
- epatch ${FILESDIR}/${PV}/${P}-pretty-eye-candy.patch
-
- # fixes
- epatch ${FILESDIR}/${PV}/${P}-3853-zero-is-not-null.patch
- epatch ${FILESDIR}/${PV}/${P}-3853-zero-is-still-not-null.patch
- epatch ${FILESDIR}/${PV}/${P}-3856-hide-and-seek-is-bad.patch
- epatch ${FILESDIR}/${PV}/${P}-3860-menu-backups.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-
- # Use a less fugly default theme
- sed -i \
- -e 's~styles/Meta~styles/Emerge~' data/init.in
-
- # Turn on aa by default if possible. Fluxbox fonts are really frickin'
- # broken, we'll do what we can to make it less painful by default.
- use truetype 1>/dev/null && \
- echo "session.screen0.antialias: true" >> data/init.in
-
- ebegin "Fixing style fonts..."
- for style in data/styles/* ; do
- [[ -d "${style}" ]] && style=${style}/theme.cfg
- [[ -f "${style}" ]] || die "waah! ${style} doesn't exist"
-
- # Make fonts more readable if we use bigger-fonts
- if use bigger-fonts 1>/dev/null ; then
- sed -i \
- -e 's~\([fF]ont:[ \t]\+[a-zA-Z]\+-\)[789]~\110~' \
- ${style} || die "sed voodoo failed (insufficient goats?)"
- fi
-
- # We don't have a reliable sans font alias, change it to lucidasans.
- # That might not work either, but it's more likely...
- sed -i \
- -e 's~\([ \t:]\)sans\(-\|$\)~\1lucidasans\2~' \
- ${style} || die "sed voodoo failed (not a full moon)"
- done
- eend $?
-}
-
-src_compile() {
- export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
- econf \
- $(use_enable nls) \
- $(use_enable xinerama) \
- $(use_enable truetype xft) \
- $(use_enable kde) \
- $(use_enable gnome) \
- $(use_enable !disablexmb xmb) \
- $(use_enable imlib imlib2) \
- --sysconfdir=/etc/X11/${PN} \
- ${myconf} || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- dodir /usr/share/fluxbox
- make DESTDIR=${D} install || die "make install failed"
- dodoc README* AUTHORS TODO* COPYING ChangeLog NEWS
-
- dodir /usr/share/xsessions
- insinto /usr/share/xsessions
- doins ${FILESDIR}/${PN}.desktop
-
- dodir /etc/X11/Sessions
- echo "/usr/bin/startfluxbox" > ${D}/etc/X11/Sessions/fluxbox
- fperms a+x /etc/X11/Sessions/fluxbox
-
- dodir /usr/share/fluxbox/menu.d
-
- # 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
-}
-
-pkg_postinst() {
- einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
- einfo "handling styles in the menu. To take advantage of this, use"
- einfo "the following for your menu styles section:"
- einfo
- einfo " [submenu] (Styles) {Select a Style}"
- einfo " [include] (/usr/share/fluxbox/menu.d/styles/)"
- einfo " [end]"
- einfo
- einfo "If you use fluxbox-generate_menu or the default global fluxbox"
- einfo "menu file, this will already be present."
- einfo
- if has_version '<x11-wm/fluxbox-0.9.10-r3' ; then
- ewarn "You must restart fluxbox before using the [include] /directory/"
- ewarn "feature if you are upgrading from an older fluxbox!"
- ewarn
- fi
- einfo "If you experience font problems, or if fluxbox takes a very"
- einfo "long time to start up, please try the 'disablexmb' USE flag."
- einfo "If that fails, please report bugs upstream."
- epause
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.13.ebuild b/x11-wm/fluxbox/fluxbox-0.9.13.ebuild
deleted file mode 100644
index 251cc78cbfac..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.13.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2005 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.ebuild,v 1.3 2005/07/09 17:08:12 swegener Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib disablexmb"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="virtual/x11
- truetype? ( media-libs/freetype )
- nls? ( sys-devel/gettext )
- imlib? ( >=media-libs/imlib2-1.2.0 )
- !<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
- ${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch ${FILESDIR}/${PV}/${P}-our-styles-go-over-here.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-
- # Turn on aa by default if possible. Fluxbox fonts are really frickin'
- # broken, we'll do what we can to make it less painful by default.
- use truetype 1>/dev/null && \
- echo "session.screen0.antialias: true" >> data/init.in
-}
-
-src_compile() {
- export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
- econf \
- $(use_enable nls) \
- $(use_enable xinerama) \
- $(use_enable truetype xft) \
- $(use_enable kde) \
- $(use_enable gnome) \
- $(use_enable !disablexmb xmb) \
- $(use_enable imlib imlib2) \
- --sysconfdir=/etc/X11/${PN} \
- --with-style=/usr/share/fluxbox/styles/Emerge \
- ${myconf} || die "configure failed"
-
- emake || die "make failed"
-
- ebegin "Creating a menu file (may take a while)"
- mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
- MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
- CHECKINIT="no. go away." HOME="${T}/home" \
- ${S}/util/fluxbox-generate_menu -is -ds \
- || die "menu generation failed"
- eend $?
-}
-
-src_install() {
- dodir /usr/share/fluxbox
- make DESTDIR=${D} install || die "make install failed"
- dodoc README* AUTHORS TODO* COPYING ChangeLog NEWS
-
- dodir /usr/share/xsessions
- insinto /usr/share/xsessions
- doins ${FILESDIR}/${PN}.desktop
-
- dodir /etc/X11/Sessions
- echo "/usr/bin/startfluxbox" > ${D}/etc/X11/Sessions/fluxbox
- fperms a+x /etc/X11/Sessions/fluxbox
-
- dodir /usr/share/fluxbox/menu.d
-
- # 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
-}
-
-pkg_postinst() {
- einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
- einfo "handling styles in the menu. To take advantage of this, use"
- einfo "the following for your menu styles section:"
- einfo
- einfo " [submenu] (Styles) {Select a Style}"
- einfo " [include] (/usr/share/fluxbox/menu.d/styles/)"
- einfo " [end]"
- einfo
- einfo "If you use fluxbox-generate_menu or the default global fluxbox"
- einfo "menu file, this will already be present."
- einfo
- ewarn "Note that menumaker and similar utilities do *not* support"
- ewarn "this out of the box."
- einfo
- einfo "If you experience font problems, or if fluxbox takes a very"
- einfo "long time to start up, please try the 'disablexmb' USE flag."
- einfo "If that fails, please report bugs upstream."
- epause
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.9.ebuild b/x11-wm/fluxbox/fluxbox-0.9.9.ebuild
deleted file mode 100644
index 833f8d0f7b55..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.9.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.9.ebuild,v 1.18 2005/01/02 18:21:50 hansmi Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome"
-
-DESCRIPTION="Fluxbox is a lightweight windowmanager for X featuring tabs."
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.gz"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for
-# the respective protocols, and does not depend on external libraries.
-RDEPEND="virtual/x11
- truetype? ( media-libs/freetype )
- nls? ( sys-devel/gettext )"
-DEPEND=">=sys-devel/autoconf-2.52
- ${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ppc sparc amd64 alpha hppa ~ia64 mips ppc64 ppc-macos"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- # upstream tell us we probably want to apply this if there's any chance
- # anyone will ever try to compile using gcc 3.4.
- epatch ${FILESDIR}/${PN}-0.9.9-gcc3.4.patch
-}
-
-src_compile() {
- export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
- econf \
- `use_enable nls` \
- `use_enable xinerama` \
- `use_enable truetype xft` \
- `use_enable kde` \
- `use_enable gnome` \
- --sysconfdir=/etc/X11/${PN} \
- ${myconf} || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- dodir /usr/share/fluxbox
- make DESTDIR=${D} install || die "make install failed"
- dodoc README* AUTHORS TODO* COPYING
-
- dodir /usr/share/xsessions
- insinto /usr/share/xsessions
- doins ${FILESDIR}/${PN}.desktop
-
- dodir /etc/X11/Sessions
- echo "/usr/bin/startfluxbox" > ${D}/etc/X11/Sessions/fluxbox
- fperms a+x /etc/X11/Sessions/fluxbox
-}
-