Version bump, bug #278713.

(Portage version: 2.2_rc49/cvs/Linux x86_64)

3 files changed, 171 insertions, 1 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 39b75531493b..54630915f8ff 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/beecrypt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.64 2009/11/15 09:44:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.65 2009/11/15 12:23:28 swegener Exp $
+
+*beecrypt-4.2.1 (15 Nov 2009)
+
+  15 Nov 2009; Sven Wegener <swegener@gentoo.org> +beecrypt-4.2.1.ebuild,
+  +files/beecrypt-4.2.1-build-system.patch:
+  Version bump, bug #278713.
 
   15 Nov 2009; Sven Wegener <swegener@gentoo.org> beecrypt-4.1.2-r1.ebuild,
   beecrypt-4.1.2-r2.ebuild:
diff --git a/dev-libs/beecrypt/beecrypt-4.2.1.ebuild b/dev-libs/beecrypt/beecrypt-4.2.1.ebuild
new file mode 100644
index 000000000000..6d24123d9a6c
--- /dev/null
+++ b/dev-libs/beecrypt/beecrypt-4.2.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2009 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.1 2009/11/15 12:23:28 swegener Exp $
+
+EAPI="2"
+
+inherit eutils multilib autotools java-pkg-opt-2
+
+DESCRIPTION="general-purpose cryptography library"
+HOMEPAGE="http://sourceforge.net/projects/beecrypt/"
+SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="java nocxx python threads doc"
+
+COMMONDEPEND="python? ( >=dev-lang/python-2.2 )
+	!<app-arch/rpm-4.2.1
+	!nocxx? ( threads? ( >=dev-libs/icu-2.8 ) )"
+
+DEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	doc? ( app-doc/doxygen
+		virtual/latex-base
+		|| ( dev-texlive/texlive-fontsextra app-text/ptex )
+	)"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.4 )"
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+
+	epatch "${FILESDIR}"/${P}-build-system.patch
+	eautoreconf
+}
+
+src_configure() {
+	# cpluscplus needs threads support
+	econf \
+		--disable-expert-mode \
+		$(use_enable threads) \
+		$(use_with python python /usr/bin/python) \
+		$(use threads && use_with !nocxx cplusplus || echo --without-cplusplus) \
+		$(use_with java) \
+		|| die
+}
+
+src_compile() {
+	default
+
+	if use doc
+	then
+		cd include/beecrypt
+		doxygen || die "doxygen failed"
+	fi
+}
+
+src_test() {
+	make check || die "self test failed"
+	make bench || die "self benchmark test failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	rm -f "${D}"/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
+}
diff --git a/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch b/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch
new file mode 100644
index 000000000000..b2bd64aea003
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch
@@ -0,0 +1,91 @@
+--- beecrypt-4.2.1/configure.ac
++++ beecrypt-4.2.1/configure.ac
+@@ -11,7 +11,7 @@
+ 
+ # Checks for package options
+ AC_ARG_ENABLE(expert-mode, [  --enable-expert-mode      follow user-defined CFLAGS settings [[default=no]]],[
+-  ac_enable_expert_mode=yes
++  ac_enable_expert_mode=$enableval
+   ],[
+   if test "X$CFLAGS" != "X"; then
+     echo "enabling expert mode"
+@@ -25,7 +25,7 @@
+   if test "$ac_enable_expert_mode" = yes; then
+     AC_MSG_ERROR([--enable-debug cannot be used in conjunction with --enable-expert-mode])
+   fi
+-  ac_enable_debug=yes
++  ac_enable_debug=$enableval
+   ],[
+   ac_enable_debug=no
+   ])
+@@ -456,7 +456,7 @@
+       ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`"
+     ])
+     AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [
+-      ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'`
++      ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, 0)'`
+     ])
+   fi
+ fi
+--- beecrypt-4.2.1/java/Makefile.am
++++ beecrypt-4.2.1/java/Makefile.am
+@@ -26,7 +26,7 @@
+ 
+ INCLUDES = -I$(top_srcdir)/include
+ 
+-libaltdir=$(prefix)/lib@LIBALT@
++libaltdir=$(libdir)
+ 
+ libalt_LTLIBRARIES = libbeecrypt_java.la
+ 
+--- beecrypt-4.2.1/acinclude.m4
++++ beecrypt-4.2.1/acinclude.m4
+@@ -1589,20 +1589,5 @@
+   AC_SUBST(TYPEDEF_BC_THREADID_T,$bc_typedef_bc_threadid_t)
+   ])
+-
+-AH_BOTTOM([
+-#if ENABLE_THREADS
+-# ifndef _REENTRANT
+-#  define _REENTRANT
+-# endif
+-# if LINUX
+-#  define _LIBC_REENTRANT
+-# endif
+-#else
+-# ifdef _REENTRANT
+-#  undef _REENTRANT
+-# endif
+-#endif
+-])
+ 
+ 
+ dnl  BEE_THREAD_LOCAL_STORAGE
+@@ -1623,7 +1609,5 @@
+   ])
+ 
+ AH_BOTTOM([
+-#if !ENABLE_THREAD_LOCAL_STORAGE
+-# define __thread
+-#endif
++#include "config.threads.h"
+ ])
+--- beecrypt-4.2.1/config.threads.h
++++ beecrypt-4.2.1/config.threads.h
+@@ -0,0 +1,16 @@
++#if ENABLE_THREADS
++# ifndef _REENTRANT
++#  define _REENTRANT
++# endif
++# if LINUX
++#  define _LIBC_REENTRANT
++# endif
++#else
++# ifdef _REENTRANT
++#  undef _REENTRANT
++# endif
++#endif
++
++#if !ENABLE_THREAD_LOCAL_STORAGE
++# define __thread
++#endif