Fix .it translation which causes parser to fail, and xfdesktop segfault. Bug 174799.

Package-Manager: portage-2.1.2.4

5 files changed, 454 insertions, 5 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 7b921ace0fc3..980eb408e377 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfdesktop
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.97 2007/04/12 14:42:13 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.98 2007/04/26 11:53:22 drac Exp $
+
+*xfdesktop-4.4.1-r1 (26 Apr 2007)
+
+  26 Apr 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfdesktop-4.4.1-translation.patch, +xfdesktop-4.4.1-r1.ebuild:
+  Fix .it translation which causes parser to fail, and xfdesktop segfault. Bug
+  174799.
 
 *xfdesktop-4.4.1 (11 Apr 2007)
 
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 0231422ab1ae..5d201f8d594f 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,3 +1,7 @@
+AUX xfdesktop-4.4.1-translation.patch 16569 RMD160 7bbd9d40a212f13ab3e94ad49d1f6e129fc47788 SHA1 78d1e3297e06fa40d63354c597c1c0ad47c23e05 SHA256 c5a4895f1db46ba0d5c32095c00d0108a80c326b8b2cfb42956eeafdb0721bd1
+MD5 6435a1847154ad95f304acd9a83e79f7 files/xfdesktop-4.4.1-translation.patch 16569
+RMD160 7bbd9d40a212f13ab3e94ad49d1f6e129fc47788 files/xfdesktop-4.4.1-translation.patch 16569
+SHA256 c5a4895f1db46ba0d5c32095c00d0108a80c326b8b2cfb42956eeafdb0721bd1 files/xfdesktop-4.4.1-translation.patch 16569
 DIST xfdesktop-4.2.3.tar.gz 3169283 RMD160 da0adb637503f85d38651953560916ebc141b3ec SHA1 d4b1285947e6f42e6aa1b95a9e7bed645a1f596d SHA256 5e0ede22e6c9441ba3642580c1768995069e8de1536013b65f9394b32152d1e6
 DIST xfdesktop-4.4.0.tar.bz2 3150198 RMD160 edeef28d1a0ac374e6fe11d8da83563a3e1dabb8 SHA1 f59d12cbc4980ce83b3739efc785c47fba09249c SHA256 f6837480d87b61827e25d47ed1ca92565f975a8dff89ab950aefb1fb392fd34b
 DIST xfdesktop-4.4.1.tar.bz2 3067577 RMD160 10e182f2cebd309ed7e2b18d00331861e21f4528 SHA1 46324ad37bb782ec7a5da11c619d9e76a0f54133 SHA256 abf8c93af0df9d6ec730917e02c57783546c40b8be091a74a5160bbf59ee4a80
@@ -10,6 +14,10 @@ EBUILD xfdesktop-4.4.0-r3.ebuild 2243 RMD160 59c41fb5b3832d61f5ccad47a74075167d2
 MD5 02e77ef509eb98201900bdc69fe1a0a7 xfdesktop-4.4.0-r3.ebuild 2243
 RMD160 59c41fb5b3832d61f5ccad47a74075167d2e48c9 xfdesktop-4.4.0-r3.ebuild 2243
 SHA256 adc9bb2e6e4fd38ed29a85b997f44daa7bd00506bef3685d3b75d94924526fdc xfdesktop-4.4.0-r3.ebuild 2243
