summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-04-07 21:08:59 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-04-07 21:08:59 +0000
commit8e26b7f4b5b4a778104ad5d7603d4ea531943c02 (patch)
treed8fa5c98f2f9d76e7beff8f6d0fe2b9bc306d887
parentVersion and slot bump (diff)
downloadgentoo-2-8e26b7f4b5b4a778104ad5d7603d4ea531943c02.tar.gz
gentoo-2-8e26b7f4b5b4a778104ad5d7603d4ea531943c02.tar.bz2
gentoo-2-8e26b7f4b5b4a778104ad5d7603d4ea531943c02.zip
EAPI=2; avoid running ldconfig (bug #265144)
(Portage version: 2.1.6.7/cvs/Linux i686)
-rw-r--r--media-libs/allegro/ChangeLog6
-rw-r--r--media-libs/allegro/allegro-4.2.2-r1.ebuild16
2 files changed, 14 insertions, 8 deletions
diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 469aeec71006..f02500e2a1b2 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/allegro
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.83 2009/04/07 02:20:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.84 2009/04/07 21:08:59 mr_bones_ Exp $
+
+ 07 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org>
+ allegro-4.2.2-r1.ebuild:
+ EAPI=2; avoid running ldconfig (bug #265144)
07 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org>
allegro-4.2.2-r1.ebuild:
diff --git a/media-libs/allegro/allegro-4.2.2-r1.ebuild b/media-libs/allegro/allegro-4.2.2-r1.ebuild
index 8bb88063b35e..cf11cba87225 100644
--- a/media-libs/allegro/allegro-4.2.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.2.2-r1.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.2-r1.ebuild,v 1.6 2009/04/07 02:20:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.2-r1.ebuild,v 1.7 2009/04/07 21:08:59 mr_bones_ Exp $
+EAPI=2
inherit autotools multilib eutils
DESCRIPTION="cross-platform multimedia library"
@@ -36,9 +37,7 @@ DEPEND="${RDEPEND}
x11-proto/xproto
)"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch \
"${FILESDIR}"/${P}-exec-stack.patch \
"${FILESDIR}"/${P}-flags.patch \
@@ -46,7 +45,8 @@ src_unpack() {
eautoreconf
}
-src_compile() {
+src_configure() {
+ LDCONFIG=/bin/true \
econf \
--enable-linux \
--enable-static \
@@ -67,8 +67,10 @@ src_compile() {
$(use_enable fbcon) \
$(use_enable svga svgalib) \
$(use_enable vga) \
- $(use_enable jack jackdigi) \
- || die
+ $(use_enable jack jackdigi)
+}
+
+src_compile() {
emake -j1 || die "emake failed"
}