summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2009-01-04 16:18:05 +0000
committerHanno Boeck <hanno@gentoo.org>2009-01-04 16:18:05 +0000
commit123dd3a90cbb9e33d0b94c4823ab99d8616d668e (patch)
treebe28edbdb25e786d52d9fb296459c17f12e37e18 /www-client
parentamd64/x86 stable, bug #253611 (diff)
downloadhistorical-123dd3a90cbb9e33d0b94c4823ab99d8616d668e.tar.gz
historical-123dd3a90cbb9e33d0b94c4823ab99d8616d668e.tar.bz2
historical-123dd3a90cbb9e33d0b94c4823ab99d8616d668e.zip
midori: fix multilib installation and respect ldflags and cflags
Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64
Diffstat (limited to 'www-client')
-rw-r--r--www-client/midori/ChangeLog7
-rw-r--r--www-client/midori/Manifest10
-rw-r--r--www-client/midori/midori-9999.ebuild8
3 files changed, 14 insertions, 11 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 826b3b37e0d0..98937c3ca98f 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for www-client/midori
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.6 2008/10/27 19:17:29 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.7 2009/01/04 16:18:05 hanno Exp $
+
+ 04 Jan 2009; Hanno Boeck <hanno@gentoo.org> midori-9999.ebuild:
+ Fix multilib installation, respect CFLAGS and LDFLAGS.
27 Oct 2008; Markus Ullmann <jokey@gentoo.org> metadata.xml,
midori-9999.ebuild:
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index a08569ac6e92..e4289ae0ba1d 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-EBUILD midori-9999.ebuild 968 RMD160 ddb7913cbe1c20e599da4d73227005c909962c84 SHA1 6931f2c24fe4a8e176ff1d7371d9bd767c9637a1 SHA256 c7161f0560db2151ed6d411b1b61382e4fcf6fbc86ebef300b4ad14651f9e277
-MISC ChangeLog 1122 RMD160 d6d630271550dfb7ba94e656f021dfb9b1b76a47 SHA1 46d81dd377a7142d0a371c9aab9ee37943928f07 SHA256 303f85078b87b04d08aa05552bc91c90ee87601aef9e4f1a3685572bd5d4eeb9
+EBUILD midori-9999.ebuild 1051 RMD160 3a2b027713f7080f29a53989837c6e22804950e6 SHA1 fdd1582d2408067d749e1e961f614631e8977f43 SHA256 d24ed2e0f1206db920f5cb07775a0e8cff158a94f7ab62e3227c5d193b293bb6
+MISC ChangeLog 1246 RMD160 6b4b64cffd3024178591b7721fa9fb34861fd7bd SHA1 f4e68b4448f5b17081a16326b15ec5ae6a0473bc SHA256 ba16cf379cf4e97f5268e57b6c76e95041b578a4a82897d83953816ec5267c4c
MISC metadata.xml 316 RMD160 16d1b3ee3fa2b25adac9aa5b943a0464bc8fea93 SHA1 6f213b7cfc52e9d3c73cf56ee73d69e1bbbb9839 SHA256 280280296201e53c21571d75ab785cae16c7803133540a44923197e408fa2e22
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkkGE8oACgkQz974XjDVpbmXzgCgr/FhXsKO0ZgZruD4QrPxk/yM
-0EMAoMCvIZxH2ZENeSasrntPVhBWYyk3
-=miu+
+iEYEARECAAYFAklg4TsACgkQr2QksT29OyBAoACbBbSP9bumpzhYfREcQIu16CSl
+XxcAoIah7UIOGJ/kPpKaUug/KygU9Alu
+=GHpq
-----END PGP SIGNATURE-----
diff --git a/www-client/midori/midori-9999.ebuild b/www-client/midori/midori-9999.ebuild
index 44007e43caf6..d8dd0b9689a2 100644
--- a/www-client/midori/midori-9999.ebuild
+++ b/www-client/midori/midori-9999.ebuild
@@ -1,8 +1,8 @@
-# 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/www-client/midori/midori-9999.ebuild,v 1.8 2008/10/27 19:17:29 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-9999.ebuild,v 1.9 2009/01/04 16:18:05 hanno Exp $
-inherit git eutils
+inherit git eutils multilib
DESCRIPTION="A lightweight web browser"
HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
@@ -25,7 +25,7 @@ pkg_setup() {
}
src_compile() {
- ./waf --prefix="/usr/" configure || die "waf configure failed."
+ CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" ./waf --prefix="/usr/" --libdir="/usr/$(get_libdir)/" configure || die "waf configure failed."
./waf build || die "waf build failed."
}