touchups

6 files changed, 9 insertions, 71 deletions

diff --git a/dev-tcltk/tclperl/Manifest b/dev-tcltk/tclperl/Manifest
index 0f732be57d86..d21838501521 100644
--- a/dev-tcltk/tclperl/Manifest
+++ b/dev-tcltk/tclperl/Manifest
@@ -1,8 +1,4 @@
-MD5 22c5eb5db147255f0c238c0cca52fd56 tclperl-3.1.ebuild 928
-MD5 7ae4ca91c2349e76d1955e83bb218014 tclperl-2.5.ebuild 732
-MD5 a5cf0ec10ee9854008d9daa71a77195a tclperl-2.5-r1.ebuild 762
 MD5 3aaf93fd73f4ca9f2bb54fefff033344 ChangeLog 570
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 24a01236fd1234ca39e6b3f4723606ee files/digest-tclperl-2.5 61
+MD5 36193defe3872ce2576b7efc8dd8d0f8 tclperl-3.1.ebuild 959
 MD5 595db246634277484e07016371570132 files/digest-tclperl-3.1 62
-MD5 24a01236fd1234ca39e6b3f4723606ee files/digest-tclperl-2.5-r1 61
diff --git a/dev-tcltk/tclperl/files/digest-tclperl-2.5 b/dev-tcltk/tclperl/files/digest-tclperl-2.5
deleted file mode 100644
index 6edc4bb59bd0..000000000000
--- a/dev-tcltk/tclperl/files/digest-tclperl-2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a4cb0f18d8645ab4c0d5a250a8c6e262 tclperl-2.5.tar.gz 5805
diff --git a/dev-tcltk/tclperl/files/digest-tclperl-2.5-r1 b/dev-tcltk/tclperl/files/digest-tclperl-2.5-r1
deleted file mode 100644
index 6edc4bb59bd0..000000000000
--- a/dev-tcltk/tclperl/files/digest-tclperl-2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a4cb0f18d8645ab4c0d5a250a8c6e262 tclperl-2.5.tar.gz 5805
diff --git a/dev-tcltk/tclperl/tclperl-2.5-r1.ebuild b/dev-tcltk/tclperl/tclperl-2.5-r1.ebuild
deleted file mode 100644
index 1746ed1a9d12..000000000000
--- a/dev-tcltk/tclperl/tclperl-2.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclperl/tclperl-2.5-r1.ebuild,v 1.1 2004/10/21 15:35:06 matsuu Exp $
-
-DESCRIPTION="a Perl package for Tcl"
-HOMEPAGE="http://jfontain.free.fr/tclperl.htm"
-SRC_URI="http://jfontain.free.fr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/tcl-8.0
-	dev-lang/perl"
-
-src_compile() {
-	[ -z "${CC}" ] && CC=gcc
-	${CC} -shared -o tclperl.so.${PV} -fPIC ${CFLAGS} -Wall tclperl.c `perl -MExtUtils::Embed -e ccopts -e ldopts` || die
-}
-
-src_install() {
-	insinto /usr/lib/tclperl
-	doins tclperl.so.${PV}
-	doins pkgIndex.tcl
-
-	dodoc CHANGES INSTALL README
-	dohtml tclperl.htm
-}
diff --git a/dev-tcltk/tclperl/tclperl-2.5.ebuild b/dev-tcltk/tclperl/tclperl-2.5.ebuild
deleted file mode 100644
index 28f1c687303a..000000000000
--- a/dev-tcltk/tclperl/tclperl-2.5.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclperl/tclperl-2.5.ebuild,v 1.3 2004/10/17 10:13:53 dholm Exp $
-
-DESCRIPTION="a Perl package for Tcl"
-HOMEPAGE="http://jfontain.free.fr/tclperl.htm"
-SRC_URI="http://jfontain.free.fr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/tcl-8.0
-	dev-lang/perl"
-
-src_compile() {
-	${CC} -shared -o tclperl.so.${PV} -fPIC ${CFLAGS} -Wall tclperl.c `perl -MExtUtils::Embed -e ccopts -e ldopts` || die
-}
-
-src_install() {
-	insinto /usr/lib/tclperl
-	doins tclperl.so.${PV}
-	doins pkgIndex.tcl
-
-	dodoc CHANGES INSTALL README
-	dohtml tclperl.htm
-}
diff --git a/dev-tcltk/tclperl/tclperl-3.1.ebuild b/dev-tcltk/tclperl/tclperl-3.1.ebuild
index ca5bdc85ba65..4fa8ed552d35 100644
--- a/dev-tcltk/tclperl/tclperl-3.1.ebuild
+++ b/dev-tcltk/tclperl/tclperl-3.1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclperl/tclperl-3.1.ebuild,v 1.1 2004/10/21 15:35:06 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclperl/tclperl-3.1.ebuild,v 1.2 2004/10/26 13:50:18 vapier Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="a Perl package for Tcl"
 HOMEPAGE="http://jfontain.free.fr/tclperl.htm"
 SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/tcl-8.3.3
@@ -18,16 +20,15 @@ src_compile() {
 	perl Makefile.PL || die
 	make OPTIMIZE="${CFLAGS}" Tcl.o || die
 
-	[ -z "${CC}" ] && CC=gcc
-	${CC} -shared ${CFLAGS} -o tclperl.so.${PV} -fPIC -DUSE_TCL_STUBS \
+	$(tc-getCC) -shared ${CFLAGS} -o tclperl.so.${PV} -fPIC -DUSE_TCL_STUBS \
 		tclperl.c tclthread.c `perl -MExtUtils::Embed -e ccopts -e ldopts` \
 		/usr/lib/libtclstub`echo 'puts $tcl_version' | tclsh`.a Tcl.o || die
 }
 
 src_install() {
-	insinto /usr/lib/tclperl
-	doins tclperl.so.${PV}
-	doins pkgIndex.tcl
+	exeinto /usr/lib/tclperl
+	doexe tclperl.so.${PV} || die "lib"
+	doexe pkgIndex.tcl || die "tcl"
 
 	dodoc CHANGES INSTALL README
 	dohtml tclperl.htm