+EBUILD xfdesktop-4.4.1-r1.ebuild 2362 RMD160 abd67ccd738679e76e2a5c4431211098853c0b11 SHA1 157b370adb2d835ad70acd9aee0325736311b35d SHA256 ea15858708e4731099c0c7976ed254ca941ff0e926f8ed80a15f3cd416fe4b5b
+MD5 be14609e9c6229e0e598468b21ab1614 xfdesktop-4.4.1-r1.ebuild 2362
+RMD160 abd67ccd738679e76e2a5c4431211098853c0b11 xfdesktop-4.4.1-r1.ebuild 2362
+SHA256 ea15858708e4731099c0c7976ed254ca941ff0e926f8ed80a15f3cd416fe4b5b xfdesktop-4.4.1-r1.ebuild 2362
 EBUILD xfdesktop-4.4.1.ebuild 2267 RMD160 9580ec40656cf3dd268c4b4a84b5bcf185be86c2 SHA1 139d4d7bd782315be9221b91c5f1099bf7c297d6 SHA256 c32419f0d817e7877ac3ada3f7dc1f6e03c07bafca4e52ddc59474449ede67e8
 MD5 abd5000dec1c5371aebc18e403b6946e xfdesktop-4.4.1.ebuild 2267
 RMD160 9580ec40656cf3dd268c4b4a84b5bcf185be86c2 xfdesktop-4.4.1.ebuild 2267
@@ -22,10 +30,10 @@ EBUILD xfdesktop-4.5_pre20070325.ebuild 2317 RMD160 b1574434ce80e4a20f3f5547335f
 MD5 c90fee382495549ef307b13dd93364f1 xfdesktop-4.5_pre20070325.ebuild 2317
 RMD160 b1574434ce80e4a20f3f5547335f7a6852ef66d1 xfdesktop-4.5_pre20070325.ebuild 2317
 SHA256 8d845fc611b1823d1514afc27b81dbe075c5d680084fae8cbae24e562f1e5c09 xfdesktop-4.5_pre20070325.ebuild 2317
-MISC ChangeLog 12184 RMD160 6bda8d67e5b674484a4d95a21b95e352075d74b7 SHA1 c37e634b57298006f5e245853812df47af10ebd5 SHA256 8f11ecf3242821bb3d2ae98d292a1c007945dcf2e7d7b4133b21bfd39723d644
-MD5 2b69f32665119f404af867523b485b13 ChangeLog 12184
-RMD160 6bda8d67e5b674484a4d95a21b95e352075d74b7 ChangeLog 12184
-SHA256 8f11ecf3242821bb3d2ae98d292a1c007945dcf2e7d7b4133b21bfd39723d644 ChangeLog 12184
+MISC ChangeLog 12428 RMD160 6b6e899e6091a905909a42127e658b3bff86be1d SHA1 9ba5a058e19908ac50a26184d49b0e0b9c90b22c SHA256 b8c3e11cddda46b2bc89147a3c5d85b73070bfa9a83b03b6fe8ba8e78d246a50
+MD5 09b5a130685deb1960a5114ba4cc58fb ChangeLog 12428
+RMD160 6b6e899e6091a905909a42127e658b3bff86be1d ChangeLog 12428
+SHA256 b8c3e11cddda46b2bc89147a3c5d85b73070bfa9a83b03b6fe8ba8e78d246a50 ChangeLog 12428
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -39,6 +47,9 @@ SHA256 4d72ecec4468ad413db51f9e36be65a2430535ef756ce08e6b54eb4a54b72391 files/di
 MD5 0b193eba97f4d5f86746f47d6eca4bb7 files/digest-xfdesktop-4.4.1 253
 RMD160 331a1eab011b0b30a5ee74dceb5f9502c9172df5 files/digest-xfdesktop-4.4.1 253
 SHA256 4d54e57f1f9b6ad05a5e4b2fd4b79c6a8ee44855a6f5fcaef4475d062d63e45b files/digest-xfdesktop-4.4.1 253
+MD5 0b193eba97f4d5f86746f47d6eca4bb7 files/digest-xfdesktop-4.4.1-r1 253
+RMD160 331a1eab011b0b30a5ee74dceb5f9502c9172df5 files/digest-xfdesktop-4.4.1-r1 253
+SHA256 4d54e57f1f9b6ad05a5e4b2fd4b79c6a8ee44855a6f5fcaef4475d062d63e45b files/digest-xfdesktop-4.4.1-r1 253
 MD5 821add2d018fccd3a52935e62e7430d4 files/digest-xfdesktop-4.5_pre20070325 283
 RMD160 c88ac91bc7dafdea317a09551a3bf24cd892e383 files/digest-xfdesktop-4.5_pre20070325 283
 SHA256 2ed3c25f70d9184f4d0178d42b7ba8e647422e86756b72365fb0bec0f8feec0b files/digest-xfdesktop-4.5_pre20070325 283
