Cleanup build system and add sh love.

(Portage version: 2.1_pre3-r1)

4 files changed, 135 insertions, 2 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index ae051bc3a28c..665cc60855ee 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/beecrypt
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.28 2005/08/11 12:45:37 herbs Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.29 2006/01/18 23:26:17 vapier Exp $
+
+*beecrypt-4.1.2-r1 (18 Jan 2006)
+
+  18 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/beecrypt-4.1.2-custom-cflags.patch, +beecrypt-4.1.2-r1.ebuild:
+  Cleanup build system and add sh love.
 
   11 Aug 2005; Herbie Hopkins <herbs@gentoo.org> beecrypt-4.1.2.ebuild:
   Fix install path of python module on multilib systems.
diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
new file mode 100644
index 000000000000..a66902ae0922
--- /dev/null
+++ b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.1 2006/01/18 23:26:17 vapier Exp $
+
+inherit flag-o-matic eutils multilib autotools
+
+DESCRIPTION="general-purpose cryptography library"
+HOMEPAGE="http://sourceforge.net/projects/beecrypt"
+SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="java mmx nocxx python sse sse2 threads"
+
+DEPEND="python? ( >=dev-lang/python-2.2 )
+	!<app-arch/rpm-4.2.1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Set correct python libdir on multilib systems
+	sed -i -e 's:get_python_lib():get_python_lib(1,0):' \
+		configure.ac || die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-custom-cflags.patch
+	eautoreconf
+}
+
+src_compile() {
+	local myarch=$(get-flag march)
+	[[ -z ${myarch} ]] && myarch=${CHOST%%-*}
+
+	use mmx && append-flags -DOPTIMIZE_MMX
+	use sse && append-flags -DOPTIMIZE_SSE
+	use sse2 && append-flags -DOPTIMIZE_SSE2
+
+	econf \
+		$(use_enable threads) \
+		$(use_with !nocxx cplusplus) \
+		$(use_with java) \
+		$(use_with python) \
+		--with-arch=${myarch} \
+		|| die
+	emake || die "emake failed"
+}
+
+src_test() {
+	export BEECRYPT_CONF_FILE=${T}/beecrypt-test.conf
+	echo provider.1=${S}/c++/provider/.libs/base.so > ${BEECRYPT_CONF_FILE}
+	make check || die "self test failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	# Not needed
+	rm -f "${D}"/usr/$(get_libdir)/python*/site-packages/_bc.*a
+	dodoc BUGS README BENCHMARKS NEWS || die "dodoc failed"
+}
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-custom-cflags.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-custom-cflags.patch
new file mode 100644
index 000000000000..3256b11929a7
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-custom-cflags.patch
@@ -0,0 +1,66 @@
+--- configure.ac.orig	2006-01-18 13:44:16.000000000 -0500
++++ configure.ac	2006-01-18 13:45:35.000000000 -0500
+@@ -502,8 +502,7 @@
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
+     ;;
+   athlon*)
+-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX"
+-    CFLAGS="$CFLAGS -mmmx"
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
+     ;;
+   i386)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
+@@ -527,23 +526,19 @@
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
+     ;;
+   pentium-mmx)
+-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586 -DOPTIMIZE_MMX"
+-    CFLAGS="$CFLAGS -mmmx"
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
+     ;;
+   pentiumpro)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
+     ;;
+   pentium2)
+-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
+-    CFLAGS="$CFLAGS -mmmx"
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
+     ;;
+   pentium3)
+-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE"
+-    CFLAGS="$CFLAGS -msse"
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
+     ;;
+   pentium4)
+-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2"
+-    CFLAGS="$CFLAGS -msse2"
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
+     ;;
+   powerpc)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_POWERPC"
+--- acinclude.m4.orig	2006-01-18 13:46:02.000000000 -0500
++++ acinclude.m4	2006-01-18 13:47:46.000000000 -0500
+@@ -454,9 +454,8 @@
+       ;;
+     esac
+   fi
+-  if test "$ac_enable_debug" = yes; then
+-    BEECRYPT_CFLAGS_REM([-O2])
+-    CFLAGS="$CFLAGS -Wall -pedantic"
++  if true; then
++    CFLAGS="$CFLAGS -Wall"
+   else
+     # Generic optimizations, including cpu tuning
+     BEECRYPT_CFLAGS_REM([-g])
+@@ -566,9 +565,8 @@
+       ;;
+     esac
+   fi
+-  if test "$ac_enable_debug" = yes; then
+-    BEECRYPT_CXXFLAGS_REM([-O2])
+-    CXXFLAGS="$CXXFLAGS -Wall -pedantic"
++  if true; then
++    CXXFLAGS="$CXXFLAGS -Wall"
+   else
+     # Generic optimizations, including cpu tuning
+     BEECRYPT_CXXFLAGS_REM([-g])
diff --git a/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r1 b/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r1
new file mode 100644
index 000000000000..8f5416806b20
--- /dev/null
+++ b/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r1
@@ -0,0 +1 @@
+MD5 820d26437843ab0a6a8a5151a73a657c beecrypt-4.1.2.tar.gz 774280