summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-12-26 04:55:58 +0000
committerMike Frysinger <vapier@gentoo.org>2006-12-26 04:55:58 +0000
commite4011290f61da4e065e1b8590b726405498b5011 (patch)
tree806cffa4f5fa62af62359aba83654b091d935f57 /dev-lang/tk
parentClean up src_install() to use proper ebuild commands rather than running `ins... (diff)
downloadgentoo-2-e4011290f61da4e065e1b8590b726405498b5011.tar.gz
gentoo-2-e4011290f61da4e065e1b8590b726405498b5011.tar.bz2
gentoo-2-e4011290f61da4e065e1b8590b726405498b5011.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/tk')
-rw-r--r--dev-lang/tk/ChangeLog6
-rw-r--r--dev-lang/tk/tk-8.4.13.ebuild28
2 files changed, 19 insertions, 15 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index a7a6fd6e9b9a..ce18f10ad1dc 100644
--- 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 a21cbcbb9274..652570192b84 100644
--- 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
}