app-editors/wxhexeditor: Version Bump

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 152 insertions, 13 deletions

diff --git a/app-editors/wxhexeditor/ChangeLog b/app-editors/wxhexeditor/ChangeLog
index d44c56e80832..3735548f396e 100644
--- a/app-editors/wxhexeditor/ChangeLog
+++ b/app-editors/wxhexeditor/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2013/03/16 20:36:53 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/wxhexeditor/ChangeLog,v 1.6 2013/06/24 14:22:13 jlec Exp $
+
+*wxhexeditor-0.22 (24 Jun 2013)
+
+  24 Jun 2013; Justin Lecher <jlec@gentoo.org> +wxhexeditor-0.22.ebuild,
+  +files/wxhexeditor-0.22-makefile.patch, metadata.xml:
+  Version Bump
 
 *wxhexeditor-0.21 (16 Mar 2013)
 
diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index 22e35565c211..fe7e9e59fcf0 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,23 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX wxhexeditor-0.20-makefile.patch 3181 SHA256 64ce76772e2b1a2d697afdf08d689d65683a01176ba0c099119a930770c85151 SHA512 da8deb6ee3c51f6009854020c213fca61529c03bb6ebb4cd99b76cd7749c1b7c09375276d67048978a763afcee244b276a4193171275c5de020fe46a98a05f36 WHIRLPOOL 8d5e36c92927659355f9c67bfd3c799b7c2f32c605797064c15ce18ae1c6c68af1da7e60b618ad7fe2910f1e78e5adc2b8f7455464a31493b68f3e36e2dce001
 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
+AUX wxhexeditor-0.22-makefile.patch 2799 SHA256 9f3bacfd18d9e4fd00803691750785d1767f069b10b83ca25ba0e891d2cd4153 SHA512 1a6a66c1e371b7ca54389788e662b307c83c255d52bf60590e78c4bfb87bd585ff7b74ddcb431abf1ec0f61afebacf4579b113cd16fa764f211b9e75a5493844 WHIRLPOOL 67b964b6b679f1755b1cc60be3c65dc6377fe58c9e346441788d67a67c749f0f67c57ff4f601c1ac242fb91e1412026bc23c7de4aa88a21f4384c1c34b918f57
 DIST wxHexEditor-v0.20-src.tar.bz2 1194554 SHA256 a3dda32eb62e3ec1c9760519302bcef688253d48b3d2c566f9629c4e4246ae55 SHA512 f8138fb892528fd7d131b0931f52cb6b19dc984aa831882d7f60f557527e6bb559429a11b5a1307cf51d1a8974123627d15ccee87561970784a75910929f85a3 WHIRLPOOL 9d3343060f815fae7b2512b098c3a1c4853c062040cb2b180bf7402231295d27e96a3996aca041ce2f694f2cc84bb6dfbc419797079713afb254900187d100e0
 DIST wxHexEditor-v0.21-src.tar.bz2 1760192 SHA256 076111ebcf1472e80ec9a16223ca60bdf4598689cc5aa076a4f9760bba51f17f SHA512 bea80a139bb76e47ed5d3644f923b4b042d8842bb3522e88e2c84947eadc7f49f2599438f583ea8a1fde05356886d8fb20f679398e1519c13acd8e4dd49ad729 WHIRLPOOL fd5ebc1609183b8879254461c7eb1a22355a2f71ca45452a6dd21ca8164c5b8b96474d9d1c01b2aea962d4d47c291e3b43d8bf1d337c7bcff6c1c109c3fe29b9
+DIST wxHexEditor-v0.22-src.tar.bz2 2329754 SHA256 3c04725d218d21807ee78ccdd4bc78d302b92139c92bbd0a0edc53f2d0003996 SHA512 d846b30110bf2c864ec8dc45d1a4e9e333ec79379e335d7ecf5c8eed18a22bf2af26de1bcdca1977c94f2789a82c6eaf5fd2c2a91389f4c20f219a974c5e18ac WHIRLPOOL 44988f4349bc78ce7dd975ce7332a72dc5176e3308a9837e0634cce55e029a758488ed1ff07fdcd1f8c64638b0bf86ea8b73cc4c8f7b7400384487eb6bbfea1d
 EBUILD wxhexeditor-0.20.ebuild 857 SHA256 8300f9028368202b2de1daab04e9fdda89416e40dc37aea00a61eb550bedbe20 SHA512 614b555403e0708ef163b4a4cae8914252384e45465fa0ed8f3560243da57828a31386351ed5cdaf8c0db3761bbe2551ad85bb0c9b941e8ac84a353256b9d04e WHIRLPOOL b7ab6bbafc5b02efa805e5b0e6722cb667bee0d646179ddaa17d95863d676f99784dc73d151555363281f16e91e90f76591bb0bc4dbf409d172fa8e879813e53
 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
