diff options
| -rw-r--r-- | dev-libs/beecrypt/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/beecrypt/beecrypt-4.2.1.ebuild | 34 |
2 files changed, 23 insertions, 18 deletions
diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog index 6647d271b69d..63c93593380e 100644 --- a/dev-libs/beecrypt/ChangeLog +++ b/dev-libs/beecrypt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/beecrypt -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.78 2011/11/13 18:46:39 vapier Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.79 2012/02/18 09:13:22 scarabeus Exp $ + + 18 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org> beecrypt-4.2.1.ebuild: + Bump to eapi4 and add static-libs useflag. 13 Nov 2011; Mike Frysinger <vapier@gentoo.org> beecrypt-4.2.1.ebuild: Convert USE=nocxx to USE=cxx. diff --git a/dev-libs/beecrypt/beecrypt-4.2.1.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1.ebuild index 4da8d4a5b8ae..aac0eba76958 100644 --- a/dev-libs/beecrypt/beecrypt-4.2.1.ebuild +++ b/dev-libs/beecrypt/beecrypt-4.2.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.14 2011/11/13 18:46:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1.ebuild,v 1.15 2012/02/18 09:13:22 scarabeus Exp $ -EAPI="3" +EAPI=4 PYTHON_DEPEND="python? 2" inherit eutils multilib autotools java-pkg-opt-2 python @@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="java cxx python threads doc" +IUSE="java cxx python static-libs threads doc" COMMONDEPEND="!<app-arch/rpm-4.2.1 - threads? ( cxx? ( >=dev-libs/icu-2.8 ) )" + cxx? ( >=dev-libs/icu-2.8 )" DEPEND="${COMMONDEPEND} java? ( >=virtual/jdk-1.4 ) @@ -28,6 +28,10 @@ DEPEND="${COMMONDEPEND} RDEPEND="${COMMONDEPEND} java? ( >=virtual/jre-1.4 )" +DOCS="BUGS README BENCHMARKS NEWS" + +REQUIRED_USE="cxx? ( threads )" + pkg_setup() { use python && python_set_active_version 2 } @@ -45,17 +49,17 @@ src_configure() { # cpluscplus needs threads support econf \ --disable-expert-mode \ + $(use_enable static-libs static) \ $(use_enable threads) \ $(use_with python python "${EPREFIX}"/usr/bin/python2) \ - $(use threads && use_with cxx cplusplus || echo --without-cplusplus) \ + $(use_with cxx cplusplus) \ $(use_with java) } src_compile() { default - if use doc - then + if use doc; then cd include/beecrypt doxygen || die "doxygen failed" fi @@ -64,17 +68,15 @@ src_compile() { src_test() { export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf" echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}" - emake check || die "self test failed" - emake bench || die "self benchmark test failed" + emake check + emake bench } src_install() { - emake DESTDIR="${D}" install || die "make install failed" + default rm -f "${ED}"/usr/$(get_libdir)/python*/site-packages/_bc.*a - dodoc BUGS README BENCHMARKS NEWS || die "dodoc failed" - if use doc - then - dohtml -r docs/html/. || die "dohtml failed" - fi + use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + + + use doc && dohtml -r docs/html/. } |