# HG changeset patch # User Nathan Phillip Brink # Date 2010-12-07 11:50:08 # Node ID 711b77d4458ec828de51ab5705e990981b890345 # Parent b2b992bbabf0b2c705968fa464a1e4205362e9d7 dev-tcltk/tcldom: Follow upstream changes regarding https://bugs.gentoo.org/290090 and https://bugs.genteoo.org/341883 . (Portage version: 2.2.0_alpha2-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050) 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 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2010 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 $ + 07 Dec 2010; Nathan Phillip Brink (binki) + +files/3.1-ldflags.patch, -tcldom-2.6.ebuild, -tcldom-3.0.ebuild, + tcldom-3.1.ebuild: + hg Follow upstream changes regarding https://bugs.gentoo.org/290090 and + https://bugs.genteoo.org/341883 . + 22 Oct 2009; Nathan Phillip Brink (ohnobinki) tcldom-2.6.ebuild, tcldom-3.0.ebuild, tcldom-3.1.ebuild: 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,25 @@ -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 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX 3.1-ldflags.patch 435 RMD160 14fb7d9ee50c5f9453a10b0f4475fe78cd3cccdb SHA1 fa8a4ecb47637621a732325f34f5eb3926168239 SHA256 2266ab40a17f256792696c321ed9efba6f00b9927c2a4ad12710b02433bec243 DIST tcldom-3.1.tar.gz 395572 RMD160 105decfa022a781b2483e2a4909cc857027ca32f SHA1 799704a6046d8eb2ccb228b1afef705121c4b5b5 SHA256 1eabfe884a072f18bd18b1ec9c495145057442e072fe5288d9742058d93278ed -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 +EBUILD tcldom-3.1.ebuild 1762 RMD160 2e1f7ce7eb318bd14812b2e05ead49ad27e788b1 SHA1 f5fff4106a2def89fbebfa704254e14312e8c093 SHA256 97a6b94ffd221760d39e9e769a490bf24297ddca32c6e838458e857261692522 +MISC ChangeLog 1698 RMD160 0079237186b3347cddb18cecbfb21ecdcf26a161 SHA1 9e438313517bae4ed41236632f11d239312374d9 SHA256 80c54018f821cdcdde5b12fb83e68242aba587271304849dffe31131d35bf22b MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iQIcBAEBCAAGBQJM/mXAAAoJEHQ6UuhrqBBQpAwQAINW3rEtSBbJ9UrVirigPDL4 +GUTT7uShE4jG5yAm4KFpPJserjS78EcMF+onSGEeUOyAgW0DjK0eC83USkZXMuCg +Gp8D0hEkirX8PnIKn4IbzflQ2BpfMCbQjg95oAQQ5lce1UXPwB6UAJSpsJD9wscB +/DUWEup0pBXmKETLQiSH0YqeCfNkJjRxPBlCTYWbrwpAkhMTWMP8WFQflEqS6xqk +8AUFIO/v4WrMmYBZg0PChasQ5HtXhNC4iMK/o1nXpEQe6gPS8f0Ak6v0bPzPh3mB +Hx8ZX4QuLAf9TL+/AP26pSjmUE71iC2UPv8PNEJt/f40+uLxxI57Dc2NQoFIXdGR +L2M1hUtZ5syOOT3WqWGRnn41QnpLeR69Lo9vGP2CQl08rs7BY/Qy50EMSAyTUKyH +gNWJvNsuE76mjDfOFEpAmdoAjjruaLmCFYvSEuL/FM4yquY6Nbg2cfoTR3OjrTnN +TzQs2Ol3OfIUokXuKXzM9p9AA1rlKCY1R0AX+2MRNaAMWZHj0L0eqH8/XmtFSUOm +hQB9yreyBmacLxn+zCNnpO1NdaaeDBb/oII7LK4HRbkZT1BiQlF8IHdKhjhEAF6f +6IQ2L3IxRhjVsd//Bcs5wnxZbrpIC2E35afaGs+Oru5NHG1kYc9pwX/osRBaVw6y +SltqBnPmgPu9TqM3Ej9r +=tLtq +-----END PGP SIGNATURE----- diff --git a/dev-tcltk/tcldom/files/3.1-ldflags.patch b/dev-tcltk/tcldom/files/3.1-ldflags.patch new file mode 100644 --- /dev/null +++ b/dev-tcltk/tcldom/files/3.1-ldflags.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index 8f273eb..d005731 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -95,7 +95,7 @@ package: $(tcldom_LIB_FILE) + + $(tcldom_LIB_FILE): $(tcldom_OBJECTS) + -rm -f $(tcldom_LIB_FILE) +- $(SHLIB_LD) $(SHLIB_LDFLAGS) @SHLIB_LD_OUT@$@ \ ++ $(SHLIB_LD) $(SHLIB_LDFLAGS) $(LDFLAGS) @SHLIB_LD_OUT@$@ \ + $(tcldom_OBJECTS) $(tcldom_LIBRARIES) $(SHLIB_LD_LIBS) + + ## Documentation section. diff --git a/dev-tcltk/tcldom/tcldom-2.6.ebuild b/dev-tcltk/tcldom/tcldom-2.6.ebuild deleted file mode 100644 --- a/dev-tcltk/tcldom/tcldom-2.6.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# 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" -IUSE="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="x86 ~ppc ~amd64" - -DEPEND=">=dev-lang/tcl-8.3.3" -RDEPEND="${DEPEND} - >=dev-tcltk/tclxml-2.6" - -src_prepare() { - # bug 131148 - sed -i -e "s/relid'/relid/" \ - {,src-libxml2/}configure {config,tclconfig}/tcl.m4 || die -} - -src_configure() { - econf --with-tcl=/usr/$(get_libdir) -} - -src_install() { - einstall || die - dodoc ChangeLog LICENSE README RELNOTES -} diff --git a/dev-tcltk/tcldom/tcldom-3.0.ebuild b/dev-tcltk/tcldom/tcldom-3.0.ebuild deleted file mode 100644 --- a/dev-tcltk/tcldom/tcldom-3.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# 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 $ - -EAPI="2" - -inherit eutils multilib - -DESCRIPTION="Document Object Model For Tcl" -HOMEPAGE="http://tclxml.sourceforge.net/tcldom.html" -SRC_URI="mirror://sourceforge/tclxml/${P}.tar.gz" - -IUSE="expat xml threads" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~x86 ~ppc ~amd64" - -DEPEND=">=dev-lang/tcl-8.3.3 - >=dev-tcltk/tcllib-1.2 - ~dev-tcltk/tclxml-3.0 - expat? ( dev-libs/expat )" -RDEPEND="${DEPEND}" - -src_prepare() { - cd library - sed -e "s/@VERSION@/${PV}/" \ - -e "s/@Tcldom_LIB_FILE@@/UNSPECIFIED/" \ - < pkgIndex.tcl.in > pkgIndex.tcl -} - -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} --with-libxml2-lib=/usr/$(get_libdir) - fi - if use expat ; then - 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 -} - -src_install() { - insinto /usr/$(get_libdir)/${PN}${PV} - doins library/*.tcl || die - - if use xml ; then - cd "${S}"/src-libxml2 - emake DESTDIR="${D}" install || die - fi - if use expat ; then - cd "${S}"/src - emake DESTDIR="${D}" install || die - fi - - 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,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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 $ @@ -22,7 +22,9 @@ DEPEND=">=dev-lang/tcl-8.3.3 RDEPEND="${DEPEND}" src_prepare() { - cd library + epatch "${FILESDIR}"/${PV}-ldflags.patch + + cd "${S}"/library || die sed -e "s/@VERSION@/${PV}/" \ -e "s/@Tcldom_LIB_FILE@@/UNSPECIFIED/" \ < pkgIndex.tcl.in > pkgIndex.tcl @@ -34,6 +36,8 @@ src_prepare() { src_configure() { local myconf="--with-tcl=/usr/$(get_libdir)" + tc-export CC + use threads && myconf="${myconf} --enable-threads" if use xml ; then @@ -42,16 +46,16 @@ src_configure() { fi if use expat ; then cd "${S}/src" - econf ${myconf} + LDFLAGS="${LDFLAGS}" econf ${myconf} fi } src_compile() { if use xml ; then - emake -C "${S}"/src-libxml2 || die + emake -C "${S}"/src-libxml2 LDFLAGS_OPTIMIZE="${LDFLAGS}" || die fi if use expat ; then - emake -C "${S}/src" || die + emake -C "${S}/src" LDFLAGS_OPTIMIZE="${LDFLAGS}" || die fi } @@ -69,7 +73,7 @@ src_install() { fi cd "${S}" - dodoc ChangeLog LICENSE README RELNOTES - docinto examples; dodoc examples/* - dohtml docs/*.html + dodoc ChangeLog README RELNOTES || die + docinto examples; dodoc examples/* || die + dohtml docs/*.html || die }