[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2024-01-02 Thread Sam James
commit: ef9bde0dec4c2051bb66d32aede85fac35ac605f
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan  3 06:21:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  3 06:21:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9bde0d

dev-libs/capstone: Stabilize 5.0.1 ppc64, #921234

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/capstone/capstone-5.0.1.ebuild 
b/dev-libs/capstone/capstone-5.0.1.ebuild
index aebb671d55fe..2e024af16add 100644
--- a/dev-libs/capstone/capstone-5.0.1.ebuild
+++ b/dev-libs/capstone/capstone-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,7 +21,7 @@ else
MY_PV="${PV/_rc/-rc}"

SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/

2023-10-15 Thread Conrad Kostecki
commit: 696f585b82a267b1e9b015b8a52789befe327cc0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Oct 10 18:37:52 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Oct 15 22:01:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696f585b

dev-libs/capstone: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33282
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/capstone-5.0_rc2-oob-mem-access.patch| 40 --
 .../files/capstone-5.0_rc2-pkgconfig.patch | 13 ---
 2 files changed, 53 deletions(-)

diff --git a/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch 
b/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch
deleted file mode 100644
index 4e538ef4d5fb..
--- a/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Mario Haustein 
-Date:   Mon Aug 22 18:52:19 2022 +0200
-
-PPC: fix out of bound memory access
-
-closes #1912
-
-Bug: https://bugs.gentoo.org/865151
-Upstream: https://github.com/capstone-engine/capstone/pull/1913
-
-diff --git a/arch/PowerPC/PPCInstPrinter.c b/arch/PowerPC/PPCInstPrinter.c
-index 22eef4ee..a5a30a8b 100644
 a/arch/PowerPC/PPCInstPrinter.c
-+++ b/arch/PowerPC/PPCInstPrinter.c
-@@ -1116,7 +1116,8 @@ static char *stripRegisterPrefix(const char *RegName)
-   char *name = cs_strdup(RegName + 2);
- 
-   // also strip the last 2 letters
--  name[strlen(name) - 2] = '\0';
-+  if(strlen(name) > 2)
-+  name[strlen(name) - 2] = '\0';
- 
-   return name;
-   }
-diff --git a/suite/cstest/issues.cs b/suite/cstest/issues.cs
-index e4fb6cfa..3183f43f 100644
 a/suite/cstest/issues.cs
-+++ b/suite/cstest/issues.cs
-@@ -1,3 +1,11 @@
-+!# issue 1912 PPC register name
-+!# CS_ARCH_PPC, CS_MODE_BIG_ENDIAN, None
-+0x2d,0x03,0x00,0x80 == cmpwi cr2, r3, 0x80
-+
-+!# issue 1912 PPC no register name
-+!# CS_ARCH_PPC, CS_MODE_BIG_ENDIAN, CS_OPT_SYNTAX_NOREGNAME
-+0x2d,0x03,0x00,0x80 == cmpwi 2, 3, 0x80
-+
- !# issue 1839 AArch64 Incorrect detailed disassembly of ldr
- !# CS_ARCH_ARM64, CS_MODE_ARM, CS_OPT_DETAIL
- 0x41,0x00,0x40,0xf9 == ldr x1, [x2] ; operands[0].access: WRITE ; 
operands[1].access: READ

diff --git a/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch 
b/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch
deleted file mode 100644
index 015220a138e8..
--- a/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/capstone.pc.in b/capstone.pc.in
-index 1b559eac..1ffcd354 100644
 a/capstone.pc.in
-+++ b/capstone.pc.in
-@@ -5,7 +5,7 @@ includedir=${prefix}/include
- 
- Name: capstone
- Description: Capstone disassembly engine
--Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
-+Version: 
@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@
- URL: http://www.capstone-engine.org
- archive=${libdir}/libcapstone.a
- Libs: -L${libdir} -lcapstone



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-10-04 Thread Conrad Kostecki
commit: 413037ff293720a019771793c1e1639172409d16
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Oct  4 21:16:11 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Oct  4 21:55:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=413037ff

dev-libs/capstone: drop 5.0_rc2-r2, 5.0_rc2-r3, 5.0_rc4, 5.0

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Conrad Kostecki  gentoo.org>

 dev-libs/capstone/Manifest   |  3 -
 dev-libs/capstone/capstone-5.0.ebuild| 92 ---
 dev-libs/capstone/capstone-5.0_rc2-r2.ebuild | 83 
 dev-libs/capstone/capstone-5.0_rc2-r3.ebuild | 95 
 dev-libs/capstone/capstone-5.0_rc4.ebuild| 91 --
 5 files changed, 364 deletions(-)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 48ab56926ed6..3c41eeac7749 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,5 +1,2 @@
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 
435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9
 SHA512 
7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
 DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 
83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0
 SHA512 
350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5
-DIST capstone-5.0.tar.gz 7636912 BLAKE2B 
8980268415a1e66afb9420a4fd4d94dcb78a7022b62a27d7a95ab0eb21a23fc27e2a2e99c0250133f3ff42c589ea7a5dba59c03175ae8f85fe74a80b52790763
 SHA512 
bb345fe7abaaf4932db93702ce713403aa88d1a63ff931be43f0ef72c5b1a7d17b85df6157fc476e236e009a2bd75cabb2534588387d01b3851e756e6c3e444d
-DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 
2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c
 SHA512 
fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a
-DIST capstone-5.0_rc4.tar.gz 7640978 BLAKE2B 
32f10208ee1789c8818aa321b2d5d11b2aadbc358ae64e862e150d1ddaaa77b9b379175dbbf9c079fb3bc967b40712346e65d7a53003e5dc9ebacab746b821de
 SHA512 
71a685017ad10a25431debe3678e2b29dc3380f78dce3eddaf3ffa26611d1ecc1f191bf930745befc5d45592a8a2887da3a258ab26db460f999d764d3155ac69

diff --git a/dev-libs/capstone/capstone-5.0.ebuild 
b/dev-libs/capstone/capstone-5.0.ebuild
deleted file mode 100644
index f34cfc5ee6a5..
--- a/dev-libs/capstone/capstone-5.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_EXT=1
-DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit cmake distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="https://www.capstone-engine.org/;
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git;
-   EGIT_REPO_BRANCH="next"
-else
-   MY_PV="${PV/_rc/-rc}-post1"
-   
SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
-   S="${WORKDIR}/${PN}-${MY_PV}"
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-LICENSE="BSD"
-SLOT="0/5" # libcapstone.so.5
-
-IUSE="python static-libs test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-BDEPEND="${DISTUTILS_DEPS}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-distutils_enable_tests setup.py
-
-if [[ ${PV} == *_rc* ]]; then
-   # Upstream doesn't flag release candidates (bug 858350)
-   QA_PKGCONFIG_VERSION=""
-fi
-
-wrap_python() {
-   local phase=$1
-   shift
-
-   if use python; then
-   pushd bindings/python >/dev/null || die
-   distutils-r1_${phase} "$@"
-   popd >/dev/null || die
-   fi
-}
-
-src_prepare() {
-   tc-export RANLIB
-   cmake_src_prepare
-
-   wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCAPSTONE_BUILD_TESTS="$(usex test)"
-   )
-   cmake_src_configure
-
-   wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-   cmake_src_compile
-
-   wrap_python ${FUNCNAME}
-}
-
-src_test() {
-   cmake_src_test
-
-   wrap_python ${FUNCNAME}
-}
-
-src_install() {
-   cmake_src_install
-
-   wrap_python ${FUNCNAME}
-
-   if ! use static-libs ; then
-   find "${ED}" -name '*.a' -delete || die
-   fi
-}

diff --git 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-09-26 Thread Sam James
commit: 137df786199a0e9f14dc45e392522ed7be0e8281
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 26 18:25:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 26 18:25:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137df786

dev-libs/capstone: Stabilize 5.0.1 x86, #914745

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0.1.ebuild 
b/dev-libs/capstone/capstone-5.0.1.ebuild
index db641fc0a701..aebb671d55fe 100644
--- a/dev-libs/capstone/capstone-5.0.1.ebuild
+++ b/dev-libs/capstone/capstone-5.0.1.ebuild
@@ -21,7 +21,7 @@ else
MY_PV="${PV/_rc/-rc}"

SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-09-26 Thread Sam James
commit: e3bd05e546dce257e1f5a7d1b9764a8ab1758356
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep 26 17:58:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 26 17:58:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bd05e5

dev-libs/capstone: Stabilize 5.0.1 amd64, #914745

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0.1.ebuild 
b/dev-libs/capstone/capstone-5.0.1.ebuild
index fd6e6133cc4f..db641fc0a701 100644
--- a/dev-libs/capstone/capstone-5.0.1.ebuild
+++ b/dev-libs/capstone/capstone-5.0.1.ebuild
@@ -21,7 +21,7 @@ else
MY_PV="${PV/_rc/-rc}"

SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-09-03 Thread Sam James
commit: 94f2d41b6cfa16a5801bda521a48c6d37b18bdaf
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  3 16:39:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  3 16:39:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f2d41b

dev-libs/capstone: Stabilize 5.0 x86, #913568

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0.ebuild 
b/dev-libs/capstone/capstone-5.0.ebuild
index 1dfff646e4a9..85c0ad8bea5b 100644
--- a/dev-libs/capstone/capstone-5.0.ebuild
+++ b/dev-libs/capstone/capstone-5.0.ebuild
@@ -21,7 +21,7 @@ else
MY_PV="${PV/_rc/-rc}-post1"

SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-09-03 Thread Sam James
commit: f81c1895aa78a8aa78606093f34facaed107f99e
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  3 16:39:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  3 16:39:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81c1895

dev-libs/capstone: Stabilize 5.0 amd64, #913568

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0.ebuild 
b/dev-libs/capstone/capstone-5.0.ebuild
index 85c0ad8bea5b..f34cfc5ee6a5 100644
--- a/dev-libs/capstone/capstone-5.0.ebuild
+++ b/dev-libs/capstone/capstone-5.0.ebuild
@@ -21,7 +21,7 @@ else
MY_PV="${PV/_rc/-rc}-post1"

SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}"
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/, dev-libs/capstone/files/

2023-08-27 Thread Sam James
commit: f8ca69dcc50e60f841b3288e662a388800f6fd58
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Aug 27 16:47:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 28 04:03:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ca69dc

dev-libs/capstone: don't add -Werror to compiler options

Closes: https://bugs.gentoo.org/911481
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/32478
Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-.ebuild |  7 +++
 dev-libs/capstone/files/capstone--werror.patch | 13 +
 2 files changed, 20 insertions(+)

diff --git a/dev-libs/capstone/capstone-.ebuild 
b/dev-libs/capstone/capstone-.ebuild
index fd6e6133cc4f..6d46a0133be7 100644
--- a/dev-libs/capstone/capstone-.ebuild
+++ b/dev-libs/capstone/capstone-.ebuild
@@ -35,6 +35,13 @@ DEPEND="${RDEPEND}
 BDEPEND="${DISTUTILS_DEPS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+PATCHES=(
+   # Currently "-Werror" is only added in the `next`-development branch, 
but
+   # not merged into 5.* releases. Eventually this patch may be needed in
+   # version 5 releas line. See bug #911481.
+   "${FILESDIR}/${P}-werror.patch"
+)
+
 distutils_enable_tests setup.py
 
 if [[ ${PV} == *_rc* ]]; then

