summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2005-11-24 12:41:19 +0000
committerSimon Stelling <blubb@gentoo.org>2005-11-24 12:41:19 +0000
commitde99effdcdf8c6e21ec2072657e02eb93dda67ca (patch)
tree5f1ca7c60933fbc6eff4a602b58a1d1af85c0cc3 /gnome-extra
parentNew Savant2 ebuild for dev-lang/php. (diff)
downloadgentoo-2-de99effdcdf8c6e21ec2072657e02eb93dda67ca.tar.gz
gentoo-2-de99effdcdf8c6e21ec2072657e02eb93dda67ca.tar.bz2
gentoo-2-de99effdcdf8c6e21ec2072657e02eb93dda67ca.zip
fix multilib-strict issues
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/gal/ChangeLog5
-rw-r--r--gnome-extra/gal/gal-0.24.ebuild16
2 files changed, 13 insertions, 8 deletions
diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index 5fd9609fc7f8..091fa3e61755 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-extra/gal
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.112 2005/10/17 12:58:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.113 2005/11/24 12:41:19 blubb Exp $
+
+ 24 Nov 2005; Simon Stelling <blubb@gentoo.org> gal-0.24.ebuild:
+ fix multilib-strict issues
17 Oct 2005; Aron Griffis <agriffis@gentoo.org> gal-0.24.ebuild:
Mark 0.24 stable on ia64
diff --git a/gnome-extra/gal/gal-0.24.ebuild b/gnome-extra/gal/gal-0.24.ebuild
index b0840488e70a..34f62160713a 100644
--- a/gnome-extra/gal/gal-0.24.ebuild
+++ b/gnome-extra/gal/gal-0.24.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-0.24.ebuild,v 1.19 2005/10/17 12:58:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-0.24.ebuild,v 1.20 2005/11/24 12:41:19 blubb Exp $
-inherit gnome.org libtool eutils
+inherit gnome.org libtool eutils multilib
DESCRIPTION="The Gnome Application Libraries"
HOMEPAGE="http://www.gnome.org/"
@@ -47,7 +47,8 @@ src_compile() {
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var/lib \
- ${myconf} || die
+ --libdir=/usr/$(get_libdir) \
+ ${myconf} || die
if use alpha; then
# This program doesn't link on alpha, at least with the
@@ -62,16 +63,17 @@ src_compile() {
src_install() {
make prefix=${D}/usr \
sysconfdir=${D}/etc \
- localstatedir=${D}/var/lib \
+ localstatedir=${D}/var/lib \
+ libdir=${D}/usr/$(get_libdir) \
install || die
# Add some type of backward compat...
- local fullname="`eval basename \`readlink ${D}/usr/lib/libgal.so\``"
- dosym ${fullname##*/} /usr/lib/libgal.so.$((`echo ${PV} | cut -d. -f2`-1))
+ local fullname="`eval basename \`readlink ${D}/usr/$(get_libdir)/libgal.so\``"
+ dosym ${fullname##*/} /usr/$(get_libdir)/libgal.so.$((`echo ${PV} | cut -d. -f2`-1))
# gal-0.23 provides libgal.so.21, and its compatible with 0.24
# so we add this symlink for more backwards compatibility - liquidx.
- dosym ${fullname##*/} /usr/lib/libgal.so.21
+ dosym ${fullname##*/} /usr/$(get_libdir)/libgal.so.21
dodoc AUTHORS COPYING ChangeLog NEWS README
}