summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cummings <mcummings@gentoo.org>2007-03-30 21:00:29 +0000
committerMichael Cummings <mcummings@gentoo.org>2007-03-30 21:00:29 +0000
commitfc592f01da999ec831e26029c09f7fc2dc3ff173 (patch)
tree542f64d217b1a461369e9f48aef9230f2b991be1
parentAdd v19, bug #94354, p.masked and will need rekeywording as this has major ch... (diff)
downloadgentoo-2-fc592f01da999ec831e26029c09f7fc2dc3ff173.tar.gz
gentoo-2-fc592f01da999ec831e26029c09f7fc2dc3ff173.tar.bz2
gentoo-2-fc592f01da999ec831e26029c09f7fc2dc3ff173.zip
Bug 169294
(Portage version: 2.1.2.2)
-rw-r--r--dev-perl/Tk-TableMatrix/ChangeLog6
-rw-r--r--dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.2.ebuild21
-rw-r--r--dev-perl/Tk-TableMatrix/Tk-TableMatrix-1.2.3.ebuild19
3 files changed, 42 insertions, 4 deletions
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 <mcummings@gentoo.org>
+ 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
+
+}