Grab more fixes from upstream so we dont need flag filtering hacks.

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 66 insertions, 33 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index f0c480c092e7..679d76bdbfcb 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,10 @@
 # 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.30 2006/06/15 19:55:07 sanchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.31 2006/10/16 04:34:05 vapier Exp $
+
+  16 Oct 2006; Mike Frysinger <vapier@gentoo.org>
+  files/beecrypt-4.1.2-configure-ac.patch, beecrypt-4.1.2-r1.ebuild:
+  Grab more fixes from upstream so we dont need flag filtering hacks.
 
   15 Jun 2006; Sandro Bonazzola <sanchan@gentoo.org>
   +files/beecrypt-4.1.2-configure-ac.patch,
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 7fcb9f96040e..af3366574888 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -17,10 +17,10 @@ AUX beecrypt-4.1.2-athlon.patch 700 RMD160 f5026638df29a94f5a77ca42d29a5d9dd3d7e
 MD5 1790137c0aa51e5978f813f06f74f9f5 files/beecrypt-4.1.2-athlon.patch 700
 RMD160 f5026638df29a94f5a77ca42d29a5d9dd3d7e103 files/beecrypt-4.1.2-athlon.patch 700
 SHA256 cc3eacd51054126b101c43592f75ed755161b680bdf5ab0c1b7ffef8f076534f files/beecrypt-4.1.2-athlon.patch 700
-AUX beecrypt-4.1.2-configure-ac.patch 1608 RMD160 4d72532820c5ee958aad90c7d4a5774dd2fe09fd SHA1 3b9172a5ddf883aa925d2e7ccad55465deee7276 SHA256 8d912f80d43d5b05178a830d169e919ed23829e21bc164c132d6910b5e92cf10
-MD5 5a9ba1240e9e33434627900dbef3239e files/beecrypt-4.1.2-configure-ac.patch 1608
-RMD160 4d72532820c5ee958aad90c7d4a5774dd2fe09fd files/beecrypt-4.1.2-configure-ac.patch 1608
-SHA256 8d912f80d43d5b05178a830d169e919ed23829e21bc164c132d6910b5e92cf10 files/beecrypt-4.1.2-configure-ac.patch 1608
+AUX beecrypt-4.1.2-configure-ac.patch 2539 RMD160 304af60e7d5dfb2100961be442cb4619929ccc52 SHA1 7a467a36be18ae90eb75798fd3f3a957e9d07649 SHA256 4d822901b8c817db28bb908ba8aa1830288ac2d09c70dfdf7711403b384d8a4f
+MD5 cee5a97ebb84116161de104388cb3c03 files/beecrypt-4.1.2-configure-ac.patch 2539
+RMD160 304af60e7d5dfb2100961be442cb4619929ccc52 files/beecrypt-4.1.2-configure-ac.patch 2539
+SHA256 4d822901b8c817db28bb908ba8aa1830288ac2d09c70dfdf7711403b384d8a4f files/beecrypt-4.1.2-configure-ac.patch 2539
 AUX beecrypt-4.1.2-custom-cflags.patch 1923 RMD160 29270a2fd07996a2362ff3344a95929385b119d7 SHA1 9a1a5e5f4efdc35d967207e2420e8723749b2ad5 SHA256 474b2c61885e68af31e489adadb0130c47437022b05050c9a2c7fe98e4444cb3
 MD5 d9df55b27ad44b732ee01ee84bca5919 files/beecrypt-4.1.2-custom-cflags.patch 1923
 RMD160 29270a2fd07996a2362ff3344a95929385b119d7 files/beecrypt-4.1.2-custom-cflags.patch 1923
@@ -43,18 +43,18 @@ EBUILD beecrypt-3.1.0-r2.ebuild 1723 RMD160 8d23c514408cb5447401b94a65b8834c8792
 MD5 b6c457c06f2f7babce8779dc33405e21 beecrypt-3.1.0-r2.ebuild 1723
 RMD160 8d23c514408cb5447401b94a65b8834c87922187 beecrypt-3.1.0-r2.ebuild 1723
 SHA256 ce7a18ed0154803578ba50d9964add3573367af04c1e55905ed43815aa417dc8 beecrypt-3.1.0-r2.ebuild 1723
-EBUILD beecrypt-4.1.2-r1.ebuild 2211 RMD160 1cc19341e3cb5b69175b2580d8358f5c6de8bd49 SHA1 3e6cd37b35215ede1b6b5eaea12a235e0805dfd1 SHA256 a4fbc2ec8e2c17544265000a0c9c376f7f02b0a64d35bf9371694cfea4d93d48
-MD5 d4dfc647b9681f76e12b6f6fc69051dc beecrypt-4.1.2-r1.ebuild 2211
-RMD160 1cc19341e3cb5b69175b2580d8358f5c6de8bd49 beecrypt-4.1.2-r1.ebuild 2211
-SHA256 a4fbc2ec8e2c17544265000a0c9c376f7f02b0a64d35bf9371694cfea4d93d48 beecrypt-4.1.2-r1.ebuild 2211
+EBUILD beecrypt-4.1.2-r1.ebuild 2068 RMD160 49e6360be3e8498b0fa5eefefab12cad5c293909 SHA1 ebdaff314c1d325f90a7f1de8854c699d857b705 SHA256 74e3f7d7df7eb978a91b59e8ce7cc01e4b2ea51dfc2762450962191dc6b023b9
+MD5 28828bf231665e685e1ce9d1b0542a5e beecrypt-4.1.2-r1.ebuild 2068
+RMD160 49e6360be3e8498b0fa5eefefab12cad5c293909 beecrypt-4.1.2-r1.ebuild 2068
+SHA256 74e3f7d7df7eb978a91b59e8ce7cc01e4b2ea51dfc2762450962191dc6b023b9 beecrypt-4.1.2-r1.ebuild 2068
 EBUILD beecrypt-4.1.2.ebuild 1571 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 SHA1 2b15ccdc2de2fb69d131c85a179f0e3cfa93a941 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e
 MD5 58efa38295c5d97f1bac7465fa9b87de beecrypt-4.1.2.ebuild 1571
 RMD160 a81510f782805e7a69dd3fc21c3b6ad3491ec0c9 beecrypt-4.1.2.ebuild 1571
 SHA256 acc9b6321c2dc67140e1a0cdfc6b666779f0580fe5b473fb2a1f7ca9a1baa33e beecrypt-4.1.2.ebuild 1571
