gentoo resync : 15.12.2019

7 files changed, 155 insertions, 84 deletions

diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index a585e5f95493..9abf6c0107a0 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,6 +1,9 @@
-DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33732d34f01c56475b70cff4e6f479908b0fbfaf418625be8ca2fcb45ac9805f725e1e6eb7eb66a899d754446445e29 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7
+AUX edb-debugger-1.0.0-climits.patch 607 BLAKE2B eb1a58c250308ca84a145f0a1333314437b9d6fb8636db8a5f6f46c6627d464f566a1d629391d5475e62ace85ffb94c387efe084301744a3a7b43ff70a25c851 SHA512 812f33bb0ed0ee83a57179701bdf8e25d70e9de73aa6f6d5c36674e4f16a124926940ce584f08537b4553749996e7c7d346bc42a8803a51ba3bbbfc968262ecf
+AUX edb-debugger-1.0.0-man1.patch 814 BLAKE2B d4c9540e0ec31b3a18d36126f92ebf850d3ca9768e6ae3d5c92d1f712f2a6542b72fe6c50dd30033a380cded0500996554c78fc0255179ade6dafdea66ce9673 SHA512 20b777ca2dd249140895658c610f74d770c757a8327f73bed7754de11bb6c50faa6fcbc71fc12ead9857f22fbc5dc20e950d2f1b1308565c02cd32fca789fc97
 DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9
-EBUILD edb-debugger-0.9.21.ebuild 2064 BLAKE2B 5e72e1670db4ef64d840a0d41f0b961fdd63003d40b06c92f129e0f63a1f5e0e7a051219bef9eb0b2826c020a943bda6a952e6c4a1ed5dd5392197e0d0216385 SHA512 3057033e815a93d42558904216f22ffae56d0a3a8afa99c0b000060cd185ae52059f87ce904f5fa9c1149f37536a1b1b6c61c0ad72e6ad0980d637fd80fc640f
+DIST edb-debugger-1.1.0.tgz 1244028 BLAKE2B 87311a53f445acb28569952541269ef5ae83219468e18bc1603b6d85225b75fd00723593891e309ccf8c8c3e7a0828cd709444fe27f3328cf4386ed3e1245bea SHA512 5834cf091cd6d84ecc10cec277ec954b936dc61b0809d5f434ba4d604fae63c06ac10852f1a4ea81f150dea82645fa0861d8842eea227cbde681a895c465d744
 EBUILD edb-debugger-1.0.0-r2.ebuild 1090 BLAKE2B 5ff08750c0014efabd46d0531035f4c7761f5c2f3c111f317a938b942720e5b8f8c78eac555803ffd4af5db32991a48f1497c1029b6e847298651bb7c9fb1864 SHA512 cad7a47d3511372561eb62186b18272c4750f05f84fcffc01dff3f35ff3886f15d026add49dc785a1b03dcdf5594574610f3bbc967999ef5720e17d16a7cd55c
+EBUILD edb-debugger-1.0.0-r3.ebuild 1168 BLAKE2B af6bd89216181d5a7130bf0967483feac79fc5f63b0b446584405e61515fb89c13ada298bb6fd0e1a079e099c08ee0cdd31d657896496d282b9b01c391e6490e SHA512 b33c9ec836553ebca21238a27cba961480cac68a6981431c00bf2c7e18e19d17b712bf4ed7dde401947f4210be0a89f1cc9efb45a7761c29a0d483b7e108830f
+EBUILD edb-debugger-1.1.0.ebuild 1110 BLAKE2B 6eb994d8bb43c53ae568d88f313e4ce7a0d80d8608ec46dc14c69040d108e159df59080462f46dd2426d9dcc62f9011e84e77b7404149c194c760ab99ca64f94 SHA512 907ff2348a0a9f23822f97bc4a8f5374158a6ac13d6f2cef65ea4d0d5ef9aeb8681b67eb3c5f687401642adb2dd90b7893fae6ffaa8dae6bc374cb50ec314fa9
 EBUILD edb-debugger-9999.ebuild 922 BLAKE2B f2d5453d64c1608e64832bdcb30c1fb4c8f7af715f9b3b901c193c1149222b16e39361069b61599a47b5a184c884ccfae9575741b25da8d0fb6657fcfa9c88ec SHA512 48f54cc3d2c7b1a536cabfcbb279f846e5edee2fea578a9bc1e0f2eaf442428189c98ea3cc2b8ed184d2517bebc5bcb89d9b24aa4dd04c177a71b45d69b291ed
