[gentoo-commits] gentoo-x86 commit in dev-libs/beecrypt: beecrypt-4.1.2-r1.ebuild beecrypt-4.1.2-r2.ebuild ChangeLog

[Mike Frysinger (vapier)]

vapier      08/01/13 01:02:25

  Modified:             beecrypt-4.1.2-r1.ebuild beecrypt-4.1.2-r2.ebuild
                        ChangeLog
  Log:
  Do not let the configure script decide the lib64.  Make it respect the standard configure --libdir option.
  (Portage version: 2.1.4)

Revision  Changes    Path
1.22                 dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild?r1=1.21&r2=1.22

Index: beecrypt-4.1.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- beecrypt-4.1.2-r1.ebuild	2 Jun 2007 03:18:38 -0000	1.21
+++ beecrypt-4.1.2-r1.ebuild	13 Jan 2008 01:02:25 -0000	1.22
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.21 2007/06/02 03:18:38 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.22 2008/01/13 01:02:25 vapier Exp $
 
 inherit flag-o-matic eutils multilib autotools java-pkg-opt-2
 
@@ -32,6 +32,10 @@
 	# Set correct python libdir on multilib systems
 	sed -i -e 's:get_python_lib():get_python_lib(1,0):' \
 		configure.ac || die "sed failed"
+	# let configure figure out libpaths, not a pokey build system
+	sed -i \
+		-e '/^libaltdir=/s:=.*:=$(libdir):' \
+		$(find . -name Makefile.am) || die
 
 	# upstream patches from CVS
 	epatch "${FILESDIR}/${P}-python-Makefile-am.patch"



1.4                  dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild?r1=1.3&r2=1.4

Index: beecrypt-4.1.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- beecrypt-4.1.2-r2.ebuild	7 Feb 2007 19:47:17 -0000	1.3
+++ beecrypt-4.1.2-r2.ebuild	13 Jan 2008 01:02:25 -0000	1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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-r2.ebuild,v 1.3 2007/02/07 19:47:17 sanchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild,v 1.4 2008/01/13 01:02:25 vapier Exp $
 
 inherit flag-o-matic eutils multilib autotools java-pkg-opt-2
 
@@ -20,7 +20,6 @@
 	java? ( >=virtual/jdk-1.4 )
 	doc? ( app-doc/doxygen
 		virtual/tetex )"
-
 RDEPEND="${COMMONDEPEND}
 	java? ( >=virtual/jre-1.4 )"
 
@@ -34,15 +33,16 @@
 	# 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}-build.patch"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${FILESDIR}/${P}-threads.patch"
-	#Patch from Fedora rpm, Miloslav Trmac <mitr@××××××.com>
-	epatch "${FILESDIR}/${P}-base64.patch"
+	# let configure figure out libpaths, not a pokey build system
+	sed -i \
+		-e '/^libaltdir=/s:=.*:=$(libdir):' \
+		$(find . -name Makefile.am) || die
+	epatch "${FILESDIR}"/${P}-python-Makefile-am.patch
+	epatch "${FILESDIR}"/${P}-python-debug-py-c.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-threads.patch
+	epatch "${FILESDIR}"/${P}-base64.patch
 	eautoreconf
 }
 



1.58                 dev-libs/beecrypt/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/beecrypt/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/beecrypt/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/beecrypt/ChangeLog?r1=1.57&r2=1.58

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ChangeLog	2 Jun 2007 07:34:14 -0000	1.57
+++ ChangeLog	13 Jan 2008 01:02:25 -0000	1.58
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/beecrypt
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.57 2007/06/02 07:34:14 alonbl Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.58 2008/01/13 01:02:25 vapier Exp $
+
+  13 Jan 2008; Mike Frysinger <vapier@g.o> beecrypt-4.1.2-r1.ebuild,
+  beecrypt-4.1.2-r2.ebuild:
+  Do not let the configure script decide the lib64. Make it respect the
+  standard configure --libdir option.
 
   02 Jun 2007; Alon Bar-Lev <alonbl@g.o>
   -files/beecrypt-3.1.0-alpha.patch, -files/beecrypt-3.1.0-athlon.diff,



-- 
gentoo-commits@l.g.o mailing list