From e262d77242ea710f116cb7b43b290b9bf86db597 Mon Sep 17 00:00:00 2001 From: Matsuu Takuto Date: Mon, 8 Dec 2008 14:04:13 +0000 Subject: Fixed xorg build issue, bug #250211. (Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r4 x86_64) --- dev-libs/wnn7sdk/ChangeLog | 5 ++++- dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild | 14 +++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'dev-libs/wnn7sdk') diff --git a/dev-libs/wnn7sdk/ChangeLog b/dev-libs/wnn7sdk/ChangeLog index 1b4b3e30ea62..ca0d9b72c308 100644 --- a/dev-libs/wnn7sdk/ChangeLog +++ b/dev-libs/wnn7sdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/wnn7sdk # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.6 2008/11/22 01:53:43 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/ChangeLog,v 1.7 2008/12/08 14:04:13 matsuu Exp $ + + 08 Dec 2008; MATSUU Takuto wnn7sdk-20011017-r1.ebuild: + Fixed xorg build issue, bug #250211. *wnn7sdk-20011017-r1 (22 Nov 2008) diff --git a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild index b05454f460ed..31a97caeb788 100644 --- a/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild +++ b/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild,v 1.1 2008/11/22 01:53:43 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/wnn7sdk/wnn7sdk-20011017-r1.ebuild,v 1.2 2008/12/08 14:04:13 matsuu Exp $ inherit eutils multilib toolchain-funcs @@ -27,7 +27,11 @@ src_unpack() { epatch "${FILESDIR}/${PN}-gentoo.patch" epatch "${FILESDIR}/${PN}-gcc4.patch" epatch "${FILESDIR}/${PN}-qa.patch" - sed -i -e "/CONFIGSRC =/s:=.*:= /usr/$(get_libdir)/X11/config:" Makefile.ini || die + + # Fix path to point to Xorg directory + sed -e "s:X11R6/::g" -i config/X11.tmpl || sed "sed 1 failed" + + sed -i -e "/CONFIGSRC =/s:=.*:= /usr/$(get_libdir)/X11/config:" Makefile.ini || die "sed 2 failed" } src_compile() { @@ -37,11 +41,11 @@ src_compile() { } src_install() { - dolib.so Wnn/jlib/*.so* || die - dolib.a Wnn/jlib/*.a || die + dolib.so Wnn/jlib/*.so* || die "dolib.so failed" + dolib.a Wnn/jlib/*.a || die "dolib.a failed" insinto /usr/include/${PN}/wnn - doins Wnn/include/*.h || die + doins Wnn/include/*.h || die "doins failed" dodoc README } -- cgit v1.2.3-65-gdbad