gentoo resync : 25.08.2018

5 files changed, 74 insertions, 44 deletions

diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 736b8cbb5ea2..900b2c435d60 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,4 +1,6 @@
 DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33732d34f01c56475b70cff4e6f479908b0fbfaf418625be8ca2fcb45ac9805f725e1e6eb7eb66a899d754446445e29 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7
-EBUILD edb-debugger-0.9.21.ebuild 2109 BLAKE2B f8412190b29713ca51b90cc322a92974a879c897c79d7145c3e0fb79d2f9c46b333064a4f2538b4a515f5131dbd38f939fb65192e9d7996458d7df03fec55f0e SHA512 d1d932deeb4109438e97c4b8417b3fa493d40a86e3582ace599097047691d1c6148ac3b62ec1b500af25171db3cfd790a8b67bb04289ae5ac7c819b0dc836def
-EBUILD edb-debugger-9999.ebuild 1238 BLAKE2B a31e56662cb09b439fcbad13011e05a931fc05f6099793336c9b74e6cde709b86a1e6d85b9b8e7c2eb66e8eacb627581313f1968ae5ef95ba84b56a5c6133bf2 SHA512 24763b7327d5d23dff879bd230c0c56c0a88dd6a7fb94c13699ce6b45c371bbf6d27c8b72736e26f25877758f004e4d46997858349a36b00ef96d701bddb459b
-MISC metadata.xml 688 BLAKE2B eaf7922cca384a33aa16e2593ecaed8de0eab807ed8781c9bb8bba754d82ef2234b74e75ca77817f5a568bd044949572bfdeee9d9ab5981c79fd3952ff587a5b SHA512 f83568251c245ecc4b3c2aebebd461e5ef765f79736a97c230bd58bdfa4da3643aa2e9fc6ca2b80eacf81ec2af6c1102c5f432002505ac6ad7977675aa629d65
+DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9
+EBUILD edb-debugger-0.9.21.ebuild 2064 BLAKE2B 5e72e1670db4ef64d840a0d41f0b961fdd63003d40b06c92f129e0f63a1f5e0e7a051219bef9eb0b2826c020a943bda6a952e6c4a1ed5dd5392197e0d0216385 SHA512 3057033e815a93d42558904216f22ffae56d0a3a8afa99c0b000060cd185ae52059f87ce904f5fa9c1149f37536a1b1b6c61c0ad72e6ad0980d637fd80fc640f
+EBUILD edb-debugger-1.0.0.ebuild 1096 BLAKE2B 3f73167ba37b9d4bc277fbf53fddc96bfb98b9f301be40cc322accc063437ef5d7001732b5868d6fb57ad469a460b220c486ec1e1322af4b3008dada35d7c86a SHA512 460c78cf689eea5eeef7811bd609bf950b68aff1151ad562477c039ab8317407a826dd5e28e036acbb7cf43e8dfc00f1f17d709c9daedc2a8d47133eaef7d852
+EBUILD edb-debugger-9999.ebuild 787 BLAKE2B be915dd9ce1d585bf4852a928f262bd37d03df3d61f9aa237bfb11f359b3f2a464d12ced3b24dd908c8ce38aae78a2b19469ab911a1d1811dfe6ff88062eb0c4 SHA512 ca50d50f061e1373c7b5177cef7cea6c5878f449b7877324ef963b37d3e93d97ed4f9ff9f7fbfc235bc339b4beebafbed796838b04d234e87a1f6714be7c542f
+MISC metadata.xml 601 BLAKE2B d91cda94777a8c5d1332e28b7cb643c59271d2442b3aef592b4ba097bd953693107e32803f23a5f2666a6cacf142ca87c0881cfc00a99f70b5a043755a14935b SHA512 76dd4c92c4a5463273ae8c8f9568e1ca330f709900a16247a7e8dc1035e3530c358c2573953d75845b442f63e965b3584ca7fa9f2fb75b55aa4985e13d3cbede
diff --git a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild b/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
index 8d159b715b63..e6f1a158575f 100644
--- a/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-0.9.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ S="${WORKDIR}/edb-debugger-${PV}"
 
 RDEPEND="
 	>=dev-libs/capstone-3.0
-	graphviz? ( >=media-gfx/graphviz-2.38.0 )
+	graphviz? ( media-gfx/graphviz )
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
@@ -29,11 +29,11 @@ RDEPEND="
 	dev-qt/qtcore:5
 	"
 DEPEND="
-	>=dev-libs/boost-1.35.0
+	dev-libs/boost
 	virtual/pkgconfig
 	${RDEPEND}"
 
-src_prepare(){
+src_prepare() {
 	#Remove this in a future version; There won't be any edb48-logo.png
 	sed -i  '/edb48-logo/d' CMakeLists.txt || die
 
@@ -41,15 +41,13 @@ src_prepare(){
 	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 '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
-	fi
 	cmake-utils_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=(
+	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
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0.ebuild
new file mode 100644
index 000000000000..19371dd7bdb6
--- /dev/null
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+S="${WORKDIR}/${P}"
+
+RDEPEND="
+	dev-libs/capstone
+	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() {
+	#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-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index 800b7d58d535..43268a0bddf5 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,16 +7,16 @@ inherit cmake-utils git-r3
 
 DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
 HOMEPAGE="https://github.com/eteran/edb-debugger"
+EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
 
 LICENSE="GPL-2+"
-IUSE="debug graphviz"
 SLOT="0"
-EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
 KEYWORDS=""
+IUSE="graphviz"
 
 RDEPEND="
-	>=dev-libs/capstone-3.0
-	graphviz? ( >=media-gfx/graphviz-2.38.0 )
+	dev-libs/capstone
+	graphviz? ( media-gfx/graphviz )
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
@@ -24,31 +24,17 @@ RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtgui:5
 	dev-qt/qtcore:5
-	"
+"
+
 DEPEND="
-	>=dev-libs/boost-1.35.0
+	dev-libs/boost
 	virtual/pkgconfig
-	${RDEPEND}"
-
-src_prepare(){
-	#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
+	${RDEPEND}
+"
 
+src_prepare() {
 	if ! use graphviz; then
-		sed -i '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
+		sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
 	fi
 	cmake-utils_src_prepare
 }
-
-src_configure() {
-	CMAKE_BUILD_TYPE=Release
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	mycmakeargs+=(
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DQT_VERSION=Qt5
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index 9be9b854d3f5..a940dc098dc5 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -10,11 +10,8 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
-		<flag name="graphviz">Add support for the Graphviz library</flag>
-		<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+	<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
+	<flag name="graphviz">Add support for the Graphviz library</flag>
+	<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">eteran/edb-debugger</remote-id>
-	</upstream>
 </pkgmetadata>