From be0b1ffbbe6130d412d7c5c0c47c11df4e26d127 Mon Sep 17 00:00:00 2001 From: Michael Cummings Date: Fri, 30 Mar 2007 21:00:29 +0000 Subject: [PATCH] Bug 169294 Package-Manager: portage-2.1.2.2 --- dev-perl/Inline-Java/Manifest | 24 +++++++++---------- dev-perl/Tk-TableMatrix/ChangeLog | 6 ++++- .../Tk-TableMatrix-1.2.2.ebuild | 21 ++++++++++++++-- .../Tk-TableMatrix-1.2.3.ebuild | 19 ++++++++++++++- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/dev-perl/Inline-Java/Manifest b/dev-perl/Inline-Java/Manifest index cc708201e534..810cf7f09f75 100644 --- a/dev-perl/Inline-Java/Manifest +++ b/dev-perl/Inline-Java/Manifest @@ -8,18 +8,18 @@ EBUILD Inline-Java-0.50.ebuild 840 RMD160 dfa6336b17dad635f5231a9551cf1d9a5401d2 MD5 ec7efe82ff8f90cb93463e81ea77c443 Inline-Java-0.50.ebuild 840 RMD160 dfa6336b17dad635f5231a9551cf1d9a5401d24b Inline-Java-0.50.ebuild 840 SHA256 e57c1ca84a1a2093ad266606ed9bbf4bb0b7556f44d008ae416500c47a66fbb6 Inline-Java-0.50.ebuild 840 -EBUILD Inline-Java-0.51.ebuild 846 RMD160 1eddd67c739d229abfef7d750524fd030959a8de SHA1 05d01dd2a159e2f6276994d6a78bcfd5e1a4e550 SHA256 2abf42c2652dbaa808ea05e4caac09d8540c95a2d5cdd2b1fae8a8723b1f3a14 -MD5 9a154aa77a53960a1e4ed36875e5c5ec Inline-Java-0.51.ebuild 846 -RMD160 1eddd67c739d229abfef7d750524fd030959a8de Inline-Java-0.51.ebuild 846 -SHA256 2abf42c2652dbaa808ea05e4caac09d8540c95a2d5cdd2b1fae8a8723b1f3a14 Inline-Java-0.51.ebuild 846 +EBUILD Inline-Java-0.51.ebuild 841 RMD160 d19484ea977aeefc182ef75eebb96c8095c00f9e SHA1 6cab6d70378acf7d72ee66a59300997edaa5aaa9 SHA256 21aee3777ba5e1eae1930bc127b39859b37378a2f61fb230c8193b1cea5d8075 +MD5 73303c3fb7722520d6a9e87724cec3ef Inline-Java-0.51.ebuild 841 +RMD160 d19484ea977aeefc182ef75eebb96c8095c00f9e Inline-Java-0.51.ebuild 841 +SHA256 21aee3777ba5e1eae1930bc127b39859b37378a2f61fb230c8193b1cea5d8075 Inline-Java-0.51.ebuild 841 EBUILD Inline-Java-0.52.ebuild 847 RMD160 4b505d42a32ba4002b7a0cf3d9153f4c7f48c7f7 SHA1 ea433f62fa400f87f1f71d3230e606126028d751 SHA256 830cbf29717f781b6f46ea6824e335e6f1c329790ea1018d2e25fd4652a7d53b MD5 a1a89e668f8a762d95b7ee6d78f03a9e Inline-Java-0.52.ebuild 847 RMD160 4b505d42a32ba4002b7a0cf3d9153f4c7f48c7f7 Inline-Java-0.52.ebuild 847 SHA256 830cbf29717f781b6f46ea6824e335e6f1c329790ea1018d2e25fd4652a7d53b Inline-Java-0.52.ebuild 847 -MISC ChangeLog 1796 RMD160 5a8dd77b901ed312b4ccd6f4b7f65ed7985d2285 SHA1 0b43747b5e9218b1527e279dd14fad8b64df8c6b SHA256 da9528f3b03802f75f0ac45af5b39b220c635656ee5e22c59334dd6ea8467e5b -MD5 e7fed98dc586152ced83fb64862f4487 ChangeLog 1796 -RMD160 5a8dd77b901ed312b4ccd6f4b7f65ed7985d2285 ChangeLog 1796 -SHA256 da9528f3b03802f75f0ac45af5b39b220c635656ee5e22c59334dd6ea8467e5b ChangeLog 1796 +MISC ChangeLog 1896 RMD160 eb4fa9a51c8e0c453ad39d874ab1aa38b140c79b SHA1 ff6f08b0d31ad60d1d08f81b6ff78a527f1b5164 SHA256 9a30dd55df05f8c973e3d2bd1fe2adf680f66b2a6feff5fb6ae03f7c9ed272fb +MD5 5d405b64792b6a64f58c7431d7576a2d ChangeLog 1896 +RMD160 eb4fa9a51c8e0c453ad39d874ab1aa38b140c79b ChangeLog 1896 +SHA256 9a30dd55df05f8c973e3d2bd1fe2adf680f66b2a6feff5fb6ae03f7c9ed272fb ChangeLog 1896 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305 @@ -34,9 +34,9 @@ MD5 1b35d97d2fa5913aac9614078f680d74 files/digest-Inline-Java-0.52 247 RMD160 5e61ad39985ed0982b143a7e4c02f104ca5a6e82 files/digest-Inline-Java-0.52 247 SHA256 cd25407d352851d8bdf8bf6684f3492abc425f16bc9bab30273d2a36fb718467 files/digest-Inline-Java-0.52 247 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) +Version: GnuPG v1.4.7 (GNU/Linux) -iD8DBQFGDW50tG5z4I8BtQoRAusgAJ9AXDiFppPcKGW1OjQp5Ylt4npQfwCfWKsZ -Sa8ytheSQ6EFUm0fgo8Jhdg= -=qS/s +iD8DBQFGDXrgQlM6RnzZP+IRAuR3AJ4vsklHNoGxNJNGn9iFAVcT0+of5wCeN7/O +7bhsKmOM2pdjEC0qIGAKTdQ= +=CQcx -----END PGP SIGNATURE----- diff --git a/dev-perl/Tk-TableMatrix/ChangeLog b/dev-perl/Tk-TableMatrix/ChangeLog index 6fee1ca4fd5c..7b4b0e9b0e0a 100644 --- a/dev-perl/Tk-TableMatrix/ChangeLog +++ b/dev-perl/Tk-TableMatrix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-perl/Tk-TableMatrix # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/ChangeLog,v 1.38 2007/01/14 01:30:51 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/ChangeLog,v 1.39 2007/03/30 21:00:29 mcummings Exp $ + + 30 Mar 2007; Michael Cummings + Tk-TableMatrix-1.2.2.ebuild, Tk-TableMatrix-1.2.3.ebuild: + Bug 169294 *Tk-TableMatrix-1.2.3 (14 Jan 2007) diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.2.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.2.ebuild index 6c496db058a0..6eaca950f55f 100644 --- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.2.ebuild +++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.2.ebuild,v 1.10 2007/01/14 01:30:51 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.2.ebuild,v 1.11 2007/03/30 21:00:29 mcummings Exp $ -inherit versionator perl-module eutils +inherit versionator perl-module eutils multilib MY_P="${PN}-$(delete_version_separator 2)" S="${WORKDIR}/${MY_P}" @@ -27,3 +27,20 @@ src_unpack() { epatch ${FILESDIR}/pTk-1.22.patch } +src_install() { + perl-module_src_install + # Clean out stray conflicting file - its generated by perl-tk already. + # Bug 169294 + local version + eval `perl '-V:version'` + perl_version=${version} + + local myarch + eval `perl '-V:archname'` + myarch=${archname} + + if [ -f ${D}/usr/$(get_libdir)/perl5/vendor_perl/${perl_version}/${myarch}/auto/Tk/pTk/extralibs.ld ]; then + rm ${D}/usr/$(get_libdir)/perl5/vendor_perl/${perl_version}/${myarch}/auto/Tk/pTk/extralibs.ld + fi + +} diff --git a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild index 503e85fbea37..10a91a53a4ab 100644 --- a/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild +++ b/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild,v 1.1 2007/01/14 01:30:51 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild,v 1.2 2007/03/30 21:00:29 mcummings Exp $ inherit versionator perl-module eutils @@ -27,3 +27,20 @@ src_unpack() { epatch ${FILESDIR}/pTk-1.22.patch } +src_install() { + perl-module_src_install + # Clean out stray conflicting file - its generated by perl-tk already. + # Bug 169294 + local version + eval `perl '-V:version'` + perl_version=${version} + + local myarch + eval `perl '-V:archname'` + myarch=${archname} + + if [ -f ${D}/usr/$(get_libdir)/perl5/vendor_perl/${perl_version}/${myarch}/auto/Tk/pTk/extralibs.ld ]; then + rm ${D}/usr/$(get_libdir)/perl5/vendor_perl/${perl_version}/${myarch}/auto/Tk/pTk/extralibs.ld + fi + +} -- 2.26.2