diff options
| -rw-r--r-- | dev-tcltk/tclpython/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-tcltk/tclpython/tclpython-3.1-r1.ebuild | 16 | ||||
| -rw-r--r-- | dev-tcltk/tclpython/tclpython-4.1-r2.ebuild | 15 |
3 files changed, 27 insertions, 10 deletions
diff --git a/dev-tcltk/tclpython/ChangeLog b/dev-tcltk/tclpython/ChangeLog index 8b5aef2a44c6..751865345f14 100644 --- a/dev-tcltk/tclpython/ChangeLog +++ b/dev-tcltk/tclpython/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-tcltk/tclpython # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/ChangeLog,v 1.13 2010/04/21 06:20:03 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/ChangeLog,v 1.14 2010/12/07 19:43:12 jlec Exp $ + + 07 Dec 2010; Justin Lecher <jlec@gentoo.org> tclpython-3.1-r1.ebuild, + tclpython-4.1-r2.ebuild: + Cleaned Python ABI specific code, #312217 21 Apr 2010; Justin Lecher <jlec@gentoo.org> -tclpython-3.1.ebuild, -tclpython-4.1-r1.ebuild: diff --git a/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild b/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild index 80077dc76119..a4d0711afc86 100644 --- a/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild +++ b/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild,v 1.3 2010/04/12 13:37:16 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-3.1-r1.ebuild,v 1.4 2010/12/07 19:43:13 jlec Exp $ PYTHON_DEPEND="2" @@ -15,7 +15,13 @@ SLOT="0" KEYWORDS="~amd64 ~ppc x86" IUSE="" -DEPEND=">=dev-lang/tcl-8.4" +DEPEND="dev-lang/tcl" +RDEPEND="${DEPEND}" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} src_compile() { cfile="tclpython" @@ -28,13 +34,13 @@ src_compile() { link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o -lpthread -lutil $(python_get_library -l) -ltcl" einfo "${link}" - eval "${link}" || die } src_install() { - exeinto /usr/$(get_libdir)/tclpython - doexe tclpython.so.${PV} pkgIndex.tcl || die "tcl" + insinto /usr/$(get_libdir)/tclpython + doins tclpython.so.${PV} pkgIndex.tcl || die "tcl" + fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV} dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython.so || die dodoc CHANGES INSTALL README || die diff --git a/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild index e726cf25dc8c..87facdcc61c4 100644 --- a/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild +++ b/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild,v 1.2 2010/04/05 20:16:17 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclpython/tclpython-4.1-r2.ebuild,v 1.3 2010/12/07 19:43:12 jlec Exp $ PYTHON_DEPEND="2" @@ -15,7 +15,13 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -DEPEND=">=dev-lang/tcl-8.4" +DEPEND="dev-lang/tcl" +RDEPEND="${DEPEND}" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} src_compile() { cfile="tclpython tclthread" @@ -31,8 +37,9 @@ src_compile() { } src_install() { - exeinto /usr/$(get_libdir)/tclpython - doexe tclpython.so.${PV} pkgIndex.tcl || die "tcl" + insinto /usr/$(get_libdir)/tclpython + doins tclpython.so.${PV} pkgIndex.tcl || die "tcl" + fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV} dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython.so || die dodoc CHANGES INSTALL README || die |