1 |
pacho 11/07/26 18:22:27 |
2 |
|
3 |
Modified: beecrypt-4.2.1.ebuild ChangeLog |
4 |
Removed: beecrypt-4.1.2-r2.ebuild beecrypt-4.1.2-r1.ebuild |
5 |
Log: |
6 |
This needs python2 (bug #312153 and #362497 by Arfrever and Vadim), remove old. |
7 |
|
8 |
(Portage version: 2.1.10.7/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.12 dev-libs/beecrypt/beecrypt-4.2.1.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild?rev=1.12&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild?rev=1.12&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild?r1=1.11&r2=1.12 |
16 |
|
17 |
Index: beecrypt-4.2.1.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v |
20 |
retrieving revision 1.11 |
21 |
retrieving revision 1.12 |
22 |
diff -u -r1.11 -r1.12 |
23 |
--- beecrypt-4.2.1.ebuild 3 Apr 2011 17:52:35 -0000 1.11 |
24 |
+++ beecrypt-4.2.1.ebuild 26 Jul 2011 18:22:27 -0000 1.12 |
25 |
@@ -1,10 +1,11 @@ |
26 |
# Copyright 1999-2011 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.11 2011/04/03 17:52:35 armin76 Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.12 2011/07/26 18:22:27 pacho Exp $ |
30 |
|
31 |
EAPI="3" |
32 |
+PYTHON_DEPEND="python? 2" |
33 |
|
34 |
-inherit eutils multilib autotools java-pkg-opt-2 |
35 |
+inherit eutils multilib autotools java-pkg-opt-2 python |
36 |
|
37 |
DESCRIPTION="general-purpose cryptography library" |
38 |
HOMEPAGE="http://sourceforge.net/projects/beecrypt/" |
39 |
@@ -15,8 +16,7 @@ |
40 |
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" |
41 |
IUSE="java nocxx python threads doc" |
42 |
|
43 |
-COMMONDEPEND="python? ( >=dev-lang/python-2.2 ) |
44 |
- !<app-arch/rpm-4.2.1 |
45 |
+COMMONDEPEND="!<app-arch/rpm-4.2.1 |
46 |
!nocxx? ( threads? ( >=dev-libs/icu-2.8 ) )" |
47 |
|
48 |
DEPEND="${COMMONDEPEND} |
49 |
@@ -28,9 +28,15 @@ |
50 |
RDEPEND="${COMMONDEPEND} |
51 |
java? ( >=virtual/jre-1.4 )" |
52 |
|
53 |
+pkg_setup() { |
54 |
+ use python && python_set_active_version 2 |
55 |
+} |
56 |
+ |
57 |
src_prepare() { |
58 |
java-pkg-opt-2_src_prepare |
59 |
|
60 |
+ use python && python_convert_shebangs -r 2 . |
61 |
+ |
62 |
epatch "${FILESDIR}"/${P}-build-system.patch |
63 |
eautoreconf |
64 |
} |
65 |
@@ -40,7 +46,7 @@ |
66 |
econf \ |
67 |
--disable-expert-mode \ |
68 |
$(use_enable threads) \ |
69 |
- $(use_with python python "${EPREFIX}"/usr/bin/python) \ |
70 |
+ $(use_with python python "${EPREFIX}"/usr/bin/python2) \ |
71 |
$(use threads && use_with !nocxx cplusplus || echo --without-cplusplus) \ |
72 |
$(use_with java) |
73 |
} |
74 |
@@ -58,8 +64,8 @@ |
75 |
src_test() { |
76 |
export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf" |
77 |
echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}" |
78 |
- make check || die "self test failed" |
79 |
- make bench || die "self benchmark test failed" |
80 |
+ emake check || die "self test failed" |
81 |
+ emake bench || die "self benchmark test failed" |
82 |
} |
83 |
|
84 |
src_install() { |
85 |
|
86 |
|
87 |
|
88 |
1.76 dev-libs/beecrypt/ChangeLog |
89 |
|
90 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/ChangeLog?rev=1.76&view=markup |
91 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/ChangeLog?rev=1.76&content-type=text/plain |
92 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/ChangeLog?r1=1.75&r2=1.76 |
93 |
|
94 |
Index: ChangeLog |
95 |
=================================================================== |
96 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v |
97 |
retrieving revision 1.75 |
98 |
retrieving revision 1.76 |
99 |
diff -u -r1.75 -r1.76 |
100 |
--- ChangeLog 3 Apr 2011 17:52:35 -0000 1.75 |
101 |
+++ ChangeLog 26 Jul 2011 18:22:27 -0000 1.76 |
102 |
@@ -1,6 +1,15 @@ |
103 |
# ChangeLog for dev-libs/beecrypt |
104 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
105 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.75 2011/04/03 17:52:35 armin76 Exp $ |
106 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.76 2011/07/26 18:22:27 pacho Exp $ |
107 |
+ |
108 |
+ 26 Jul 2011; Pacho Ramos <pacho@g.o> -beecrypt-4.1.2-r1.ebuild, |
109 |
+ -beecrypt-4.1.2-r2.ebuild, -files/beecrypt-4.1.2-base64.patch, |
110 |
+ -files/beecrypt-4.1.2-build.patch, -files/beecrypt-4.1.2-gcc4.patch, |
111 |
+ -files/beecrypt-4.1.2-python-Makefile-am.patch, |
112 |
+ -files/beecrypt-4.1.2-python-debug-py-c.patch, |
113 |
+ -files/beecrypt-4.1.2-threads.patch, beecrypt-4.2.1.ebuild: |
114 |
+ This needs python2 (bug #312153 and #362497 by Arfrever and Vadim), remove |
115 |
+ old. |
116 |
|
117 |
03 Apr 2011; Raúl Porcel <armin76@g.o> beecrypt-4.2.1.ebuild: |
118 |
ia64/s390/sh stable wrt #342387 |