-MISC metadata.xml 625 BLAKE2B 892c86b51532607c2387d664df6d8d468f1dfe1de27475d4e528a63c04271daf586dd5be8c70e202a7dbadd7c36e9f8e9da970df1cc56ed0c8c9e36e0bd46805 SHA512 7e399f334c4462f200e10c482110de80940ad5f28b6965a227436b6e2122e574531745c3e4dd64f95490797ac537264cc93c96e5293d57fbd657939241b0fe4c
+MISC metadata.xml 580 BLAKE2B ca6847b4ec53715b5d408e36acf6753a8da4bfb7f8da771bab017daaa92c6b7d34e9100662e209626d49e9a45d1b0624015f46ef83aac0db1b23902521731aaf SHA512 75333f5eba045b2a70efd901680f80781291e85ee3498fb65e9ac8eabf6ba466525eb0f87093d1f173742b01e53d50a8bc874a2a83689c2ae62e90a7dbcbe077
diff --git a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild b/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
deleted file mode 100644
index e6f1a158575f..000000000000
--- a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
-HOMEPAGE="https://github.com/eteran/edb-debugger"
-
-LICENSE="GPL-2+"
-IUSE="graphviz legacy-mem-write pax_kernel"
-SLOT="0"
-
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/edb-debugger-${PV}"
-
-RDEPEND="
-	>=dev-libs/capstone-3.0
-	graphviz? ( media-gfx/graphviz )
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5
-	"
-DEPEND="
-	dev-libs/boost
-	virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare() {
-	#Remove this in a future version; There won't be any edb48-logo.png
-	sed -i  '/edb48-logo/d' CMakeLists.txt || die
-
-	#Make the desktop's entries somewhat cuter
-	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
-	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_DISABLE_FIND_PACKAGE_GRAPHVIZ=$(usex !graphviz)
-		-DQT_VERSION=Qt5
-	)
-	if use pax_kernel || use legacy-mem-write; then
-		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=Yes )
-	else
-		mycmakeargs+=( -DASSUME_PROC_PID_MEM_WRITE_BROKEN=No )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cd src/images/ || die
-	newicon "edb48-logo.png" "edb.png"
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use legacy-mem-write; then
-		ewarn "You really do not want to turn on legacy-mem-write unless you need it."
-		ewarn "Be sure to test without legacy-mem-write first and only enable if you actually need it."
-	else
-		ewarn
-		ewarn "If you notice that EDB doesn't work correctly, enable legacy-mem-write USE Flag"
-		ewarn "Please Report Bugs & Requests At: https://github.com/eteran/edb-debugger/issues"
-		ewarn
-	fi
-}
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
new file mode 100644
index 000000000000..c5dadbd7bf7f
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
+SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+	dev-libs/capstone:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	graphviz? ( media-gfx/graphviz )
+"
+
+DEPEND="
+	dev-libs/boost
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-man1.patch
+	"${FILESDIR}"/${P}-climits.patch
+)
+
+src_prepare() {
+	#Make the desktop's entries somewhat better
+	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
+	if ! use graphviz; then
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild
new file mode 100644
index 000000000000..5b720ad3e0d6
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.1.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
+HOMEPAGE="https://github.com/eteran/edb-debugger"
+SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="graphviz"
+
+RDEPEND="
+	dev-libs/capstone:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	graphviz? ( media-gfx/graphviz )
+"
+
+DEPEND="
+	dev-libs/boost
+	virtual/pkgconfig
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	#Make the desktop's entries somewhat better
+	sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
+	sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
+
+	if ! use graphviz; then
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
new file mode 100644
index 000000000000..929492ae670f
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.0.0-climits.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/701112
+
+From f5e0bce1c1d33e11062fd61a3bbad52ee18e8a8b Mon Sep 17 00:00:00 2001
+From: Evan Teran <evan.teran@gmail.com>
+Date: Mon, 15 Jul 2019 14:44:25 -0400
+Subject: [PATCH] fix for issue #719
+
+---
+ src/ByteShiftArray.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/ByteShiftArray.cpp
++++ b/src/ByteShiftArray.cpp
+@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+ #include "ByteShiftArray.h"
++#include <climits>
+ 
+ //------------------------------------------------------------------------------
+ // Name: ByteShiftArray
+-- 
+2.24.0
+
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
new file mode 100644
index 000000000000..92625ac3701a
--- /dev/null
+++ b/dev-util/edb-debugger/files/edb-debugger-1.0.0-man1.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/701080
+
+From c84c5a28adaacaeee65a20e1bd8a90762cbe843c Mon Sep 17 00:00:00 2001
+From: Ruslan Kabatsayev <b7.10110111@gmail.com>
+Date: Thu, 5 Jul 2018 23:45:03 +0300
+Subject: [PATCH] Fix installation path of the man page
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,6 +123,6 @@ endif()
+ add_subdirectory(src)
+ add_subdirectory(plugins)
+ 
+-install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
++install (FILES ${CMAKE_SOURCE_DIR}/edb.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ install (FILES ${CMAKE_SOURCE_DIR}/edb.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/)
+ install (FILES ${CMAKE_SOURCE_DIR}/src/images/edb.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/)
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index d22e537d27af..6506dc772361 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -9,9 +9,11 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
 	<use>
-	<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
-	<flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag>
-	<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+		<flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag>
 	</use>
 </pkgmetadata>