From c36a97960726038c040b21992f06ad5e053a1810 Mon Sep 17 00:00:00 2001 From: Herbie Hopkins Date: Fri, 24 Jun 2005 18:55:13 +0000 Subject: Fixed multilib-strict issue, bug #96958 Package-Manager: portage-2.0.51.22-r1 --- app-doc/chmlib/ChangeLog | 5 ++++- app-doc/chmlib/Manifest | 16 +++++++++++++--- app-doc/chmlib/chmlib-0.35.ebuild | 11 ++++++++--- 3 files changed, 25 insertions(+), 7 deletions(-) (limited to 'app-doc/chmlib') diff --git a/app-doc/chmlib/ChangeLog b/app-doc/chmlib/ChangeLog index 47186f1c94a0..423b32205452 100644 --- a/app-doc/chmlib/ChangeLog +++ b/app-doc/chmlib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-doc/chmlib # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/chmlib/ChangeLog,v 1.10 2005/01/01 13:05:16 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/chmlib/ChangeLog,v 1.11 2005/06/24 18:55:13 herbs Exp $ + + 24 Jun 2005; Herbie Hopkins chmlib-0.35.ebuild: + Fixed multilib-strict issue, bug #96958 19 Dec 2004; Jason Huebel chmlib-0.35.ebuild: stable on amd64 diff --git a/app-doc/chmlib/Manifest b/app-doc/chmlib/Manifest index 48f2be56032e..a1229f313a3a 100644 --- a/app-doc/chmlib/Manifest +++ b/app-doc/chmlib/Manifest @@ -1,10 +1,20 @@ -MD5 c4e0f380b27feed3d6ffa57f434f08b6 ChangeLog 1289 -MD5 f30eb2324e15841bcb8d7596bcab1df1 chmlib-0.31.ebuild 1473 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 2095c8fbff91172458e40a3c7f4c35c4 chmlib-0.32.ebuild 1676 +MD5 f30eb2324e15841bcb8d7596bcab1df1 chmlib-0.31.ebuild 1473 MD5 7912dfce57aa45cc73b72fb4c81d5e27 chmlib-0.33.ebuild 1676 -MD5 88ddc0014e63d38e2c5bdb5a9fea6cac chmlib-0.35.ebuild 1676 +MD5 fa6c5694a640524a7ae25445fe5ce11f ChangeLog 1396 MD5 a5f4a4a8acdf2c295bdb3bc50b4e0d86 metadata.xml 254 +MD5 3841b3d02541fc293ef1f6a1b42925b5 chmlib-0.35.ebuild 1783 MD5 5e241d7b61c20016a54f95cc7538c41c files/digest-chmlib-0.31 59 MD5 79e2ad3061c14b4285f578bc09190b55 files/digest-chmlib-0.32 60 MD5 d946aa58575a98474e1d1f8c01195a6e files/digest-chmlib-0.33 60 MD5 5f72df9f154b0843fcc8986396d9e476 files/digest-chmlib-0.35 60 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.1 (GNU/Linux) + +iD8DBQFCvFc62G5bA0cA/ScRAoiEAKDBqHkqH7uvK0lDrB4fc2R8aGAgdQCfRD3b +13r2BluzYqHLtODlfZ0Trf0= +=g8an +-----END PGP SIGNATURE----- diff --git a/app-doc/chmlib/chmlib-0.35.ebuild b/app-doc/chmlib/chmlib-0.35.ebuild index 14b119268ed9..3e57b973eede 100644 --- a/app-doc/chmlib/chmlib-0.35.ebuild +++ b/app-doc/chmlib/chmlib-0.35.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/chmlib/chmlib-0.35.ebuild,v 1.4 2005/01/01 13:05:16 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/chmlib/chmlib-0.35.ebuild,v 1.5 2005/06/24 18:55:13 herbs Exp $ + +inherit multilib DESCRIPTION="Library for MS CHM (compressed html) file format plus extracting and http server utils" HOMEPAGE="http://66.93.236.84/~jedwin/projects/chmlib/" @@ -17,7 +19,10 @@ IUSE="" src_unpack() { unpack ${A} cd ${S} - sed -i -r "s,(\\\$\\{INSTALLPREFIX\\}),\${DESTDIR}\\1,g;s,@LIBTOOL@,libtool,g" Makefile.in + sed -i -r "s,(\\\$\\{INSTALLPREFIX\\}),\${DESTDIR}\\1,g; + s,@LIBTOOL@,libtool,g; + s,(\\\$\\{INSTALLPREFIX\\})/lib,\1/$(get_libdir),g" \ + Makefile.in || die "sed failed" econf || die "econf failed" # sed -i "s:gcc-3.2:gcc:" Makefile # sed -i "s:/usr/local/:/${D}/usr/:" Makefile @@ -38,7 +43,7 @@ src_compile() { src_install() { #Make expects to find these dirs. dodir /usr/bin - dodir /usr/lib + dodir /usr/$(get_libdir) dodir /usr/include dodir /usr/share/doc/${PF}/examples/ -- cgit v1.2.3-65-gdbad