summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2006-09-18 05:39:16 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2006-09-18 05:39:16 +0000
commit3de8de894f1eb9a484ec5db95250432f5aeaac7f (patch)
treecdaefd63e2b6b9f8189d9dbe761e1d5dda3e5aab /media-libs
parentstable for x86 (diff)
downloadgentoo-2-3de8de894f1eb9a484ec5db95250432f5aeaac7f.tar.gz
gentoo-2-3de8de894f1eb9a484ec5db95250432f5aeaac7f.tar.bz2
gentoo-2-3de8de894f1eb9a484ec5db95250432f5aeaac7f.zip
Add in a sed of libdir in libGL.la from 6.5-r4 to avoid breaking things in a big way.
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/mesa/ChangeLog6
-rw-r--r--media-libs/mesa/mesa-6.5.1.ebuild6
2 files changed, 8 insertions, 4 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 3be2f8bf0b4d..b1abbe2f5e85 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.111 2006/09/17 07:49:22 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.112 2006/09/18 05:39:16 dberkholz Exp $
+
+ 18 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; mesa-6.5.1.ebuild:
+ Add in a sed of libdir in libGL.la from 6.5-r4 to avoid breaking things in a
+ big way.
17 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; mesa-6.5.1.ebuild:
(#147872) Require libdrm 2.0.2. At least the r200 driver needs it, maybe more.
diff --git a/media-libs/mesa/mesa-6.5.1.ebuild b/media-libs/mesa/mesa-6.5.1.ebuild
index af244b481ebb..aee6fb8b772a 100644
--- a/media-libs/mesa/mesa-6.5.1.ebuild
+++ b/media-libs/mesa/mesa-6.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1.ebuild,v 1.6 2006/09/17 07:49:22 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1.ebuild,v 1.7 2006/09/18 05:39:16 dberkholz Exp $
inherit eutils toolchain-funcs multilib flag-o-matic portability
@@ -227,8 +227,8 @@ src_install() {
insinto /usr/$(get_libdir)
# (#67729) Needs to be lib, not $(get_libdir)
doins ${FILESDIR}/lib/libGLU.la
- insinto /usr/$(get_libdir)/opengl/xorg-x11/lib
- doins ${FILESDIR}/lib/libGL.la
+ sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
+ > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
# On *BSD libcs dlopen() and similar functions are present directly in
# libc.so and does not require linking to libdl. portability eclass takes