diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2009-11-15 09:44:26 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2009-11-15 09:44:26 +0000 |
| commit | 0c6787410f56962ed95b05ae99e2b91640a0d311 (patch) | |
| tree | 98a523bb345784db37940228c04bbea9985fdf01 | |
| parent | Automated update of use.local.desc (diff) | |
| download | gentoo-2-0c6787410f56962ed95b05ae99e2b91640a0d311.tar.gz gentoo-2-0c6787410f56962ed95b05ae99e2b91640a0d311.tar.bz2 gentoo-2-0c6787410f56962ed95b05ae99e2b91640a0d311.zip | |
Fix installation on multilib systems with multilib-strict, bug #293236.
(Portage version: 2.2_rc49/cvs/Linux x86_64)
| -rw-r--r-- | dev-libs/beecrypt/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/dev-libs/beecrypt/ChangeLog b/dev-libs/beecrypt/ChangeLog index b73270ca7edd..39b75531493b 100644 --- a/dev-libs/beecrypt/ChangeLog +++ b/dev-libs/beecrypt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/beecrypt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.63 2009/11/14 18:19:43 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/ChangeLog,v 1.64 2009/11/15 09:44:26 swegener Exp $ + + 15 Nov 2009; Sven Wegener <swegener@gentoo.org> beecrypt-4.1.2-r1.ebuild, + beecrypt-4.1.2-r2.ebuild: + Fix installation on multilib systems with multilib-strict, bug #293236. 14 Nov 2009; Daniel Gryniewicz <dang@gentoo.org> beecrypt-4.1.2-r2.ebuild: Fix building with march=native; bug #220267 diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild index ec6416707f82..8922aff181fc 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-2008 Gentoo Foundation +# Copyright 1999-2009 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.22 2008/01/13 01:02:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r1.ebuild,v 1.23 2009/11/15 09:44:26 swegener Exp $ inherit flag-o-matic eutils multilib autotools java-pkg-opt-2 @@ -35,6 +35,7 @@ src_unpack() { # let configure figure out libpaths, not a pokey build system sed -i \ -e '/^libaltdir=/s:=.*:=$(libdir):' \ + -e '/^pkgaltlibdir=/s:=.*:=$(libdir)/beecrypt:' \ $(find . -name Makefile.am) || die # upstream patches from CVS diff --git a/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild b/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild index a4a4d35fb086..aa8fd8313dd9 100644 --- a/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild +++ b/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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.8 2009/11/14 18:19:43 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.1.2-r2.ebuild,v 1.9 2009/11/15 09:44:26 swegener Exp $ inherit flag-o-matic eutils multilib autotools java-pkg-opt-2 @@ -37,6 +37,7 @@ src_unpack() { # let configure figure out libpaths, not a pokey build system sed -i \ -e '/^libaltdir=/s:=.*:=$(libdir):' \ + -e '/^pkgaltlibdir=/s:=.*:=$(libdir)/beecrypt:' \ $(find . -name Makefile.am) || die epatch "${FILESDIR}"/${P}-python-Makefile-am.patch epatch "${FILESDIR}"/${P}-python-debug-py-c.patch |