diff --git a/dev-libs/capstone/files/capstone--werror.patch 
b/dev-libs/capstone/files/capstone--werror.patch
new file mode 100644
index ..1ec58fa056a3
--- /dev/null
+++ b/dev-libs/capstone/files/capstone--werror.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/911481
+Upstream: https://github.com/capstone-engine/capstone/pull/2114
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -28,7 +28,7 @@ project(capstone
+ if (MSVC)
+ add_compile_options(/W1 /w14189)
+ else()
+-add_compile_options(-Werror -Wformat -Wmissing-braces -Wunused-function 
-Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
++add_compile_options(-Wformat -Wmissing-braces -Wunused-function 
-Warray-bounds -Wunused-variable -Wparentheses -Wint-in-bool-context)
+ endif()
+ 
+ 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-08-25 Thread Sam James
commit: e2c1f28cf5c41f87bb687ac43a06c43929d5eda6
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 26 03:56:49 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 03:56:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c1f28c

dev-libs/capstone: sync live

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-libs/capstone/capstone-.ebuild 
b/dev-libs/capstone/capstone-.ebuild
index 67ee41c5cd22..fd6e6133cc4f 100644
--- a/dev-libs/capstone/capstone-.ebuild
+++ b/dev-libs/capstone/capstone-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
@@ -18,8 +18,9 @@ if [[ ${PV} ==  ]]; then
EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git;
EGIT_REPO_BRANCH="next"
 else
-   
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
-   S=${WORKDIR}/${P/_rc/-rc}
+   MY_PV="${PV/_rc/-rc}"
+   
SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}/${PN}-${MY_PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-08-25 Thread Sam James
commit: 1ca8bac650de5c4a06a9fbf69c5a6ff0c4a94237
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Aug 23 21:16:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 26 03:56:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ca8bac6

dev-libs/capstone: add 5.0.1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/32425
Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/Manifest  |  1 +
 dev-libs/capstone/capstone-5.0.1.ebuild | 92 +
 2 files changed, 93 insertions(+)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 621c1b186bcc..48ab56926ed6 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,4 +1,5 @@
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 
435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9
 SHA512 
7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
+DIST capstone-5.0.1.tar.gz 7654195 BLAKE2B 
83f6681d4c9c748df00daf59f7b33637ab72eee661261c22acae40a6db2def70bb6b5339d731244fdbae6f1e1b0b5b22bb6f60c1390a1bebceb97b3f810aedb0
 SHA512 
350aba77ce2d96b5c25764913591ba80e4497177ae0a8b2c820c6755ee8310848fbfc54e7ccac27fafc2dbc6778118ad92c53d1b5cb601d4fa146dec7d7e11e5
 DIST capstone-5.0.tar.gz 7636912 BLAKE2B 
8980268415a1e66afb9420a4fd4d94dcb78a7022b62a27d7a95ab0eb21a23fc27e2a2e99c0250133f3ff42c589ea7a5dba59c03175ae8f85fe74a80b52790763
 SHA512 
bb345fe7abaaf4932db93702ce713403aa88d1a63ff931be43f0ef72c5b1a7d17b85df6157fc476e236e009a2bd75cabb2534588387d01b3851e756e6c3e444d
 DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 
2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c
 SHA512 
fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a
 DIST capstone-5.0_rc4.tar.gz 7640978 BLAKE2B 
32f10208ee1789c8818aa321b2d5d11b2aadbc358ae64e862e150d1ddaaa77b9b379175dbbf9c079fb3bc967b40712346e65d7a53003e5dc9ebacab746b821de
 SHA512 
71a685017ad10a25431debe3678e2b29dc3380f78dce3eddaf3ffa26611d1ecc1f191bf930745befc5d45592a8a2887da3a258ab26db460f999d764d3155ac69

diff --git a/dev-libs/capstone/capstone-5.0.1.ebuild 
b/dev-libs/capstone/capstone-5.0.1.ebuild
new file mode 100644
index ..fd6e6133cc4f
--- /dev/null
+++ b/dev-libs/capstone/capstone-5.0.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="https://www.capstone-engine.org/;
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git;
+   EGIT_REPO_BRANCH="next"
+else
+   MY_PV="${PV/_rc/-rc}"
+   
SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}/${PN}-${MY_PV}"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+
+IUSE="python static-libs test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+BDEPEND="${DISTUTILS_DEPS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+distutils_enable_tests setup.py
+
+if [[ ${PV} == *_rc* ]]; then
+   # Upstream doesn't flag release candidates (bug 858350)
+   QA_PKGCONFIG_VERSION=""
+fi
+
+wrap_python() {
+   local phase=$1
+   shift
+
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${phase} "$@"
+   popd >/dev/null || die
+   fi
+}
+
+src_prepare() {
+   tc-export RANLIB
+   cmake_src_prepare
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCAPSTONE_BUILD_TESTS="$(usex test)"
+   )
+   cmake_src_configure
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   cmake_src_compile
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   cmake_src_test
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   cmake_src_install
+
+   wrap_python ${FUNCNAME}
+
+   if ! use static-libs ; then
+   find "${ED}" -name '*.a' -delete || die
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-07-31 Thread Joonas Niilola
commit: 682eb65fc6cf2660fe9f99818d5cfed109858815
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jul 31 08:07:10 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 31 08:07:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682eb65f

dev-libs/capstone: enable py3.12

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/capstone/capstone-5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0.ebuild 
b/dev-libs/capstone/capstone-5.0.ebuild
index 009ac6850fc6..1dfff646e4a9 100644
--- a/dev-libs/capstone/capstone-5.0.ebuild
+++ b/dev-libs/capstone/capstone-5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-07-31 Thread Joonas Niilola
commit: d6a379c5709ef8fc3168a0ccd50029ce1e3aad4d
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Jul 12 12:30:55 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jul 31 08:02:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a379c5

dev-libs/capstone: add 5.0

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31849
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/capstone/Manifest|  1 +
 dev-libs/capstone/capstone-5.0.ebuild | 92 +++
 2 files changed, 93 insertions(+)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 1447ad1fc12d..621c1b186bcc 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,3 +1,4 @@
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 
435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9
 SHA512 
7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
+DIST capstone-5.0.tar.gz 7636912 BLAKE2B 
8980268415a1e66afb9420a4fd4d94dcb78a7022b62a27d7a95ab0eb21a23fc27e2a2e99c0250133f3ff42c589ea7a5dba59c03175ae8f85fe74a80b52790763
 SHA512 
bb345fe7abaaf4932db93702ce713403aa88d1a63ff931be43f0ef72c5b1a7d17b85df6157fc476e236e009a2bd75cabb2534588387d01b3851e756e6c3e444d
 DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 
2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c
 SHA512 
fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a
 DIST capstone-5.0_rc4.tar.gz 7640978 BLAKE2B 
32f10208ee1789c8818aa321b2d5d11b2aadbc358ae64e862e150d1ddaaa77b9b379175dbbf9c079fb3bc967b40712346e65d7a53003e5dc9ebacab746b821de
 SHA512 
71a685017ad10a25431debe3678e2b29dc3380f78dce3eddaf3ffa26611d1ecc1f191bf930745befc5d45592a8a2887da3a258ab26db460f999d764d3155ac69

diff --git a/dev-libs/capstone/capstone-5.0.ebuild 
b/dev-libs/capstone/capstone-5.0.ebuild
new file mode 100644
index ..009ac6850fc6
--- /dev/null
+++ b/dev-libs/capstone/capstone-5.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="https://www.capstone-engine.org/;
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git;
+   EGIT_REPO_BRANCH="next"
+else
+   MY_PV="${PV/_rc/-rc}-post1"
+   
SRC_URI="https://github.com/capstone-engine/capstone/archive/${MY_PV}.tar.gz -> 
${P}.tar.gz"
+   S="${WORKDIR}/${PN}-${MY_PV}"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+
+IUSE="python static-libs test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+BDEPEND="${DISTUTILS_DEPS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+distutils_enable_tests setup.py
+
+if [[ ${PV} == *_rc* ]]; then
+   # Upstream doesn't flag release candidates (bug 858350)
+   QA_PKGCONFIG_VERSION=""
+fi
+
+wrap_python() {
+   local phase=$1
+   shift
+
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${phase} "$@"
+   popd >/dev/null || die
+   fi
+}
+
+src_prepare() {
+   tc-export RANLIB
+   cmake_src_prepare
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCAPSTONE_BUILD_TESTS="$(usex test)"
+   )
+   cmake_src_configure
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   cmake_src_compile
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   cmake_src_test
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   cmake_src_install
+
+   wrap_python ${FUNCNAME}
+
+   if ! use static-libs ; then
+   find "${ED}" -name '*.a' -delete || die
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-06-18 Thread John Helmert III
commit: c73b13cec72168163d911d2c59089bab2d0bdca6
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Jun 17 08:09:55 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sun Jun 18 19:01:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c73b13ce

dev-libs/capstone: add 5.0_rc4

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: John Helmert III  gentoo.org>

 dev-libs/capstone/Manifest|  1 +
 dev-libs/capstone/capstone-5.0_rc4.ebuild | 91 +++
 2 files changed, 92 insertions(+)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index b6fb009623c3..1447ad1fc12d 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,2 +1,3 @@
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 
435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9
 SHA512 
7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
 DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 
2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c
 SHA512 
fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a
+DIST capstone-5.0_rc4.tar.gz 7640978 BLAKE2B 
32f10208ee1789c8818aa321b2d5d11b2aadbc358ae64e862e150d1ddaaa77b9b379175dbbf9c079fb3bc967b40712346e65d7a53003e5dc9ebacab746b821de
 SHA512 
71a685017ad10a25431debe3678e2b29dc3380f78dce3eddaf3ffa26611d1ecc1f191bf930745befc5d45592a8a2887da3a258ab26db460f999d764d3155ac69

diff --git a/dev-libs/capstone/capstone-5.0_rc4.ebuild 
b/dev-libs/capstone/capstone-5.0_rc4.ebuild
new file mode 100644
index ..67ee41c5cd22
--- /dev/null
+++ b/dev-libs/capstone/capstone-5.0_rc4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="https://www.capstone-engine.org/;
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git;
+   EGIT_REPO_BRANCH="next"
+else
+   
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
+   S=${WORKDIR}/${P/_rc/-rc}
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+
+IUSE="python static-libs test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+BDEPEND="${DISTUTILS_DEPS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+distutils_enable_tests setup.py
+
+if [[ ${PV} == *_rc* ]]; then
+   # Upstream doesn't flag release candidates (bug 858350)
+   QA_PKGCONFIG_VERSION=""
+fi
+
+wrap_python() {
+   local phase=$1
+   shift
+
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${phase} "$@"
+   popd >/dev/null || die
+   fi
+}
+
+src_prepare() {
+   tc-export RANLIB
+   cmake_src_prepare
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCAPSTONE_BUILD_TESTS="$(usex test)"
+   )
+   cmake_src_configure
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   cmake_src_compile
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   cmake_src_test
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   cmake_src_install
+
+   wrap_python ${FUNCNAME}
+
+   if ! use static-libs ; then
+   find "${ED}" -name '*.a' -delete || die
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-06-18 Thread John Helmert III
commit: 0c65852cfabded4b6f742d2d87cb85d1c9ed9db4
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Jun 17 08:10:34 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sun Jun 18 19:02:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c65852c

dev-libs/capstone: sync live

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31499
Signed-off-by: John Helmert III  gentoo.org>

 dev-libs/capstone/capstone-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-libs/capstone/capstone-.ebuild 
b/dev-libs/capstone/capstone-.ebuild
index ef624cde1cad..67ee41c5cd22 100644
--- a/dev-libs/capstone/capstone-.ebuild
+++ b/dev-libs/capstone/capstone-.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
-DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
 
 inherit cmake distutils-r1 toolchain-funcs
@@ -19,7 +20,7 @@ if [[ ${PV} ==  ]]; then
 else

SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
S=${WORKDIR}/${P/_rc/-rc}
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-03-20 Thread Sam James
commit: ae11af6c17f30b012663831355d842604ed9289d
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 20 21:51:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 20 21:51:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae11af6c

dev-libs/capstone: Stabilize 5.0_rc2-r3 amd64, #902453

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
index 52e6eaa6617a..e93b0919338c 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} ==  ]]; then
 else

SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
S=${WORKDIR}/${P/_rc/-rc}
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-03-20 Thread Sam James
commit: 21babf79c5dce4f357e1c044503f7f09aa4606b0
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 20 21:52:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 20 21:52:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21babf79

dev-libs/capstone: Stabilize 5.0_rc2-r3 x86, #902453

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
index e93b0919338c..c2a407fa7ca8 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} ==  ]]; then
 else

SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
S=${WORKDIR}/${P/_rc/-rc}
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-02-17 Thread Viorel Munteanu
commit: 72e21ed97ef7f7e5a9a2e71e3ea326dc7f91a406
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon Jan 30 23:03:56 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Feb 17 17:25:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e21ed9

dev-libs/capstone: don't install static libraries unconditionally

Closes: https://bugs.gentoo.org/890941
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/29350
Signed-off-by: Viorel Munteanu  gentoo.org>

 .../{capstone-.ebuild => capstone-5.0_rc2-r3.ebuild} | 16 +---
 dev-libs/capstone/capstone-.ebuild   | 11 ---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/dev-libs/capstone/capstone-.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
