dev-util/edb-debugger: version bump to 1.0.0 and cleanup.

Removed (old) specific versions of Boost and Graphviz.

Package-Manager: Portage-2.3.46, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9344

diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 9d7861b8c7da07b132630147f7e8e93bb22630e9..d3ee7921341ac593e5c8d0ea4ebf78aed2677717 100644 (file)
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1 +1,2 @@
 DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33732d34f01c56475b70cff4e6f479908b0fbfaf418625be8ca2fcb45ac9805f725e1e6eb7eb66a899d754446445e29 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7
+DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9

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 8d159b715b631f8530bd830d97668f3e6a8f44fd..e6f1a158575f5c7bda8a8633ff375e20ce12f616 100644 (file)
--- 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 (file)
index 0000000..19371dd
--- /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 800b7d58d535df4be1258e11ae237c517214beb1..43268a0bddf52f49e9a30a43d3c9448ed70662db 100644 (file)
--- 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 9be9b854d3f505e61ffb88bd6eb672ca5c469e3f..a940dc098dc58ccdce36ddc3b0ff5032761c6b84 100644 (file)
--- 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>