fix bug 95603 and a multilib-strict issue

Package-Manager: portage-2.0.51.22-r3

diff --git a/x11-libs/gtkscintilla2/ChangeLog b/x11-libs/gtkscintilla2/ChangeLog
index 460dc28783624a0d7dd88935705b064135700aa4..00de90c0ca74b8d5c2060d1a056b4132aa97451b 100644 (file)
--- a/x11-libs/gtkscintilla2/ChangeLog
+++ b/x11-libs/gtkscintilla2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/gtkscintilla2
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkscintilla2/ChangeLog,v 1.9 2004/10/19 09:07:43 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkscintilla2/ChangeLog,v 1.10 2005/11/06 10:53:13 blubb Exp $
+
+  06 Nov 2005; Simon Stelling <blubb@gentoo.org> gtkscintilla2-0.1.0.ebuild:
+  fix bug 95603 and a multilib-strict issue
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
   gtkscintilla2-0.1.0.ebuild:

diff --git a/x11-libs/gtkscintilla2/Manifest b/x11-libs/gtkscintilla2/Manifest
index 387da697522b2bbc940546ec0619a5a3d94b0262..4cd71bed08428212bf7d4cbc0b83676a20fb533d 100644 (file)
--- a/x11-libs/gtkscintilla2/Manifest
+++ b/x11-libs/gtkscintilla2/Manifest
@@ -1,6 +1,6 @@
-MD5 7d0d5b278294115269a74c0ecaaf78d2 ChangeLog 1316
+MD5 12e9e7bb63088b7fde094a731b11701f ChangeLog 1436
 MD5 ffcd1cf74fbd27a58e785b42f97bf17a gtkscintilla2-0.0.8.ebuild 1133
-MD5 ca2ed69366c744f32026b925471f2ea6 gtkscintilla2-0.1.0.ebuild 1141
+MD5 78944e2ac0e7c304ba71c2e79cbd7213 gtkscintilla2-0.1.0.ebuild 1209
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 f29bb40add3aa939317a482a5351a3fd files/digest-gtkscintilla2-0.0.8 71
 MD5 dc9e42bf3ab4148baffc1e474a266416 files/digest-gtkscintilla2-0.1.0 71

diff --git a/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild b/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild
index 32c667b527ec0d0d25b058b49ccea794ab61949e..bc93737af0e9964284083a2b537d105ff0aa4dd3 100644 (file)
--- a/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild
+++ b/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild,v 1.7 2004/10/19 09:07:43 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkscintilla2/gtkscintilla2-0.1.0.ebuild,v 1.8 2005/11/06 10:53:13 blubb Exp $
+
+inherit multilib
 
 MY_P="GtkScintilla2-${PV}"
 DESCRIPTION="Gtk-2 wrappers for the Scintilla source editing components."
@@ -27,7 +29,7 @@ src_unpack() {
 
        # some quick touches to the Makefile, bump the version
        # and make use of our CFLAGS
-       GTHREAD_LDFLAGS="$(pkg-config gthread-2.0 --libs)"
+       GTHREAD_LDFLAGS=$(echo "$(pkg-config gthread-2.0 --libs)" | sed 's|/|\\/|g')
        sed -e "/CFLAGS/s/-g/${CFLAGS} -fPIC/" \
                -e "s/^LDFLAGS_PRE =/LDFLAGS_PRE = ${GTHREAD_LDFLAGS}/" \
                -i Makefile
@@ -44,7 +46,7 @@ src_compile() {
 
 src_install() {
 
-       make DESTDIR=${D} install || die
+       make DESTDIR=${D} LIB_DIR=/usr/$(get_libdir) install || die
        dodoc COPYING README
 
 }