From abf005f284c00d6ed38908b3f5beffb8c6c20951 Mon Sep 17 00:00:00 2001 From: Herbie Hopkins Date: Thu, 26 May 2005 23:32:37 +0000 Subject: Multilib fixes. (Portage version: 2.0.51.22-r1) --- dev-dotnet/gtk-sharp/ChangeLog | 6 +++++- dev-dotnet/gtk-sharp/Manifest | 22 +++++++++++----------- dev-dotnet/gtk-sharp/gtk-sharp-1.0.10.ebuild | 6 +++++- dev-dotnet/gtk-sharp/gtk-sharp-1.9.5.ebuild | 8 ++++++-- dev-dotnet/gtk-sharp/gtk-sharp-2.5.5.ebuild | 8 ++++++-- 5 files changed, 33 insertions(+), 17 deletions(-) (limited to 'dev-dotnet/gtk-sharp') diff --git a/dev-dotnet/gtk-sharp/ChangeLog b/dev-dotnet/gtk-sharp/ChangeLog index a3f12a680c25..0a9f430fd6f0 100644 --- a/dev-dotnet/gtk-sharp/ChangeLog +++ b/dev-dotnet/gtk-sharp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-dotnet/gtk-sharp # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.40 2005/05/24 17:39:50 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.41 2005/05/26 23:32:37 herbs Exp $ + + 26 May 2005; Herbie Hopkins gtk-sharp-1.0.10.ebuild, + gtk-sharp-1.9.5.ebuild, gtk-sharp-2.5.5.ebuild: + Multilib fixes. *gtk-sharp-1.0.10 (24 May 2005) *gtk-sharp-1.0.8-r1 (24 May 2005) diff --git a/dev-dotnet/gtk-sharp/Manifest b/dev-dotnet/gtk-sharp/Manifest index f962618dcb1b..997ef0f9c691 100644 --- a/dev-dotnet/gtk-sharp/Manifest +++ b/dev-dotnet/gtk-sharp/Manifest @@ -1,18 +1,18 @@ +MD5 c9267c734b06382e5fed5e270df3d9c8 gtk-sharp-1.9.3-r1.ebuild 2082 +MD5 67a7a7adeecad24d95addd09c25ee0f6 gtk-sharp-1.0.10.ebuild 1574 +MD5 c5f4fc4d0c78d9befa57a1366cc04b5e gtk-sharp-1.9.5.ebuild 2265 +MD5 9916a1570107a47d53b9e026eb260340 gtk-sharp-2.5.5.ebuild 2267 +MD5 23fdc6271384ec02b6318d47fd89878a gtk-sharp-1.0.8-r1.ebuild 1449 MD5 24ef27bc6a7accf5a4d08745570aa71c gtk-sharp-1.0.6.ebuild 1456 MD5 fa8d8ee9c412cff7cf851e5019494ac7 gtk-sharp-1.0.8.ebuild 1445 -MD5 4a78557c5c588d3da4d067e840123ae5 ChangeLog 11044 -MD5 e06909c47712ae995f4879eefb22e38b metadata.xml 160 -MD5 c3d363558a0a2733c47d6b3687f8b499 gtk-sharp-1.0.10.ebuild 1459 -MD5 c9267c734b06382e5fed5e270df3d9c8 gtk-sharp-1.9.3-r1.ebuild 2082 MD5 f47dc6805f7acab0d2f9d67322a52328 gtk-sharp-1.9.3.1.ebuild 2075 -MD5 6549abc2228e2e3ce5bf1e5d36e64e3f gtk-sharp-2.5.5.ebuild 2128 -MD5 2190dd377df1b729caf02d24f8cdbed9 gtk-sharp-1.9.5.ebuild 2126 -MD5 23fdc6271384ec02b6318d47fd89878a gtk-sharp-1.0.8-r1.ebuild 1449 -MD5 d3c03463afacd40a934397a076f9bf9b files/digest-gtk-sharp-2.5.5 147 -MD5 ff5a2a47c3e1d785fc179c922857e409 files/digest-gtk-sharp-1.0.6 147 -MD5 fef3bd202b3f48969673897302f3be4c files/digest-gtk-sharp-1.0.8 147 +MD5 f36fef2480f1e0e10574758e1060300d ChangeLog 11187 +MD5 e06909c47712ae995f4879eefb22e38b metadata.xml 160 +MD5 302dbc192d1c69a0ba956625d73ef2c2 files/digest-gtk-sharp-1.0.10 149 MD5 fef3bd202b3f48969673897302f3be4c files/digest-gtk-sharp-1.0.8-r1 147 MD5 284fbaa2e02c9f1dca27440457411e0b files/digest-gtk-sharp-1.9.3-r1 147 MD5 fe4e7ed3578050079793d30322ad8a6c files/digest-gtk-sharp-1.9.3.1 151 +MD5 ff5a2a47c3e1d785fc179c922857e409 files/digest-gtk-sharp-1.0.6 147 +MD5 fef3bd202b3f48969673897302f3be4c files/digest-gtk-sharp-1.0.8 147 MD5 2f754d97c9892c6b5cd78fb43433df9d files/digest-gtk-sharp-1.9.5 147 -MD5 302dbc192d1c69a0ba956625d73ef2c2 files/digest-gtk-sharp-1.0.10 149 +MD5 d3c03463afacd40a934397a076f9bf9b files/digest-gtk-sharp-2.5.5 147 diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-1.0.10.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-1.0.10.ebuild index 97cfcf2ae11e..ed6eaa6115f0 100644 --- a/dev-dotnet/gtk-sharp/gtk-sharp-1.0.10.ebuild +++ b/dev-dotnet/gtk-sharp/gtk-sharp-1.0.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.0.10.ebuild,v 1.1 2005/05/24 17:39:50 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.0.10.ebuild,v 1.2 2005/05/26 23:32:37 herbs Exp $ inherit eutils mono @@ -32,6 +32,10 @@ src_unpack() { epatch ${WORKDIR}/${P}-configurable.diff sed -i -e 's:\:GTK_SHARP_PKG_PATH:g' configure.in + # Use correct libdir in pkgconfig file + sed -i -e 's:^libdir.*:libdir=@libdir@:' \ + ${S}/gtk-sharp.pc.in || die + aclocal || die # See bug #73563, comment #9 libtoolize --copy --force || die diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-1.9.5.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-1.9.5.ebuild index 6c0fb942398d..04a69b3d5d11 100644 --- a/dev-dotnet/gtk-sharp/gtk-sharp-1.9.5.ebuild +++ b/dev-dotnet/gtk-sharp/gtk-sharp-1.9.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.9.5.ebuild,v 1.1 2005/05/20 19:53:54 latexer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-1.9.5.ebuild,v 1.2 2005/05/26 23:32:37 herbs Exp $ inherit eutils mono @@ -34,6 +34,10 @@ src_unpack() { #fixes support with pkgconfig-0.17, bug #92503 sed -i -e 's/\/GTK_SHARP_PKG_PATH/g' configure.in + # Use correct libdir in pkgconfig files + sed -i -e 's:^libdir.*:libdir=@libdir@:' \ + ${S}/*/{,GConf}/*.pc.in || die + aclocal || die automake || die autoconf || die @@ -62,7 +66,7 @@ src_compile() { } src_install () { - make GACUTIL_FLAGS="/root ${D}/usr/lib /gacdir /usr/lib /package ${PN}-2.0" \ + make GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) /package ${PN}-2.0" \ DESTDIR=${D} install || die dodoc README* ChangeLog diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.5.5.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.5.5.ebuild index 66936fc798aa..eb88a3614558 100644 --- a/dev-dotnet/gtk-sharp/gtk-sharp-2.5.5.ebuild +++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.5.5.ebuild,v 1.2 2005/05/21 09:31:03 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.5.5.ebuild,v 1.3 2005/05/26 23:32:37 herbs Exp $ inherit eutils mono @@ -31,6 +31,10 @@ src_unpack() { #fixes support with pkgconfig-0.17, bug #92503 sed -i -e 's/\/GTK_SHARP_PKG_PATH/g' configure.in + # Use correct libdir in pkgconfig files + sed -i -e 's:^libdir.*:libdir=@libdir@:' \ + ${S}/*/{,GConf}/*.pc.in || die + export WANT_AUTOMAKE="1.8" aclocal || die automake || die @@ -61,7 +65,7 @@ src_compile() { } src_install () { - make GACUTIL_FLAGS="/root ${D}/usr/lib /gacdir /usr/lib /package ${PN}-2.0" \ + make GACUTIL_FLAGS="/root ${D}/usr/$(get_libdir) /gacdir /usr/$(get_libdir) /package ${PN}-2.0" \ DESTDIR=${D} install || die dodoc README* ChangeLog -- cgit v1.2.3-65-gdbad