gentoo resync : 06.01.2018

4 files changed, 6 insertions, 135 deletions

diff --git a/app-editors/wxhexeditor/Manifest b/app-editors/wxhexeditor/Manifest
index 82df1de13820..9c01e27e7d72 100644
--- a/app-editors/wxhexeditor/Manifest
+++ b/app-editors/wxhexeditor/Manifest
@@ -1,7 +1,4 @@
-AUX wxhexeditor-0.23-syslibs.patch 2587 BLAKE2B 157759185c8a5c8f93dea51a118c2c9648340c64bdc785e54cbefc2cc6b3213601ad4d21bf94544cbe7db43f0514315e63bb4ad083fbc87dbeff60147c0b353f SHA512 243fe4573d442e66e41fdc1c73c2038bb802cd0822762de30b44c77e4ec15632a03cc06a7694ee45ac81f2c895fe283ef8d30996df9de8cd682dbd9359f805b2
 AUX wxhexeditor-0.24-syslibs.patch 2458 BLAKE2B 65dc8a710fb33826b5ae9a9ae2b31cdf58e58252aa4be8df37a4e18495faaaee066c95f1b527d91c71b9b38d8123cc1cac91e9e0386a67ed77b0b8e24ad43016 SHA512 658526b38bb3e3313174ac464711ccceb3606e38e6826c62b4dcb5dca79c6ef32c6d7c84e883035572431eebaf0b7e2ace154df406f2338f39aace84d9fe9403
-DIST wxHexEditor-v0.23-src.tar.bz2 2534659 BLAKE2B 932b2d9ab14dee71b5f5f57d89bc71c190c136c106339563ade44ea47e47819c4fdb32511296c14b3bebdfedd55a331c74e9a722e1d54e22ba53d203f753b57d SHA512 abbd2338c2d0d7d514342f5c330ea42c9ee1f3489c4661426927f51c802a7806e4ee965fa5d467c7b928ba87395eb6c351ab5f43f18d5fce836adede5f1d6be4
 DIST wxHexEditor-v0.24-src.tar.xz 900868 BLAKE2B 6748249d75e7570197a6c78378a8f3109bfa4c72bf32fe63e2abd31734d97fda3d56ecddb52ac5f9a18cc77b2c727f8277688f1bf75ef8f665a3a9cefd1cb8a6 SHA512 8589da169c90cca5abf6ba957d5c5e17e4211123dbdbaf0e04d31757113e7e302d40df58144ec25d431c7c4ce2fa2721b16621d03630ac8b90478c704a8c5b09
