Clean up src_install() to use proper ebuild commands rather than running `install...

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index f100ae60613fb7417c8c8f49a16277b29f372283..7c1c81783129cd8b6742562edf91c8e56e07a70d 100644 (file)
--- 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 ffeb48beb731d72e68c76790f0de8255ee563b81..427263b7e01fd7975f96237e77853c6d5c016280 100644 (file)
--- 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
 }
 

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index a7a6fd6e9b9a9507d981236f8f1c5c7c70892b76..ce18f10ad1dc0fa87b6b9e1f19764f30a898faeb 100644 (file)
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.70 2006/06/03 19:37:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.71 2006/12/26 04:55:58 vapier Exp $
+
+  26 Dec 2006; Mike Frysinger <vapier@gentoo.org> tk-8.4.13.ebuild:
+  Clean up src_install() to use proper ebuild commands rather than running
+  `install` and use relative symlinks for libraries.
 
 *tk-8.4.13 (03 Jun 2006)
 

diff --git a/dev-lang/tk/tk-8.4.13.ebuild b/dev-lang/tk/tk-8.4.13.ebuild
index a21cbcbb9274986a6fdc27c10787a464754d83e4..652570192b84c311ec0fc00bab473d3ad5c108c7 100644 (file)
--- a/dev-lang/tk/tk-8.4.13.ebuild
+++ b/dev-lang/tk/tk-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/tk/tk-8.4.13.ebuild,v 1.1 2006/06/03 19:37:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.13.ebuild,v 1.2 2006/12/26 04:55:58 vapier Exp $
 
 inherit eutils
 
@@ -85,24 +85,24 @@ src_install() {
                -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
                -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
                -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-               ${D}/usr/${mylibdir}/tkConfig.sh || die
+               "${D}"/usr/${mylibdir}/tkConfig.sh || die
 
        # install private headers
-       dodir /usr/${mylibdir}/tk${v1}/include/unix
-       install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tk${v1}/include/unix
-       dodir /usr/${mylibdir}/tk${v1}/include/generic
-       install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tk${v1}/include/generic
-       rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-       rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-       rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
+       insinto /usr/${mylibdir}/tk${v1}/include/unix
+       doins "${S}"/unix/*.h || die
+       insinto /usr/${mylibdir}/tk${v1}/include/generic
+       doins "${S}"/generic/*.h || die
+       rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
+       rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
+       rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
 
        # install symlink for libraries
-       #dosym /usr/${mylibdir}/libtk${v1}.a /usr/${mylibdir}/libtk.a
-       dosym /usr/${mylibdir}/libtk${v1}.so /usr/${mylibdir}/libtk.so
-       dosym /usr/${mylibdir}/libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+       #dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
+       dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
+       dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
 
-       ln -sf wish${v1} ${D}/usr/bin/wish
+       ln -sf wish${v1} "${D}"/usr/bin/wish
 
-       cd ${S}
+       cd "${S}"
        dodoc ChangeLog README changes license.terms
 }