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
commitc39e0c9d1e919e640191a9318f7fab71528223e8 (patch)
tree8a716f55ae61a294579918c084884a6f3e960ce8 /media-libs/allegro
parentversion bump by Matthias Schöffmann <matthias@dsx.at> (proxy-commit) via php... (diff)
downloadhistorical-c39e0c9d1e919e640191a9318f7fab71528223e8.tar.gz
historical-c39e0c9d1e919e640191a9318f7fab71528223e8.tar.bz2
historical-c39e0c9d1e919e640191a9318f7fab71528223e8.zip
Dependency computing fixed. Bug #264560
Package-Manager: portage-2.1.6.7/cvs/Linux x86_64
Diffstat (limited to 'media-libs/allegro')
-rw-r--r--media-libs/allegro/ChangeLog6
-rw-r--r--media-libs/allegro/Manifest5
-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
4 files changed, 22 insertions, 5 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/Manifest b/media-libs/allegro/Manifest
index 7fcdf8213d96..48b171be73a7 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,7 +1,8 @@
AUX allegro-4.2.2-autoconf.patch 1105 RMD160 bcf408f6f5f02feffb1cba96dc44dbfbc004d3c1 SHA1 4f826fde824031b91c9f73b946768bfe5d265815 SHA256 69060c6984721f09ce1da0c43c4b91f8b0f2f3e113c5c88cd8cd567c0050f5f1
+AUX allegro-4.2.2-deplib.patch 587 RMD160 c3fc02e8fe00ac53ed50e3a86e19b3d58e75504b SHA1 b3cbebcfa6f9889d9abaf49de0d2e41c5f75ab9b SHA256 4d9d628488b938786c03dd9c07459ec8f5629ef5815350a2f8b8cad1bdaf1542
AUX allegro-4.2.2-exec-stack.patch 4523 RMD160 71b77b6c29a46f478a731e7eff3b47285c89bd80 SHA1 6cd70fb48ca88df77a7bc00f5f5f2e37703b3cf4 SHA256 2d2924b847eac9bdf8cd43f56b11c53d62ae0b496e02d39b4bab6911ada4aa64
AUX allegro-4.2.2-flags.patch 1776 RMD160 7f9610f4d8a1734eeffdc0835ed27a0d8d5189b6 SHA1 024645cef686d4c82b61518ea632783ec598f050 SHA256 85c869ba264f8d786045b0568b77acc7c7f929aa10f4d00f6b57941f2a1cf1ef
DIST allegro-4.2.2.tar.gz 3178406 RMD160 ea5b38f2eee95994bd134039822c6b0b6e78e04a SHA1 25e3854432cede0266632019ae912eb33cd18f8e SHA256 3e7fe701fa0fa99e0870e2c10e21e6592b0b58e6eb5e9844aff17db9a25d06a8
-EBUILD allegro-4.2.2-r1.ebuild 2576 RMD160 25796e6d9e6563cf5c8a0c60e11886dae804c874 SHA1 cefd3ef12878d05d51fdd0ffdd782adf69311456 SHA256 5d9d95b019dd68f2aa4908754c2ac51ffbef0c08ae2d3802006613da6a2eb486
-MISC ChangeLog 10775 RMD160 7661b54db9db01bd4640f962e1a3fe3b02868575 SHA1 3cc9cabe0a1a8ee104e3c38ed4d44a63b072c097 SHA256 135bdb7cce02c958282a0e93a950c2b130c7690e6c363a3ca6147f4497a8d8a7
+EBUILD allegro-4.2.2-r1.ebuild 2609 RMD160 d7eec603cea8a9dd756e02349757c92b01ab9fad SHA1 db33325d64649ae95598de652ecdc48fae0e4068 SHA256 c6b5baf7dfa14899ec67e2bcc7b757872722d1c92be7856ca50cefaf4b33e36b
+MISC ChangeLog 10943 RMD160 346b75fbc47be1123f94210fdde327804d7fe952 SHA1 f8ab11e42b9d6e235b039679462a9c325fd285e1 SHA256 b0618c8ad1e912e2047d3e89cab0ccd1a5b5907b43ee07eac916f83202c85044
MISC metadata.xml 717 RMD160 f9b6c4bbade2f548e4ec6ea05d23e49b6fbfdf5e SHA1 e0671b5ddff48fb22b917e153fab2e92555ba534 SHA256 8ff21d29ac568f1603666f4266f2266a44a4e6e45555f62763607693fdc68f5a
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)"