similarity index 81%
copy from dev-libs/capstone/capstone-.ebuild
copy to dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
index 259fa40dbb50..52e6eaa6617a 100644
--- a/dev-libs/capstone/capstone-.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r3.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit cmake distutils-r1 toolchain-funcs
 
@@ -17,22 +18,27 @@ if [[ ${PV} ==  ]]; then
EGIT_REPO_BRANCH="next"
 else

SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+   S=${WORKDIR}/${P/_rc/-rc}
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
 
-IUSE="python test"
+IUSE="python static-libs test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
 "
+BDEPEND="${DISTUTILS_DEPS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 distutils_enable_tests setup.py
 
-S=${WORKDIR}/${P/_rc/-rc}
+PATCHES=(
+   "${FILESDIR}"/${P}-pkgconfig.patch
+   "${FILESDIR}"/${P}-oob-mem-access.patch
+)
 
 if [[ ${PV} == *_rc* ]]; then
# Upstream doesn't flag release candidates (bug 858350)
@@ -82,4 +88,8 @@ src_install() {
cmake_src_install
 
wrap_python ${FUNCNAME}
+
+   if ! use static-libs ; then
+   find "${ED}" -name '*.a' -delete || die
+   fi
 }

diff --git a/dev-libs/capstone/capstone-.ebuild 
b/dev-libs/capstone/capstone-.ebuild
index 259fa40dbb50..ef624cde1cad 100644
--- a/dev-libs/capstone/capstone-.ebuild
+++ b/dev-libs/capstone/capstone-.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
 
 inherit cmake distutils-r1 toolchain-funcs
 
@@ -17,23 +18,23 @@ if [[ ${PV} ==  ]]; then
EGIT_REPO_BRANCH="next"
 else

SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
+   S=${WORKDIR}/${P/_rc/-rc}
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
 
-IUSE="python test"
+IUSE="python static-libs test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
 "
+BDEPEND="${DISTUTILS_DEPS}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 distutils_enable_tests setup.py
 
-S=${WORKDIR}/${P/_rc/-rc}
-
 if [[ ${PV} == *_rc* ]]; then
# Upstream doesn't flag release candidates (bug 858350)
QA_PKGCONFIG_VERSION=""
@@ -82,4 +83,8 @@ src_install() {
cmake_src_install
 
wrap_python ${FUNCNAME}
+
+   if ! use static-libs ; then
+   find "${ED}" -name '*.a' -delete || die
+   fi
 }



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-01-19 Thread Mike Frysinger
commit: a237f9e56bc6421e374c38cbd821067bf4ff0042
Author: Mike Frysinger  gentoo  org>
AuthorDate: Fri Jan 20 00:03:35 2023 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Jan 20 00:03:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a237f9e5

dev-libs/capstone: use https:// for HOMEPAGE

Signed-off-by: Mike Frysinger  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild   | 2 +-
 dev-libs/capstone/capstone-5.0_rc2-r2.ebuild | 2 +-
 dev-libs/capstone/capstone-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index af978b9b5397..579ef58d9929 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
+HOMEPAGE="https://www.capstone-engine.org/;
 
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
index 145967865032..fe79e806cfad 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
+HOMEPAGE="https://www.capstone-engine.org/;
 
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
 
 LICENSE="BSD"

diff --git a/dev-libs/capstone/capstone-.ebuild 
b/dev-libs/capstone/capstone-.ebuild
index 4adc4be2a941..259fa40dbb50 100644
--- a/dev-libs/capstone/capstone-.ebuild
+++ b/dev-libs/capstone/capstone-.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{9..11} )
 inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
+HOMEPAGE="https://www.capstone-engine.org/;
 
 if [[ ${PV} ==  ]]; then
inherit git-r3



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-01-14 Thread Arthur Zamarin
commit: 765ac09fc7bb9e724117ccf5d368a01b1007ec8e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jan 14 08:04:00 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jan 14 08:04:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765ac09f

dev-libs/capstone: Keyword 5.0_rc2-r2 ppc64, #863782

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
index 7464c02b8b52..764116496c13 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.g
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 
 IUSE="python test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2023-01-04 Thread Sam James
commit: 3c1e535842253bbc891d9607d0b6af220772e82b
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Jan  4 20:15:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  5 05:19:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c1e5358

dev-libs/capstone: drop 5.0_rc2-r1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r1.ebuild | 82 
 1 file changed, 82 deletions(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
deleted file mode 100644
index f8b94f595aef..
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/5" # libcapstone.so.5
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-IUSE="python test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-distutils_enable_tests setup.py
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-PATCHES=(
-   "${FILESDIR}"/${P}-pkgconfig.patch
-)
-
-if [[ ${PV} == *_rc* ]]; then
-   # Upstream doesn't flag release candidates (bug 858350)
-   QA_PKGCONFIG_VERSION=""
-fi
-
-wrap_python() {
-   local phase=$1
-   shift
-
-   if use python; then
-   pushd bindings/python >/dev/null || die
-   distutils-r1_${phase} "$@"
-   popd >/dev/null || die
-   fi
-}
-
-src_prepare() {
-   tc-export RANLIB
-   cmake_src_prepare
-
-   wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCAPSTONE_BUILD_TESTS="$(usex test)"
-   )
-   cmake_src_configure
-
-   wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-   cmake_src_compile
-
-   wrap_python ${FUNCNAME}
-}
-
-src_test() {
-   cmake_src_test
-
-   wrap_python ${FUNCNAME}
-}
-
-src_install() {
-   cmake_src_install
-
-   wrap_python ${FUNCNAME}
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-12-02 Thread WANG Xuerui
commit: d2b770996423bbb411afbeaa82e9dcaee52a0509
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri Dec  2 04:52:42 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Fri Dec  2 10:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b77099

dev-libs/capstone: forward ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-libs/capstone/capstone-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-.ebuild 
b/dev-libs/capstone/capstone-.ebuild
index 762e910dbcef..b36915de6643 100644
--- a/dev-libs/capstone/capstone-.ebuild
+++ b/dev-libs/capstone/capstone-.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} ==  ]]; then
EGIT_REPO_BRANCH="next"
 else

SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-12-02 Thread WANG Xuerui
commit: 5b67c83632e496d950ec9411b971e56d07cc8c0f
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri Dec  2 04:51:58 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Fri Dec  2 10:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b67c836

dev-libs/capstone: keyword 5.0_rc2-r2 for ~loong

Although it's without support for the native arch (i.e. LoongArch), at
least it builds so support can always come in later versions...

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
index 0d7962784225..7464c02b8b52 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.g
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
 
 IUSE="python test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-11-10 Thread Sam James
commit: afb50c69bc5a1f43a35538ee3232e05d19e22d52
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 11 06:30:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 11 06:30:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb50c69

dev-libs/capstone: Stabilize 5.0_rc2-r2 amd64, #880851

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
index 408465885acb..0d7962784225 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.g
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 IUSE="python test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-11-10 Thread Sam James
commit: d84d7afe930bba05c41b431a34e3515a0584766d
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 11 04:25:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 11 04:25:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d84d7afe

dev-libs/capstone: Stabilize 5.0_rc2-r2 x86, #880851

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
index 854077b25d6a..408465885acb 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.g
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
 
 IUSE="python test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/, dev-libs/capstone/files/

2022-10-10 Thread Joonas Niilola
commit: cf6e9c648407a023b5383021d62310d93d60fb70
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Sep  8 06:05:15 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Oct 10 13:10:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6e9c64

dev-libs/capstone: fix out of bound memory access

Closes: https://bugs.gentoo.org/865151
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27188
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r2.ebuild   | 83 ++
 .../files/capstone-5.0_rc2-oob-mem-access.patch| 40 +++
 2 files changed, 123 insertions(+)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
new file mode 100644
index ..854077b25d6a
--- /dev/null
+++ b/dev-libs/capstone/capstone-5.0_rc2-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+IUSE="python test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+PATCHES=(
+   "${FILESDIR}"/${P}-pkgconfig.patch
+   "${FILESDIR}"/${P}-oob-mem-access.patch
+)
+
+if [[ ${PV} == *_rc* ]]; then
+   # Upstream doesn't flag release candidates (bug 858350)
+   QA_PKGCONFIG_VERSION=""
+fi
+
+wrap_python() {
+   local phase=$1
+   shift
+
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${phase} "$@"
+   popd >/dev/null || die
+   fi
+}
+
+src_prepare() {
+   tc-export RANLIB
+   cmake_src_prepare
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCAPSTONE_BUILD_TESTS="$(usex test)"
+   )
+   cmake_src_configure
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   cmake_src_compile
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   cmake_src_test
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   cmake_src_install
+
+   wrap_python ${FUNCNAME}
+}

diff --git a/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch 
b/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch
new file mode 100644
index ..4e538ef4d5fb
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-5.0_rc2-oob-mem-access.patch
@@ -0,0 +1,40 @@
+Author: Mario Haustein 
+Date:   Mon Aug 22 18:52:19 2022 +0200
+
+PPC: fix out of bound memory access
+
+closes #1912
+
+Bug: https://bugs.gentoo.org/865151
+Upstream: https://github.com/capstone-engine/capstone/pull/1913
+
+diff --git a/arch/PowerPC/PPCInstPrinter.c b/arch/PowerPC/PPCInstPrinter.c
+index 22eef4ee..a5a30a8b 100644
+--- a/arch/PowerPC/PPCInstPrinter.c
 b/arch/PowerPC/PPCInstPrinter.c
+@@ -1116,7 +1116,8 @@ static char *stripRegisterPrefix(const char *RegName)
+   char *name = cs_strdup(RegName + 2);
+ 
+   // also strip the last 2 letters
+-  name[strlen(name) - 2] = '\0';
++  if(strlen(name) > 2)
++  name[strlen(name) - 2] = '\0';
+ 
+   return name;
+   }
+diff --git a/suite/cstest/issues.cs b/suite/cstest/issues.cs
+index e4fb6cfa..3183f43f 100644
+--- a/suite/cstest/issues.cs
 b/suite/cstest/issues.cs
+@@ -1,3 +1,11 @@
++!# issue 1912 PPC register name
++!# CS_ARCH_PPC, CS_MODE_BIG_ENDIAN, None
++0x2d,0x03,0x00,0x80 == cmpwi cr2, r3, 0x80
++
++!# issue 1912 PPC no register name
++!# CS_ARCH_PPC, CS_MODE_BIG_ENDIAN, CS_OPT_SYNTAX_NOREGNAME
++0x2d,0x03,0x00,0x80 == cmpwi 2, 3, 0x80
++
+ !# issue 1839 AArch64 Incorrect detailed disassembly of ldr
+ !# CS_ARCH_ARM64, CS_MODE_ARM, CS_OPT_DETAIL
+ 0x41,0x00,0x40,0xf9 == ldr x1, [x2] ; operands[0].access: WRITE ; 
operands[1].access: READ



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-08-27 Thread Sam James
commit: f359a7aaec42a7632d7803a40061e3168a1a2b66
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 27 08:26:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 27 08:27:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f359a7aa

dev-libs/capstone: Stabilize 5.0_rc2-r1 amd64, #866893

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index c50be03fcdbe..f8b94f595aef 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.g
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 IUSE="python test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-08-27 Thread Sam James
commit: ebd67f8c795da47b0947ee55250c6e0648b3b44f
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug 27 08:25:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug 27 08:27:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd67f8c

dev-libs/capstone: Stabilize 5.0_rc2-r1 x86, #866893

Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index 70a870cb34e7..c50be03fcdbe 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.g
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86"
 
 IUSE="python test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-08-15 Thread Sam James
commit: 0de700a0ca9796006c220524aa1535738af45de6
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Aug  5 18:00:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 15 23:10:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de700a0

dev-libs/capstone: add 

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-.ebuild | 85 ++
 1 file changed, 85 insertions(+)

