diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2006-08-29 11:27:28 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2006-08-29 11:27:28 +0000 |
| commit | e2564b5436447d5f613a530282247d7faa38b185 (patch) | |
| tree | 14f32257f8b3b4d345f01186bd48f31113de1647 /sys-libs | |
| parent | stable on amd64 (diff) | |
| download | gentoo-2-e2564b5436447d5f613a530282247d7faa38b185.tar.gz gentoo-2-e2564b5436447d5f613a530282247d7faa38b185.tar.bz2 gentoo-2-e2564b5436447d5f613a530282247d7faa38b185.zip | |
fix for multilib-strict adherence; bug 145370
(Portage version: 2.1.1_rc1)
Diffstat (limited to 'sys-libs')
4 files changed, 30 insertions, 13 deletions
diff --git a/sys-libs/libtermcap-compat/ChangeLog b/sys-libs/libtermcap-compat/ChangeLog index c5473f1c1ff1..404ef096045f 100644 --- a/sys-libs/libtermcap-compat/ChangeLog +++ b/sys-libs/libtermcap-compat/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/libtermcap-compat -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/ChangeLog,v 1.28 2005/08/20 04:22:41 vapier Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/ChangeLog,v 1.29 2006/08/29 11:27:28 blubb Exp $ + + 29 Aug 2006; <blubb@gentoo.org> libtermcap-compat-2.0.8-r1.ebuild: + fix for multilib-strict adherence; bug 145370 *libtermcap-compat-2.0.8-r2 (20 Aug 2005) diff --git a/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r1 b/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r1 index 320617ace8a6..28967d668400 100644 --- a/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r1 +++ b/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r1 @@ -1,3 +1,9 @@ -MD5 37318885db65314f1bcc2b22751123d3 termtypes.tc.gz 228329 -MD5 7a557332d50129e9570dc7a655c4e4cd termcap-2.0.8.tar.bz2 211523 MD5 de0de2ec41441025214d56f7d8eba462 libtermcap-compat-2.0.8-gentoo-0.1.tar.bz2 9960 +RMD160 e04feac67ee9dc298693962749b4be3690e7a871 libtermcap-compat-2.0.8-gentoo-0.1.tar.bz2 9960 +SHA256 aba11a32f2b1ae6262928796cc8637f84c8baf0a5e5149853ed3c570e5f79f3d libtermcap-compat-2.0.8-gentoo-0.1.tar.bz2 9960 +MD5 7a557332d50129e9570dc7a655c4e4cd termcap-2.0.8.tar.bz2 211523 +RMD160 c5f9f99d57d4788429dd94d7ca37968d35210070 termcap-2.0.8.tar.bz2 211523 +SHA256 293fb17823ae10b01902465d9f83625598b784e7bf72dde5425914c1c718f917 termcap-2.0.8.tar.bz2 211523 +MD5 37318885db65314f1bcc2b22751123d3 termtypes.tc.gz 228329 +RMD160 1dacc8fa5dc1639ddf40dc31dff523653a7fc3f1 termtypes.tc.gz 228329 +SHA256 c4fa04257fea6e968d4caa28cc18dbbf9eea4769a463296eaca21ceea757a728 termtypes.tc.gz 228329 diff --git a/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r2 b/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r2 index 320617ace8a6..28967d668400 100644 --- a/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r2 +++ b/sys-libs/libtermcap-compat/files/digest-libtermcap-compat-2.0.8-r2 @@ -1,3 +1,9 @@ -MD5 37318885db65314f1bcc2b22751123d3 termtypes.tc.gz 228329 -MD5 7a557332d50129e9570dc7a655c4e4cd termcap-2.0.8.tar.bz2 211523 MD5 de0de2ec41441025214d56f7d8eba462 libtermcap-compat-2.0.8-gentoo-0.1.tar.bz2 9960 +RMD160 e04feac67ee9dc298693962749b4be3690e7a871 libtermcap-compat-2.0.8-gentoo-0.1.tar.bz2 9960 +SHA256 aba11a32f2b1ae6262928796cc8637f84c8baf0a5e5149853ed3c570e5f79f3d libtermcap-compat-2.0.8-gentoo-0.1.tar.bz2 9960 +MD5 7a557332d50129e9570dc7a655c4e4cd termcap-2.0.8.tar.bz2 211523 +RMD160 c5f9f99d57d4788429dd94d7ca37968d35210070 termcap-2.0.8.tar.bz2 211523 +SHA256 293fb17823ae10b01902465d9f83625598b784e7bf72dde5425914c1c718f917 termcap-2.0.8.tar.bz2 211523 +MD5 37318885db65314f1bcc2b22751123d3 termtypes.tc.gz 228329 +RMD160 1dacc8fa5dc1639ddf40dc31dff523653a7fc3f1 termtypes.tc.gz 228329 +SHA256 c4fa04257fea6e968d4caa28cc18dbbf9eea4769a463296eaca21ceea757a728 termtypes.tc.gz 228329 diff --git a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild index 06f10f5e8669..7713e214c19f 100644 --- a/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild +++ b/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild,v 1.12 2005/08/20 04:22:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtermcap-compat/libtermcap-compat-2.0.8-r1.ebuild,v 1.13 2006/08/29 11:27:28 blubb Exp $ -inherit eutils +inherit eutils multilib toolchain-funcs PATCHVER=0.1 @@ -42,18 +42,20 @@ src_compile() { } src_install () { - dodir /lib /include /usr/lib + dodir /$(get_libdir) /include /usr/$(get_libdir) make prefix="${D}" OWNER="root:root" install || die # Conflicts with ncurses. rm -rf ${D}/include - cd ${D}/lib; mv libtermcap.a ../usr/lib + cd ${D}/$(get_libdir); mv libtermcap.a ../usr/$(get_libdir) # Make sure we link to /lib/libtermcap.so, not /usr/lib/libtermcap.a, # bug #4411. gen_usr_ldscript libtermcap.so - dosym libtermcap.so.2 /lib/libtermcap.so - dosym libtermcap.so.${PV} /lib/libtermcap.so.2 + dosym libtermcap.so.2 /$(get_libdir)/libtermcap.so + dosym libtermcap.so.${PV} /$(get_libdir)/libtermcap.so.2 + + cd ${D} ; rm ./lib insinto /etc doins ${WORKDIR}/termcap |