vapier 14/08/14 01:45:52 Modified: jimtcl-9999.ebuild ChangeLog Added: jimtcl-0.75-r1.ebuild Log: Rewrite ebuild to fix many errors & merge the live/release versions. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.9 dev-lang/jimtcl/jimtcl-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild?r1=1.8&r2=1.9 Index: jimtcl-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- jimtcl-9999.ebuild 17 Sep 2013 19:16:49 -0000 1.8 +++ jimtcl-9999.ebuild 14 Aug 2014 01:45:51 -0000 1.9 @@ -1,44 +1,72 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild,v 1.8 2013/09/17 19:16:49 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-9999.ebuild,v 1.9 2014/08/14 01:45:51 vapier Exp $ -EAPI="4" +EAPI="5" -inherit multilib git-2 +inherit multiprocessing eutils + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git" + inherit git-2 +else + inherit vcs-snapshot + SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip" + KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86" +fi DESCRIPTION="Small footprint implementation of Tcl programming language" -HOMEPAGE="http://jim.tcl.tk" -EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git" +HOMEPAGE="http://jim.tcl.tk/" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="" IUSE="doc static-libs" + +RDEPEND="" DEPEND="doc? ( app-text/asciidoc ) app-arch/unzip" +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git-2_src_unpack + else + default + cd "${WORKDIR}"/msteveb-jimtcl-* + S=${PWD} + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.75-bootstrap.patch +} + src_configure() { - ! use static-libs && myconf=--with-jim-shared - econf ${myconf} + multijob_init + CCACHE=None multijob_child_init econf --with-jim-shared + if use static-libs ; then + # The build does not support doing both simultaneously. + mkdir static-libs + cd static-libs + CCACHE=None ECONF_SOURCE=${S} multijob_child_init econf + fi + multijob_finish } src_compile() { + # Must build static-libs first. + use static-libs && emake -C static-libs libjim.a emake all use doc && emake docs } src_install() { dobin jimsh - use static-libs && { - dolib.a libjim.a - } || { - dolib.so libjim.so* - dosym /usr/$(get_libdir)/libjim.so* \ - /usr/$(get_libdir)/libjim.so - } + use static-libs && dolib.a static-libs/libjim.a + ln -sf libjim.so.* libjim.so + dolib.so libjim.so* insinto /usr/include - doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h - doins jim-win32compat.h jim-eventloop.h jim-config.h + doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \ + jim-win32compat.h jim-eventloop.h jim-config.h dodoc AUTHORS README TODO use doc && dohtml Tcl.html } 1.15 dev-lang/jimtcl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/jimtcl/ChangeLog?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/jimtcl/ChangeLog?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/jimtcl/ChangeLog?r1=1.14&r2=1.15 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ChangeLog 10 Jun 2014 00:21:53 -0000 1.14 +++ ChangeLog 14 Aug 2014 01:45:51 -0000 1.15 @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/jimtcl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/ChangeLog,v 1.14 2014/06/10 00:21:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/ChangeLog,v 1.15 2014/08/14 01:45:51 vapier Exp $ + +*jimtcl-0.75-r1 (14 Aug 2014) + + 14 Aug 2014; Mike Frysinger <[email protected]> + +files/jimtcl-0.75-bootstrap.patch, +jimtcl-0.75-r1.ebuild, + jimtcl-9999.ebuild: + Rewrite ebuild to fix many errors & merge the live/release versions. 10 Jun 2014; Mike Frysinger <[email protected]> jimtcl-0.73.ebuild, jimtcl-0.74-r1.ebuild, jimtcl-0.75.ebuild: 1.1 dev-lang/jimtcl/jimtcl-0.75-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild?rev=1.1&content-type=text/plain Index: jimtcl-0.75-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-0.75-r1.ebuild,v 1.1 2014/08/14 01:45:51 vapier Exp $ EAPI="5" inherit multiprocessing eutils if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="http://repo.or.cz/r/jimtcl.git" inherit git-2 else inherit vcs-snapshot SRC_URI="https://github.com/msteveb/jimtcl/zipball/${PV} -> ${P}.zip" KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~s390 ~sh ~x86" fi DESCRIPTION="Small footprint implementation of Tcl programming language" HOMEPAGE="http://jim.tcl.tk/" LICENSE="LGPL-2" SLOT="0" IUSE="doc static-libs" RDEPEND="" DEPEND="doc? ( app-text/asciidoc ) app-arch/unzip" src_unpack() { if [[ ${PV} == "9999" ]] ; then git-2_src_unpack else default cd "${WORKDIR}"/msteveb-jimtcl-* S=${PWD} fi } src_prepare() { epatch "${FILESDIR}"/${PN}-0.75-bootstrap.patch } src_configure() { multijob_init CCACHE=None multijob_child_init econf --with-jim-shared if use static-libs ; then # The build does not support doing both simultaneously. mkdir static-libs cd static-libs CCACHE=None ECONF_SOURCE=${S} multijob_child_init econf fi multijob_finish } src_compile() { # Must build static-libs first. use static-libs && emake -C static-libs libjim.a emake all use doc && emake docs } src_install() { dobin jimsh use static-libs && dolib.a static-libs/libjim.a ln -sf libjim.so.* libjim.so dolib.so libjim.so* insinto /usr/include doins jim.h jimautoconf.h jim-subcmd.h jim-signal.h \ jim-win32compat.h jim-eventloop.h jim-config.h dodoc AUTHORS README TODO use doc && dohtml Tcl.html }