diff --git a/dev-libs/capstone/capstone-.ebuild 
b/dev-libs/capstone/capstone-.ebuild
new file mode 100644
index ..87de60dcff0a
--- /dev/null
+++ b/dev-libs/capstone/capstone-.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git;
+   EGIT_REPO_BRANCH="next"
+else
+   SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+
+IUSE="python test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+if [[ ${PV} == *_rc* ]]; then
+   # Upstream doesn't flag release candidates (bug 858350)
+   QA_PKGCONFIG_VERSION=""
+fi
+
+wrap_python() {
+   local phase=$1
+   shift
+
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${phase} "$@"
+   popd >/dev/null || die
+   fi
+}
+
+src_prepare() {
+   tc-export RANLIB
+   cmake_src_prepare
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCAPSTONE_BUILD_TESTS="$(usex test)"
+   )
+   cmake_src_configure
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   cmake_src_compile
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   cmake_src_test
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   cmake_src_install
+
+   wrap_python ${FUNCNAME}
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-08-15 Thread Sam James
commit: fc2c44378b3737d3ce5acbc9d6dbe6da95316ea4
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Aug  5 18:00:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 15 23:10:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2c4437

dev-libs/capstone: bump EAPI and PYTHON_COMPAT

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild   | 4 ++--
 dev-libs/capstone/capstone-5.0_rc2-r1.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 9ce37b266b5f..52eee28b21c5 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake distutils-r1 toolchain-funcs
 

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index db57662f4bb8..54773a6f23a8 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit cmake distutils-r1 toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-08-15 Thread Sam James
commit: dcaee255e1d1bf25e75874a586e0e415051e8d31
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Tue Aug  9 15:36:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 15 23:10:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcaee255

dev-libs/capstone: update SRC_URI

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/26751
Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild   | 2 +-
 dev-libs/capstone/capstone-5.0_rc2-r1.ebuild | 2 +-
 dev-libs/capstone/capstone-.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 52eee28b21c5..b604ecec3a89 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -10,7 +10,7 @@ inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index 54773a6f23a8..70a870cb34e7 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -10,7 +10,7 @@ inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/5" # libcapstone.so.5

diff --git a/dev-libs/capstone/capstone-.ebuild 
b/dev-libs/capstone/capstone-.ebuild
index 87de60dcff0a..762e910dbcef 100644
--- a/dev-libs/capstone/capstone-.ebuild
+++ b/dev-libs/capstone/capstone-.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} ==  ]]; then
EGIT_REPO_URI="https://github.com/capstone-engine/capstone.git;
EGIT_REPO_BRANCH="next"
 else
-   SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz 
-> ${P}.tar.gz"
+   
SRC_URI="https://github.com/capstone-engine/capstone/archive/${PV/_rc/-rc}.tar.gz
 -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-08-15 Thread Sam James
commit: 286e639219aee227d810b126db9f358796ec7d79
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Aug  5 17:57:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 15 23:10:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=286e6392

dev-libs/capstone: ebuild cleanup

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r1.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index e0bb01977da0..db57662f4bb8 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -42,10 +42,8 @@ wrap_python() {
 
if use python; then
pushd bindings/python >/dev/null || die
-   echo distutils-r1_${phase} "$@"
-   pwd
distutils-r1_${phase} "$@"
-   popd >/dev/null
+   popd >/dev/null || die
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-08-15 Thread Sam James
commit: 012a436299678a705b33579e21b800f3a18e5360
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Aug  5 17:56:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 15 23:10:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=012a4362

dev-libs/capstone: disable pkg-config QA checks for release candidates only

see https://github.com/gentoo/gentoo/pull/26511#issuecomment-1206157400

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index 174d710dac2a..e0bb01977da0 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -31,8 +31,10 @@ PATCHES=(
"${FILESDIR}"/${P}-pkgconfig.patch
 )
 
-# Upstream doesn't flag release candidates (bug 858350)
-QA_PKGCONFIG_VERSION=""
+if [[ ${PV} == *_rc* ]]; then
+   # Upstream doesn't flag release candidates (bug 858350)
+   QA_PKGCONFIG_VERSION=""
+fi
 
 wrap_python() {
local phase=$1



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-08-05 Thread Joonas Niilola
commit: 889c0a0a8332e3867084c6198ca41b53d5192a16
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Jul 21 19:27:39 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Aug  5 07:17:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=889c0a0a

dev-libs/capstone: disable pkg-config QA check

Closes: https://bugs.gentoo.org/858350
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/26511
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/capstone/capstone-5.0_rc2-r1.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index 6127c611b7d2..174d710dac2a 100644
--- a/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -31,6 +31,9 @@ PATCHES=(
"${FILESDIR}"/${P}-pkgconfig.patch
 )
 
+# Upstream doesn't flag release candidates (bug 858350)
+QA_PKGCONFIG_VERSION=""
+
 wrap_python() {
local phase=$1
shift



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/, dev-libs/capstone/

2022-05-10 Thread Sam James
commit: 3f161266557c6d49226102e8df0725789639f993
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Apr 30 17:02:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 11 02:11:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f161266

dev-libs/capstone: fix version statement in pkg-config file

Bug: https://bugs.gentoo.org/841716
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 .../{capstone-5.0_rc2.ebuild => capstone-5.0_rc2-r1.ebuild} |  4 
 dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch| 13 +
 2 files changed, 17 insertions(+)

diff --git a/dev-libs/capstone/capstone-5.0_rc2.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
similarity index 96%
rename from dev-libs/capstone/capstone-5.0_rc2.ebuild
rename to dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
index f54ab3111868..6127c611b7d2 100644
--- a/dev-libs/capstone/capstone-5.0_rc2.ebuild
+++ b/dev-libs/capstone/capstone-5.0_rc2-r1.ebuild
@@ -27,6 +27,10 @@ distutils_enable_tests setup.py
 
 S=${WORKDIR}/${P/_rc/-rc}
 
+PATCHES=(
+   "${FILESDIR}"/${P}-pkgconfig.patch
+)
+
 wrap_python() {
local phase=$1
shift

diff --git a/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch 
b/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch
new file mode 100644
index ..015220a138e8
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-5.0_rc2-pkgconfig.patch
@@ -0,0 +1,13 @@
+diff --git a/capstone.pc.in b/capstone.pc.in
+index 1b559eac..1ffcd354 100644
+--- a/capstone.pc.in
 b/capstone.pc.in
+@@ -5,7 +5,7 @@ includedir=${prefix}/include
+ 
+ Name: capstone
+ Description: Capstone disassembly engine
+-Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
++Version: 
@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@
+ URL: http://www.capstone-engine.org
+ archive=${libdir}/libcapstone.a
+ Libs: -L${libdir} -lcapstone



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-04-29 Thread Joonas Niilola
commit: ffa7579205688fbf7db8f6f5a14107d14acd0d37
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Apr 23 06:10:47 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr 29 09:01:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa75792

dev-libs/capstone: fix remote-id, add myself as a maintainer

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/capstone/metadata.xml | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dev-libs/capstone/metadata.xml b/dev-libs/capstone/metadata.xml
index 34d3866444dc..6194c61cc422 100644
--- a/dev-libs/capstone/metadata.xml
+++ b/dev-libs/capstone/metadata.xml
@@ -1,8 +1,15 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   mario.haust...@hrz.tu-chemnitz.de
+   Mario Haustein
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

-   aquynh/capstone
+   capstone-engine/capstone

 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-04-29 Thread Joonas Niilola
commit: 88a60755a21f4040a54612fcf347b509f7a7527b
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Tue Apr 19 20:04:30 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Apr 29 09:01:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a60755

dev-libs/capstone: version bump 5.0_rc2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://bugs.gentoo.org/837647
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-libs/capstone/Manifest|  1 +
 dev-libs/capstone/capstone-5.0_rc2.ebuild | 75 +++
 2 files changed, 76 insertions(+)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 90b32128accd..b6fb009623c3 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1 +1,2 @@
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 
435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9
 SHA512 
7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e
+DIST capstone-5.0_rc2.tar.gz 5761725 BLAKE2B 
2f5074fe1881309ee2d36cdfeba10bacefbac5c994d42dd3b08c07fe8b70e298d9d18e9c061dad1a54c6368bdc296fd02f30d77f78b1ae05074764e7041aef2c
 SHA512 
fdc4992399a2add960b12ff2495087a97fa66dce85e87375ba9d19e02b7ea5fb16a7efa93d839c2693378f6367efc9df68f192584ba624443d3b0b197d4dcd9a

diff --git a/dev-libs/capstone/capstone-5.0_rc2.ebuild 
b/dev-libs/capstone/capstone-5.0_rc2.ebuild
new file mode 100644
index ..f54ab3111868
--- /dev/null
+++ b/dev-libs/capstone/capstone-5.0_rc2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/5" # libcapstone.so.5
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+IUSE="python test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+distutils_enable_tests setup.py
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+   local phase=$1
+   shift
+
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   echo distutils-r1_${phase} "$@"
+   pwd
+   distutils-r1_${phase} "$@"
+   popd >/dev/null
+   fi
+}
+
+src_prepare() {
+   tc-export RANLIB
+   cmake_src_prepare
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCAPSTONE_BUILD_TESTS="$(usex test)"
+   )
+   cmake_src_configure
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   cmake_src_compile
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   cmake_src_test
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   cmake_src_install
+
+   wrap_python ${FUNCNAME}
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2022-01-23 Thread Yixun Lan
commit: 27c406469e8b296b255dda3a4856da847bf34f71
Author: Yongxiang Liang  gmail  com>
AuthorDate: Sun Jan  9 11:47:57 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Jan 23 08:04:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c40646

dev-libs/capstone: keyword ~riscv

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yongxiang Liang  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index c6854f19510c..9ce37b266b5f 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 # A few disassembly outputs need an update
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2021-10-27 Thread Agostino Sarubbo
commit: eb2af1e172d6be5e22e17cbb477b2112bd1d09fc
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct 27 06:36:52 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct 27 06:36:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb2af1e1

dev-libs/capstone: x86 stable wrt bug #815499

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index b232bd3855b..c6854f19510 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 # A few disassembly outputs need an update
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2021-10-27 Thread Agostino Sarubbo
commit: 7ead496629a43f47d04ea7f5e327baab34087557
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Oct 27 06:35:29 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Oct 27 06:35:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ead4966

dev-libs/capstone: amd64 stable wrt bug #815499

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 893c0616467..b232bd3855b 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 # A few disassembly outputs need an update
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2021-07-23 Thread Sergei Trofimovich
commit: ba36a57660a1bceb6048059a932cfbe4a8660902
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jul 23 07:26:10 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul 23 07:33:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba36a576

dev-libs/capstone: drop slyfox@ from maintainers, m-n orphan now

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/metadata.xml | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev-libs/capstone/metadata.xml b/dev-libs/capstone/metadata.xml
index 506ec45bd2c..a75ba5dd10c 100644
--- a/dev-libs/capstone/metadata.xml
+++ b/dev-libs/capstone/metadata.xml
@@ -1,11 +1,7 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   
-   sly...@gentoo.org
-   Sergei Trofimovich
-   
+   

aquynh/capstone




[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2021-07-03 Thread Sergei Trofimovich
commit: 9a92931a3b8f636be24f599a2de0f7b627ab117b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul  3 07:09:27 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul  3 07:09:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a92931a

dev-libs/capstone: add RESTRICT=test

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 7e0bcec945e..893c0616467 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -16,7 +16,8 @@ LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-RESTRICT="!test? ( test )"
+# A few disassembly outputs need an update
+RESTRICT="test"
 
 IUSE="python static-libs test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2021-05-15 Thread Sergei Trofimovich
commit: 6fa10f11c1d1eaececa7334da36fd59c6f6cbcea
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat May 15 13:39:02 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat May 15 13:58:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa10f11

dev-libs/capstone: allow python-3.10

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 5597a9c44c0..7e0bcec945e 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
 
 inherit cmake distutils-r1 toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2020-11-10 Thread Sergei Trofimovich
commit: cfc375c4741404650cb32fee6bf98355413b9ce9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Nov 10 23:29:00 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Nov 10 23:48:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc375c4

dev-libs/capstone: allow python-3.9

While at it respect user's RANLIB.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 09477aff2a6..dbebb9fd25b 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 
 inherit cmake distutils-r1 toolchain-funcs
 
@@ -48,6 +48,7 @@ wrap_python() {
 }
 
 src_prepare() {
+   tc-export RANLIB
cmake_src_prepare
 
wrap_python ${FUNCNAME}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2020-09-01 Thread Sergei Trofimovich
commit: 9006fa7d25ee94089e500635f3f90eb0922a8db6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Sep  1 18:11:24 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Sep  1 18:13:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9006fa7d

dev-libs/capstone: allow python-3.8

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 99f181cb326..58806a1fa74 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit cmake-utils distutils-r1 toolchain-funcs
 
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
 "
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+#TODO: needs upstream fixes
+#distutils_enable_tests setup.py
+
 S=${WORKDIR}/${P/_rc/-rc}
 
 PATCHES=(
@@ -32,9 +35,14 @@ PATCHES=(
 )
 
 wrap_python() {
+   local phase=$1
+   shift
+
if use python; then
pushd bindings/python >/dev/null || die
-   distutils-r1_${1} "$@"
+   echo distutils-r1_${phase} "$@"
+   pwd
+   distutils-r1_${phase} "$@"
popd >/dev/null
fi
 }



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2020-09-01 Thread Sergei Trofimovich
commit: 8aa23805b75a645a36bfc724db5dc85138587e3d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Sep  1 18:13:18 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Sep  1 18:13:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa23805

dev-libs/capstone: switch to cmake.eclass

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 58806a1fa74..09477aff2a6 100644
--- a/dev-libs/capstone/capstone-4.0.2-r2.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit cmake-utils distutils-r1 toolchain-funcs
+inherit cmake distutils-r1 toolchain-funcs
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/;
@@ -48,7 +48,7 @@ wrap_python() {
 }
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
wrap_python ${FUNCNAME}
 }
@@ -58,25 +58,25 @@ src_configure() {
-DCAPSTONE_BUILD_TESTS="$(usex test)"
-DCAPSTONE_BUILD_STATIC="$(usex static-libs)"
)
-   cmake-utils_src_configure
+   cmake_src_configure
 
wrap_python ${FUNCNAME}
 }
 
 src_compile() {
-   cmake-utils_src_compile
+   cmake_src_compile
 
wrap_python ${FUNCNAME}
 }
 
 src_test() {
-   cmake-utils_src_test
+   cmake_src_test
 
wrap_python ${FUNCNAME}
 }
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
 
wrap_python ${FUNCNAME}
 }



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2020-07-05 Thread Sergei Trofimovich
commit: d0ab3d5f0d37a1444ae171760052d930299ffd22
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul  5 10:48:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul  5 10:56:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ab3d5f

dev-libs/capstone: drop old

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r1.ebuild | 70 --
 1 file changed, 70 deletions(-)

diff --git a/dev-libs/capstone/capstone-4.0.2-r1.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r1.ebuild
deleted file mode 100644
index 6de5971d2cd..000
--- a/dev-libs/capstone/capstone-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4" # libcapstone.so.4
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RESTRICT="!test? ( test )"
-
-IUSE="python static-libs test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-wrap_python() {
-   if use python; then
-   pushd bindings/python >/dev/null || die
-   distutils-r1_${1} "$@"
-   popd >/dev/null
-   fi
-}
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCAPSTONE_BUILD_TESTS="$(usex test)"
-   -DCAPSTONE_BUILD_STATIC="$(usex static-libs)"
-   )
-   cmake-utils_src_configure
-
-   wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-   cmake-utils_src_compile
-
-   wrap_python ${FUNCNAME}
-}
-
-src_test() {
-   cmake-utils_src_test
-
-   wrap_python ${FUNCNAME}
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   wrap_python ${FUNCNAME}
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/

2020-07-04 Thread Sergei Trofimovich
commit: fdff36839aec81790a39d14109d2bce76283c94d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul  4 18:04:26 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul  4 18:04:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdff3683

dev-libs/capstone: rely on CMAKE_INSTALL_LIBDIR

Bug: https://bugs.gentoo.org/730722
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch 
b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
index 69479ce407d..056140be13d 100644
--- a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
+++ b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
@@ -6,7 +6,7 @@ https://bugs.gentoo.org/730722
  prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=${prefix}
 -libdir=${prefix}/lib@LIBSUFFIX@
-+libdir=${prefix}/lib@LIB_SUFFIX@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
  includedir=${prefix}/include/capstone
  
  Name: capstone



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/, dev-libs/capstone/

2020-07-04 Thread Sergei Trofimovich
commit: 878bbb63fd18d27496bba1fda39948773820
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul  4 17:51:53 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul  4 17:52:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=878bbb63

dev-libs/capstone: install into --libdir=

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/730722
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r2.ebuild | 74 ++
 .../capstone/files/capstone-4.0.2-libsuffix.patch  | 12 
 2 files changed, 86 insertions(+)

diff --git a/dev-libs/capstone/capstone-4.0.2-r2.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
new file mode 100644
index 000..99f181cb326
--- /dev/null
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4" # libcapstone.so.4
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RESTRICT="!test? ( test )"
+
+IUSE="python static-libs test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+PATCHES=(
+   "${FILESDIR}"/${P}-libsuffix.patch
+)
+
+wrap_python() {
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${1} "$@"
+   popd >/dev/null
+   fi
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCAPSTONE_BUILD_TESTS="$(usex test)"
+   -DCAPSTONE_BUILD_STATIC="$(usex static-libs)"
+   )
+   cmake-utils_src_configure
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   cmake-utils_src_compile
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   cmake-utils_src_test
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   wrap_python ${FUNCNAME}
+}

