Bump to eapi4 and add static-libs useflag.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

3 files changed, 40 insertions, 25 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/Manifest b/dev-libs/beecrypt/Manifest
index ace1a2f10e7d..14c611964cca 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX beecrypt-4.2.1-build-system.patch 2188 RMD160 01c8b9d4da5ea403b5f4362c3247a9ad37f3a979 SHA1 32534fe1c13602876d2c85588b72b3781a339e03 SHA256 5cf1fc73482f20ca4e937a401c1fb2e93eddc29802dc3a62a2ebddb7bb1689dd
 DIST beecrypt-4.2.1.tar.gz 882758 RMD160 2602b07bdd28d8d4a352199eca3d17b771098d66 SHA1 b1c62c2480c79302a8ca5c09063b3d654275eae0 SHA256 286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d
-EBUILD beecrypt-4.2.1.ebuild 2011 RMD160 a655544fba572d585fe6022feca1f1affc16ddeb SHA1 fef3142e107d86bffa8ea6c74b5680bd4d6ed758 SHA256 1b3a820a4fb570e92843ebd0ea45b9750be5a91736c5d706046eb1e4f6a6cbdb
-MISC ChangeLog 12469 RMD160 0af54c7eec6acb2943539f6c47dd88f715758572 SHA1 129e3fd99f1b18762f235b1d9948d2d07e9d9677 SHA256 3d81e4217f44acf66ea131b71d472fd8b211a84b82a6f1a3d73b48f0805be47e
+EBUILD beecrypt-4.2.1.ebuild 1934 RMD160 29a6119191e7179e067aa375ada6f6548d4e7fd3 SHA1 b7a569b680c5f095754c103f8a59a6a179fe9730 SHA256 fb6a5a431652764ec54ba7bfcbeabe0ea9d013a1895b8853a0af684b4a793b94
+MISC ChangeLog 12596 RMD160 d2e294d5e1fa659ec46f1c3a342f1b7a09569937 SHA1 7fcdad25532f1a059d7c74c00459bb8637a5b7d0 SHA256 0a5735911be58466c4f454fd96ab3c61ec5c30ee3ed498c63cd0eacbfb3e5900
 MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7AEJUACgkQaC/OocHi7JYyYwD8DfnMHS3cfhletL+IhBtW5aei
-/tDuYas42LaxRYiJVxIA/3dse0fGCPu4x4lf5NxIq9kX2dUcXQ7MsrKgpFoUMzeb
-=ZhQe
+iQIcBAEBAgAGBQJPP2u4AAoJEOSiRoyO7jvormAP/jZPBK/5KW+qml68eVcn5nlY
+uOoWRVyghxUq1aSVFAI9ZmNpi1MKfx8asw0rGKnTpCh3GbufpDDfxJqHqEC6qDRE
+LfZqc51T3pL2LFit1mEe8SC6FdoYeH5k410pVb8dS1TFqygm97epFoNlMDwDOFgf
+MtrKEFbQf86fK4Jrtcrv2rAaZceKru+fODO6x004TmvGCoAlKps8d+HoUksEZ9Hx
+8Mpejog2vg7mZ68e8zF+Y2yfgbhnn0/3xX+7/q7gMLHJy6CLZbr5PjNALzj+uC7X
+BfuijpmeDWAzeWNAcI+PMt16C2xpF2AjySzVCqLJmGpLbuMhG5nob1NoLJa4uFVw
+/ObSy51t43/AMSXzgHj/ZsMsOvwLkepAF2Bqh5NUJYO3OzJo3zHE3mbB7Q59jzzR
+j0RVnju7I88TXrdk9JujX2JMle5bfXKMlaJxw9q4nEhwO68izRXbonF0VUndEdzR
+gkSlJHEpVP6qvniDjVdHKtjj9jGt17iU7aF4Dyamgt1ovhN/LHW/UaDt52E8MEab
+QQLrzPh0lFERwFb+JUcj+0uxX1wZbDaX4fGkzRfp9TMl+dxGIuEoox6Z1hRsaZb4
+iqvtGg6uTGZ4Ff3KVcUS1nhOveqkXllyxSSeSYnXT7vFv+uYs54q0cEpi43Ebmmn
+9cKOvMzVyOwB2pgcJiMw
+=4a3d
 -----END PGP SIGNATURE-----
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/.
 }