-EBUILD wxhexeditor-0.23.ebuild 1016 BLAKE2B 8c28390aafa8d8c3976b6c5aeede19cd3b8e2001a87194329d978c4bedb0a8856c448bf3d28a4105d070b0395c7dbf422022063f2c9f4d759ae77786564b487b SHA512 7226c5c5f9f3e4e58d2f82707b6a6cdfce5ec1b0eaedded0da033e149b06b0811f323e2d32eb698c222a6209a78a98f5c70eb74b976520e5d4044cd02369016a
-EBUILD wxhexeditor-0.24.ebuild 759 BLAKE2B 28a33de33abec1d86cdd8fb414ef56fd14f76b9f88307e268a2d8e012f36eae9eb2a6e3ef80e443be5e37c47ff3c4441eb9c6a37bb927e4395785c835e0dffe8 SHA512 2691699ea8b2ae58e5580349ec1415bcb4269ca68c1d84a6df01f1d73db8a6c06de239d12c0a9c35149f12be653efeca24b4d8268dda4e3d865f99e753d30cc9
+EBUILD wxhexeditor-0.24.ebuild 780 BLAKE2B f956a2b44390a6a3d673778d06f63af8747cd200dd01858ca8b3de527e52b2c19d4cee9dabffce2fd6827e9336fca1076ae56fef4282160686163748be067407 SHA512 a8027cecbedf4a9ace1d163bbc14d29941f53f20844b4eea0a845076b9d8440376c4c87728bd88d53a5dd5a470f0279a0cea639e54a37a4786ad06e566606732
 MISC metadata.xml 352 BLAKE2B 6b049a05b438e20e604ed3c93e89e66d5f18cb0dc7322a9f4d5cdd976ba074b625b162baa30ff8b2276429826caec1d22a757945e14a845be3b6bfe9eaeb69b3 SHA512 918e551de8f159920d7d98010dc748efb0e9a79c9a11f6d6fcd44127d3779a66510da18cbccc69a974472bf3f230fd5cadbc15665a4a3710b8c1b92237725f6a
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch
deleted file mode 100644
index 341c63bd8dd5..000000000000
--- a/app-editors/wxhexeditor/files/wxhexeditor-0.23-syslibs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Use system copies of mhash and udis86.
-Also pass -fopenmp when linking to avoid build errors.
-
---- a/Makefile
-+++ b/Makefile
-@@ -3,9 +3,9 @@ WXCONFIG = wx-config
- #CXX ?= `$(WXCONFIG) --cxx`
- CC = `$(WXCONFIG) --cc`
- CXX = `$(WXCONFIG) --cxx`
--LDFLAGS += -lgomp
-+LDFLAGS += -fopenmp -lgomp
- #add this ldflags for WinConsole  "-Wl,--subsystem,console -mconsole" for win-debug
--WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -Iudis86 -Imhash/include -MMD -fopenmp
-+WXCXXFLAGS= `$(WXCONFIG) --cxxflags` -MMD -fopenmp
- WXLDFLAGS = `$(WXCONFIG) --libs` `$(WXCONFIG) --libs aui` `$(WXCONFIG) --libs core`
- RC = `$(WXCONFIG) --rescomp`
- #RC = x86_64-w64-mingw32-windres --define WX_CPU_AMD64
-@@ -25,7 +25,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=`ls -l ./locale | grep ^d | sed s/.*\ //g;`
-@@ -36,7 +36,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
-@@ -63,15 +63,6 @@ langs: $(MOBJECTS)
- %.mo : %.po
- 	$(MSGFMT) $< -o $@
- 
--udis86/libudis86/.libs/libudis86.a:
--	cd udis86;./autogen.sh
--	cd udis86;./configure --host=$(HOST) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)"
--	cd udis86/libudis86; $(MAKE) $(MFLAGS)
--
--mhash/lib/.libs/libmhash.a:
--	cd mhash; ./configure --host=$(HOST) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)"
--	cd mhash; $(MAKE) $(MFLAGS)
--
- win: $(RESOURCES) $(EXECUTABLE_WIN)
- 
- #Stack override required for file comparison function...
---- 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.23.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.23.ebuild
deleted file mode 100644
index 21b74845f48d..000000000000
--- a/app-editors/wxhexeditor/wxhexeditor-0.23.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="ar cs de es fr hu_HU it ja_JP nl_NL pl pt_BR ro ru tr zh_CN"
-
-inherit eutils l10n 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:3.0[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() {
-	WX_GTK_VER="3.0" need-wxwidgets unicode
-	epatch "${FILESDIR}"/${P}-syslibs.patch
-
-	do_kill_locale() {
-		rm -r "${S}"/locale/${1}
-	}
-
-	rm "${S}"/locale/wxHexEditor.pot
-	l10n_find_plocales_changes "${S}"/locale '' ''
-	l10n_for_each_disabled_locale_do do_kill_locale
-}
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
index a9a2abcec259..517f24a35eb8 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
@@ -30,8 +30,11 @@ PATCHES=(
 )
 
 pkg_pretend() {
-	tc-has-openmp \
-		|| die "${PN} uses OpenMP libraries. Please use an OpenMP-capable compiler."
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && tc-check-openmp
 }
 
 src_prepare() {