diff --git a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch 
b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
new file mode 100644
index 000..69479ce407d
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
@@ -0,0 +1,12 @@
+cmake does not provide 'LIBSUFFIX' variables, but provides 'LIB_SUFFIX'.
+https://bugs.gentoo.org/730722
+--- a/capstone.pc.in
 b/capstone.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib@LIBSUFFIX@
++libdir=${prefix}/lib@LIB_SUFFIX@
+ includedir=${prefix}/include/capstone
+ 
+ Name: capstone



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/

2020-06-04 Thread Aaron Bauman
commit: 025eabb3583fc387c4a4c5187da6fc161b5b164f
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jun  3 18:18:44 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Thu Jun  4 16:46:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=025eabb3

dev-libs/capstone: remove unused patch(es)

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16058
Signed-off-by: Aaron Bauman  gentoo.org>

 .../files/capstone-3.0.5_rc2-CVE-2017-6952.patch   | 41 --
 .../capstone/files/capstone-3.0.5_rc2-FLAGS.patch  | 16 -
 dev-libs/capstone/files/capstone-4.0-FLAGS.patch   | 20 ---
 .../files/capstone-4.0-double-DESTDIR.patch| 12 ---
 .../files/capstone-4.0-no-fuzz-tests.patch | 10 --
 5 files changed, 99 deletions(-)

diff --git a/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch 
b/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch
deleted file mode 100644
index ba16126f741..000
--- a/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 6fe86eef621b9849f51a5e1e5d73258a93440403
-Author: Quang Nguyễn 
-Date:   Mon Mar 13 22:34:48 2017 +0700
-
-provide a validity check to prevent against Integer overflow conditions 
(#870)
-
-* provide a validity check to prevent against Integer overflow conditions
-
-* fix some style issues.
-
-diff --git a/windows/winkernel_mm.c b/windows/winkernel_mm.c
-index c127da3a..ecdc1ca2 100644
 a/windows/winkernel_mm.c
-+++ b/windows/winkernel_mm.c
-@@ -3,6 +3,7 @@
- 
- #include "winkernel_mm.h"
- #include 
-+#include 
- 
- // A pool tag for memory allocation
- static const ULONG CS_WINKERNEL_POOL_TAG = 'kwsC';
-@@ -33,8 +34,16 @@ void * CAPSTONE_API cs_winkernel_malloc(size_t size)
- 
-   // FP; a use of NonPagedPool is required for Windows 7 support
- #pragma prefast(suppress : 30030) // Allocating executable 
POOL_TYPE memory
--  CS_WINKERNEL_MEMBLOCK *block = (CS_WINKERNEL_MEMBLOCK 
*)ExAllocatePoolWithTag(
--  NonPagedPool, size + sizeof(CS_WINKERNEL_MEMBLOCK), 
CS_WINKERNEL_POOL_TAG);
-+  size_t number_of_bytes = 0;
-+  CS_WINKERNEL_MEMBLOCK *block = NULL;
-+  // A specially crafted size value can trigger the overflow.
-+  // If the sum in a value that overflows or underflows the capacity of 
the type,
-+  // the function returns NULL.
-+  if (!NT_SUCCESS(RtlSizeTAdd(size, sizeof(CS_WINKERNEL_MEMBLOCK), 
_of_bytes))) {
-+  return NULL;
-+  }
-+  block = (CS_WINKERNEL_MEMBLOCK *)ExAllocatePoolWithTag(
-+  NonPagedPool, number_of_bytes, CS_WINKERNEL_POOL_TAG);
-   if (!block) {
-   return NULL;
-   }

diff --git a/dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch 
b/dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch
deleted file mode 100644
index 4be2ed4ba0e..000
--- a/dev-libs/capstone/files/capstone-3.0.5_rc2-FLAGS.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Add support for user overridden CFLAGS and LDFLAGS
-diff --git a/cstool/Makefile b/cstool/Makefile
-index 450ac1b..3cf2a81 100644
 a/cstool/Makefile
-+++ b/cstool/Makefile
-@@ -3,2 +3,3 @@
- include ../functions.mk
-+include ../config.mk
- 
-@@ -8,4 +9,4 @@ LIBNAME = capstone
- 
--CFLAGS = -I../include
--LDFLAGS = -O3 -Wall -L.. -l$(LIBNAME)
-+CFLAGS += -I../include
-+LDFLAGS += -Wall -L.. -l$(LIBNAME)
- 

diff --git a/dev-libs/capstone/files/capstone-4.0-FLAGS.patch 
b/dev-libs/capstone/files/capstone-4.0-FLAGS.patch
deleted file mode 100644
index 66e855c0c34..000
--- a/dev-libs/capstone/files/capstone-4.0-FLAGS.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Drop -O3 and allow user to specify their optimizations.
-
 a/cstool/Makefile
-+++ b/cstool/Makefile
-@@ -1,13 +1,14 @@
- # Makefile for Cstool of Capstone Disassembly Engine
- 
- include ../functions.mk
-+include ../config.mk
- 
- .PHONY: clean all
- 
- LIBNAME = capstone
- 
- CFLAGS += -I../include -I.
--LDFLAGS += -O3 -Wall -L.. -l$(LIBNAME)
-+LDFLAGS += -Wall -L.. -l$(LIBNAME)
- 
- TARGET = cstool
- SOURCES := $(wildcard *.c)

diff --git a/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch 
b/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch
deleted file mode 100644
index 46aca725e40..000
--- a/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://github.com/aquynh/capstone/issues/1311
-
-Avoid double DESTDIR in install.
 a/Makefile
-+++ b/Makefile
-@@ -75,4 +75,4 @@ LIBDIRARCH ?= lib
- #LIBDIRARCH ?= lib64
--LIBDIR = $(DESTDIR)$(PREFIX)/$(LIBDIRARCH)
--BINDIR = $(DESTDIR)$(PREFIX)/bin
-+LIBDIR = $(PREFIX)/$(LIBDIRARCH)
-+BINDIR = $(PREFIX)/bin
- 

diff --git a/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2020-05-29 Thread Sergei Trofimovich
commit: 6970031573e4333632c7166280e686aa29ed1fb3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri May 29 22:03:36 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri May 29 22:13:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69700315

dev-libs/capstone: drop old

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/Manifest  |  1 -
 dev-libs/capstone/capstone-4.0.1.ebuild | 92 -
 dev-libs/capstone/capstone-4.0.2.ebuild | 92 -
 3 files changed, 185 deletions(-)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index fcbad2d319e..90b32128acc 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,2 +1 @@
-DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 
585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e
 SHA512 
43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
 DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 
435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9
 SHA512 
7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e

diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild 
b/dev-libs/capstone/capstone-4.0.1.ebuild
deleted file mode 100644
index 3f7e112a107..000
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4" # libcapstone.so.4
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RESTRICT="!test? ( test )"
-
-IUSE="python test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.0-FLAGS.patch
-   "${FILESDIR}"/${PN}-4.0-no-fuzz-tests.patch
-)
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-wrap_python() {
-   if use python; then
-   pushd bindings/python >/dev/null || die
-   distutils-r1_${1} "$@"
-   popd >/dev/null
-   fi
-}
-
-src_prepare() {
-   default
-
-   wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-   {
-   cat <<-EOF
-   # Gentoo overrides:
-   #   verbose build
-   V = 1
-   #   toolchain
-   AR = $(tc-getAR)
-   CC = $(tc-getCC)
-   RANLIB = $(tc-getRANLIB)
-   #  toolchain flags
-   CFLAGS = ${CFLAGS}
-   LDFLAGS = ${LDFLAGS}
-   #  libs
-   LIBDIRARCH = $(get_libdir)
-   PREFIX = ${EPREFIX}/usr
-   EOF
-   } >> config.mk || die
-
-   if ! use test; then
-   # Don't build tests if not requested: bug #663006
-   sed -i tests/Makefile -e 's@all: $(BINARY)@all:@' || die
-   fi
-
-   wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-   default
-
-   wrap_python ${FUNCNAME}
-}
-
-src_test() {
-   default
-
-   wrap_python ${FUNCNAME}
-}
-
-src_install() {
-   default
-
-   wrap_python ${FUNCNAME}
-}