-MISC ChangeLog 4927 RMD160 ad30e0a733340e49a0d8fabc7751daccb84377cd SHA1 430d3f6ef3ab701f39bb4360a5977d2d8b5a5a9a SHA256 cd76708e16597b6b46714631384458b66d751873c726efe2d16c711c38070b53
-MD5 0fb80baf7e876148cf8a3a72f83d23a8 ChangeLog 4927
-RMD160 ad30e0a733340e49a0d8fabc7751daccb84377cd ChangeLog 4927
-SHA256 cd76708e16597b6b46714631384458b66d751873c726efe2d16c711c38070b53 ChangeLog 4927
+MISC ChangeLog 5116 RMD160 601f55ac71ec96a4f3fd9949886ead6315fe0844 SHA1 6ddd90c4ea9c45d29b298c426e78013e4c3c38a3 SHA256 ba34a7f35955f40eb7fb512ce3e0ce38d6145390ea3534383dd0cfe6f462b025
+MD5 2f396e92511685796d044067d45c08d0 ChangeLog 5116
+RMD160 601f55ac71ec96a4f3fd9949886ead6315fe0844 ChangeLog 5116
+SHA256 ba34a7f35955f40eb7fb512ce3e0ce38d6145390ea3534383dd0cfe6f462b025 ChangeLog 5116
 MISC metadata.xml 441 RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c SHA1 0061a112b5252de7a4803ecb7b201e48be7dc5b7 SHA256 5675e81fe2ef6bb6949439f5c88e041c614a2ad8c554c685e745a457c116279d
 MD5 ca48fb502dfc8284bdf1dad98f1f1f93 metadata.xml 441
 RMD160 78ec9e33fd6ae832d800ba544f5474e36cafd48c metadata.xml 441
@@ -72,9 +72,9 @@ MD5 f036930b8f9b568a6d4f0be92dfd660a files/digest-beecrypt-4.1.2-r1 244
 RMD160 95f2cc2b7b670f7e7ebfcdb7b320386305e49ab7 files/digest-beecrypt-4.1.2-r1 244
 SHA256 99d90cfdcd84ee178ff78f76c1a75b7ea12bc89a29cf633a585d884de57413b8 files/digest-beecrypt-4.1.2-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEkbpZ1c24p4LpXH8RAkDcAJ4yeBmaa7NqzxXs6U3BDTBjGpnM8QCeMbC0
-tr2HAlLPu2I7fgVCG0UfaeE=
-=95fC
+iD8DBQFFMwvIamhnQswr0vIRAlTTAJ9Fr0yZH0Y2vpvBlM4sPMga+crElQCfRY5l
+cQYi0d8p1kY7svq2dSQ8Wvg=
+=6PEw
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
index b728cca8fdab..807a731c36a4 100644
--- a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
+++ b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild
@@ -1,7 +1,9 @@
 # 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.2 2006/06/15 19:55:07 sanchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.3 2006/10/16 04:34:05 vapier Exp $
 
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
 inherit flag-o-matic eutils multilib autotools
 
 DESCRIPTION="general-purpose cryptography library"
@@ -16,31 +18,28 @@ 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"
+pkg_setup() {
 	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."
+}
+
+src_unpack() {
 	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"
 
-	#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
+	# 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%%-*}
 
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
index e224ea8b51bf..4ac8ceb9e76d 100644
--- a/dev-libs/beecrypt/files/beecrypt-4.1.2-configure-ac.patch
+++ b/dev-libs/beecrypt/files/beecrypt-4.1.2-configure-ac.patch
@@ -1,8 +1,38 @@
---- 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 @@
+Some updates from upstream to handle more/newer cpu types
+
+--- beecrypt-4.1.2/acinclude.m4
++++ beecrypt-4.1.2/acinclude.m4
+@@ -16,7 +16,7 @@
+   i[[3456]]86)
+     case $withval in
+     i[[3456]]86 | \
+-    pentium | pentium-mmx | pentiumpro | pentium[[234]] | \
++    pentium | pentium-m | pentium-mmx | pentiumpro | pentium[[234]] | \
+     athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp)
+       ;;
+     *)
+@@ -80,9 +80,10 @@
+   case $target_cpu in
+   i[[3456]]86)
+     case $withval in
++    em64t | \
+     i[[3456]]86 | \
+-    pentium | pentium-mmx | pentiumpro | pentium[[234]] | \
+-    athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp)
++    pentium | pentium-m | pentium-mmx | pentiumpro | pentium[[234]] | \
++    athlon | athlon-tbird | athlon-4 | athlon-xp | athlon-mp | athlon64 | k8)
+       if test "$ac_with_cpu" != yes; then
+         bc_target_cpu=$withval
+       fi
+--- beecrypt-4.1.2/configure.ac
++++ beecrypt-4.1.2/configure.ac
+@@ -502,9 +513,11 @@
+   arm*)
      CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
      ;;
++  x86_64 | athlon64 | athlon-fx | em64t | k8)
++    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64"
++    ;;
    athlon*)
 -    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX"
 -    CFLAGS="$CFLAGS -mmmx"