From 6538f6feb6ecc88f4ee88ff6d585332a773f2ee3 Mon Sep 17 00:00:00 2001 From: Dane Smith Date: Wed, 19 Jan 2011 08:45:50 -0500 Subject: Take 3 --- dev-libs/cryptlib/Manifest | 2 +- dev-libs/cryptlib/cryptlib-3.4.0.ebuild | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'dev-libs') diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest index 5aed839..00981b6 100644 --- a/dev-libs/cryptlib/Manifest +++ b/dev-libs/cryptlib/Manifest @@ -6,6 +6,6 @@ DIST cl340.zip 5514751 RMD160 d38cf69841942670f84e4c2d64a708f5cb3d4299 SHA1 78f7 DIST cryptlib-3.3.3-manual.pdf.bz2 1066618 RMD160 27f18912b4f0194b76ca3a9a53839ec028c2473b SHA1 a87611f8aa69117b9bc511bb6c865ab8d723a94b SHA256 a52b0a7ef4c7288442f3189e1050492fa9c6c5048a09ce5f161a2a402dd068da DIST cryptlib-3.4.0-manual.pdf.bz2 1215921 RMD160 9070e2ed2fd748463cd06f09e22d422ce79bc0eb SHA1 bcb4f6bd558920b69a04bfd757460fc8f16afd7a SHA256 b06b736e6e123f578adcd08a8ede6cdb62e3e6d4ac2decb3570def1b29d44da8 EBUILD cryptlib-3.3.3-r1.ebuild 3479 RMD160 0d5b5c7bfebef5b5f434e28f846423dcb956c19b SHA1 1fd7f274a5de5764fb48596266efeef0582f6c55 SHA256 62399309c9bb34a8ad4ec0180042dee59e21465f3feaa10b8f1950fd6dad851b -EBUILD cryptlib-3.4.0.ebuild 3735 RMD160 c0b18c6c3cb2d53558a8687e5988c7620e3e2ab8 SHA1 e43285852e5ff23d8229583204d42ada0826a669 SHA256 ab2bf10db9a061a224f3fd2269ea289fb08c4bdebadf3972b70252acf71b401a +EBUILD cryptlib-3.4.0.ebuild 3497 RMD160 ce76eff5edcfd2d1d0b8c45d3922f4d9dc3c2c15 SHA1 e20ff6235a8d57c60047a4829e1b31d475efad8c SHA256 10235f2912e5882367c8691b6c707d0034b6839a1e8fc3524e508547a8a06c41 MISC ChangeLog 5111 RMD160 c1ad631bbfeb6ddcfddcf48c77baf54af6e97b85 SHA1 66f4ba9dbc0b2b1b8e40f2546956bd5893129d57 SHA256 ce31f17d90af86c9adf395875b70b7e4af7744337e51a4e5eb698fc76401d8b9 MISC metadata.xml 217 RMD160 d1e82852b46d347f8fc7027e72959160b5ade089 SHA1 d899a6870ab5af7dfe496ae91441fb7c103556a9 SHA256 5153c83d89a45bec698ace8ba637c14762333a6ddbe7ca798af6ce19f155d759 diff --git a/dev-libs/cryptlib/cryptlib-3.4.0.ebuild b/dev-libs/cryptlib/cryptlib-3.4.0.ebuild index ff83774..bb985a3 100644 --- a/dev-libs/cryptlib/cryptlib-3.4.0.ebuild +++ b/dev-libs/cryptlib/cryptlib-3.4.0.ebuild @@ -30,7 +30,7 @@ RDEPEND="sys-libs/zlib DEPEND="${RDEPEND} app-arch/unzip" -#DISTUTILS_SETUP_FILES="bindings/setup.py" +DISTUTILS_SETUP_FILES="bindings/setup.py" RESTRICT_PYTHON_ABIS="3.*" src_unpack() { @@ -59,16 +59,14 @@ src_prepare() { # Fix version number of shared library. sed -i -e 's/PLV="2"/PLV="3"/' tools/buildall.sh || die "sed tools/buildall.sh failed" - #Fix where python will look for libraries -# sed -i -e 's/\.\./\./g' bindings/setup.py \ -# || die "sed setup.py failed" - sed -i -e 's:bindings/::g' bindings/setup.py || die "sed setup.py failed" - # Respect LDFLAGS and fix soname and strip issues. epatch "${FILESDIR}/${PN}-3.3.2-ld.patch" # Use external zlib. epatch "${FILESDIR}/${PN}-3.4.0-external-zlib.patch" + + #Fix setup.py + epatch "${FILESDIR}"/${P}-python.patch } src_compile() { @@ -108,9 +106,7 @@ src_compile() { # Python bindings don't work with -O2 and higher. replace-flags -O* -O1 - pushd bindings > /dev/null distutils_src_compile - popd > /dev/null fi } @@ -123,9 +119,7 @@ src_install() { doins cryptlib.h || die if use python; then - pushd bindings > /dev/null distutils_src_install - popd > /dev/null fi dodoc README || die -- cgit v1.2.3-65-gdbad