Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/beecrypt: beecrypt-4.2.1.ebuild ChangeLog
Date: Sat, 18 Feb 2012 09:13:33
Message-Id: 20120218091322.C1D682004B@flycatcher.gentoo.org
1 scarabeus 12/02/18 09:13:22
2
3 Modified: beecrypt-4.2.1.ebuild ChangeLog
4 Log:
5 Bump to eapi4 and add static-libs useflag.
6
7 (Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.15 dev-libs/beecrypt/beecrypt-4.2.1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild?rev=1.15&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild?rev=1.15&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild?r1=1.14&r2=1.15
15
16 Index: beecrypt-4.2.1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v
19 retrieving revision 1.14
20 retrieving revision 1.15
21 diff -u -r1.14 -r1.15
22 --- beecrypt-4.2.1.ebuild 13 Nov 2011 18:46:39 -0000 1.14
23 +++ beecrypt-4.2.1.ebuild 18 Feb 2012 09:13:22 -0000 1.15
24 @@ -1,8 +1,8 @@
25 -# Copyright 1999-2011 Gentoo Foundation
26 +# Copyright 1999-2012 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.14 2011/11/13 18:46:39 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.15 2012/02/18 09:13:22 scarabeus Exp $
30
31 -EAPI="3"
32 +EAPI=4
33 PYTHON_DEPEND="python? 2"
34
35 inherit eutils multilib autotools java-pkg-opt-2 python
36 @@ -14,10 +14,10 @@
37 LICENSE="GPL-2 LGPL-2"
38 SLOT="0"
39 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
40 -IUSE="java cxx python threads doc"
41 +IUSE="java cxx python static-libs threads doc"
42
43 COMMONDEPEND="!<app-arch/rpm-4.2.1
44 - threads? ( cxx? ( >=dev-libs/icu-2.8 ) )"
45 + cxx? ( >=dev-libs/icu-2.8 )"
46
47 DEPEND="${COMMONDEPEND}
48 java? ( >=virtual/jdk-1.4 )
49 @@ -28,6 +28,10 @@
50 RDEPEND="${COMMONDEPEND}
51 java? ( >=virtual/jre-1.4 )"
52
53 +DOCS="BUGS README BENCHMARKS NEWS"
54 +
55 +REQUIRED_USE="cxx? ( threads )"
56 +
57 pkg_setup() {
58 use python && python_set_active_version 2
59 }
60 @@ -45,17 +49,17 @@
61 # cpluscplus needs threads support
62 econf \
63 --disable-expert-mode \
64 + $(use_enable static-libs static) \
65 $(use_enable threads) \
66 $(use_with python python "${EPREFIX}"/usr/bin/python2) \
67 - $(use threads && use_with cxx cplusplus || echo --without-cplusplus) \
68 + $(use_with cxx cplusplus) \
69 $(use_with java)
70 }
71
72 src_compile() {
73 default
74
75 - if use doc
76 - then
77 + if use doc; then
78 cd include/beecrypt
79 doxygen || die "doxygen failed"
80 fi
81 @@ -64,17 +68,15 @@
82 src_test() {
83 export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf"
84 echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}"
85 - emake check || die "self test failed"
86 - emake bench || die "self benchmark test failed"
87 + emake check
88 + emake bench
89 }
90
91 src_install() {
92 - emake DESTDIR="${D}" install || die "make install failed"
93 + default
94 rm -f "${ED}"/usr/$(get_libdir)/python*/site-packages/_bc.*a
95
96 - dodoc BUGS README BENCHMARKS NEWS || die "dodoc failed"
97 - if use doc
98 - then
99 - dohtml -r docs/html/. || die "dohtml failed"
100 - fi
101 + use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
102 +
103 + use doc && dohtml -r docs/html/.
104 }
105
106
107
108 1.79 dev-libs/beecrypt/ChangeLog
109
110 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/ChangeLog?rev=1.79&view=markup
111 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/ChangeLog?rev=1.79&content-type=text/plain
112 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/ChangeLog?r1=1.78&r2=1.79
113
114 Index: ChangeLog
115 ===================================================================
116 RCS file: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v
117 retrieving revision 1.78
118 retrieving revision 1.79
119 diff -u -r1.78 -r1.79
120 --- ChangeLog 13 Nov 2011 18:46:39 -0000 1.78
121 +++ ChangeLog 18 Feb 2012 09:13:22 -0000 1.79
122 @@ -1,6 +1,9 @@
123 # ChangeLog for dev-libs/beecrypt
124 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
125 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.78 2011/11/13 18:46:39 vapier Exp $
126 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
127 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.79 2012/02/18 09:13:22 scarabeus Exp $
128 +
129 + 18 Feb 2012; Tomáš Chvátal <scarabeus@g.o> beecrypt-4.2.1.ebuild:
130 + Bump to eapi4 and add static-libs useflag.
131
132 13 Nov 2011; Mike Frysinger <vapier@g.o> beecrypt-4.2.1.ebuild:
133 Convert USE=nocxx to USE=cxx.