[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptopp/files/, dev-python/pycryptopp/
commit: 66ca2f7ff2c8a8f51193d5d75d7f1cc0b77e5a44
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Oct 1 16:59:43 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Oct 1 16:59:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ca2f7f
dev-python/pycryptopp: fix building with crypto++-7+
Closes: https://bugs.gentoo.org/654614
Signed-off-by: Thomas Deutschmann gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../files/pycryptopp-0.7.1-abi-change.patch| 55 ++
...opp-0.7.1.ebuild => pycryptopp-0.7.1-r1.ebuild} | 6 ++-
2 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
new file mode 100644
index 000..d6edd2ecc63
--- /dev/null
+++ b/dev-python/pycryptopp/files/pycryptopp-0.7.1-abi-change.patch
@@ -0,0 +1,55 @@
+https://github.com/tahoe-lafs/pycryptopp/issues/42
+
+--- old/src/pycryptopp/cipher/aesmodule.cpp
old/src/pycryptopp/cipher/aesmodule.cpp
+@@ -20,6 +20,8 @@
+ #include
+ #endif
+
++typedef unsigned char byte;
++
+ static const char*const aes___doc__ = "_aes counter mode cipher\n\
+ You are advised to run aes.start_up_self_test() after importing this module.";
+
+--- old/src/pycryptopp/cipher/xsalsa20module.cpp
old/src/pycryptopp/cipher/xsalsa20module.cpp
+@@ -16,6 +16,8 @@
+ #include
+ #endif
+
++typedef unsigned char byte;
++
+ static const char* const xsalsa20__doc__ = "_xsalsa20 cipher";
+
+ static PyObject *xsalsa20_error;
+--- old/src/pycryptopp/hash/sha256module.cpp
old/src/pycryptopp/hash/sha256module.cpp
+@@ -21,6 +21,8 @@
+ #include
+ #endif
+
++typedef unsigned char byte;
++
+ static const char*const sha256___doc__ = "_sha256 hash function";
+
+ static PyObject *sha256_error;
+--- old/src/pycryptopp/publickey/rsamodule.cpp
old/src/pycryptopp/publickey/rsamodule.cpp
+@@ -87,7 +87,7 @@
+ VerifyingKey_serialize(VerifyingKey *self, PyObject *dummy) {
+ std::string outstr;
+ StringSink ss(outstr);
+-self->k->DEREncode(ss);
++self->k->GetMaterial().Save(ss);
+ PyStringObject* result =
reinterpret_cast(PyString_FromStringAndSize(outstr.c_str(),
outstr.size()));
+ if (!result)
+ return NULL;
+@@ -216,7 +216,7 @@
+ SigningKey_serialize(SigningKey *self, PyObject *dummy) {
+ std::string outstr;
+ StringSink ss(outstr);
+-self->k->DEREncode(ss);
++self->k->GetMaterial().Save(ss);
+ PyStringObject* result =
reinterpret_cast(PyString_FromStringAndSize(outstr.c_str(),
outstr.size()));
+ if (!result)
+ return NULL;
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
b/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild
similarity index 89%
rename from dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
rename to dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild
index 3a4257ebfa7..400c5ec5bc8 100644
--- a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.7.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 vcs-snapshot
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
DOCS="NEWS.rst"
+PATCHES=( "${FILESDIR}"/${PN}-0.7.1-abi-change.patch )
+
S="${WORKDIR}/${MY_P}"
python_prepare_all() {
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptopp/
commit: a0a6934e0e14e392ddf3af7faa8ebb8738022fe8
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Mar 17 08:54:18 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Mar 17 10:51:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a6934e
dev-python/pycryptopp: use HTTPS
dev-python/pycryptopp/pycryptopp-0.6.0.ebuild | 5 +++--
dev-python/pycryptopp/pycryptopp-0.7.1.ebuild | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
index 43aa84bb1f4..01b582c7cb3 100644
--- a/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -10,7 +10,8 @@ NUM="1206569328141510525648634803928199668821045408958"
MY_P="${P}.${NUM}"
DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
-HOMEPAGE="http://tahoe-lafs.org/trac/pycryptopp
https://pypi.python.org/pypi/pycryptopp;
+HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
+ https://pypi.python.org/pypi/pycryptopp;
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
index 17cb785f7e5..648eaf39acd 100644
--- a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
+++ b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -10,7 +10,8 @@ NUM="869544967005693312591928092448767568728501330214"
MY_P="${P}.${NUM}"
DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
-HOMEPAGE="http://tahoe-lafs.org/trac/pycryptopp
https://pypi.python.org/pypi/pycryptopp;
+HOMEPAGE="https://tahoe-lafs.org/trac/pycryptopp
+ https://pypi.python.org/pypi/pycryptopp;
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycryptopp/
commit: acbe43d6858efb23c00b6c8f3969117a3be22cb0
Author: Tim Harder gentoo org>
AuthorDate: Thu May 12 03:50:26 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Thu May 12 04:08:58 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbe43d6
dev-python/pycryptopp: version bump to 0.7.1
dev-python/pycryptopp/Manifest| 1 +
dev-python/pycryptopp/pycryptopp-0.7.1.ebuild | 44 +++
2 files changed, 45 insertions(+)
diff --git a/dev-python/pycryptopp/Manifest b/dev-python/pycryptopp/Manifest
index 5c83b32..704f313 100644
--- a/dev-python/pycryptopp/Manifest
+++ b/dev-python/pycryptopp/Manifest
@@ -1 +1,2 @@
DIST pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958.tar.gz
2009822 SHA256 116158917bd243da2701cfeba9a6374854bc9a599d1466e1a2dbadf37c802059
SHA512
bdd7d983bc0f8ef50c140a8da0c532883f0f1461d4a91d2761c872403133e9474d4fdbd78e275adbaacd2066cab4121034002a4730258162a618b3af913fdf7a
WHIRLPOOL
809aecb84ff38232351b0700225564672d082528d0a98ec071ce40b97e02df59ac41647ae6356ecafca91665cf533787db5182cd9536177affedbd7b89c3
+DIST pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.tar.gz
1992756 SHA256 08ad57a1a39b7ed23c173692281da0b8d49d98ad3dcc09f8cca6d901e142699f
SHA512
8b5996badedcd32345818f95e26487ac938c10e1790495515c74816075261a4fcedd2f80c55beddbdea54ed8899bc7c7b1a192468cb3cf434c50f9a68b65cc25
WHIRLPOOL
7a3b67615cbef44bef5e9d965364f1d10f2622922ebce2e345f58f3b20b56bee0d222d9466c9bb53dd53ae0c988ef192e4feda9ef05d6c3fb5be88cdd181cf88
diff --git a/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
new file mode 100644
index 000..fd4c669
--- /dev/null
+++ b/dev-python/pycryptopp/pycryptopp-0.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+NUM="869544967005693312591928092448767568728501330214"
+MY_P="${P}.${NUM}"
+
+DESCRIPTION="Python wrappers for a few algorithms from the Crypto++ library"
+HOMEPAGE="http://tahoe-lafs.org/trac/pycryptopp
https://pypi.python.org/pypi/pycryptopp;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/crypto++"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DOCS="NEWS.rst"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+ # Don't install license files
+ sed -i -e "/data_files=data_files,/d" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ # use system crypto++ library
+ distutils-r1_python_compile --disable-embedded-cryptopp
+}
+
+python_test() {
+ esetup.py test
+}
