summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-04-15 07:58:05 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-04-15 07:58:05 +0000
commit2af334fd2a8e7e1af78a073e73c61fcab37e50ad (patch)
treec733e2026b5abd7e7286636b5d45943a4d0b236c
parentversion bump by Matthias Schöffmann <matthias@dsx.at> (proxy-commit) via php... (diff)
downloadgentoo-2-2af334fd2a8e7e1af78a073e73c61fcab37e50ad.tar.gz
gentoo-2-2af334fd2a8e7e1af78a073e73c61fcab37e50ad.tar.bz2
gentoo-2-2af334fd2a8e7e1af78a073e73c61fcab37e50ad.zip
Dependency computing fixed. Bug #264560
(Portage version: 2.1.6.7/cvs/Linux x86_64)
-rw-r--r--media-libs/allegro/ChangeLog6
-rw-r--r--media-libs/allegro/allegro-4.2.2-r1.ebuild5
-rw-r--r--media-libs/allegro/files/allegro-4.2.2-deplib.patch11
3 files changed, 19 insertions, 3 deletions
diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index f02500e2a1b2..ff2778d22bd3 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.84 2009/04/07 21:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.85 2009/04/15 07:58:04 tupone Exp $
+
+ 15 Apr 2009; Alfredo Tupone <tupone@gentoo.org>
+ +files/allegro-4.2.2-deplib.patch, allegro-4.2.2-r1.ebuild:
+ Dependency computing fixed. Bug #264560 by Zdenek Sojka
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 cf11cba87225..1359a2033dab 100644
--- a/media-libs/allegro/allegro-4.2.2-r1.ebuild
+++ b/media-libs/allegro/allegro-4.2.2-r1.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/media-libs/allegro/allegro-4.2.2-r1.ebuild,v 1.7 2009/04/07 21:08:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.2.2-r1.ebuild,v 1.8 2009/04/15 07:58:04 tupone Exp $
EAPI=2
inherit autotools multilib eutils
@@ -41,7 +41,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-exec-stack.patch \
"${FILESDIR}"/${P}-flags.patch \
- "${FILESDIR}"/${P}-autoconf.patch
+ "${FILESDIR}"/${P}-autoconf.patch \
+ "${FILESDIR}"/${P}-deplib.patch
eautoreconf
}
diff --git a/media-libs/allegro/files/allegro-4.2.2-deplib.patch b/media-libs/allegro/files/allegro-4.2.2-deplib.patch
new file mode 100644
index 000000000000..032cc19b7a5a
--- /dev/null
+++ b/media-libs/allegro/files/allegro-4.2.2-deplib.patch
@@ -0,0 +1,11 @@
+--- misc/deplib.sh.old 2009-04-15 09:30:10.000000000 +0200
++++ misc/deplib.sh 2009-04-15 09:31:13.000000000 +0200
+@@ -152,7 +152,7 @@
+ includes1=`grep '^[ ]*#[ ]*include[ ]*[a-zA-Z0-9_][a-zA-Z0-9_]*' $dep | \
+ sed 's,^[ ]*#[ ]*include[ ]*\([a-zA-Z0-9_]*\),\1,'`
+ includes2=`grep '^[ ]*#[ ]*include[ ]*".*"' $dep | \
+- sed 's,^[ ]*#[ ]*include[ ]*"\(.*\)",\1,'`
++ sed 's,^[ ]*#[ ]*include[ ]*"\(.*\)".*,\1,'`
+ if test -n "$includes1"; then
+ for include in $includes1; do
+ includes="$includes \$($include)"