diff --git a/dev-libs/capstone/capstone-4.0.2.ebuild 
b/dev-libs/capstone/capstone-4.0.2.ebuild
deleted file mode 100644
index 3f7e112a107..000
--- a/dev-libs/capstone/capstone-4.0.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4" # libcapstone.so.4
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RESTRICT="!test? ( test )"
-
-IUSE="python test"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.0-FLAGS.patch
-   "${FILESDIR}"/${PN}-4.0-no-fuzz-tests.patch
-)
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-wrap_python() {
-   if use python; then
-   pushd bindings/python 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2020-05-20 Thread Sergei Trofimovich
commit: efa42a94e69af8e64611dd012457691e8b420adf
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed May 20 17:53:27 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed May 20 17:53:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa42a94

dev-libs/capstone: switch to cmake, add USE=static-libs, bug #724302

Make-based build system can't handle shared-only cstoll linkage.
Let's switch over to cmake and see how it goes.

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/724302
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/capstone-4.0.2-r1.ebuild | 70 ++
 1 file changed, 70 insertions(+)

diff --git a/dev-libs/capstone/capstone-4.0.2-r1.ebuild 
b/dev-libs/capstone/capstone-4.0.2-r1.ebuild
new file mode 100644
index 000..6de5971d2cd
--- /dev/null
+++ b/dev-libs/capstone/capstone-4.0.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake-utils distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4" # libcapstone.so.4
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RESTRICT="!test? ( test )"
+
+IUSE="python static-libs test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${1} "$@"
+   popd >/dev/null
+   fi
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCAPSTONE_BUILD_TESTS="$(usex test)"
+   -DCAPSTONE_BUILD_STATIC="$(usex static-libs)"
+   )
+   cmake-utils_src_configure
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   cmake-utils_src_compile
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   cmake-utils_src_test
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   wrap_python ${FUNCNAME}
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2020-05-08 Thread Sergei Trofimovich
commit: e877e3f6b965dc4605c987fc43af13df2642a460
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri May  8 18:44:05 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri May  8 18:44:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e877e3f6

dev-libs/capstone: bump up to 4.0.2

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/Manifest  |  1 +
 dev-libs/capstone/capstone-4.0.2.ebuild | 92 +
 2 files changed, 93 insertions(+)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 08f5b1652fe..fcbad2d319e 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1 +1,2 @@
 DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 
585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e
 SHA512 
43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
+DIST capstone-4.0.2.tar.gz 3439542 BLAKE2B 
435729a8fef2dce6495635352101b3befe563c8404efdbb0dccabecbe2bded332221665bacdbcd9043dda72b652b6f29c0e1a548cefb8c64d5b6b9dc174ed3d9
 SHA512 
7f93534517307b737422a8825b66b2a1f3e1cca2049465d60ab12595940154aaf843ba40ed348fce58de58b990c19a0caef289060eb72898cb008a88c470970e

diff --git a/dev-libs/capstone/capstone-4.0.2.ebuild 
b/dev-libs/capstone/capstone-4.0.2.ebuild
new file mode 100644
index 000..3f7e112a107
--- /dev/null
+++ b/dev-libs/capstone/capstone-4.0.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4" # libcapstone.so.4
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RESTRICT="!test? ( test )"
+
+IUSE="python test"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.0-FLAGS.patch
+   "${FILESDIR}"/${PN}-4.0-no-fuzz-tests.patch
+)
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${1} "$@"
+   popd >/dev/null
+   fi
+}
+
+src_prepare() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   {
+   cat <<-EOF
+   # Gentoo overrides:
+   #   verbose build
+   V = 1
+   #   toolchain
+   AR = $(tc-getAR)
+   CC = $(tc-getCC)
+   RANLIB = $(tc-getRANLIB)
+   #  toolchain flags
+   CFLAGS = ${CFLAGS}
+   LDFLAGS = ${LDFLAGS}
+   #  libs
+   LIBDIRARCH = $(get_libdir)
+   PREFIX = ${EPREFIX}/usr
+   EOF
+   } >> config.mk || die
+
+   if ! use test; then
+   # Don't build tests if not requested: bug #663006
+   sed -i tests/Makefile -e 's@all: $(BINARY)@all:@' || die
+   fi
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   default
+
+   wrap_python ${FUNCNAME}
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2020-03-23 Thread Sergei Trofimovich
commit: 84101b2db7a647949afeefc493e8845caf3b189d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 23 23:35:46 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 23 23:57:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84101b2d

dev-libs/capstone: drop old

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/Manifest |  1 -
 dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild | 84 --
 2 files changed, 85 deletions(-)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 918678e19b2..08f5b1652fe 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,2 +1 @@
-DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B 
dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362
 SHA512 
31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 
585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e
 SHA512 
43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36

diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
deleted file mode 100644
index b3ee45ea8df..000
--- a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3" # libcapstone.so.3
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-IUSE="python"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-CVE-2017-6952.patch
-   "${FILESDIR}"/${P}-FLAGS.patch
-)
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-wrap_python() {
-   if use python; then
-   pushd bindings/python >/dev/null || die
-   distutils-r1_${1} "$@"
-   popd >/dev/null
-   fi
-}
-
-src_prepare() {
-   default
-
-   wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-   {
-   cat <<-EOF
-   # Gentoo overrides:
-   #   verbose build
-   V = 1
-   #   toolchain
-   AR = $(tc-getAR)
-   CC = $(tc-getCC)
-   RANLIB = $(tc-getRANLIB)
-   #  toolchain flags
-   CFLAGS = ${CFLAGS}
-   LDFLAGS = ${LDFLAGS}
-   #  libs
-   LIBDIRARCH = $(get_libdir)
-   EOF
-   } >> config.mk || die
-
-   wrap_python ${FUNCNAME}
-}
-
-src_compile() {
-   default
-
-   wrap_python ${FUNCNAME}
-}
-
-src_test() {
-   default
-
-   wrap_python ${FUNCNAME}
-}
-
-src_install() {
-   default
-
-   wrap_python ${FUNCNAME}
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2020-02-12 Thread Sergei Trofimovich
commit: b712cee8c03d630c99855c6cb216341fd26d2e70
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Feb 12 22:26:12 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Feb 12 22:32:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b712cee8

dev-libs/capstone: drop old

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/Manifest  |  1 -
 dev-libs/capstone/capstone-3.0.5_rc2.ebuild | 44 ---
 dev-libs/capstone/capstone-4.0.ebuild   | 86 -
 3 files changed, 131 deletions(-)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 66b9b56b6b4..918678e19b2 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,3 +1,2 @@
 DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B 
dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362
 SHA512 
31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 
585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e
 SHA512 
43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
-DIST capstone-4.0.tar.gz 3411532 BLAKE2B 
3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e
 SHA512 
5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb

diff --git a/dev-libs/capstone/capstone-3.0.5_rc2.ebuild 
b/dev-libs/capstone/capstone-3.0.5_rc2.ebuild
deleted file mode 100644
index 80fb03207d6..000
--- a/dev-libs/capstone/capstone-3.0.5_rc2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3" # libcapstone.so.3
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-CVE-2017-6952.patch
-   "${FILESDIR}"/${P}-FLAGS.patch
-)
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-src_configure() {
-   {
-   cat <<-EOF
-   # Gentoo overrides:
-   #   verbose build
-   V = 1
-   #   toolchain
-   AR = $(tc-getAR)
-   CC = $(tc-getCC)
-   RANLIB = $(tc-getRANLIB)
-   #  toolchain flags
-   CFLAGS = ${CFLAGS}
-   LDFLAGS = ${LDFLAGS}
-   #  libs
-   LIBDIRARCH = $(get_libdir)
-   EOF
-   } >> config.mk || die
-
-}

diff --git a/dev-libs/capstone/capstone-4.0.ebuild 
b/dev-libs/capstone/capstone-4.0.ebuild
deleted file mode 100644
index 2ba9bc1397d..000
--- a/dev-libs/capstone/capstone-4.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/4" # libcapstone.so.4
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-IUSE="python"
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-FLAGS.patch
-   "${FILESDIR}"/${P}-no-fuzz-tests.patch
-   "${FILESDIR}"/${P}-double-DESTDIR.patch
-)
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-wrap_python() {
-   if use python; then
-   pushd bindings/python >/dev/null || die
-   distutils-r1_${1} "$@"
-   popd >/dev/null
-   fi
-}
-
-src_prepare() {
-   default
-
-   wrap_python ${FUNCNAME}
-}
-
-src_configure() {
-   {
-   cat <<-EOF
-   # Gentoo overrides:
-   #   verbose build
-   V = 1
-   #   toolchain
-   AR = $(tc-getAR)
-   CC = $(tc-getCC)
-   RANLIB = $(tc-getRANLIB)
-   #  toolchain flags
-   CFLAGS = ${CFLAGS}
-   LDFLAGS = ${LDFLAGS}
-   #  libs
-   LIBDIRARCH = $(get_libdir)
-   PREFIX = ${EPREFIX}/usr
-   EOF

[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2019-10-02 Thread Mike Auty
commit: d526b707cb06c3b62e954e4b625c4b6dd5181367
Author: Mike Auty  gentoo  org>
AuthorDate: Wed Oct  2 17:53:20 2019 +
Commit: Mike Auty  gentoo  org>
CommitDate: Wed Oct  2 17:53:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d526b707

dev-libs/capstone: Indicate python-3.7 support.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Mike Auty  gentoo.org>

 dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild | 2 +-
 dev-libs/capstone/capstone-4.0.1.ebuild| 2 +-
 dev-libs/capstone/capstone-4.0.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
index a371dec0b3b..f33b120cb40 100644
--- a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 

diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild 
b/dev-libs/capstone/capstone-4.0.1.ebuild
index 77b9b960a58..668f96bde91 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 

diff --git a/dev-libs/capstone/capstone-4.0.ebuild 
b/dev-libs/capstone/capstone-4.0.ebuild
index 2f0796ab51f..18d7547f3dd 100644
--- a/dev-libs/capstone/capstone-4.0.ebuild
+++ b/dev-libs/capstone/capstone-4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2019-09-18 Thread Sergei Trofimovich
commit: 4af6607f04424cd164e0cd175429c15c4076a4e1
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Sep 18 22:11:26 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep 18 22:12:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af6607f

dev-libs/capstone:guard tests building behind USE=test, bug #663006

Reported-by: Michał Górny
Closes: https://bugs.gentoo.org/663006
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/capstone-4.0.1.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild 
b/dev-libs/capstone/capstone-4.0.1.ebuild
index e4931c690d0..77b9b960a58 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -16,7 +16,9 @@ LICENSE="BSD"
 SLOT="0/4" # libcapstone.so.4
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-IUSE="python"
+RESTRICT="!test? ( test )"
+
+IUSE="python test"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
@@ -63,6 +65,11 @@ src_configure() {
EOF
} >> config.mk || die
 
+   if ! use test; then
+   # Don't build tests if not requested: bug #663006
+   sed -i tests/Makefile -e 's@all: $(BINARY)@all:@' || die
+   fi
+
wrap_python ${FUNCNAME}
 }
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2019-08-05 Thread Guilherme Amadio
commit: 410be6c7772b8d3c5a71b71f4595d4824558c8f7
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Thu Aug  1 07:46:01 2019 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Mon Aug  5 12:39:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410be6c7

dev-libs/capstone: prefix support

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Guilherme Amadio  gentoo.org>

 dev-libs/capstone/capstone-4.0.1.ebuild | 1 +
 dev-libs/capstone/capstone-4.0.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild 
b/dev-libs/capstone/capstone-4.0.1.ebuild
index 10fabceeab0..e4931c690d0 100644
--- a/dev-libs/capstone/capstone-4.0.1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -59,6 +59,7 @@ src_configure() {
LDFLAGS = ${LDFLAGS}
#  libs
LIBDIRARCH = $(get_libdir)
+   PREFIX = ${EPREFIX}/usr
EOF
} >> config.mk || die
 

diff --git a/dev-libs/capstone/capstone-4.0.ebuild 
b/dev-libs/capstone/capstone-4.0.ebuild
index 2d3c1f9c454..2f0796ab51f 100644
--- a/dev-libs/capstone/capstone-4.0.ebuild
+++ b/dev-libs/capstone/capstone-4.0.ebuild
@@ -60,6 +60,7 @@ src_configure() {
LDFLAGS = ${LDFLAGS}
#  libs
LIBDIRARCH = $(get_libdir)
+   PREFIX = ${EPREFIX}/usr
EOF
} >> config.mk || die
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2019-01-10 Thread Sergei Trofimovich
commit: f0dc5fd6f922ff64183878ed1f28c9af0d281594
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jan 10 21:37:14 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jan 10 21:37:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0dc5fd6

dev-libs/capstone: bump up to 4.0.1

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/Manifest  |  1 +
 dev-libs/capstone/capstone-4.0.1.ebuild | 84 +
 2 files changed, 85 insertions(+)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index f3ffa497b09..66b9b56b6b4 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,2 +1,3 @@
 DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B 
dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362
 SHA512 
31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
+DIST capstone-4.0.1.tar.gz 3434276 BLAKE2B 
585e0ee19b76d96116c67b021bbe19fd01d8db600b565094ff71a01d8a87b1123a8c5e2f944f1551c411565d5a25dfbfbb3138ca220b1281044a31004002399e
 SHA512 
43c52024065b41b45eff9423341db3f3d5163fa7aa01b360faa30437786740c8f2c34c36faa04dced5308e09d8bd78df3bad0ab9c06f98612169edb176f83c36
 DIST capstone-4.0.tar.gz 3411532 BLAKE2B 
3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e
 SHA512 
5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb

diff --git a/dev-libs/capstone/capstone-4.0.1.ebuild 
b/dev-libs/capstone/capstone-4.0.1.ebuild
new file mode 100644
index 000..c0b0864f5e2
--- /dev/null
+++ b/dev-libs/capstone/capstone-4.0.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4" # libcapstone.so.4
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="python"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.0-FLAGS.patch
+   "${FILESDIR}"/${PN}-4.0-no-fuzz-tests.patch
+)
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${1} "$@"
+   popd >/dev/null
+   fi
+}
+
+src_prepare() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   {
+   cat <<-EOF
+   # Gentoo overrides:
+   #   verbose build
+   V = 1
+   #   toolchain
+   AR = $(tc-getAR)
+   CC = $(tc-getCC)
+   RANLIB = $(tc-getRANLIB)
+   #  toolchain flags
+   CFLAGS = ${CFLAGS}
+   LDFLAGS = ${LDFLAGS}
+   #  libs
+   LIBDIRARCH = $(get_libdir)
+   EOF
+   } >> config.mk || die
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   default
+
+   wrap_python ${FUNCNAME}
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/, dev-libs/capstone/files/

