patch configure instead of configure.ac to fix beecrypt's buggy build system

4 files changed, 23 insertions, 12 deletions

diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog
index 2daddbfffbda..832bf75b68ed 100644
--- a/dev-libs/beecrypt/ChangeLog
+++ b/dev-libs/beecrypt/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/beecrypt
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.6 2003/11/12 04:28:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.7 2003/11/12 15:31:06 agriffis Exp $
+
+  12 Nov 2003; Aron Griffis <agriffis@gentoo.org> beecrypt-3.1.0-r1.ebuild,
+  files/beecrypt-3.1.0-alpha.patch:
+  This library's makefiles are way too smart for its own good. If you update
+  configure.ac, then the makefiles notice and insist on rebuilding half a dozen
+  other things (even after you run autoconf). The end result is that mpopt.s is
+  emptied and undefined symbols appear in the library.
+
+  Modified the patch to affect configure instead of configure.ac so that
+  autoconf isn't required and the build system doesn't screw up.
 
   11 Nov 2003; Aron Griffis <agriffis@gentoo.org> beecrypt-3.1.0-r1.ebuild:
   Fix autoconf whoops which caused mpopt.s to fail to build because the
diff --git a/dev-libs/beecrypt/Manifest b/dev-libs/beecrypt/Manifest
index 6d50eebc88bb..de37aa15d41d 100644
--- a/dev-libs/beecrypt/Manifest
+++ b/dev-libs/beecrypt/Manifest
@@ -1,6 +1,6 @@
-MD5 cb905999a81801c28783b3c2130c6a61 ChangeLog 1116
-MD5 f0666ca8558a8714f312aa4da107df33 beecrypt-3.1.0-r1.ebuild 1193
+MD5 2e4d29d9e40cb23062d7fbb2ce917757 ChangeLog 1660
+MD5 dbd4d423a2661a55e812a14ac6a52fb3 beecrypt-3.1.0-r1.ebuild 1315
 MD5 6bce8a668d96b5ade40a38ead9551f79 beecrypt-3.1.0.ebuild 864
 MD5 1c56cad20612ef6cbb3d1b56fa3c0b2e files/digest-beecrypt-3.1.0 66
-MD5 0662ebed6b09d49025d75c26915726ab files/beecrypt-3.1.0-alpha.patch 323
+MD5 9801ec0e3201addd45f08dea31ac5324 files/beecrypt-3.1.0-alpha.patch 321
 MD5 1c56cad20612ef6cbb3d1b56fa3c0b2e files/digest-beecrypt-3.1.0-r1 66
diff --git a/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild b/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild
index a5a74e1fc75c..631773ed8cad 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-2003 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.2 2003/11/12 04:28:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-3.1.0-r1.ebuild,v 1.3 2003/11/12 15:31:06 agriffis Exp $
 
 DESCRIPTION="Beecrypt is a general-purpose cryptography library."
 HOMEPAGE="http://sourceforge.net/projects/beecrypt"
@@ -11,8 +11,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 SLOT="0"
 
 DEPEND="python? ( =dev-lang/python-2.2* )
-		!<app-arch/rpm-4.2.1
-		alpha? ( sys-devel/autoconf )"
+		!<app-arch/rpm-4.2.1"
 
 IUSE="python"
 
@@ -23,9 +22,11 @@ src_unpack() {
 	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.  (11 Nov 2003 agriffis)
+		# 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
-		autoconf
 	fi
 }
 
diff --git a/dev-libs/beecrypt/files/beecrypt-3.1.0-alpha.patch b/dev-libs/beecrypt/files/beecrypt-3.1.0-alpha.patch
index 4f02541bdd74..6c736583c6e6 100644
--- a/dev-libs/beecrypt/files/beecrypt-3.1.0-alpha.patch
+++ b/dev-libs/beecrypt/files/beecrypt-3.1.0-alpha.patch
@@ -1,6 +1,6 @@
---- beecrypt-3.1.0/configure.ac.old	2003-08-17 02:46:57.000000000 -0400
-+++ beecrypt-3.1.0/configure.ac	2003-11-11 18:31:44.000000000 -0500
-@@ -757,7 +757,7 @@
+--- beecrypt-3.1.0/configure.old	2003-08-17 02:46:57.000000000 -0400
++++ beecrypt-3.1.0/configure	2003-11-11 18:31:44.000000000 -0500
+@@ -17780,7 +17780,7 @@
  case $target_os in
  linux*)
    case $bc_target_arch in