# HG changeset patch # User Binki # Date 2009-10-21 22:45:34 # Node ID c39425525b0ab417f56fcb25be64c43d288a7383 # Parent 3816047badb754ebe081c2ad788e6fd8f4b02eda multilib ./configure fix, converted to EAPI="2" diff --git a/dev-tcltk/tcldom/ChangeLog b/dev-tcltk/tcldom/ChangeLog --- a/dev-tcltk/tcldom/ChangeLog +++ b/dev-tcltk/tcldom/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for dev-tcltk/tcldom -# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/ChangeLog,v 1.11 2007/02/22 01:31:38 peper Exp $ + 22 Oct 2009; Nathan Phillip Brink (ohnobinki) + tcldom-2.6.ebuild, tcldom-3.0.ebuild, + tcldom-3.1.ebuild: + concvererted to EAPI="2", fix ./configure problem on multilib + https://bugs.gentoo.org/290090 + 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/dev-tcltk/tcldom/Manifest b/dev-tcltk/tcldom/Manifest --- a/dev-tcltk/tcldom/Manifest +++ b/dev-tcltk/tcldom/Manifest @@ -1,8 +1,8 @@ DIST tcldom-2.6.tar.gz 375574 RMD160 f70d7a4b6135e20cbc40221775c12fbd24794370 SHA1 e83260e289a73d1c27c2e98a62faf12149b6839a SHA256 de0f5267a334866858b3499c440596a12af6868916da09dba9bbb0c6c21d9b65 DIST tcldom-3.0.tar.gz 396326 RMD160 b38f0346b7762e38a1bd82ebeb8fa7accd4da544 SHA1 106c49ed371acf2e28fcad47e68e9ebae67e346e SHA256 be5e11b45d82a2d1a1fe5801f9f763b003040aae513250fe509cd96f96b6ec60 DIST tcldom-3.1.tar.gz 395572 RMD160 105decfa022a781b2483e2a4909cc857027ca32f SHA1 799704a6046d8eb2ccb228b1afef705121c4b5b5 SHA256 1eabfe884a072f18bd18b1ec9c495145057442e072fe5288d9742058d93278ed -EBUILD tcldom-2.6.ebuild 767 RMD160 dca71282e7a0d013eabaa32f722017cd22fe3f7a SHA1 842402c6c926389b39aec8a9ac5d88c2b6ddc683 SHA256 0959a219d536c86a12482145c242cbba46d72eb01442d0e7e82c4cac22638329 -EBUILD tcldom-3.0.ebuild 1322 RMD160 d9ca223c2d1c6df7d878d1e85769c31a5d36c31f SHA1 e46f877e80b52e7a925e1b61aaa3e128c2dfd108 SHA256 36bf63879a2f1851d4df3010ace4c0fed0f0fbf3bffccf26daab29aaf5b8e492 -EBUILD tcldom-3.1.ebuild 1417 RMD160 8661101091e342d69384c661291321629c7a332a SHA1 d0274251e7d4b1273795efa06a8769d3efbec4ca SHA256 c2caf924ec1960189b64916646eea350a5ad59983b66298c209d53e7794eeacc -MISC ChangeLog 1185 RMD160 200c744e6c6537caf257373cbcf12a44eff40c7a SHA1 f6ba1e04aa57364db2fecb34cba7705a281a2655 SHA256 983719fb82d14a3c8bf4f4560cc07c40318fd54ae60a955dd4a90b86b8b0aef0 +EBUILD tcldom-2.6.ebuild 784 RMD160 e1f382776b6ee45f20b98d43c6680b3cbbb802b2 SHA1 39f7f0fd5c475f32e254da9966f319a71f7a03b6 SHA256 c29a36bdcf0be42ea6c8d1010abf4ec2e3a41e4c08476c40c931788b6afdb0c9 +EBUILD tcldom-3.0.ebuild 1503 RMD160 32f72062043261cb1a0d34967095154c92cddbe3 SHA1 80140fd5e9dee35cb0cbe1961513ee5c05cab1a3 SHA256 a6725eb608b22f48819272ac0516897aff7810e90b3a8b42f379fa23dedcb6b7 +EBUILD tcldom-3.1.ebuild 1596 RMD160 bc5cae80fe98a89e15705068db88913df9384895 SHA1 d60c2966de03cd61898f48b1f97c9be1c774d470 SHA256 d52f219ba24f37729c4323112313d9bb91a8fd37320b419caa6705103f1fbc9a +MISC ChangeLog 1423 RMD160 35e3744b51f551d362f79d3f9b68dd25e7271fe2 SHA1 ffd7483c1dcefb3b32c34ce16bf05d49d9243153 SHA256 f598e92539e800fa6a13997e3b2faa8825fd1c6fc150a1646694fabef7b236c4 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 diff --git a/dev-tcltk/tcldom/tcldom-2.6.ebuild b/dev-tcltk/tcldom/tcldom-2.6.ebuild --- a/dev-tcltk/tcldom/tcldom-2.6.ebuild +++ b/dev-tcltk/tcldom/tcldom-2.6.ebuild @@ -1,7 +1,11 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/tcldom-2.6.ebuild,v 1.6 2006/06/04 02:34:19 matsuu Exp $ +EAPI="2" + +inherit multilib + DESCRIPTION="Document Object Model For Tcl" HOMEPAGE="http://tclxml.sourceforge.net/tcldom.html" SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz" @@ -14,17 +18,14 @@ DEPEND=">=dev-lang/tcl-8.3.3" RDEPEND="${DEPEND} >=dev-tcltk/tclxml-2.6" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { # bug 131148 sed -i -e "s/relid'/relid/" \ {,src-libxml2/}configure {config,tclconfig}/tcl.m4 || die } -src_compile() { - econf || die - make || die +src_configure() { + econf --with-tcl=/usr/$(get_libdir) } src_install() { diff --git a/dev-tcltk/tcldom/tcldom-3.0.ebuild b/dev-tcltk/tcldom/tcldom-3.0.ebuild --- a/dev-tcltk/tcldom/tcldom-3.0.ebuild +++ b/dev-tcltk/tcldom/tcldom-3.0.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/tcldom-3.0.ebuild,v 1.3 2006/06/03 19:56:32 matsuu Exp $ -inherit eutils +EAPI="2" + +inherit eutils multilib DESCRIPTION="Document Object Model For Tcl" HOMEPAGE="http://tclxml.sourceforge.net/tcldom.html" @@ -17,30 +19,36 @@ DEPEND=">=dev-lang/tcl-8.3.3 >=dev-tcltk/tcllib-1.2 ~dev-tcltk/tclxml-3.0 expat? ( dev-libs/expat )" +RDEPEND="${DEPEND}" -src_unpack() { - unpack ${A} - - cd ${S}/library +src_prepare() { + cd library sed -e "s/@VERSION@/${PV}/" \ -e "s/@Tcldom_LIB_FILE@@/UNSPECIFIED/" \ < pkgIndex.tcl.in > pkgIndex.tcl } -src_compile() { - local myconf="" +src_configure() { + local myconf="--with-tcl=/usr/$(get_libdir)" use threads && myconf="${myconf} --enable-threads" if use xml ; then - cd ${S}/src-libxml2 - econf ${myconf} || die - emake || die + cd "${S}"/src-libxml2 + econf ${myconf} --with-libxml2-lib=/usr/$(get_libdir) fi if use expat ; then - cd ${S}/src - econf ${myconf} || die - emake || die + cd "${S}"/src + econf ${myconf} + fi +} + +src_compile() { + if use xml ; then + emake -C src-libxml2 || die + fi + if use expat ; then + emake -C src || die fi } @@ -49,15 +57,15 @@ src_install() { doins library/*.tcl || die if use xml ; then - cd ${S}/src-libxml2 - make DESTDIR=${D} install || die + cd "${S}"/src-libxml2 + emake DESTDIR="${D}" install || die fi if use expat ; then - cd ${S}/src - make DESTDIR=${D} install || die + cd "${S}"/src + emake DESTDIR="${D}" install || die fi - cd ${S} + cd "${S}" dodoc ChangeLog LICENSE README RELNOTES docinto examples; dodoc examples/* dohtml docs/*.html diff --git a/dev-tcltk/tcldom/tcldom-3.1.ebuild b/dev-tcltk/tcldom/tcldom-3.1.ebuild --- a/dev-tcltk/tcldom/tcldom-3.1.ebuild +++ b/dev-tcltk/tcldom/tcldom-3.1.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/tcldom-3.1.ebuild,v 1.2 2006/06/03 19:56:32 matsuu Exp $ -inherit eutils +EAPI="2" + +inherit eutils multilib DESCRIPTION="Document Object Model For Tcl" HOMEPAGE="http://tclxml.sourceforge.net/tcldom.html" @@ -17,11 +19,10 @@ DEPEND=">=dev-lang/tcl-8.3.3 >=dev-tcltk/tcllib-1.2 ~dev-tcltk/tclxml-3.1 expat? ( dev-libs/expat )" +RDEPEND="${DEPEND}" -src_unpack() { - unpack ${A} - - cd "${S}/library" +src_prepare() { + cd library sed -e "s/@VERSION@/${PV}/" \ -e "s/@Tcldom_LIB_FILE@@/UNSPECIFIED/" \ < pkgIndex.tcl.in > pkgIndex.tcl @@ -30,20 +31,27 @@ src_unpack() { sed -i -e "s/relid'/relid/" "${S}"/*/{configure,tcl.m4} || die } -src_compile() { - local myconf="" +src_configure() { + local myconf="--with-tcl=/usr/$(get_libdir)" use threads && myconf="${myconf} --enable-threads" if use xml ; then cd "${S}/src-libxml2" - econf ${myconf} || die - emake || die + econf ${myconf} --with-libxml2-lib=/usr/$(get_libdir) fi if use expat ; then cd "${S}/src" - econf ${myconf} || die - emake || die + econf ${myconf} + fi +} + +src_compile() { + if use xml ; then + emake -C "${S}"/src-libxml2 || die + fi + if use expat ; then + emake -C "${S}/src" || die fi } @@ -53,11 +61,11 @@ src_install() { if use xml ; then cd "${S}/src-libxml2" - make DESTDIR="${D}" install || die + emake DESTDIR="${D}" install || die fi if use expat ; then cd "${S}/src" - make DESTDIR="${D}" install || die + emake DESTDIR="${D}" install || die fi cd "${S}"