Fixing ebuild headers, adding metadata.xml. Updated without bumping beecrypt-4.1.2-r1 ebuild. This ebuild uses upstream patches from cvs. Fixes python test failures on pentium3, athlon-xp, pentium-mmx; provides a workaround for pentium-m and athlon64. The ebuild is far from perfection, see bug #124900 for known issues. Thanks to Benedikt Boehm, #gentoo-python, #gentoo-amd64-dev, #gentoo-java for their support.

(Portage version: 2.1)

12 files changed, 142 insertions, 14 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 665cc60855ee..f0c480c092e7 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-libs/beecrypt
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.30 2006/06/15 19:55:07 sanchan Exp $
+
+  15 Jun 2006; Sandro Bonazzola <sanchan@gentoo.org>
+  +files/beecrypt-4.1.2-configure-ac.patch,
+  +files/beecrypt-4.1.2-python-Makefile-am.patch,
+  +files/beecrypt-4.1.2-python-debug-py-c.patch, +metadata.xml,
+  beecrypt-4.1.2-r1.ebuild:
+  Fixing ebuild headers, adding metadata.xml. Updated without bumping
+  beecrypt-4.1.2-r1 ebuild.
+  This ebuild uses upstream patches from cvs. Fixes python test failures on
+  pentium3, athlon-xp, pentium-mmx; provides a workaround for pentium-m and
+  athlon64. The ebuild is far from perfection, see bug #124900 for known
+  issues. Thanks to Benedikt Boehm, #gentoo-python, #gentoo-amd64-dev, 
+  #gentoo-java for their support.
 
 *beecrypt-4.1.2-r1 (18 Jan 2006)
 
diff --git a/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild b/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
index 7984b68941cc..f0aa06e844f5 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-2005 Gentoo Foundation
+# 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-3.1.0-r1.ebuild,v 1.15 2005/02/17 17:31:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild,v 1.16 2006/06/15 19:55:07 sanchan Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
index a66902ae0922..b728cca8fdab 100644
--- a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.2 2006/06/15 19:55:07 sanchan Exp $
 
 inherit flag-o-matic eutils multilib autotools
 
@@ -11,37 +11,46 @@ 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"
+IUSE="java nocxx python threads"
 
 DEPEND="python? ( >=dev-lang/python-2.2 )
 	!<app-arch/rpm-4.2.1"
 
 src_unpack() {
+	ewarn "Due to upstream bug in configure.ac we have to replace the following cpu flags:"
+	ewarn "pentium-m -> pentium3"
+	ewarn "athlon64 -> k8"
+	ewarn "The MMX assembler code presents TEXTREL issues. If you don't want them try using"
+	ewarn "relaxed CFLAGS like -march=i686 instead of -march=pentium3 and so on."
+	ewarn "This ebuild fails on multilib system with multilib-strict on AMD64."
+	ewarn "Feel free to help upstream solving the above bugs."
 	unpack ${A}
-	cd "${S}"
-
+	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
+	#upstream patches from CVS
+	epatch ${FILESDIR}/${P}-python-Makefile-am.patch
+	epatch ${FILESDIR}/${P}-python-debug-py-c.patch
+	epatch ${FILESDIR}/${P}-configure-ac.patch
 	eautoreconf
 }
 
 src_compile() {
+	replace-cpu-flags pentium-m pentium3
+	replace-cpu-flags athlon64 k8
+
 	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} \
+		--libdir=/usr/$(get_libdir) \
 		|| die
 	emake || die "emake failed"
 }