+EBUILD wxhexeditor-0.22.ebuild 929 SHA256 a9b1980928fc2551c383f91a47e0b9309f9e720d5e51b121ae1d5fc449964abc SHA512 b63d42e352cdb8a0454aec8b40adfcd6f8beb3b352150ea195c081f49f6d5cb1b2c1162d59ee9843d7b3ded844bcc8ea37727c016c0a652ae6e3f7aa3abaebed WHIRLPOOL 151c022daae2c928d9d6591be418dfed5082e3d683a81f418e2bbc7c72361a89bae57881bb9955ca82860357fa5741593b06f04a7f5c4048313d1c25b0ea223f
+MISC ChangeLog 1662 SHA256 f86fa61a5babcfe711b52f569edcf9cb134bf215c4fbb3e4103b306210032969 SHA512 ae4325c2a8e9ca8505de8b7486a9ed9af6571d3b76da9855628ae1cf6dc2a080217afa9778b8079385b9750475641bafb81640c8c7f4b07883b17062f57ae3d3 WHIRLPOOL c4d4c3ee31227f79e52506ddcb1dd45ccbc8a9c87b9315a57aa6e6bca608e9fc45b9940130708b6505a44c31a65954e94a48dc09a28bb309244aacbd9fd1735e
+MISC metadata.xml 164 SHA256 ee70daf030763a4ef5d611ca197732718665799e49fd6ed88766036297fcbb45 SHA512 98709279d2cad53fe1fd05b1cf24b814c4b0f4d011cbb75a92ab7ad4c158a292c74640218c2bf7ccda27855e66be7f24745c2ef9cddf394cf175655f3de541a1 WHIRLPOOL a2c59e64c6f41cb27dec841cacee614a23a88cef2ebaba7f64391ddb0883d780519c7e27ee34380ff7d0db4d1a07bb1a7c18942bba9fbe2ecf770c924f60cef9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRRNppAAoJEO04vUmVeoRjdL0H/iKxWvbDIkxM7un917jG8qfh
-pxNG0vqQSZOak2Q5s4mmBYmY5iasktdrSfc7v2XMPDUOoypa1RS3zLmPXrUFQoBI
-iXL1E3ozy9qCHzqb5nFzboQB1r0AAE+T6xlyPwu9nt6wAuq6QYFZ7A1HKBtVRLla
-cEXWcUc7iW5Z1NwkaIME6b8GI68bf/us3Qx0cTrRPvefaMuk8vYsMYZddaxlHjUx
-AAvoOaPKrok3s8nn9MLIsL7zhZ4mmntnD4CxUILarp4jXR+i5yGb18C3y42y+ar/
-1usvn8vxCtvHQ9o9BvtkLZmIwnWD+ooWWxoybYLCYAITqVElcLRBejVxK7PbSh8=
-=sOA9
+iEYEAREKAAYFAlHIVhcACgkQgAnW8HDreRZMvQCfX/lJG3mWKAcnaCerkn+n6X/0
+5NgAnRxkY0JEBqhtN3KqSGC5905oyYrM
+=Z/ka
 -----END PGP SIGNATURE-----
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch
new file mode 100644
index 000000000000..5e40694487f4
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.22-makefile.patch
@@ -0,0 +1,96 @@
+ Makefile           | 19 +++++--------------
+ src/HexDialogs.cpp |  2 +-
+ src/HexEditor.h    |  2 +-
+ src/HexPanels.h    |  2 +-
+ 4 files changed, 8 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index ead0702..cb80ddf 100755
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,9 @@
+ WXCONFIG = wx-config
+ CC = `$(WXCONFIG) --cc`
+ CXX = `$(WXCONFIG) --cxx`
+-CFLAGS = -O2
+-CXXFLAGS = -O2
+-WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -O2 -c ${OPTFLAGS}
++CFLAGS ?= -O2
++CXXFLAGS ?= -O2
++WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -O2 -c ${OPTFLAGS}
+ WXLDFLAGS = `$(WXCONFIG) --libs`
+ RC = `$(WXCONFIG) --rescomp`
+ #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
+@@ -23,7 +23,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 ru
+@@ -34,7 +34,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
+@@ -61,15 +61,6 @@ langs: $(MOBJECTS)
+ %.mo : %.po
+ 	$(MSGFMT) $< -o $@
+ 
+-udis86/libudis86/.libs/libudis86.a:
+-	cd udis86;./autogen.sh
+-	cd udis86;./configure --host=$(HOST) CC=$(CC) CXX=$(CXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+-	cd udis86/libudis86; $(MAKE) $(MFLAGS)
+-
+-mhash/lib/.libs/libmhash.a:
+-	cd mhash; ./configure --host=$(HOST) CC=$(CC) CXX=$(CXX) CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+-	cd mhash; $(MAKE) $(MFLAGS)
+-
+ win: $(RESOURCES) $(EXECUTABLE_WIN)
+ 
+ #Stack override required for file comparison function...
+diff --git a/src/HexDialogs.cpp b/src/HexDialogs.cpp
+index 133830e..6ea0cc0 100644
+--- 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>
+diff --git a/src/HexEditor.h b/src/HexEditor.h
+index 7946d05..d4e1eb8 100644
+--- 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>
+diff --git a/src/HexPanels.h b/src/HexPanels.h
+index d498fa9..9f2ad5d 100644
+--- 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/metadata.xml b/app-editors/wxhexeditor/metadata.xml
index d89f137c9768..5d8fbd1908c9 100644
--- a/app-editors/wxhexeditor/metadata.xml
+++ b/app-editors/wxhexeditor/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>wxwidgets</herd>
+  <herd>wxwidgets</herd>
 </pkgmetadata>
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.22.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.22.ebuild
new file mode 100644
index 000000000000..c2954e192ecc
--- /dev/null
+++ b/app-editors/wxhexeditor/wxhexeditor-0.22.ebuild
@@ -0,0 +1,38 @@
+# 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.22.ebuild,v 1.1 2013/06/24 14:22:14 jlec Exp $
+
+EAPI="5"
+
+WX_GTK_VER="2.8"
+
+inherit eutils toolchain-funcs wxwidgets
+
+MY_PN="wxHexEditor"
+
+DESCRIPTION="A cross-platform hex editor designed specially for large files."
+HOMEPAGE="http://wxhexeditor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+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
+}