public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/ikelos:master commit in: dev-util/capstone/, dev-util/capstone/files/
@ 2015-08-18 21:35 Mike Auty
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Auty @ 2015-08-18 21:35 UTC (permalink / raw
  To: gentoo-commits

commit:     0e7c50fc7bb23c1f37eec57a3f00e473d1f94654
Author:     layman <layman <AT> localhost>
AuthorDate: Tue Aug 18 21:15:10 2015 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 21:15:10 2015 +0000
URL:        https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=0e7c50fc

Remove the pointless/testing patch file.

 dev-util/capstone/Manifest                         |  1 -
 .../files/capstone-3.0.4-python-setup.patch        | 42 ----------------------
 2 files changed, 43 deletions(-)

diff --git a/dev-util/capstone/Manifest b/dev-util/capstone/Manifest
index e50e5f6..f303fb7 100644
--- a/dev-util/capstone/Manifest
+++ b/dev-util/capstone/Manifest
@@ -1,3 +1,2 @@
-AUX capstone-3.0.4-python-setup.patch 1403 SHA256 da86561eef1047b08bbf3975daa1eb59cf93066b93cb216f8db20d8fa13ac8ed SHA512 827d84a032ce109c810aebec71c24482ed56bd701dab3ddc905c2e6331950da1733139f67a1cd26ff4ba2be590a61a090b9cd497b6243c8f76050eaef100ec36 WHIRLPOOL a8b493667b889b64bf5567ed83e99bea84ec6508b72c41cdb4a3234539a84fba74ac8d2c2089d624ec1611a10b06f785144743f874f20c518299a2f9aa94bf7d
 DIST capstone-3.0.4.tar.gz 2800818 SHA256 5d6dadf5864c56f8de66c66088fa68e849d0bff6577865a4f81b6f23112b14f2 SHA512 a5c29e7c559b5391d6a4ec9a7f766699ea6d321aa2f1fc57fdcec893107fa3ef2f5f6323629971c1129f1ca087df4f3ad03d0a8234d2eae368c8ccfec04dbf4d WHIRLPOOL 24aa002e215ee2a74c06a9be40218c78258a853028c74e1cdf95a5e2ea484471cf084cc8f5cc9db1aaefc16cf80a0b37480d4af60ca9119730334cbe2a02b906
 EBUILD capstone-3.0.4.ebuild 1717 SHA256 c6a0cdc8ccc45b1b1048d8ce0c3d02babd61ae22056b82d67e85ca5359ebc63a SHA512 55bb1011ba9788e157beb6c168f66c0eca48d64e20a6d463811850a66e31e6c190e96b017bf527928a56ba24014e4bfd05e6e042f18d6684f24d225163f1a99e WHIRLPOOL 51a4a938c5df6505e28ae1f395f6bae4eb0e7052783b93d2d82616cb76ef0d45849d2f65ec3af595560af97976fd736a9cd73950f647d4731d5a8be7e8e6fc2e

diff --git a/dev-util/capstone/files/capstone-3.0.4-python-setup.patch b/dev-util/capstone/files/capstone-3.0.4-python-setup.patch
deleted file mode 100644
index ad3fbfe..0000000
--- a/dev-util/capstone/files/capstone-3.0.4-python-setup.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN capstone-2.1.2.orig/bindings/python/setup.py capstone-2.1.2/bindings/python/setup.py
---- capstone-2.1.2.orig/bindings/python/setup.py	2014-04-01 10:22:54.000000000 +0800
-+++ capstone-2.1.2/bindings/python/setup.py	2014-04-10 09:07:21.023071179 +0800
-@@ -4,17 +4,6 @@
- 
- VERSION = '2.1'
- 
--# clean package directory first
--import os.path, shutil, sys
--for f in sys.path:
--    if f.endswith('packages'):
--        pkgdir = os.path.join(f, 'capstone')
--        #print(pkgdir)
--        try:
--            shutil.rmtree(pkgdir)
--        except:
--            pass
--
- setup(
-     provides     = ['capstone'],
-     packages     = ['capstone'],
-diff -urN capstone-2.1.2.orig/bindings/python/setup_cython.py capstone-2.1.2/bindings/python/setup_cython.py
---- capstone-2.1.2.orig/bindings/python/setup_cython.py	2014-04-01 10:22:54.000000000 +0800
-+++ capstone-2.1.2/bindings/python/setup_cython.py	2014-04-10 09:10:03.838082455 +0800
-@@ -21,17 +21,6 @@
-     Extension("capstone.x86_const", ["pyx/x86_const.pyx"], extra_compile_args=compile_args)
- ]
- 
--# clean package directory first
--import os.path, shutil, sys
--for f in sys.path:
--    if f.endswith('packages'):
--        pkgdir = os.path.join(f, 'capstone')
--        #print(pkgdir)
--        try:
--            shutil.rmtree(pkgdir)
--        except:
--            pass
--
- setup(
-     provides     = ['capstone'],
-     package_dir  = {'capstone' : 'pyx'},


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] dev/ikelos:master commit in: dev-util/capstone/, dev-util/capstone/files/
@ 2015-08-17 17:08 Mike Auty
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Auty @ 2015-08-17 17:08 UTC (permalink / raw
  To: gentoo-commits

commit:     6bb89897e17d9e41af87b6a06e5d0da2f069769e
Author:     layman <layman <AT> localhost>
AuthorDate: Mon Aug 17 17:06:20 2015 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 17:06:20 2015 +0000
URL:        https://gitweb.gentoo.org/dev/ikelos.git/commit/?id=6bb89897

Add in capstone monolithic install (so python bindings are up-to-date).

 dev-util/capstone/Manifest                         |  3 +
 dev-util/capstone/capstone-3.0.4.ebuild            | 64 ++++++++++++++++++++++
 .../files/capstone-3.0.4-python-setup.patch        | 42 ++++++++++++++
 3 files changed, 109 insertions(+)

diff --git a/dev-util/capstone/Manifest b/dev-util/capstone/Manifest
new file mode 100644
index 0000000..e50e5f6
--- /dev/null
+++ b/dev-util/capstone/Manifest
@@ -0,0 +1,3 @@
+AUX capstone-3.0.4-python-setup.patch 1403 SHA256 da86561eef1047b08bbf3975daa1eb59cf93066b93cb216f8db20d8fa13ac8ed SHA512 827d84a032ce109c810aebec71c24482ed56bd701dab3ddc905c2e6331950da1733139f67a1cd26ff4ba2be590a61a090b9cd497b6243c8f76050eaef100ec36 WHIRLPOOL a8b493667b889b64bf5567ed83e99bea84ec6508b72c41cdb4a3234539a84fba74ac8d2c2089d624ec1611a10b06f785144743f874f20c518299a2f9aa94bf7d
+DIST capstone-3.0.4.tar.gz 2800818 SHA256 5d6dadf5864c56f8de66c66088fa68e849d0bff6577865a4f81b6f23112b14f2 SHA512 a5c29e7c559b5391d6a4ec9a7f766699ea6d321aa2f1fc57fdcec893107fa3ef2f5f6323629971c1129f1ca087df4f3ad03d0a8234d2eae368c8ccfec04dbf4d WHIRLPOOL 24aa002e215ee2a74c06a9be40218c78258a853028c74e1cdf95a5e2ea484471cf084cc8f5cc9db1aaefc16cf80a0b37480d4af60ca9119730334cbe2a02b906
+EBUILD capstone-3.0.4.ebuild 1717 SHA256 c6a0cdc8ccc45b1b1048d8ce0c3d02babd61ae22056b82d67e85ca5359ebc63a SHA512 55bb1011ba9788e157beb6c168f66c0eca48d64e20a6d463811850a66e31e6c190e96b017bf527928a56ba24014e4bfd05e6e042f18d6684f24d225163f1a99e WHIRLPOOL 51a4a938c5df6505e28ae1f395f6bae4eb0e7052783b93d2d82616cb76ef0d45849d2f65ec3af595560af97976fd736a9cd73950f647d4731d5a8be7e8e6fc2e

diff --git a/dev-util/capstone/capstone-3.0.4.ebuild b/dev-util/capstone/capstone-3.0.4.ebuild
new file mode 100644
index 0000000..5085a24
--- /dev/null
+++ b/dev-util/capstone/capstone-3.0.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: blshkv$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit eutils multilib distutils-r1
+
+#MY_PV=${PV//_/-}
+DESCRIPTION="A lightweight multi-platform, multi-architecture disassembly framework"
+HOMEPAGE="http://www.capstone-engine.org/"
+SRC_URI="https://github.com/aquynh/capstone/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="python cython"
+
+#RDEPEND="python? ( >=dev-python/capstone-python-${PV} )"
+RDEPEND=""
+DEPEND="cython? ( >=dev-python/cython-0.22 )
+        !dev-python/capstone-python"
+#TODO: add java and ocaml bindings
+
+#S=${WORKDIR}/${PN}-${MY_PV}
+
+src_prepare() {
+	if use python; then
+        cd "${S}/bindings/python"
+        #our hack to adjust cython setup
+		if use cython; then
+            cp setup_cython.py setup.py
+            #this section is from Makefile
+            cp capstone/__init__.py pyx/__init__.py
+			for i in arm{,_const} arm64{,_const} mips{,_const} ppc{,_const} x86{,_const} sparc{,_const} systemz sysz_const xcore{,_const}; do
+			    cp capstone/${i}.py pyx/${i}.pyx
+			done
+        fi
+		distutils-r1_src_prepare
+	fi
+	default_src_prepare
+}
+
+src_compile() {
+	if use python; then
+		cd "${S}/bindings/python"
+		distutils-r1_src_compile
+		cd "${S}"
+	fi
+	default_src_compile
+}
+
+src_install() {
+	cd "${S}/bindings/python"
+	distutils-r1_src_install
+	cd "${S}"
+	emake DESTDIR="${ED}" LIBDIRARCH=$(get_libdir) install
+#	if use !test; then
+#		dodir /usr/share/"${PN}"/
+#		cp -R "${S}"/tests "${D}/usr/share/${PN}/" || die "Install failed!"
+#	fi
+	dodoc README CREDITS.TXT RELEASE_NOTES ChangeLog docs/BHUSA2014-capstone.pdf
+}

diff --git a/dev-util/capstone/files/capstone-3.0.4-python-setup.patch b/dev-util/capstone/files/capstone-3.0.4-python-setup.patch
new file mode 100644
index 0000000..ad3fbfe
--- /dev/null
+++ b/dev-util/capstone/files/capstone-3.0.4-python-setup.patch
@@ -0,0 +1,42 @@
+diff -urN capstone-2.1.2.orig/bindings/python/setup.py capstone-2.1.2/bindings/python/setup.py
+--- capstone-2.1.2.orig/bindings/python/setup.py	2014-04-01 10:22:54.000000000 +0800
++++ capstone-2.1.2/bindings/python/setup.py	2014-04-10 09:07:21.023071179 +0800
+@@ -4,17 +4,6 @@
+ 
+ VERSION = '2.1'
+ 
+-# clean package directory first
+-import os.path, shutil, sys
+-for f in sys.path:
+-    if f.endswith('packages'):
+-        pkgdir = os.path.join(f, 'capstone')
+-        #print(pkgdir)
+-        try:
+-            shutil.rmtree(pkgdir)
+-        except:
+-            pass
+-
+ setup(
+     provides     = ['capstone'],
+     packages     = ['capstone'],
+diff -urN capstone-2.1.2.orig/bindings/python/setup_cython.py capstone-2.1.2/bindings/python/setup_cython.py
+--- capstone-2.1.2.orig/bindings/python/setup_cython.py	2014-04-01 10:22:54.000000000 +0800
++++ capstone-2.1.2/bindings/python/setup_cython.py	2014-04-10 09:10:03.838082455 +0800
+@@ -21,17 +21,6 @@
+     Extension("capstone.x86_const", ["pyx/x86_const.pyx"], extra_compile_args=compile_args)
+ ]
+ 
+-# clean package directory first
+-import os.path, shutil, sys
+-for f in sys.path:
+-    if f.endswith('packages'):
+-        pkgdir = os.path.join(f, 'capstone')
+-        #print(pkgdir)
+-        try:
+-            shutil.rmtree(pkgdir)
+-        except:
+-            pass
+-
+ setup(
+     provides     = ['capstone'],
+     package_dir  = {'capstone' : 'pyx'},


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-08-18 21:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-18 21:35 [gentoo-commits] dev/ikelos:master commit in: dev-util/capstone/, dev-util/capstone/files/ Mike Auty
  -- strict thread matches above, loose matches on Subject: below --
2015-08-17 17:08 Mike Auty

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox