Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/distorm64/, dev-libs/distorm64/files/
Date: Sat, 04 Jun 2016 11:30:24
Message-Id: 1465039809.cbd85e155aedfd660c283da4abc00887b6044d45.slyfox@gentoo
1 commit: cbd85e155aedfd660c283da4abc00887b6044d45
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 4 11:29:28 2016 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 4 11:30:09 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd85e15
7
8 dev-libs/distorm64: drop old
9
10 Package-Manager: portage-2.3.0_rc1
11
12 dev-libs/distorm64/Manifest | 2 -
13 dev-libs/distorm64/distorm64-1.7.30-r1.ebuild | 70 ----------------------
14 dev-libs/distorm64/distorm64-3.1.ebuild | 33 ----------
15 dev-libs/distorm64/distorm64-3.3.ebuild | 36 -----------
16 .../distorm64/files/distorm64-1.7.30-python.patch | 11 ----
17 .../files/distorm64-1.7.30-respect_flags.patch | 42 -------------
18 6 files changed, 194 deletions(-)
19
20 diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
21 index 3171bf6..f3f4c39 100644
22 --- a/dev-libs/distorm64/Manifest
23 +++ b/dev-libs/distorm64/Manifest
24 @@ -1,4 +1,2 @@
25 DIST distorm-3.3.3.tar.gz 220254 SHA256 a99d49f111c1ae889c4368eaa11feed9d3d2cfd451081f8f3ddc90138eb045ab SHA512 abc37d050efcb7fd7c6e0f1ef055537f06059528fb48a07d159621adca8d905ee3a44b394d75e10aa69f2429fb1023e9282b349281acb3a9474148f195306fbf WHIRLPOOL d58924e2a7626d122abdff1823c25080cd98b7bedffc14865e84314d5f035fa24ff48dc7f3d5318bfc183ba22999453c79a4b76bc6a3b26d8e35ffbc52da8f7d
26 -DIST distorm3-1.0.zip 137505 SHA256 f381d0ddabed04ee9161633d3eb3c0bdb87100accd9b669385d4d72b36931f69 SHA512 56e9640b8f140ab9cf9cbacd205b7caf21a84ad698c1b1b3cf93194c986e4de107e056929742301ee7491c5e9bf75784d712740a2fadec084952ca5382fb7e24 WHIRLPOOL 95d4b4fa4a31c6f7fa101fd2f807c89eb87ff6d1a5cb150e14198e655c54acb77caf13a7ad12ba0abea59e0be17f6ca6d04bd0a70c572bd807d436013c4bbaf3
27 DIST distorm3-3-sdist.zip 143096 SHA256 a4794af34bc71b1efebf155ff046b236af6b218c11c01127e63bdca340d43abe SHA512 a00a24af997d22c905ba7a311c7f7a4345458888163225266bf3f7f8449b12fa7089ad9154cbfa65ed2f9ffe1002b4475de812778792250bd714cb69c41f5eb9 WHIRLPOOL bd2226394ed25fac93876ae5c7a0f5a073fccb056aa4e9b9bcdd06b2f9414954a0e4c5b94ca254637f648177282fe928f54f16368fd28dab644fe27c1c9f87e7
28 -DIST distorm64-pkg1.7.30.tar.bz2 91976 SHA256 bc2fc90e2111dfbba7fa397725ed6ae8b70477a3f7c60995e73d44a778a751be SHA512 d5890a3c295a81d6b59eabc14bbf2cdb8686f7675bae993ab2ec7a4d6957ab3a700776c75e58443db78c6cb29b9aaa287d4eac6c35bec68d444d3dbd5fba03c8 WHIRLPOOL 1f8c0f4bcf54ad1cb0b5460c11e031711d6c1d3db60b3c003d2d2ace1dae3c2b92f4e93ca20d119ffc34a41f6c902b1970229038b4e2518e20f18d980cc29082
29
30 diff --git a/dev-libs/distorm64/distorm64-1.7.30-r1.ebuild b/dev-libs/distorm64/distorm64-1.7.30-r1.ebuild
31 deleted file mode 100644
32 index b64a51d..0000000
33 --- a/dev-libs/distorm64/distorm64-1.7.30-r1.ebuild
34 +++ /dev/null
35 @@ -1,70 +0,0 @@
36 -# Copyright 1999-2009 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -# $Id$
39 -
40 -EAPI="2"
41 -SUPPORT_PYTHON_ABIS="1"
42 -
43 -inherit eutils flag-o-matic python toolchain-funcs
44 -
45 -DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
46 -HOMEPAGE="http://www.ragestorm.net/distorm/"
47 -SRC_URI="http://ragestorm.net/distorm/${PN}-pkg${PV}.tar.bz2"
48 -
49 -LICENSE="BSD"
50 -SLOT="0"
51 -KEYWORDS="~amd64 ~x86"
52 -IUSE="+python"
53 -
54 -DEPEND="python? ( >=dev-lang/python-2.4 )"
55 -RDEPEND="${DEPEND}"
56 -RESTRICT_PYTHON_ABIS="3.*"
57 -
58 -S="${WORKDIR}/${PN}"
59 -
60 -src_prepare() {
61 - epatch "${FILESDIR}/${P}-python.patch"
62 - epatch "${FILESDIR}/${P}-respect_flags.patch"
63 -}
64 -
65 -src_compile() {
66 - cd "${WORKDIR}/${PN}/build/linux"
67 - emake CC="$(tc-getCC)" clib || die "emake clib failed"
68 -
69 - if use python; then
70 - building() {
71 - # Build ../../src/pydistorm.o separately with each enabled version of Python.
72 - rm -f ../../src/pydistorm.o
73 -
74 - # Additional CFLAGS retrieved from build/linux/Makefile.
75 - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -I$(python_get_includedir) -Wall -fPIC -DSUPPORT_64BIT_OFFSET -D_DLL" TARGET="distorm.so-${PYTHON_ABI}" py
76 - }
77 - python_execute_function building
78 - fi
79 -
80 - cd "${WORKDIR}/${PN}/linuxproj"
81 - emake CC="$(tc-getCC)" disasm || die "emake disasm failed"
82 -
83 -}
84 -
85 -src_install() {
86 - cd "${WORKDIR}/${PN}/build/linux"
87 -
88 - dolib.so libdistorm64.so
89 -
90 - if use python; then
91 - installation() {
92 - dodir "$(python_get_sitedir)"
93 - install distorm.so-${PYTHON_ABI} "${D}$(python_get_sitedir)/distorm.so"
94 - }
95 - python_execute_function -q installation
96 - fi
97 -
98 - cd "${WORKDIR}/${PN}"
99 - newlib.a distorm64.a libdistorm64.a
100 -
101 - dobin linuxproj/disasm
102 -
103 - dodir "/usr/include"
104 - install distorm.h "${D}usr/include/" || die "Unable to install distorm.h"
105 -}
106
107 diff --git a/dev-libs/distorm64/distorm64-3.1.ebuild b/dev-libs/distorm64/distorm64-3.1.ebuild
108 deleted file mode 100644
109 index a359404..0000000
110 --- a/dev-libs/distorm64/distorm64-3.1.ebuild
111 +++ /dev/null
112 @@ -1,33 +0,0 @@
113 -# Copyright 1999-2012 Gentoo Foundation
114 -# Distributed under the terms of the GNU General Public License v2
115 -# $Id$
116 -
117 -EAPI="3"
118 -PYTHON_DEPEND="2"
119 -SUPPORT_PYTHON_ABIS="1"
120 -RESTRICT_PYTHON_ABIS="3.* 2.5"
121 -
122 -inherit eutils distutils python
123 -
124 -DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
125 -HOMEPAGE="http://www.ragestorm.net/distorm/"
126 -
127 -# This is not nice - hardcoding is bad
128 -SRC_URI="https://distorm.googlecode.com/files/distorm3-1.0.zip"
129 -S="${WORKDIR}/distorm3-1.0"
130 -
131 -DEPEND="app-arch/unzip"
132 -RDEPEND=""
133 -
134 -LICENSE="GPL-3"
135 -SLOT="0"
136 -KEYWORDS="~amd64 ~x86"
137 -IUSE=""
138 -
139 -pkg_setup() {
140 - python_pkg_setup
141 -}
142 -
143 -src_compile() {
144 - distutils_src_compile
145 -}
146
147 diff --git a/dev-libs/distorm64/distorm64-3.3.ebuild b/dev-libs/distorm64/distorm64-3.3.ebuild
148 deleted file mode 100644
149 index 17b85e6..0000000
150 --- a/dev-libs/distorm64/distorm64-3.3.ebuild
151 +++ /dev/null
152 @@ -1,36 +0,0 @@
153 -# Copyright 1999-2013 Gentoo Foundation
154 -# Distributed under the terms of the GNU General Public License v2
155 -# $Id$
156 -
157 -EAPI=5
158 -PYTHON_DEPEND="2"
159 -SUPPORT_PYTHON_ABIS="1"
160 -RESTRICT_PYTHON_ABIS="3.* 2.5"
161 -
162 -inherit eutils distutils python versionator
163 -
164 -DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
165 -HOMEPAGE="http://www.ragestorm.net/distorm/"
166 -
167 -MY_PN=distorm
168 -MY_PV=$(replace_all_version_separators '-')
169 -MY_P=${MY_PN}${MY_PV}
170 -
171 -SRC_URI="https://distorm.googlecode.com/files/${MY_P}-sdist.zip"
172 -S="${WORKDIR}/${MY_P}"
173 -
174 -DEPEND="app-arch/unzip"
175 -RDEPEND=""
176 -
177 -LICENSE="GPL-3"
178 -SLOT="0"
179 -KEYWORDS="~amd64 ~x86"
180 -IUSE=""
181 -
182 -pkg_setup() {
183 - python_pkg_setup
184 -}
185 -
186 -src_compile() {
187 - distutils_src_compile
188 -}
189
190 diff --git a/dev-libs/distorm64/files/distorm64-1.7.30-python.patch b/dev-libs/distorm64/files/distorm64-1.7.30-python.patch
191 deleted file mode 100644
192 index 15d82f2..0000000
193 --- a/dev-libs/distorm64/files/distorm64-1.7.30-python.patch
194 +++ /dev/null
195 @@ -1,11 +0,0 @@
196 ---- src/pydistorm.h
197 -+++ src/pydistorm.h
198 -@@ -22,7 +22,7 @@
199 - #include "decoder.h"
200 -
201 - #ifdef __GNUC__
202 -- #include <python2.5/Python.h>
203 -+ #include <Python.h>
204 - #elif _MSC_VER
205 - #include <python.h>
206 - #endif
207
208 diff --git a/dev-libs/distorm64/files/distorm64-1.7.30-respect_flags.patch b/dev-libs/distorm64/files/distorm64-1.7.30-respect_flags.patch
209 deleted file mode 100644
210 index 0af2da2..0000000
211 --- a/dev-libs/distorm64/files/distorm64-1.7.30-respect_flags.patch
212 +++ /dev/null
213 @@ -1,42 +0,0 @@
214 ---- build/linux/Makefile
215 -+++ build/linux/Makefile
216 -@@ -6,7 +6,7 @@
217 - COBJS = ../../src/x86defs.o ../../src/wstring.o ../../src/textdefs.o ../../src/prefix.o ../../src/operands.o ../../src/insts.o ../../src/instructions.o ../../src/distorm.o ../../src/decoder.o
218 - PYOBJS = ../../src/x86defs.o ../../src/wstring.o ../../src/textdefs.o ../../src/pydistorm.o ../../src/prefix.o ../../src/operands.o ../../src/insts.o ../../src/instructions.o ../../src/decoder.o
219 - CC = gcc
220 --CFLAGS = -O2 -Wall -fPIC -DSUPPORT_64BIT_OFFSET -D_DLL
221 -+CFLAGS += -Wall -fPIC -DSUPPORT_64BIT_OFFSET -D_DLL
222 -
223 - all: clib py
224 -
225 -@@ -14,11 +14,11 @@
226 - /bin/rm -rf ../../src/*.o ${TARGET} ../../distorm64.a
227 -
228 - clib: ${COBJS}
229 -- ${CC} ${CFLAGS} ${VERSION} ${COBJS} -fPIC -shared -o ${TARGET}
230 -+ ${CC} ${LDFLAGS} ${VERSION} ${COBJS} -fPIC -shared -o ${TARGET}
231 - ar rs ../../distorm64.a ${COBJS}
232 -
233 - py: ${PYOBJS}
234 -- ${CC} ${CFLAGS} ${VERSION} ${PYOBJS} -fPIC -shared -o ${TARGET}
235 -+ ${CC} ${LDFLAGS} ${VERSION} ${PYOBJS} -fPIC -shared -o ${TARGET}
236 -
237 - install: libdistorm64.so
238 - install -s ${TARGET} /usr/local/lib
239 ---- linuxproj/Makefile
240 -+++ linuxproj/Makefile
241 -@@ -4,12 +4,12 @@
242 -
243 - TARGET = disasm
244 - CC = gcc
245 --CFLAGS = -Wall -O2 -I. -o
246 -+CFLAGS += -Wall -I.
247 -
248 - all: disasm
249 -
250 - disasm:
251 -- ${CC} ${CFLAGS} ${TARGET} main.c ../distorm64.a
252 -+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${TARGET} main.c ../distorm64.a
253 -
254 - clean:
255 - /bin/rm -rf *.o ${TARGET}