diff options
| -rw-r--r-- | dev-lang/tk/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/tk/tk-8.4.9.ebuild | 50 |
2 files changed, 30 insertions, 27 deletions
diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog index acc126e8f8f5..35ade8bd2ade 100644 --- a/dev-lang/tk/ChangeLog +++ b/dev-lang/tk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/tk -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.56 2005/05/27 07:30:07 josejx Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.57 2005/06/03 23:58:33 vapier Exp $ + + 03 Jun 2005; Mike Frysinger <vapier@gentoo.org> tk-8.4.9.ebuild: + Touchup libdir usage to get rid of all the // gremlins. 27 May 2005; Joseph Jezak <josejx@gentoo.org> tk-8.4.9.ebuild: Marked ppc stable. diff --git a/dev-lang/tk/tk-8.4.9.ebuild b/dev-lang/tk/tk-8.4.9.ebuild index ef8a05b09f8d..ef920e57c254 100644 --- a/dev-lang/tk/tk-8.4.9.ebuild +++ b/dev-lang/tk/tk-8.4.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.7 2005/05/27 07:30:07 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.8 2005/06/03 23:58:33 vapier Exp $ inherit eutils @@ -13,16 +13,15 @@ SLOT="0" KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86" IUSE="threads" -DEPEND=">=sys-apps/sed-4.0.5 - >=sys-apps/portage-2.0.47-r10 - virtual/x11 +RDEPEND="virtual/x11 =dev-lang/tcl-${PV}*" +DEPEND="${RDEPEND} + >=sys-apps/portage-2.0.47-r10" S=${WORKDIR}/${PN}${PV} pkg_setup() { - if use threads - then + if use threads ; then ewarn "" ewarn "PLEASE NOTE: You are compiling ${P} with" ewarn "threading enabled." @@ -44,15 +43,15 @@ src_unpack() { src_compile() { cd ${S}/unix + local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} local local_config_use="" - if use threads - then + if use threads ; then local_config_use="--enable-threads" fi econf \ - --with-tcl=/usr/$(get_libdir) \ + --with-tcl=/usr/${mylibdir} \ ${local_config_use} || die emake CFLAGS="${CFLAGS}" || die @@ -68,28 +67,29 @@ src_install() { make INSTALL_ROOT=${D} install || die # fix the tkConfig.sh to eliminate refs to the build directory + local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/} sed -i \ - -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \ - -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/$(get_libdir)/tk${v1}/include'," \ - -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/$(get_libdir)," \ - -e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/$(get_libdir)," \ - -e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \ - -e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/$(get_libdir)'," \ + -e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ + -e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \ + -e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \ + -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/lib/tkConfig.sh # install private headers - dodir /usr/$(get_libdir)/tk${v1}/include/unix - install -c -m0644 ${S}/unix/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/unix - dodir /usr/$(get_libdir)/tk${v1}/include/generic - install -c -m0644 ${S}/generic/*.h ${D}/usr/$(get_libdir)/tk${v1}/include/generic - rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tk.h - rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkDecls.h - rm -f ${D}/usr/$(get_libdir)/tk${v1}/include/generic/tkPlatDecls.h + 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 # install symlink for libraries - #dosym /usr/$(get_libdir)/libtk${v1}.a /usr/$(get_libdir)/libtk.a - dosym /usr/$(get_libdir)/libtk${v1}.so /usr/$(get_libdir)/libtk.so - dosym /usr/$(get_libdir)/libtkstub${v1}.a /usr/$(get_libdir)/libtkstub.a + #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 ln -sf wish${v1} ${D}/usr/bin/wish |