Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 207879 Details for
Bug 290090
dev-tcltk/tcldom disrespects multilib
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
/tmp/tcldom-multilib-eapi2-compile.patch
tcldom-multilib-eapi2-compile.patch (text/x-diff), 6.82 KB, created by
Nathan Phillip Brink (binki) (RETIRED)
on 2009-10-22 02:38:14 UTC
(
hide
)
Description:
/tmp/tcldom-multilib-eapi2-compile.patch
Filename:
MIME Type:
Creator:
Nathan Phillip Brink (binki) (RETIRED)
Created:
2009-10-22 02:38:14 UTC
Size:
6.82 KB
patch
obsolete
>diff -r 3816047badb7 dev-tcltk/tcldom/Manifest >--- a/dev-tcltk/tcldom/Manifest Wed Oct 21 21:52:19 2009 -0400 >+++ b/dev-tcltk/tcldom/Manifest Wed Oct 21 22:27:07 2009 -0400 >@@ -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 >+EBUILD tcldom-2.6.ebuild 784 RMD160 b85c743ea09a154e2e64ac47a820117ff8be4a5b SHA1 d81b4b71b36e4142b2b1450e0ad65c46a94152a4 SHA256 2d27492d1036ff85751aacd30a26d7bd36fd8c06ffd710f974966c7f7efe220d >+EBUILD tcldom-3.0.ebuild 1503 RMD160 b3f2bd70cf91a320cab7098837cbe7050ab42b18 SHA1 a28cc610035c2af707b5f6d9912edef93dfae610 SHA256 755b8d0f6761f9f2cad62550b1e3976337ec7739f051fdb170cddb9abcbb971f >+EBUILD tcldom-3.1.ebuild 1596 RMD160 178c0c671f8fb4073163d249d280894bd7f75d7e SHA1 db7643c5f4883d36b2f41c75afacbdf0a30b245d SHA256 217dc016cec6d1e44c25c6ec5093912900eb467044c1052c18cf1126b01fb442 > MISC ChangeLog 1185 RMD160 200c744e6c6537caf257373cbcf12a44eff40c7a SHA1 f6ba1e04aa57364db2fecb34cba7705a281a2655 SHA256 983719fb82d14a3c8bf4f4560cc07c40318fd54ae60a955dd4a90b86b8b0aef0 > MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 >diff -r 3816047badb7 dev-tcltk/tcldom/tcldom-2.6.ebuild >--- a/dev-tcltk/tcldom/tcldom-2.6.ebuild Wed Oct 21 21:52:19 2009 -0400 >+++ b/dev-tcltk/tcldom/tcldom-2.6.ebuild Wed Oct 21 22:27:07 2009 -0400 >@@ -2,6 +2,10 @@ > # 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 @@ > 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 -r 3816047badb7 dev-tcltk/tcldom/tcldom-3.0.ebuild >--- a/dev-tcltk/tcldom/tcldom-3.0.ebuild Wed Oct 21 21:52:19 2009 -0400 >+++ b/dev-tcltk/tcldom/tcldom-3.0.ebuild Wed Oct 21 22:27:07 2009 -0400 >@@ -2,7 +2,9 @@ > # 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 @@ > >=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 @@ > 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 -r 3816047badb7 dev-tcltk/tcldom/tcldom-3.1.ebuild >--- a/dev-tcltk/tcldom/tcldom-3.1.ebuild Wed Oct 21 21:52:19 2009 -0400 >+++ b/dev-tcltk/tcldom/tcldom-3.1.ebuild Wed Oct 21 22:27:07 2009 -0400 >@@ -2,7 +2,9 @@ > # 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 @@ > >=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 @@ > 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 @@ > > 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}"
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=207879">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 290090
: 207879 |
207880