diff --git a/xfce-base/xfdesktop/files/digest-xfdesktop-4.4.1-r1 b/xfce-base/xfdesktop/files/digest-xfdesktop-4.4.1-r1
new file mode 100644
index 000000000000..fe26e0771dc3
--- /dev/null
+++ b/xfce-base/xfdesktop/files/digest-xfdesktop-4.4.1-r1
@@ -0,0 +1,3 @@
+MD5 7cbebc8e895eb19ee735e520ea48d03b xfdesktop-4.4.1.tar.bz2 3067577
+RMD160 10e182f2cebd309ed7e2b18d00331861e21f4528 xfdesktop-4.4.1.tar.bz2 3067577
+SHA256 abf8c93af0df9d6ec730917e02c57783546c40b8be091a74a5160bbf59ee4a80 xfdesktop-4.4.1.tar.bz2 3067577
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.4.1-translation.patch b/xfce-base/xfdesktop/files/xfdesktop-4.4.1-translation.patch
new file mode 100644
index 000000000000..6a1b3ca0ac53
--- /dev/null
+++ b/xfce-base/xfdesktop/files/xfdesktop-4.4.1-translation.patch
@@ -0,0 +1,341 @@
+diff -ur xfdesktop-4.4.1.orig/modules/menu/xfce-registered-categories.xml.it xfdesktop-4.4.1/modules/menu/xfce-registered-categories.xml.it
+--- xfdesktop-4.4.1.orig/modules/menu/xfce-registered-categories.xml.it	2007-04-06 23:29:54.000000000 +0300
++++ xfdesktop-4.4.1/modules/menu/xfce-registered-categories.xml.it	2007-04-26 14:46:30.000000000 +0300
+@@ -332,337 +332,3 @@
+ 	<category name="WineX" replace="Wine" toplevel="true" builtin-icon="WINE" />
+ 	<category name="CrossOver" replace="Wine" toplevel="true" builtin-icon="WINE" />
+ </xfce-registered-categories>
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE xfce-registered-categories>
+-
+-<!-- Note: You can copy this file to ~/.config/xfce4/desktop/ for customisation. -->
+-
+-<!--
+-	Here is how this file works:
+-
+-	<xfce-registered-categories> - root element, required.
+-
+-	<category>
+-		name:  Required.  Corresponds to an official category from the
+-		  freedesktop.org menu spec.
+-		replace: Optional.  Name that is displayed as the menu name for items
+-		  in the category (useful, e.g., for translations).
+-		icon: icon to be displayed for this category (actually, for the menu
+-		  item referenced by this category's 'replace' attribute)
+-		toplevel: Optional.  Marks categories as being "allowed" to be toplevel
+-		  menus.  Note: if a category is unrooted, it will be promoted to
+-		  toplevel regardless of the value of this attribute. (default: false)
+-		ignore: Optional.  This category will be ignored when organising menu
+-		  items. (default: false)
+-		hide: Optional.  Items referencing this category will not appear in any
+-			menu. (default: false)
+-
+-	<subcategory> - sub-element of <category>, specifies a subcategory relation
+-		name: Required.  Corresponds to an official category from the
+-		  freedesktop.org menu spec.
+-	  Example:
+-	  <category name="Graphics">
+-		  <subcategory name="RasterGraphics">
+-	  </category>
+-	  Note that even if subcategories are definied, it is possible to collapse
+-	  all subcategories into a flat one-level menu by specifying style="simple"
+-	  in the <include> tag in your menu.xml file.
+--->
+-
+-<xfce-registered-categories>
+-	<category name="Legacy" toplevel="true" replace="Accessori" builtin-icon="ACCESSORIES" />
+-	<category name="Core" toplevel="true" replace="Accessori" builtin-icon="ACCESSORIES" />
+-	<category name="Development" toplevel="true" replace="Sviluppo" builtin-icon="DEVELOPMENT">
+-		<subcategory name="Building" />
+-		<subcategory name="Debugger" />
+-		<subcategory name="IDE" />
+-		<subcategory name="GUIDesigner" />
+-		<subcategory name="Profiling" />
+-		<subcategory name="RevisionControl" />
+-		<subcategory name="Translation" />
+-		<subcategory name="ProjectManagement" />
+-		<subcategory name="WebDevelopment" />
+-	</category>
+-	<category name="Building" builtin-icon="DEVELOPMENT" />
+-	<category name="Debugger" replace="Strumenti di debug" builtin-icon="DEVELOPMENT" />
+-	<category name="IDE" replace="Ambienti" builtin-icon="DEVELOPMENT" />
+-	<category name="GUIDesigner" replace="Disegnatori GUI" builtin-icon="DEVELOPMENT" />
+-	<category name="Profiling" builtin-icon="DEVELOPMENT" />
+-	<category name="RevisionControl" replace="Controllo revisioni" builtin-icon="DEVELOPMENT" />
+-	<category name="Translation" replace="Traduzioni" builtin-icon="DEVELOPMENT" />
+-	<category name="Office" toplevel="true" replace="Ufficio" builtin-icon="OFFICE">
+-		<subcategory name="Calendar" />
+-		<subcategory name="ContactManagement" />
+-		<subcategory name="Database" />
+-		<subcategory name="Dictionary" />
+-		<subcategory name="Chart" />
+-		<subcategory name="Email" />
+-		<subcategory name="Finance" />
+-		<subcategory name="FlowChart" />
+-		<subcategory name="PDA" />
+-		<subcategory name="ProjectManagement" />
+-		<subcategory name="Presentation" />
+-		<subcategory name="Spreadsheet" />
+-		<subcategory name="WordProcessor" />
+-		<subcategory name="Photograph" />
+-		<subcategory name="Viewer" />
+-	</category>
+-	<category name="Calendar" replace="Agende" builtin-icon="OFFICE" />
+-	<category name="ContactManagement" replace="Gestione contatti" builtin-icon="OFFICE" />
+-	<category name="Database" builtin-icon="OFFICE" />
+-	<category name="Dictionary" replace="Dizionari" builtin-icon="OFFICE" />
+-	<category name="Chart" replace="Diagrammmi" builtin-icon="OFFICE" />
+-	<category name="Email" replace="Posta elettronica" builtin-icon="OFFICE" />
+-	<category name="Finance" replace="Finanza" builtin-icon="OFFICE" />
+-	<category name="FlowChart" replace="Diagrammi" builtin-icon="OFFICE" />
+-	<category name="PDA" builtin-icon="OFFICE" />
+-	<category name="ProjectManagement" replace="Gestione progetti" builtin-icon="OFFICE" />
+-	<category name="Presentation" replace="Presentazioni" builtin-icon="OFFICE" />
+-	<category name="Spreadsheet" replace="Fogli di calcolo" builtin-icon="OFFICE" />
+-	<category name="WordProcessor" replace="Elaborazione testi" builtin-icon="OFFICE" />
+-	<category name="Graphics" toplevel="true" replace="Grafica" builtin-icon="GRAPHICS">
+-		<subcategory name="2DGraphics" />
+-		<subcategory name="3DGraphics" />
+-		<subcategory name="Scanning" />
+-		<subcategory name="Photograph" />
+-		<subcategory name="Viewer" />
+-	</category>
+-	<category name="2DGraphics" replace="Grafica 2-D" builtin-icon="GRAPHICS">
+-		<subcategory name="VectorGraphics" />
+-		<subcategory name="RasterGraphics" />
+-	</category>
+-	<category name="VectorGraphics" replace="Grafica vettoriale" builtin-icon="GRAPHICS" />
+-	<category name="RasterGraphics" replace="Grafica Raster" builtin-icon="GRAPHICS" />
+-	<category name="3DGraphics" replace="Grafica 3-D" builtin-icon="GRAPHICS" />
+-	<category name="Scanning" replace="Scansione" builtin-icon="GRAPHICS">
+-		<subcategory name="OCR" />
+-	</category>
+-	<category name="OCR" builtin-icon="GRAPHICS" />
+-	<category name="Photograph" replace="Fotografia" builtin-icon="GRAPHICS" />
+-	<category name="Viewer" replace="Visualizzatori" builtin-icon="GRAPHICS" />
+-	<category name="Settings" toplevel="true" replace="Impostazioni" builtin-icon="SETTINGS">
+-		<subcategory name="DesktopSettings" />
+-		<subcategory name="HardwareSettings" />
+-		<subcategory name="PackageSettings" />
+-		<subcategory name="Security" />
+-		<subcategory name="Accessibility" />
+-		<subcategory name="Screensaver" />
+-	</category>
+-	<category name="DesktopSettings" replace="Impostazioni dell'ambiente" builtin-icon="SETTINGS" />
+-	<category name="HardwareSettings" replace="Impostazioni dell'hardware" builtin-icon="SETTINGS" />
+-	<category name="PackageSettings" replace="Impostazioni dei pacchetti" builtin-icon="SETTINGS" />
+-	<category name="Network" toplevel="true" replace="Rete" builtin-icon="NETWORK">
+-		<subcategory name="Email" />
+-		<subcategory name="Dialup" />
+-		<subcategory name="InstantMessaging" />
+-		<subcategory name="IRCClient" />
+-		<subcategory name="FileTransfer" />
+-		<subcategory name="HamRadio" />
+-		<subcategory name="News" />
+-		<subcategory name="P2P" />
+-		<subcategory name="RemoteAccess" />
+-		<subcategory name="Telephony" />
+-		<subcategory name="WebBrowser" />
+-		<subcategory name="WebDevelopment" />
+-	</category>
+-	<category name="Dialup" builtin-icon="NETWORK" />
+-	<category name="InstantMessaging" replace="Messaggistica istantanea" builtin-icon="NETWORK" />
+-	<category name="IRCClient" replace="Client IRC" builtin-icon="NETWORK" />
+-	<category name="FileTransfer" replace="Trasferimento file" builtin-icon="NETWORK" />
+-	<category name="HamRadio" replace="Ham Radio" builtin-icon="NETWORK" />
+-	<category name="News" builtin-icon="NETWORK" />
+-	<category name="P2P" replace="Peer-to-Peer" builtin-icon="NETWORK" />
+-	<category name="RemoteAccess" replace="Accessa remoto" builtin-icon="NETWORK" />
+-	<category name="Telephony" replace="Telefonia" builtin-icon="NETWORK" />
+-	<category name="WebBrowser" replace="Naviagazione internet" builtin-icon="NETWORK" />
+-	<category name="WebDevelopment" replace="Sviluppo web" builtin-icon="NETWORK" />
+-	<category name="AudioVideo" replace="Multimedia" toplevel="true" builtin-icon="MULTIMEDIA">
+-		<subcategory name="HamRadio" />
+-		<subcategory name="Audio" />
+-		<subcategory name="Video" />
+-		<subcategory name="AudioVideoEditing" />
+-		<subcategory name="Player" />
+-		<subcategory name="Recorder" />
+-		<subcategory name="DiscBurning" />
+-	</category>
+-	<category name="Audio" builtin-icon="MULTIMEDIA">
+-		<subcategory name="Midi" />
+-		<subcategory name="Mixer" />
+-		<subcategory name="Sequencer" />
+-		<subcategory name="Tuner" />
+-		<subcategory name="AudioVideoEditing" />
+-		<subcategory name="Player" />
+-		<subcategory name="Recorder" />
+-	</category>
+-	<category name="Midi"  builtin-icon="MULTIMEDIA" />
+-	<category name="Mixer" replace="Mixer del suono" builtin-icon="MULTIMEDIA" />
+-	<category name="Sequencer" replace="Sequencer" builtin-icon="MULTIMEDIA" />
+-	<category name="Tuner" replace="Sintonizzatori" builtin-icon="MULTIMEDIA" />
+-	<category name="Video" builtin-icon="MULTIMEDIA">
+-		<subcategory name="TV" />
+-		<subcategory name="AudioVideoEditing" />
+-		<subcategory name="Player" />
+-		<subcategory name="Recorder" />
+-		<subcategory name="Music" />
+-	</category>
+-	<category name="TV" builtin-icon="MULTIMEDIA" />
+-	<category name="AudioVideoEditing" replace="Montaggio" builtin-icon="MULTIMEDIA" />
+-	<category name="Player" replace="Riproduttori multimediali" builtin-icon="MULTIMEDIA" />
+-	<category name="Recorder" replace="Registratori" builtin-icon="MULTIMEDIA" />
+-	<category name="DiscBurning" replace="Masterizzazione CD e DVD" builtin-icon="MULTIMEDIA" />
+-	<category name="Game" toplevel="true" replace="Giochi" builtin-icon="GAME">
+-		<subcategory name="ActionGame" />
+-		<subcategory name="AdventureGame" />
+-		<subcategory name="ArcadeGame" />
+-		<subcategory name="BoardGame" />
+-		<subcategory name="BlocksGame" />
+-		<subcategory name="CardGame" />
+-		<subcategory name="KidsGame" />
+-		<subcategory name="LogicGame" />
+-		<subcategory name="RolePlaying" />
+-		<subcategory name="Simulation" />
+-		<subcategory name="SportsGame" />
+-		<subcategory name="StrategyGame" />
+-	</category>
+-	<category name="ActionGame" replace="Giochi d'azione" builtin-icon="GAME" />
+-	<category name="AdventureGame" replace="Giochi d'avventura" builtin-icon="GAME" />
+-	<category name="ArcadeGame" replace="Giochi Arcade" builtin-icon="GAME" />
+-	<category name="BoardGame" replace="Giochi da tavola" builtin-icon="GAME" />
+-	<category name="BlocksGame" replace="Giochi enigmistici" builtin-icon="GAME" />
+-	<category name="CardGame" replace="Giochi di carte" builtin-icon="GAME" />
+-	<category name="KidsGame" replace="Giochi per bambini" builtin-icon="GAME" />
+-	<category name="LogicGame" replace="Giochi di logica" builtin-icon="GAME" />
+-	<category name="RolePlaying" replace="Giochi di ruolo" builtin-icon="GAME" />
+-	<category name="Simulation" replace="Simulazione" builtin-icon="GAME" />
+-	<category name="SportsGame" replace="Giochi di sport" builtin-icon="GAME" />
+-	<category name="StrategyGame" replace="Giochi di strategia" builtin-icon="GAME" />
+-	<category name="Education" replace="Educazione" toplevel="true">
+-		<subcategory name="Art" />
+-		<subcategory name="Construction" />
+-		<subcategory name="Music" />
+-		<subcategory name="Languages" />
+-		<subcategory name="Teaching" />
+-	</category>
+-	<category name="Art" replace="Arte" />
+-	<category name="Construction" replace="Costruzione" />
+-	<category name="Music" replace="Musica" />
+-	<category name="Languages" replace="Lingue" />
+-	<category name="Science" replace="Scienza" toplevel="true">
+-		<subcategory name="Astronomy" />
+-		<subcategory name="Biology" />
+-		<subcategory name="Chemistry" />
+-		<subcategory name="Geology" />
+-		<subcategory name="Math" />
+-		<subcategory name="MedicalSoftware" />
+-		<subcategory name="Physics" />
+-		<subcategory name="Engineering" />
+-	</category>
+-	<category name="Astronomy" replace="Astronomia" />
+-	<category name="Biology" replace="Biologia" />
+-	<category name="Chemistry" replace="Chimica" />
+-	<category name="Geology" replace="Geometri" />
+-	<category name="Math" replace="Matematica" />
+-	<category name="MedicalSoftware" replace="Medicina" />
+-	<category name="Physics" replace="Fisica" />
+-	<category name="Teaching" replace="Insegnamento" />
+-	<category name="Amusement" replace="Giochi" builtin-icon="GAME" />
+-	<category name="Applet" replace="Applet" />
+-	<category name="Archiving" replace="Archiviazione" />
+-	<category name="Electronics" replace="Elettronica" />
+-	<category name="Emulator" toplevel="true" replace="Emulazione" builtin-icon="SYSTEM" />
+-	<category name="Engineering" replace="Ingegneria" />
+-	<category name="FileManager" replace="Gestione file" />
+-	<category name="Shell" replace="Shell" />
+-	<category name="Screensaver" replace="Salva Schermi" />
+-	<category name="TerminalEmulator" replace="Emulatori di terminale" />
+-	<category name="TrayIcon" replace="Icone dell'area di notifica" />
+-	<category name="System" toplevel="true" replace="Sistema" builtin-icon="SYSTEM">
+-		<subcategory name="FileSystem" />
+-		<subcategory name="Monitor" />
+-		<subcategory name="Security" />
+-		<subcategory name="Accessibility" />
+-		<subcategory name="TerminalEmulator" />
+-		<subcategory name="Shell" />
+-	</category>
+-	<category name="FileSystem" builtin-icon="SYSTEM" />
+-	<category name="Monitor" replace="Monitoraggio" builtin-icon="SYSTEM" />
+-	<category name="Security" replace="Sicurezza" builtin-icon="SYSTEM" />
+-	<category name="Utility" toplevel="true" replace="Accessori" builtin-icon="ACCESSORIES">
+-		<subcategory name="Accessibility" />
+-		<subcategory name="Calculator" />
+-		<subcategory name="Clock" />
+-		<subcategory name="TextEditor" />
+-		<subcategory name="Archiving" />
+-		<subcategory name="TerminalEmulator" />
+-		<subcategory name="FileManager" />
+-		<subcategory name="Shell" />
+-	</category>
+-	<category name="Accessibility" replace="Accessibilità" builtin-icon="UTILITY" />
+-	<category name="Calculator" replace="Calcolatrici" builtin-icon="ACCESSORIES" />
+-	<category name="Clock" replace="Orologi" builtin-icon="ACCESSORIES" />
+-	<category name="TextEditor" replace="Editor di testi" builtin-icon="ACCESSORIES" />
+-	<category name="KDE" toplevel="true" ignore="true">
+-		<subcategory name="Development" />
+-		<subcategory name="Office" />
+-		<subcategory name="Graphics" />
+-		<subcategory name="Settings" />
+-		<subcategory name="Network" />
+-		<subcategory name="AudioVideo" />
+-		<subcategory name="Game" />
+-		<subcategory name="Education" />
+-		<subcategory name="Science" />
+-		<subcategory name="System" />
+-		<subcategory name="Utility" />
+-	</category>
+-	<category name="GNOME" toplevel="true" ignore="true">
+-		<subcategory name="Development" />
+-		<subcategory name="Office" />
+-		<subcategory name="Graphics" />
+-		<subcategory name="Settings" />
+-		<subcategory name="Network" />
+-		<subcategory name="AudioVideo" />
+-		<subcategory name="Game" />
+-		<subcategory name="Education" />
+-		<subcategory name="Science" />
+-		<subcategory name="System" />
+-		<subcategory name="Utility" />
+-	</category>
+-	<category name="GTK" toplevel="true" ignore="true">
+-		<subcategory name="GNOME" />
+-	</category>
+-	<category name="Qt" toplevel="true" ignore="true">
+-		<subcategory name="KDE" />
+-	</category>
+-	<category name="Motif" toplevel="true" ignore="true">
+-		<subcategory name="Development" />
+-		<subcategory name="Office" />
+-		<subcategory name="Graphics" />
+-		<subcategory name="Settings" />
+-		<subcategory name="Network" />
+-		<subcategory name="AudioVideo" />
+-		<subcategory name="Game" />
+-		<subcategory name="Education" />
+-		<subcategory name="Science" />
+-		<subcategory name="System" />
+-		<subcategory name="Utility" />
+-	</category>
+-	<category name="Java" toplevel="true" ignore="true">
+-		<subcategory name="Applet" />
+-	</category>
+-	<category name="ConsoleOnly" toplevel="true" replace="Console" ignore="true">
+-		<subcategory name="Development" />
+-		<subcategory name="Office" />
+-		<subcategory name="Graphics" />
+-		<subcategory name="Settings" />
+-		<subcategory name="Network" />
+-		<subcategory name="AudioVideo" />
+-		<subcategory name="Game" />
+-		<subcategory name="Education" />
+-		<subcategory name="Science" />
+-		<subcategory name="System" />
+-		<subcategory name="Utility" />
+-	</category>
+-	<category name="Wine" toplevel="true" builtin-icon="WINE" />
+-	<category name="WineX" replace="Wine" toplevel="true" builtin-icon="WINE" />
+-	<category name="CrossOver" replace="Wine" toplevel="true" builtin-icon="WINE" />
+-</xfce-registered-categories>
diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild
new file mode 100644
index 000000000000..8bd9409bf3e8
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.1-r1.ebuild,v 1.1 2007/04/26 11:53:22 drac Exp $
+
+inherit eutils xfce44
+
+XFCE_VERSION=4.4.1
+xfce44
+xfce44_core_package
+
+DESCRIPTION="Desktop manager"
+HOMEPAGE="http://www.xfce.org/projects/xfdesktop"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dbus debug doc minimal"
+
+LANG="ca cs da de el es et eu fi fr he hu ja ko nl pl pt_BR ro ru sk sv uk vi zh_CN zh_TW"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libSM
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	gnome-base/librsvg
+	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
+	dbus? ( || ( dev-libs/dbus-glib <sys-apps/dbus-1 )
+		>=xfce-base/thunar-${THUNAR_MASTER_VERSION} )
+	!minimal? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
+		>=xfce-extra/exo-0.3.2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+for X in ${LANG}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+XFCE_CONFIG="${XFCE_CONFIG} $(use_enable doc xsltproc)"
+DOCS="AUTHORS ChangeLog NEWS TODO README"
+XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml
+	/etc/xdg/xfce4/desktop/menu.xml"
+
+pkg_setup() {
+	if use dbus; then
+		XFCE_CONFIG="${XFCE_CONFIG} --enable-thunarx --enable-file-icons"
+	else
+		XFCE_CONFIG="${XFCE_CONFIG} --disable-thunarx --disable-file-icons"
+	fi
+
+	if use minimal; then
+		XFCE_CONFIG="${XFCE_CONFIG} --disable-desktop-icons --disable-exo --disable-panel-plugin"
+	else
+		XFCE_CONFIG="${XFCE_CONFIG} --enable-desktop-icons --enable-exo --enable-panel-plugin"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-translation.patch
+}
+
+src_install() {
+	xfce44_src_install
+
+	# clean out the config files that don't affect us
+	local config lang
+	for config in ${XFCE_LOCALIZED_CONFIGS}; do
+		for lang in ${LANG}; do
+			local localized_config="${D}/${config}.${lang}"
+			if [[ -f ${localized_config} ]]; then
+				use "linguas_${lang}" || rm ${localized_config}
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	xfce44_pkg_postinst
+
+	if ! use dbus; then
+		elog
+		elog "You need USE=\"dbus\" to enable desktop icons."
+		elog
+	fi
+}