diff --git a/dev-libs/beecrypt/beecrypt-4.1.2.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2.ebuild
index c0aba24d8437..c80bfd325cb9 100644
--- a/dev-libs/beecrypt/beecrypt-4.1.2.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.ebuild,v 1.2 2005/08/11 12:45:37 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2.ebuild,v 1.3 2006/06/15 19:55:07 sanchan Exp $
 
 inherit flag-o-matic eutils multilib
 
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-configure-ac.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-configure-ac.patch
new file mode 100644
index 000000000000..e224ea8b51bf
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-configure-ac.patch
@@ -0,0 +1,56 @@
+--- beecrypt-4.1.2/configure.ac	2004-12-21 12:37:56.000000000 +0100
++++ beecrypt-cvs/configure.ac	2006-01-07 09:48:07.000000000 +0100
+@@ -502,8 +513,7 @@
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
+     ;;
+   athlon*)
+-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX"
+-    CFLAGS="$CFLAGS -mmmx"
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
+     ;;
+   i386)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
+@@ -526,24 +536,23 @@
+   pentium)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
+     ;;
++  pentium-m)
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2"
++    ;;
+   pentium-mmx)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586 -DOPTIMIZE_MMX"
+-    CFLAGS="$CFLAGS -mmmx"
+     ;;
+   pentiumpro)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
+     ;;
+   pentium2)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
+-    CFLAGS="$CFLAGS -mmmx"
+     ;;
+   pentium3)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE"
+-    CFLAGS="$CFLAGS -msse"
+     ;;
+   pentium4)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2"
+-    CFLAGS="$CFLAGS -msse2"
+     ;;
+   powerpc)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_POWERPC"
+@@ -556,15 +565,12 @@
+     ;;
+   sparcv8)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8"
+-    CFLAGS="$CFLAGS -Wa,-xarch=v8"
+     ;;
+   sparcv8plus*)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV8PLUS"
+-    CFLAGS="$CFLAGS -Wa,-xarch=v8plus"
+     ;;
+   sparcv9*)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_SPARCV9"
+-    CFLAGS="$CFLAGS -Wa,-xarch=v9"
+     ;;
+   x86_64)
+     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64"
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-python-Makefile-am.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-python-Makefile-am.patch
new file mode 100644
index 000000000000..c78982afbaf6
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-python-Makefile-am.patch
@@ -0,0 +1,8 @@
+--- beecrypt-4.1.2/python/test/Makefile.am	2004-07-19 08:07:59.000000000 +0200
++++ beecrypt-cvs/python/test/Makefile.am	2006-05-06 15:04:17.000000000 +0200
+@@ -11,4 +11,4 @@
+ all:
+ 
+ check:
+-	$(VALGRIND) PYTHONPATH=.. python test_all.py verbose
++	$(VALGRIND) PYTHONPATH="..:../.libs" python test_all.py verbose
diff --git a/dev-libs/beecrypt/files/beecrypt-4.1.2-python-debug-py-c.patch b/dev-libs/beecrypt/files/beecrypt-4.1.2-python-debug-py-c.patch
new file mode 100644
index 000000000000..7bb0e7886a0b
--- /dev/null
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-python-debug-py-c.patch
@@ -0,0 +1,23 @@
+--- beecrypt-4.1.2/python/debug-py.c	2004-06-20 13:09:21.000000000 +0200
++++ beecrypt-cvs/python/debug-py.c	2005-06-16 09:38:01.000000000 +0200
+@@ -1,10 +1,5 @@
+-
+-/*@unchecked@*/
+-extern PyTypeObject PyCode_Type;
+-/*@unchecked@*/
+-extern PyTypeObject PyDictIter_Type;
+-/*@unchecked@*/
+-extern PyTypeObject PyFrame_Type;
++#include "compile.h"
++#include "frameobject.h"
+ 
+ #include "beecrypt/python/mpw-py.h"	/* XXX debug only */
+ #include "beecrypt/python/rng-py.h"	/* XXX debug only */
+@@ -33,7 +28,6 @@
+     if (o->ob_type == &PyCode_Type)	return "Code";
+     if (o->ob_type == &PyComplex_Type)	return "Complex";
+     if (o->ob_type == &PyDict_Type)	return "Dict";
+-    if (o->ob_type == &PyDictIter_Type)	return "DictIter";
+     if (o->ob_type == &PyFile_Type)	return "File";
+     if (o->ob_type == &PyFloat_Type)	return "Float";
+     if (o->ob_type == &PyFrame_Type)	return "Frame";
diff --git a/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r1 b/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r1
index c1eceaa1cc97..89b4d6802bff 100644
--- a/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r1
+++ b/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r1
@@ -1 +1,3 @@
 MD5 1472cada46e2ab9f532f984de9740386 beecrypt-3.1.0.tar.gz 452555
+RMD160 da5f1ad11f8724ee75c2860252a881d1591ccb43 beecrypt-3.1.0.tar.gz 452555
+SHA256 50b574d330fecbc9faed81746a1abfcec903c264ae753ac64d4edf22c701519f beecrypt-3.1.0.tar.gz 452555
diff --git a/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r2 b/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r2
index c1eceaa1cc97..89b4d6802bff 100644
--- a/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r2
+++ b/dev-libs/beecrypt/files/digest-beecrypt-3.1.0-r2
@@ -1 +1,3 @@
 MD5 1472cada46e2ab9f532f984de9740386 beecrypt-3.1.0.tar.gz 452555
+RMD160 da5f1ad11f8724ee75c2860252a881d1591ccb43 beecrypt-3.1.0.tar.gz 452555
+SHA256 50b574d330fecbc9faed81746a1abfcec903c264ae753ac64d4edf22c701519f beecrypt-3.1.0.tar.gz 452555
diff --git a/dev-libs/beecrypt/files/digest-beecrypt-4.1.2 b/dev-libs/beecrypt/files/digest-beecrypt-4.1.2
index 8f5416806b20..776005bb16fb 100644
--- a/dev-libs/beecrypt/files/digest-beecrypt-4.1.2
+++ b/dev-libs/beecrypt/files/digest-beecrypt-4.1.2
@@ -1 +1,3 @@
 MD5 820d26437843ab0a6a8a5151a73a657c beecrypt-4.1.2.tar.gz 774280
+RMD160 fe26e5429738450fa2ef00b37e9725eec29bda08 beecrypt-4.1.2.tar.gz 774280
+SHA256 f29eb246947677a9e7870521e3d576fd0d91a7072210a4404ed137e40cfc18fd beecrypt-4.1.2.tar.gz 774280
diff --git a/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r1 b/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r1
index 8f5416806b20..776005bb16fb 100644
--- a/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r1
+++ b/dev-libs/beecrypt/files/digest-beecrypt-4.1.2-r1
@@ -1 +1,3 @@
 MD5 820d26437843ab0a6a8a5151a73a657c beecrypt-4.1.2.tar.gz 774280
+RMD160 fe26e5429738450fa2ef00b37e9725eec29bda08 beecrypt-4.1.2.tar.gz 774280
+SHA256 f29eb246947677a9e7870521e3d576fd0d91a7072210a4404ed137e40cfc18fd beecrypt-4.1.2.tar.gz 774280
diff --git a/dev-libs/beecrypt/metadata.xml b/dev-libs/beecrypt/metadata.xml
new file mode 100644
index 000000000000..52dde0a10f4b
--- /dev/null
+++ b/dev-libs/beecrypt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+	<email>sanchan@gentoo.org</email>
+	<description>I actually don't use this packages, but since I'm working on rpm bump I'll take care of this for now.
+		Feel free to contact me if you want to take over the maintainership of this package.
+	</description>
+</maintainer>
+</pkgmetadata>