Apply first aid to the mess

5 files changed, 73 insertions, 14 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 4e145d3cd0fd..d289e21ed8e1 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/beecrypt
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.16 2004/04/12 19:19:01 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.17 2004/04/13 19:54:56 cretin Exp $
+
+*beecrypt-3.1.0-r2 (13 Apr 2004)
+
+  13 Apr 2004; Stefan Jones <cretin@gentoo.org> beecrypt-3.1.0-r2.ebuild:
+  New version which will work!
+  ( fix the inline assembly functions nit linking)
 
   12 Apr 2004; Stefan Jones <cretin@gentoo.org> beecrypt-3.1.0-r1.ebuild:
   Fix athlon in mcpu or march, #47592
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 32f5678ae049..aeadc94916a7 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -1,6 +1,8 @@
 MD5 f1cecb92fdafb2efaf98dd882aa44a98 beecrypt-3.1.0-r1.ebuild 1660
+MD5 f38fbbccff9c04c8555ad683ee30f88b beecrypt-3.1.0-r2.ebuild 1664
 MD5 32849fb0432936a6d4a77f6fa65fbba4 ChangeLog 2591
 MD5 a1ec8219f4c2e7e3185f2cd869ddae33 files/beecrypt-3.1.0-python2.3.patch 769
 MD5 db9e84b099b36cd8fc6d05840c25007f files/beecrypt-3.1.0-athlon.diff 393
 MD5 9801ec0e3201addd45f08dea31ac5324 files/beecrypt-3.1.0-alpha.patch 321
 MD5 1c56cad20612ef6cbb3d1b56fa3c0b2e files/digest-beecrypt-3.1.0-r1 66
+MD5 1c56cad20612ef6cbb3d1b56fa3c0b2e files/digest-beecrypt-3.1.0-r2 66
diff --git a/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild b/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
index cb63a44b3338..f00805ae3252 100644
--- a/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
+++ b/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild,v 1.10 2004/04/12 19:19:01 cretin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild,v 1.11 2004/04/13 19:54:56 cretin Exp $
 
 inherit flag-o-matic
 
@@ -32,24 +32,13 @@ src_unpack() {
 	fi
 	# fix for python paths (#39282)
 	epatch ${FILESDIR}/beecrypt-3.1.0-python2.3.patch
-
-	# Athlons are i686
-	epatch ${FILESDIR}/beecrypt-3.1.0-athlon.diff
-	autoconf
 }
 
 src_compile() {
-	conf=""
-	arch=`get-flag march`
-	[ -n "$arch" ] && conf="--with-arch=$arch"
-	cpu=`get-flag mcpu`
-	[ -n "$cpu" ] && conf="$conf --with-cpu=$cpu"
-
 	econf \
 		`use_with python` \
 		--enable-shared \
-		--enable-static \
-		$conf || die
+		--enable-static || die
 	emake || die "emake failed"
 }
 
diff --git a/dev-libs/beecrypt/beecrypt-3.1.0-r2.ebuild b/dev-libs/beecrypt/beecrypt-3.1.0-r2.ebuild
new file mode 100644
index 000000000000..98fa307ee5d2
--- /dev/null
+++ b/dev-libs/beecrypt/beecrypt-3.1.0-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0-r2.ebuild,v 1.1 2004/04/13 19:54:56 cretin Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Beecrypt is a general-purpose cryptography library."
+HOMEPAGE="http://sourceforge.net/projects/beecrypt"
+SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+KEYWORDS="-x86"
+SLOT="0"
+
+DEPEND="python? ( >=dev-lang/python-2.2 )
+		!<app-arch/rpm-4.2.1"
+
+IUSE="python"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	if use alpha; then
+		# Prevent usage of lib64 on alpha where it isn't appropriate.
+		# We only have one execution model, so all libraries install
+		# in /usr/lib.  Note: This patch modifies configure, not
+		# configure.ac, because this package's Makefile is too smart
+		# and screws up mpopt.s when configure.ac is modified.
+		# (11 Nov 2003 agriffis)
+		epatch ${FILESDIR}/beecrypt-3.1.0-alpha.patch
+	fi
+	# fix for python paths (#39282)
+	epatch ${FILESDIR}/beecrypt-3.1.0-python2.3.patch
+
+	# Athlons are i686
+	epatch ${FILESDIR}/beecrypt-3.1.0-athlon.diff
+	./autogen.sh
+}
+
+src_compile() {
+	conf=""
+	arch=`get-flag march`
+	[ -n "$arch" ] && conf="--with-arch=$arch"
+	cpu=`get-flag mcpu`
+	[ -n "$cpu" ] && conf="$conf --with-cpu=$cpu"
+
+	econf \
+		`use_with python` \
+		--enable-shared \
+		--enable-static \
+		$conf || die
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	# Not needed
+	rm -f ${D}/usr/lib/python*/site-packages/_bc.*a
+	dodoc BUGS README BENCHMARKS NEWS || die "dodoc failed"
+}
diff --git a/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r2 b/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r2
new file mode 100644
index 000000000000..c1eceaa1cc97
--- /dev/null
+++ b/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r2
@@ -0,0 +1 @@
+MD5 1472cada46e2ab9f532f984de9740386 beecrypt-3.1.0.tar.gz 452555