2018-12-18 Thread Sergei Trofimovich
commit: e477d6aca1b5848044ed2f72fe6d78e7f5b966cd
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Dec 19 00:37:36 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Dec 19 07:22:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e477d6ac

dev-libs/capstone: bump up to 4.0

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-libs/capstone/Manifest |  1 +
 dev-libs/capstone/capstone-4.0.ebuild  | 85 ++
 dev-libs/capstone/files/capstone-4.0-FLAGS.patch   | 20 +
 .../files/capstone-4.0-double-DESTDIR.patch| 12 +++
 .../files/capstone-4.0-no-fuzz-tests.patch | 10 +++
 5 files changed, 128 insertions(+)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 4832b61e74a..f3ffa497b09 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1 +1,2 @@
 DIST capstone-3.0.5_rc2.tar.gz 2829338 BLAKE2B 
dd35fc6c31ec008f78840410ea0d20de56ea8f01c3af1d28488beaceee7fa06ce03c8cd0f56d834eb738d23f528d240693586122b9c1e353365f7348fb6f8362
 SHA512 
31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
+DIST capstone-4.0.tar.gz 3411532 BLAKE2B 
3e60a946e81f6d6ea88c314ad066e1855e2401cd9e8e61a67d48071b0fe4b705b2276b0d2b52d0979f472895a69cbe7609f6a2c60b79be668730f41ea98bf92e
 SHA512 
5a10c67e88b246ad905364c62c56b4741df242c22f1b62bdea171e4d1d43e484f42f30b33e17324be6cff4c6fb10365528a9c3f4b2a5339ad24b0564fdd40bdb

diff --git a/dev-libs/capstone/capstone-4.0.ebuild 
b/dev-libs/capstone/capstone-4.0.ebuild
new file mode 100644
index 000..78213838489
--- /dev/null
+++ b/dev-libs/capstone/capstone-4.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4" # libcapstone.so.4
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="python"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-FLAGS.patch
+   "${FILESDIR}"/${P}-no-fuzz-tests.patch
+   "${FILESDIR}"/${P}-double-DESTDIR.patch
+)
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${1} "$@"
+   popd >/dev/null
+   fi
+}
+
+src_prepare() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   {
+   cat <<-EOF
+   # Gentoo overrides:
+   #   verbose build
+   V = 1
+   #   toolchain
+   AR = $(tc-getAR)
+   CC = $(tc-getCC)
+   RANLIB = $(tc-getRANLIB)
+   #  toolchain flags
+   CFLAGS = ${CFLAGS}
+   LDFLAGS = ${LDFLAGS}
+   #  libs
+   LIBDIRARCH = $(get_libdir)
+   EOF
+   } >> config.mk || die
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   default
+
+   wrap_python ${FUNCNAME}
+}

diff --git a/dev-libs/capstone/files/capstone-4.0-FLAGS.patch 
b/dev-libs/capstone/files/capstone-4.0-FLAGS.patch
new file mode 100644
index 000..66e855c0c34
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0-FLAGS.patch
@@ -0,0 +1,20 @@
+Drop -O3 and allow user to specify their optimizations.
+
+--- a/cstool/Makefile
 b/cstool/Makefile
+@@ -1,13 +1,14 @@
+ # Makefile for Cstool of Capstone Disassembly Engine
+ 
+ include ../functions.mk
++include ../config.mk
+ 
+ .PHONY: clean all
+ 
+ LIBNAME = capstone
+ 
+ CFLAGS += -I../include -I.
+-LDFLAGS += -O3 -Wall -L.. -l$(LIBNAME)
++LDFLAGS += -Wall -L.. -l$(LIBNAME)
+ 
+ TARGET = cstool
+ SOURCES := $(wildcard *.c)

diff --git a/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch 
b/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch
new file mode 100644
index 000..46aca725e40
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch
@@ -0,0 +1,12 @@
+https://github.com/aquynh/capstone/issues/1311
+
+Avoid double DESTDIR in install.
+--- a/Makefile
 b/Makefile
+@@ -75,4 +75,4 @@ LIBDIRARCH ?= lib
+ #LIBDIRARCH ?= lib64
+-LIBDIR = $(DESTDIR)$(PREFIX)/$(LIBDIRARCH)
+-BINDIR = $(DESTDIR)$(PREFIX)/bin
++LIBDIR = $(PREFIX)/$(LIBDIRARCH)
++BINDIR = 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2017-12-24 Thread Sergei Trofimovich
commit: 2c67cd64c97f2f393cdbb3b6fb03498c7402fa27
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Dec 24 14:13:32 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Dec 24 14:13:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c67cd64

dev-libs/capstone: add missing 'setuptools' DEPEND, bug #640266

Reported-by: int80
Closes: https://bugs.gentoo.org/640266
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
index 62b3292ce98..17f8b6cd3af 100644
--- a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -18,7 +18,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="python"
 RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2017-10-12 Thread Sergei Trofimovich
commit: 30c1405213ac6bfe721f74ac374815f871747798
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct 12 11:13:09 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 12 11:14:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c14052

dev-libs/capstone: keyworded for ~arm64 (thanks to Dan Robertson), bug #633892

Reported-by: Dan Robertson
Bug: https://bugs.gentoo.org/633892
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
index 02b42dcd4ea..62b3292ce98 100644
--- a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0/3" # libcapstone.so.3
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 IUSE="python"
 RDEPEND="python? ( ${PYTHON_DEPS} )"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2017-09-25 Thread Pacho Ramos
commit: 7fcafe7a39582a15eaf4952831420fc1ff62a254
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Sep 25 13:27:59 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Sep 25 13:36:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fcafe7a

dev-libs/capstone: Support newer python

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
index fa2b8736435..02b42dcd4ea 100644
--- a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 toolchain-funcs
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2017-07-29 Thread Sergei Trofimovich
commit: 474fa516153f0d047ea0a2797ba81bbf043eda1b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul 29 08:58:53 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 29 09:26:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474fa516

dev-libs/capstone: add basic support for python bindings

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild | 82 ++
 1 file changed, 82 insertions(+)

