Version bump (Bug #455956 by Dave Armstrong). Fix .desktop file validation

warnings. Remove old.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

6 files changed, 159 insertions, 113 deletions

diff --git a/app-editors/wxhexeditor/ChangeLog b/app-editors/wxhexeditor/ChangeLog
index e4096ded8111..d44c56e80832 100644
--- a/app-editors/wxhexeditor/ChangeLog
+++ b/app-editors/wxhexeditor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-editors/wxhexeditor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/ChangeLog,v 1.4 2013/02/05 18:38:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/ChangeLog,v 1.5 2013/03/16 20:36:53 dirtyepic Exp $
+
+*wxhexeditor-0.21 (16 Mar 2013)
+
+  16 Mar 2013; Ryan Hill <dirtyepic@gentoo.org> -wxhexeditor-0.11.ebuild,
+  -files/wxhexeditor-0.11-makefile.patch, +wxhexeditor-0.21.ebuild,
+  +files/wxhexeditor-0.21-desktop-validation.patch,
+  +files/wxhexeditor-0.21-makefile.patch:
+  Version bump (Bug #455956 by Dave Armstrong). Fix .desktop file validation
+  warnings. Remove old.
 
   05 Feb 2013; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove redundant maintainer from metadata.
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index ae4664623ffa..22e35565c211 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX wxhexeditor-0.11-makefile.patch 3250 SHA256 84af7674a1eb350149288914b1af6e6c8f2f9252a8ed6ec4f8a74d16fcc131c7 SHA512 fa94dc160cb6cfc0e0b55a56d5bddf9b55a67ce3ad26503c699c2ce93127d7cb95204a49322de26cd54cdf1be52e9db065cb40d129acc4efdef071bb3a4e448c WHIRLPOOL 0b05489c471ff51116e96a58587cf6585b69b17d7e58825df425c5ff7e7a67186f60090df9c5ee85f93b98993bbd5035cc7e32ab37fefdaf2c7c66d0dd1e208f
 AUX wxhexeditor-0.20-makefile.patch 3181 SHA256 64ce76772e2b1a2d697afdf08d689d65683a01176ba0c099119a930770c85151 SHA512 da8deb6ee3c51f6009854020c213fca61529c03bb6ebb4cd99b76cd7749c1b7c09375276d67048978a763afcee244b276a4193171275c5de020fe46a98a05f36 WHIRLPOOL 8d5e36c92927659355f9c67bfd3c799b7c2f32c605797064c15ce18ae1c6c68af1da7e60b618ad7fe2910f1e78e5adc2b8f7455464a31493b68f3e36e2dce001
-DIST wxHexEditor-v0.11-src.tar.bz2 507012 SHA256 85c866c7f09c53c90af2fd12f1978125caa1b7d0ee20719915e45220d31f1ee5 SHA512 187fd3e2b20a68cd23644bf91afc7c65431670c4125b44eec665ebae3eadf8ffc13885f12386a4d5ca7274b402fa7609a94b6eb8111a229940dc85896a073d99 WHIRLPOOL 92ce6657f56a05cded331a988a3aa7ea8eeef4399cb68cdf471c1b0e026b17736c3916020ad97212ec36408e4b48c2a7ce42ec6849aa97c824af0d8d22e735b5
+AUX wxhexeditor-0.21-desktop-validation.patch 378 SHA256 e21e0c6975f5208244feff9d2530c21029ec425244974d83767fcb0f440479b1 SHA512 0b75a9d0c9c214950e9406197d87cf1bf033160a481cf1f9742532b66e37c5328dc57c4e3f4677a4311c9e55bd55d2b120e10b4edebb3aac197454f382fa46cd WHIRLPOOL 386889035036ebc781aeee464a84f7f758617eaa2bb639a0b5295adee33dc1d9e8aac926d0aae3321127ce9ad88079ab41f59822329f082ff68b16b03b7d8a0c
+AUX wxhexeditor-0.21-makefile.patch 3277 SHA256 204c5b682f39871f22483b7ec8574cb43c49b5023a4743d1981af6e5ff8668e4 SHA512 5a7ab104b07b3fc1119729e2080ebdfc22d987f71d95afb4d50efc52b49365005c9db8a91a49f0c789defced0f7976cf2992cebbbd31dcc36b82adba65e46b66 WHIRLPOOL 2ebcf754129e2e4f13c1170729404faa2e61783c31805597b4ba9ae945864d3a560a7479839698318b6336e87823e6bf1021cef3bfe66e016562c334dfe7cd6b
 DIST wxHexEditor-v0.20-src.tar.bz2 1194554 SHA256 a3dda32eb62e3ec1c9760519302bcef688253d48b3d2c566f9629c4e4246ae55 SHA512 f8138fb892528fd7d131b0931f52cb6b19dc984aa831882d7f60f557527e6bb559429a11b5a1307cf51d1a8974123627d15ccee87561970784a75910929f85a3 WHIRLPOOL 9d3343060f815fae7b2512b098c3a1c4853c062040cb2b180bf7402231295d27e96a3996aca041ce2f694f2cc84bb6dfbc419797079713afb254900187d100e0
-EBUILD wxhexeditor-0.11.ebuild 740 SHA256 e0b379e2eb4d77e2489bbb413c251be02f27835f9f52c64d8ad91a0b7eaeb656 SHA512 32e0869e1fbd2f31a21ff9bb2cd46d703495a7b952497553fdfab6222a503642d2084a934ad51266ca19c2a34e360652bd38de3fb5a89f6390ba9d52fbe21eec WHIRLPOOL 6d48140eb71f21dcf1bae7270c487e5ede9a34ce4e44322e47ab782cb062f263046256ac16de9e3b7038cfd7badcca998a05999aa57812b1b8a965c66eb111bc
+DIST wxHexEditor-v0.21-src.tar.bz2 1760192 SHA256 076111ebcf1472e80ec9a16223ca60bdf4598689cc5aa076a4f9760bba51f17f SHA512 bea80a139bb76e47ed5d3644f923b4b042d8842bb3522e88e2c84947eadc7f49f2599438f583ea8a1fde05356886d8fb20f679398e1519c13acd8e4dd49ad729 WHIRLPOOL fd5ebc1609183b8879254461c7eb1a22355a2f71ca45452a6dd21ca8164c5b8b96474d9d1c01b2aea962d4d47c291e3b43d8bf1d337c7bcff6c1c109c3fe29b9
 EBUILD wxhexeditor-0.20.ebuild 857 SHA256 8300f9028368202b2de1daab04e9fdda89416e40dc37aea00a61eb550bedbe20 SHA512 614b555403e0708ef163b4a4cae8914252384e45465fa0ed8f3560243da57828a31386351ed5cdaf8c0db3761bbe2551ad85bb0c9b941e8ac84a353256b9d04e WHIRLPOOL b7ab6bbafc5b02efa805e5b0e6722cb667bee0d646179ddaa17d95863d676f99784dc73d151555363281f16e91e90f76591bb0bc4dbf409d172fa8e879813e53
-MISC ChangeLog 1118 SHA256 39d1190c4bd9a0309a7a36dcd74a4d532d9628c803715be0af82c96f86ffa58b SHA512 20ebffd6801dc3213689904c9ad59be6ace0a780928302dca640cf642ecc0b7b4e243bd57becacc4168a4bdfcdc515ceb84fbab80c05ea6007937a2bf35517cd WHIRLPOOL 1f5d0089d6a3212b1894524854641467bb622e334a65ef6d2775d0bb54e35d6efc2c8d2ace7706946146308a697d0405016b0cd365198c519ce48f5b1f476c45
+EBUILD wxhexeditor-0.21.ebuild 1051 SHA256 8cc8fe04ba7dee09f3bb018f5e38827733c73611e01b4d3be99c48b15ab32029 SHA512 36032aaff9739c579dd8e0ea640896650f86eba81a8001b07fefdcd902b285785637c0ed189cd36deeeb34871eb15b0382bc4d4f3782434a9368bfc1a94c6ec1 WHIRLPOOL fdcbb9013c062d63d509ffea33fed1fb835ce616d580ae2e9a2773c4eb6c176c92ed19e7bd9b4e7f6dead8bc19d8d06363227ca2c7bc6fdb2d79b641e3e1a351
+MISC ChangeLog 1489 SHA256 66260181306fbfe7085cd94c3471445205d10131a339b1558ebf1cb7d5f8a437 SHA512 8bc965578a51a986eba6e15c12515bf28e138e87fff5c85ce1faaaebd3732417898a30b9167d3aef29f1283f7c089559afa9e4282489ac08eeec28bf554e52e9 WHIRLPOOL 7ff2d36b1a405af993fcf548e8ab900f752019a146c9129003183d652ae71c4dece714464c7c654f9bc357ce998cf55e73a2f7af314af6f8a9204828032a4ff5
 MISC metadata.xml 162 SHA256 fab42f6a31209847529447a2bea2b9dd746521fe5d59d967470736120712f093 SHA512 54458e1e306dfb7f1018129fa314d3e5d17219807a0a210d78ccf98034eba020115e2aeca7ea4922074e52dcb748fe06fa616bd083f30ed905f4c2f323afedf0 WHIRLPOOL 70cdb6ff3e6e6a6c01049ca93d1ddd2e9976516c3de0e8dbc1ae76a133e01a715658fdb7dabeefa1c1d9f7388b059710d5174375b32d23d44424abc7f8dd277f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJREVGOAAoJEEqz6FtPBkyjNYsH/AqRF182ytSuw4YnEmuqmcBl
-B7QCfw9b+t+T/4MgE+M5wRFesal49/CI4msOmV56WB13RK1G/q4dE5p6t1mMgApu
-kvCuSZ8rocT609zDxEGVKS9nef0v/pQCJCJv+ZbVwUXepr2n5nBFWS3wn8HJeOcM
-N8yKUX/lTurMjxllUizZgUqwKzgP45JStabagkHOtKa99M20Nb72FRWI7CvxyjkH
-CTdfqvbJB913kbGjrRLdWrCgl7aXC58uzdxAWo2xnj+y9ywZUDzoeqh4XAuh1Vkp
-xNJXZmxXtcvnZ1KqUJiupN1dA9lnOjQWyPSYsW5UMu/G1GBa/ZDpQXsfaX6W08k=
-=PKBh
+iQEcBAEBCAAGBQJRRNppAAoJEO04vUmVeoRjdL0H/iKxWvbDIkxM7un917jG8qfh
+pxNG0vqQSZOak2Q5s4mmBYmY5iasktdrSfc7v2XMPDUOoypa1RS3zLmPXrUFQoBI
+iXL1E3ozy9qCHzqb5nFzboQB1r0AAE+T6xlyPwu9nt6wAuq6QYFZ7A1HKBtVRLla
+cEXWcUc7iW5Z1NwkaIME6b8GI68bf/us3Qx0cTrRPvefaMuk8vYsMYZddaxlHjUx
+AAvoOaPKrok3s8nn9MLIsL7zhZ4mmntnD4CxUILarp4jXR+i5yGb18C3y42y+ar/
+1usvn8vxCtvHQ9o9BvtkLZmIwnWD+ooWWxoybYLCYAITqVElcLRBejVxK7PbSh8=
+=sOA9
 -----END PGP SIGNATURE-----
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.11-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.11-makefile.patch
deleted file mode 100644
index 10180c9b2877..000000000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.11-makefile.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-https://bugs.gentoo.org/373665
-
-  use system udis86
-  respect flags
-  fix parallel build
-
---- a/hashlibpp/src/Makefile
-+++ b/hashlibpp/src/Makefile
-@@ -50,7 +50,7 @@ INCLUDE_PATH = /usr/include/hashlib++
- LIB_PATH = /usr/local/lib/
- 
- # Compiler to use
--COMPILER = g++
-+COMPILER = ${CXX}
- 
- # Global options for the compiler
- COPTIONS = -ansi -Wall -Wextra
-@@ -62,7 +62,7 @@ COPTIONS = -ansi -Wall -Wextra
- ifdef DEBUG
- 	COPTIONS += -g
- else
--	COPTIONS += -O3 -fomit-frame-pointer
-+	COPTIONS += ${CXXFLAGS}
- endif
- 
- GCC = $(COMPILER) $(COPTIONS)
-@@ -149,7 +149,7 @@ hl_sha512wrapper.o:	hl_sha512wrapper.cpp hl_sha512wrapper.h
- #----------------------------------------------------------------------- 
- # Creating a static lib using ar
- 
--LIB:		MD5 SHA1 SHA256			
-+LIB:		MD5 SHA1 SHA256 SHA2EXT
- 		ar rs libhl++.a $(MD5) $(SHA1) $(SHA256) $(SHA2EXT)
- 
- #----------------------------------------------------------------------- 
---- a/makefile
-+++ b/makefile
-@@ -1,7 +1,7 @@
- WXCONFIG = wx-config
- CPP = `$(WXCONFIG) --cxx`
--CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -MMD -c ${OPTFLAGS}
--LDFLAGS = `$(WXCONFIG) --libs`
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -c ${OPTFLAGS}
-+WXLDFLAGS = `$(WXCONFIG) --libs` ${LDFLAGS}
- RC = `$(WXCONFIG) --rescomp`
- #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
- RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
-@@ -17,7 +17,7 @@ SOURCES= src/HexEditorGui.cpp \
- 			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
- 			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
- 			src/HexEditorFrame.cpp
--LIBS = udis86/libudis86/.libs/libudis86.a hashlibpp/src/libhl++.a
-+LIBS = hashlibpp/src/libhl++.a
- OBJECTS=$(SOURCES:.cpp=.o)
- DEPENDS=$(OBJECTS:.o=.d)
- RESOURCES= resources/resource.rc
-@@ -39,19 +39,19 @@ all: prepare $(EXECUTABLE)
- prepare: $(LIBS) $(SOURCES)
- 
- $(EXECUTABLE): $(OBJECTS) $(LIBS)
--	$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -o $@
-+	$(CPP) $(OBJECTS) $(LIBS) -ludis86 $(WXLDFLAGS) ${LDFLAGS} -o $@
- 
- .cpp.o:
--	$(CPP) $(CXXFLAGS) $< -o $@
-+	$(CPP) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@
- 
- %.o : %.rc
- 	$(RC) $(RCFLAGS) $< -o $@
- 
--udis86/libudis86/.libs/libudis86.a:
--	echo Please make sure if libudis86 build for your host to avoid link time errors!
--	cd udis86;./autogen.sh
--	cd udis86;./configure
--	cd udis86/libudis86; $(MAKE) $(MFLAGS)
-+#udis86/libudis86/.libs/libudis86.a:
-+#	echo Please make sure if libudis86 build for your host to avoid link time errors!
-+#	cd udis86;./autogen.sh
-+#	cd udis86;./configure
-+#	cd udis86/libudis86; $(MAKE) $(MFLAGS)
- 
- hashlibpp/src/libhl++.a:
- 	echo "Please make sure if libudis86 build for your host to avoid link time errors!"
-@@ -61,10 +61,10 @@ win: prepare $(RESOURCES) $(EXECUTABLE_WIN)
- 
- #Stack override required for file comparison function...
- $(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ)
--	$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,5242880 -o $@
-+	$(CPP) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(WXLDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,5242880 ${LDFLAGS} -o $@
- 
- maclink: $(OBJECTS)
--	$(CPP) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -o $(EXECUTABLE)
-+	$(CPP) $(OBJECTS) $(LIBS) $(WXLDFLAGS) -lexpat ${LDFLAGS} -o $(EXECUTABLE)
- 
- mac: prepare maclink
- 	mkdir -p $(EXECUTABLE_DIR_MAC)/Contents
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch
new file mode 100644
index 000000000000..aa2bb39bf85a
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.21-desktop-validation.patch
@@ -0,0 +1,17 @@
+--- a/resources/wxHexEditor.desktop
++++ b/resources/wxHexEditor.desktop
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+-Version=v1.0
++Version=1.0
+ Encoding=UTF-8
+ Name=wxHexEditor
+ GenericName=wxHexEditor
+ Comment=A hex editor for huge files and devices
+ Exec=wxHexEditor
+-Icon=wxHexEditor.png
++Icon=wxHexEditor
+ Terminal=false
+ Type=Application
+-MimeType=*
+ Categories=Utility;TextEditor;
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch
new file mode 100644
index 000000000000..34efd652abbe
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.21-makefile.patch
@@ -0,0 +1,107 @@
+- respect CXXFLAGS/LDFLAGS
+- install into /usr
+- use system mhash and udis86
+
+--- a/makefile
++++ b/makefile
+@@ -1,8 +1,8 @@
+ WXCONFIG = wx-config
+ CC = `$(WXCONFIG) --cc`
+ CXX = `$(WXCONFIG) --cxx`
+-CXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS}
+-LDFLAGS = `$(WXCONFIG) --libs`
++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -O2 -c ${OPTFLAGS}
++WXLDFLAGS = `$(WXCONFIG) --libs`
+ RC = `$(WXCONFIG) --rescomp`
+ #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
+ RCFLAGS = `$(WXCONFIG) --cxxflags | sed s/' '-m.*//g;`
+@@ -21,7 +21,7 @@ SOURCES= src/HexEditorGui.cpp \
+ 			src/HexEditorCtrl/wxHexCtrl/Tag.cpp\
+ 			src/HexEditorCtrl/HexEditorCtrlGui.cpp\
+ 			src/HexEditorFrame.cpp
+-LIBS = udis86/libudis86/.libs/libudis86.a mhash/lib/.libs/libmhash.a
++LIBS = -ludis86 -lmhash
+ OBJECTS=$(SOURCES:.cpp=.o)
+ DEPENDS=$(OBJECTS:.o=.d)
+ LANGUAGEDIRS=tr
+@@ -32,7 +32,7 @@ EXECUTABLE=wxHexEditor
+ EXECUTABLE_WIN=$(EXECUTABLE).exe
+ EXECUTABLE_DIR_MAC=$(EXECUTABLE).app
+ 
+-PREFIX      = /usr/local
++PREFIX      = /usr
+ BINDIR      = $(PREFIX)/bin
+ DATADIR     = $(PREFIX)/share
+ LOCALEDIR   = $(DATADIR)/locale
+@@ -46,10 +46,10 @@ $(OBJECTS): $(LIBS) $(SOURCES)
+ MOBJECTS=$(LANGUAGES:.po=.mo)
+ 
+ $(EXECUTABLE): $(OBJECTS)
+-	$(CXX) $(OBJECTS) $(LIBS) $(LDFLAGS) -lgomp -o $@
++	$(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lgomp -o $@
+ 
+ .cpp.o: $(LIBS)
+-	$(CXX) $(CXXFLAGS) $< -o $@
++	$(CXX) $(WXCXXFLAGS) ${CXXFLAGS} $< -o $@
+ 
+ %.o : %.rc
+ 	$(RC) $(RCFLAGS) $< -o $@
+@@ -59,23 +59,14 @@ langs: $(MOBJECTS)
+ %.mo : %.po
+ 	$(MSGFMT) $< -o $@
+ 
+-udis86/libudis86/.libs/libudis86.a:
+-	cd udis86;./autogen.sh
+-	cd udis86;./configure --host=$(HOST)
+-	cd udis86/libudis86; $(MAKE) $(MFLAGS)
+-
+-mhash/lib/.libs/libmhash.a:
+-	cd mhash; ./configure --host=$(HOST)
+-	cd mhash; $(MAKE) $(MFLAGS)
+-
+ win: $(RESOURCES) $(EXECUTABLE_WIN)
+ 
+ #Stack override required for file comparison function...
+ $(EXECUTABLE_WIN): $(OBJECTS) $(RESOURCE_OBJ)
+-	$(CXX) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) $(LDFLAGS) -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@
++	$(CXX) $(OBJECTS) $(RESOURCE_OBJ) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -static-libgcc -static-libstdc++ -Wl,--stack,32000000 -o $@
+ 
+ maclink: $(OBJECTS)
+-	$(CXX) $(OBJECTS) $(LIBS) $(LDFLAGS) -lexpat -lgomp -Wl,-stack_size,0x2000000 -o $(EXECUTABLE)
++	$(CXX) $(OBJECTS) $(LIBS) ${CXXFLAGS} $(WXLDFLAGS) ${LDFLAGS} -lexpat -lgomp -Wl,-stack_size,0x2000000 -o $(EXECUTABLE)
+ 
+ mac: maclink langs
+ 	mkdir -p $(EXECUTABLE_DIR_MAC)/Contents
+--- a/src/HexDialogs.cpp
++++ b/src/HexDialogs.cpp
+@@ -24,7 +24,7 @@
+ #define NANINT 0xFFFFFFFFFFFFFFFFLL
+ #include "HexDialogs.h"
+ #include <wx/progdlg.h>
+-#include "../mhash/include/mhash.h"
++#include <mhash.h>
+ 
+ #ifdef _OPENMP
+    #include <omp.h>
+--- a/src/HexEditor.h
++++ b/src/HexEditor.h
+@@ -25,7 +25,7 @@
+ #ifndef _wxHexEditor_h_
+ #define _wxHexEditor_h_
+ 
+-#include "../mhash/include/mhash.h"
++#include <mhash.h>
+ 
+ #include <wx/ffile.h>
+ #include <wx/clipbrd.h>
+--- a/src/HexPanels.h
++++ b/src/HexPanels.h
+@@ -27,7 +27,7 @@
+ #include "HexEditorFrame.h"
+ #include "HexEditorCtrl/HexEditorCtrl.h"
+ #include "HexEditorCtrl/wxHexCtrl/wxHexCtrl.h"
+-#include "../udis86/udis86.h"
++#include <udis86.h>
+ 
+ #ifdef WX_GCH
+ #include <wx_pch.h>
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.11.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild
index 4a966d4aef3d..80bccd2624a6 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.11.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/wxhexeditor-0.11.ebuild,v 1.1 2011/08/19 04:44:27 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/wxhexeditor-0.21.ebuild,v 1.1 2013/03/16 20:36:53 dirtyepic Exp $
 
-EAPI="4"
+EAPI="5"
 WX_GTK_VER="2.8"
 
 inherit eutils toolchain-funcs wxwidgets
@@ -18,13 +18,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-libs/udis86
+DEPEND="app-crypt/mhash
+	dev-libs/udis86
 	x11-libs/wxGTK:2.8[X]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}"
 
+pkg_pretend() {
+	tc-has-openmp \
+		|| die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
+}
+
 src_prepare() {
+	# parts sent upstream : https://sourceforge.net/p/wxhexeditor/patches/8/
 	epatch "${FILESDIR}"/${P}-makefile.patch
-	tc-export CXX
+	# sent upstream : https://sourceforge.net/p/wxhexeditor/patches/9/
+	epatch "${FILESDIR}"/${P}-desktop-validation.patch
 }