summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-12-26 04:54:47 +0000
committerMike Frysinger <vapier@gentoo.org>2006-12-26 04:54:47 +0000
commitb082a0f586e335ab9036c39da97e55448da8c1ae (patch)
tree7f69d7daf3a19adef521f486ee16e9cbfcc57cd0 /dev-lang
parentuse emake in src_install() (diff)
downloadgentoo-2-b082a0f586e335ab9036c39da97e55448da8c1ae.tar.gz
gentoo-2-b082a0f586e335ab9036c39da97e55448da8c1ae.tar.bz2
gentoo-2-b082a0f586e335ab9036c39da97e55448da8c1ae.zip
Clean up src_install() to use proper ebuild commands rather than running `install` and use relative symlinks for libraries.
(Portage version: 2.1.2_rc4-r1)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/tcl/ChangeLog6
-rw-r--r--dev-lang/tcl/tcl-8.4.13.ebuild28
2 files changed, 19 insertions, 15 deletions
diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index f100ae60613f..7c1c81783129 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/tcl
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.70 2006/10/18 09:18:49 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.71 2006/12/26 04:54:47 vapier Exp $
+
+ 26 Dec 2006; Mike Frysinger <vapier@gentoo.org> tcl-8.4.13.ebuild:
+ Clean up src_install() to use proper ebuild commands rather than running
+ `install` and use relative symlinks for libraries.
18 Oct 2006; Roy Marples <uberlord@gentoo.org> tcl-8.4.13.ebuild:
Added ~sparc-fbsd keyword.
diff --git a/dev-lang/tcl/tcl-8.4.13.ebuild b/dev-lang/tcl/tcl-8.4.13.ebuild
index ffeb48beb731..427263b7e01f 100644
--- a/dev-lang/tcl/tcl-8.4.13.ebuild
+++ b/dev-lang/tcl/tcl-8.4.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.13.ebuild,v 1.4 2006/10/18 09:18:49 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.4.13.ebuild,v 1.5 2006/12/26 04:54:47 vapier Exp $
inherit eutils multilib toolchain-funcs
@@ -66,7 +66,7 @@ src_install() {
local v1
v1=${PV%.*}
- cd ${S}/unix
+ cd "${S}"/unix
S= make DESTDIR="${D}" install || die
# fix the tclConfig.sh to eliminate refs to the build directory
@@ -80,24 +80,24 @@ src_install() {
-e "s,^TCL_LIB_FILE='libtcl${v1}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${v1}\$\{TCL_DBGX\}.so\"," \
-e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
-e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/${mylibdir}'," \
- ${D}/usr/${mylibdir}/tclConfig.sh || die
+ "${D}"/usr/${mylibdir}/tclConfig.sh || die
# install private headers
- dodir /usr/${mylibdir}/tcl${v1}/include/unix
- install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/unix
- dodir /usr/${mylibdir}/tcl${v1}/include/generic
- install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tcl${v1}/include/generic
- rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
- rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
- rm -f ${D}/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
+ insinto /usr/${mylibdir}/tcl${v1}/include/unix
+ doins "${S}"/unix/*.h || die
+ insinto /usr/${mylibdir}/tcl${v1}/include/generic
+ doins "${S}"/generic/*.h || die
+ rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tcl.h
+ rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclDecls.h
+ rm -f "${D}"/usr/${mylibdir}/tcl${v1}/include/generic/tclPlatDecls.h
# install symlink for libraries
- dosym /usr/${mylibdir}/libtcl${v1}.so /usr/${mylibdir}/libtcl.so
- dosym /usr/${mylibdir}/libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+ dosym libtcl${v1}.so /usr/${mylibdir}/libtcl.so
+ dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
- ln -sf tclsh${v1} ${D}/usr/bin/tclsh
+ ln -sf tclsh${v1} "${D}"/usr/bin/tclsh
- cd ${S}
+ cd "${S}"
dodoc README changes license.terms
}