diff --git a/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild 
b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
new file mode 100644
index 000..fa2b8736435
--- /dev/null
+++ b/dev-libs/capstone/capstone-3.0.5_rc2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3" # libcapstone.so.3
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="python"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-CVE-2017-6952.patch
+   "${FILESDIR}"/${P}-FLAGS.patch
+)
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+wrap_python() {
+   if use python; then
+   pushd bindings/python >/dev/null || die
+   distutils-r1_${1} "$@"
+   popd >/dev/null
+   fi
+}
+
+src_prepare() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_configure() {
+   {
+   cat <<-EOF
+   # Gentoo overrides:
+   #   verbose build
+   V = 1
+   #   toolchain
+   AR = $(tc-getAR)
+   CC = $(tc-getCC)
+   RANLIB = $(tc-getRANLIB)
+   #  toolchain flags
+   CFLAGS = ${CFLAGS}
+   LDFLAGS = ${LDFLAGS}
+   #  libs
+   LIBDIRARCH = $(get_libdir)
+   EOF
+   } >> config.mk || die
+
+   wrap_python ${FUNCNAME}
+}
+
+src_compile() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_test() {
+   default
+
+   wrap_python ${FUNCNAME}
+}
+
+src_install() {
+   default
+
+   wrap_python ${FUNCNAME}
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2017-03-25 Thread Sergei Trofimovich
commit: 02d2f9e91bd5ee4d821aeab31a342760f341a738
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 25 16:07:50 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 25 16:07:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d2f9e9

dev-libs/capstone: drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/capstone/Manifest |  1 -
 dev-libs/capstone/capstone-3.0.4-r2.ebuild | 37 --
 2 files changed, 38 deletions(-)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 3f35304c88d..6cd13a71cea 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1,2 +1 @@
-DIST capstone-3.0.4.tar.gz 2800818 SHA256 
5d6dadf5864c56f8de66c66088fa68e849d0bff6577865a4f81b6f23112b14f2 SHA512 
a5c29e7c559b5391d6a4ec9a7f766699ea6d321aa2f1fc57fdcec893107fa3ef2f5f6323629971c1129f1ca087df4f3ad03d0a8234d2eae368c8ccfec04dbf4d
 WHIRLPOOL 
24aa002e215ee2a74c06a9be40218c78258a853028c74e1cdf95a5e2ea484471cf084cc8f5cc9db1aaefc16cf80a0b37480d4af60ca9119730334cbe2a02b906
 DIST capstone-3.0.5_rc2.tar.gz 2829338 SHA256 
587c092454ad59137686529f3c008c265cc6d427a85d5d2e8f6a902b72d215b3 SHA512 
31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 WHIRLPOOL 
11a84f178cae68507d2686a81ca6cbc84b6402cb02e7278c03ec598887a0aa02d28a9ecbf388e09c8c3ae8d8ecf323dd4eaa211f79969089c4c7d6fbbe022349

diff --git a/dev-libs/capstone/capstone-3.0.4-r2.ebuild 
b/dev-libs/capstone/capstone-3.0.4-r2.ebuild
deleted file mode 100644
index 563d98ff101..000
--- a/dev-libs/capstone/capstone-3.0.4-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="disassembly/disassembler framework + bindings"
-HOMEPAGE="http://www.capstone-engine.org/;
-SRC_URI="https://github.com/aquynh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/3" # libcapstone.so.3
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   {
-   cat <<-EOF
-   # Gentoo overrides:
-   #   verbose build
-   V = 1
-   #   toolchain
-   AR = $(tc-getAR)
-   CC = $(tc-getCC)
-   RANLIB = $(tc-getRANLIB)
-   #  toolchain flags
-   CFLAGS = ${CFLAGS}
-   LDFLAGS = ${LDFLAGS}
-   #  libs
-   LIBDIRARCH = $(get_libdir)
-   EOF
-   } >> config.mk || die
-
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/files/, dev-libs/capstone/

2017-03-25 Thread Sergei Trofimovich
commit: 83209f33a128ec7f48adbfad813cfbc13a2fd444
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 25 16:07:40 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 25 16:07:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83209f33

dev-libs/capstone: bump up to 3.0.5-rc2, fix CVE-2017-6952, bug #612912

I don't believe 3.0.4 is affected:

- it's a vulnerability in windows kernel driver. Not something you can easily 
build in gentoo today as it requires MSVS to build a driver
- the windows code was added in capstone-3.0.5-rc1. It's not present in 3.0.4 
in gentoo at all

But not to forget about the vulnerability on next bump
I'm bumping up to vilnerable release candidate and applying
the upstream patch to fix CVE-2017-6952.

Reported-by: Agostino Sarubbo
Bug: https://bugs.gentoo.org/612912
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/capstone/Manifest |  1 +
 dev-libs/capstone/capstone-3.0.5_rc2.ebuild| 44 ++
 .../files/capstone-3.0.5_rc2-CVE-2017-6952.patch   | 41 
 .../capstone/files/capstone-3.0.5_rc2-FLAGS.patch  | 16 
 4 files changed, 102 insertions(+)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
index 239b44faf89..3f35304c88d 100644
--- a/dev-libs/capstone/Manifest
+++ b/dev-libs/capstone/Manifest
@@ -1 +1,2 @@
 DIST capstone-3.0.4.tar.gz 2800818 SHA256 
5d6dadf5864c56f8de66c66088fa68e849d0bff6577865a4f81b6f23112b14f2 SHA512 
a5c29e7c559b5391d6a4ec9a7f766699ea6d321aa2f1fc57fdcec893107fa3ef2f5f6323629971c1129f1ca087df4f3ad03d0a8234d2eae368c8ccfec04dbf4d
 WHIRLPOOL 
24aa002e215ee2a74c06a9be40218c78258a853028c74e1cdf95a5e2ea484471cf084cc8f5cc9db1aaefc16cf80a0b37480d4af60ca9119730334cbe2a02b906
+DIST capstone-3.0.5_rc2.tar.gz 2829338 SHA256 
587c092454ad59137686529f3c008c265cc6d427a85d5d2e8f6a902b72d215b3 SHA512 
31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 WHIRLPOOL 
11a84f178cae68507d2686a81ca6cbc84b6402cb02e7278c03ec598887a0aa02d28a9ecbf388e09c8c3ae8d8ecf323dd4eaa211f79969089c4c7d6fbbe022349

diff --git a/dev-libs/capstone/capstone-3.0.5_rc2.ebuild 
b/dev-libs/capstone/capstone-3.0.5_rc2.ebuild
new file mode 100644
index 000..80fb03207d6
--- /dev/null
+++ b/dev-libs/capstone/capstone-3.0.5_rc2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV/_rc/-rc}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3" # libcapstone.so.3
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-CVE-2017-6952.patch
+   "${FILESDIR}"/${P}-FLAGS.patch
+)
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+src_configure() {
+   {
+   cat <<-EOF
+   # Gentoo overrides:
+   #   verbose build
+   V = 1
+   #   toolchain
+   AR = $(tc-getAR)
+   CC = $(tc-getCC)
+   RANLIB = $(tc-getRANLIB)
+   #  toolchain flags
+   CFLAGS = ${CFLAGS}
+   LDFLAGS = ${LDFLAGS}
+   #  libs
+   LIBDIRARCH = $(get_libdir)
+   EOF
+   } >> config.mk || die
+
+}

diff --git a/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch 
b/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch
new file mode 100644
index 000..ba16126f741
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-3.0.5_rc2-CVE-2017-6952.patch
@@ -0,0 +1,41 @@
+commit 6fe86eef621b9849f51a5e1e5d73258a93440403
+Author: Quang Nguyễn 
+Date:   Mon Mar 13 22:34:48 2017 +0700
+
+provide a validity check to prevent against Integer overflow conditions 
(#870)
+
+* provide a validity check to prevent against Integer overflow conditions
+
+* fix some style issues.
+
+diff --git a/windows/winkernel_mm.c b/windows/winkernel_mm.c
+index c127da3a..ecdc1ca2 100644
+--- a/windows/winkernel_mm.c
 b/windows/winkernel_mm.c
+@@ -3,6 +3,7 @@
+ 
+ #include "winkernel_mm.h"
+ #include 
++#include 
+ 
+ // A pool tag for memory allocation
+ static const ULONG CS_WINKERNEL_POOL_TAG = 'kwsC';
+@@ -33,8 +34,16 @@ void * CAPSTONE_API cs_winkernel_malloc(size_t size)
+ 
+   // FP; a use of NonPagedPool is required for Windows 7 support
+ #pragma prefast(suppress : 30030) // Allocating executable 
POOL_TYPE memory
+-  CS_WINKERNEL_MEMBLOCK *block = (CS_WINKERNEL_MEMBLOCK 
*)ExAllocatePoolWithTag(
+-  NonPagedPool, size + sizeof(CS_WINKERNEL_MEMBLOCK), 
CS_WINKERNEL_POOL_TAG);
++  size_t number_of_bytes = 0;
++  

[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2016-09-28 Thread Richard Farina
commit: d338cb91ccf02a0a6c0ad5359506e6e8b8d1676c
Author: Zero_Chaos  gentoo  org>
AuthorDate: Wed Sep 28 19:25:22 2016 +
Commit: Richard Farina  gentoo  org>
CommitDate: Wed Sep 28 19:25:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d338cb91

dev-libs/capstone: adding ~arm

Package-Manager: portage-2.3.1

 dev-libs/capstone/capstone-3.0.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/capstone/capstone-3.0.4-r2.ebuild 
b/dev-libs/capstone/capstone-3.0.4-r2.ebuild
index 41855d1..3f5e774 100644
--- a/dev-libs/capstone/capstone-3.0.4-r2.ebuild
+++ b/dev-libs/capstone/capstone-3.0.4-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aquynh/${PN}/archive/${PV}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3" # libcapstone.so.3
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2016-09-03 Thread Sergei Trofimovich
commit: 5917f76438cba881d0e8dbf8ccb1670b453ca0bb
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep  3 14:00:55 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep  3 14:01:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5917f764

dev-libs/capstone: respect gentoo toolchain overrides, bug #592778

Respect AR, CC, CFLAGS, LDFLAGS, RANLIB, $libdir.
Thanks to Mike Auty who provided an example fix.

Reported-by: Mike Auty
Bug: https://bugs.gentoo.org/592778

Package-Manager: portage-2.3.0

 ...ne-3.0.4-r1.ebuild => capstone-3.0.4-r2.ebuild} | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/dev-libs/capstone/capstone-3.0.4-r1.ebuild 
b/dev-libs/capstone/capstone-3.0.4-r2.ebuild
similarity index 55%
rename from dev-libs/capstone/capstone-3.0.4-r1.ebuild
rename to dev-libs/capstone/capstone-3.0.4-r2.ebuild
index 018e9db..41855d1 100644
--- a/dev-libs/capstone/capstone-3.0.4-r1.ebuild
+++ b/dev-libs/capstone/capstone-3.0.4-r2.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/;
 SRC_URI="https://github.com/aquynh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -14,3 +16,23 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
+
+src_configure() {
+   {
+   cat <<-EOF
+   # Gentoo overrides:
+   #   verbose build
+   V = 1
+   #   toolchain
+   AR = $(tc-getAR)
+   CC = $(tc-getCC)
+   RANLIB = $(tc-getRANLIB)
+   #  toolchain flags
+   CFLAGS = ${CFLAGS}
+   LDFLAGS = ${LDFLAGS}
+   #  libs
+   LIBDIRARCH = $(get_libdir)
+   EOF
+   } >> config.mk || die
+
+}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2016-06-04 Thread Sergei Trofimovich
commit: c5f81a53b51a62349aabec79fc5ea8abebbf6a84
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun  4 11:59:04 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun  4 11:59:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5f81a53

dev-libs/capstone: use upstream build system

Makefile-based build system does proper soname versioning

Package-Manager: portage-2.3.0_rc1

 .../capstone/{capstone-3.0.4.ebuild => capstone-3.0.4-r1.ebuild}   | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dev-libs/capstone/capstone-3.0.4.ebuild 
b/dev-libs/capstone/capstone-3.0.4-r1.ebuild
similarity index 81%
rename from dev-libs/capstone/capstone-3.0.4.ebuild
rename to dev-libs/capstone/capstone-3.0.4-r1.ebuild
index da406e9..018e9db 100644
--- a/dev-libs/capstone/capstone-3.0.4.ebuild
+++ b/dev-libs/capstone/capstone-3.0.4-r1.ebuild
@@ -3,19 +3,14 @@
 # $Id$
 
 EAPI=6
-inherit cmake-utils flag-o-matic
 
 DESCRIPTION="disassembly/disassembler framework + bindings"
 HOMEPAGE="http://www.capstone-engine.org/;
 SRC_URI="https://github.com/aquynh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/3" # libcapstone.so.3
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
-
-src_test() {
-   cmake-utils_src_make test
-}



[gentoo-commits] repo/gentoo:master commit in: dev-libs/capstone/

2016-06-04 Thread Sergei Trofimovich
commit: 90953339323eb8685f77e97600c89d37779e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun  4 11:46:38 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun  4 11:54:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9095

dev-libs/capstone: initial commit, a disassembler library for various targets

Package-Manager: portage-2.3.0_rc1

 dev-libs/capstone/Manifest  |  1 +
 dev-libs/capstone/capstone-3.0.4.ebuild | 21 +
 dev-libs/capstone/metadata.xml  | 12 
 3 files changed, 34 insertions(+)

diff --git a/dev-libs/capstone/Manifest b/dev-libs/capstone/Manifest
new file mode 100644
index 000..239b44f
--- /dev/null
+++ b/dev-libs/capstone/Manifest
@@ -0,0 +1 @@
+DIST capstone-3.0.4.tar.gz 2800818 SHA256 
5d6dadf5864c56f8de66c66088fa68e849d0bff6577865a4f81b6f23112b14f2 SHA512 
a5c29e7c559b5391d6a4ec9a7f766699ea6d321aa2f1fc57fdcec893107fa3ef2f5f6323629971c1129f1ca087df4f3ad03d0a8234d2eae368c8ccfec04dbf4d
 WHIRLPOOL 
24aa002e215ee2a74c06a9be40218c78258a853028c74e1cdf95a5e2ea484471cf084cc8f5cc9db1aaefc16cf80a0b37480d4af60ca9119730334cbe2a02b906

diff --git a/dev-libs/capstone/capstone-3.0.4.ebuild 
b/dev-libs/capstone/capstone-3.0.4.ebuild
new file mode 100644
index 000..da406e9
--- /dev/null
+++ b/dev-libs/capstone/capstone-3.0.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="disassembly/disassembler framework + bindings"
+HOMEPAGE="http://www.capstone-engine.org/;
+SRC_URI="https://github.com/aquynh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_test() {
+   cmake-utils_src_make test
+}

diff --git a/dev-libs/capstone/metadata.xml b/dev-libs/capstone/metadata.xml
new file mode 100644
index 000..506ec45
--- /dev/null
+++ b/dev-libs/capstone/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+   
+   sly...@gentoo.org
+   Sergei Trofimovich
+   
+   
+   aquynh/capstone
+   
+