summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2010-12-07 17:01:46 +0000
committerJustin Lecher <jlec@gentoo.org>2010-12-07 17:01:46 +0000
commit34d2d47e2ebebaa465ea3327c81ad0fbc33f1066 (patch)
treea1dde69d38095fd98d25886ffe7ab4d761e005d5 /dev-tcltk
parentVersion Bump, cleaned old (diff)
downloadhistorical-34d2d47e2ebebaa465ea3327c81ad0fbc33f1066.tar.gz
historical-34d2d47e2ebebaa465ea3327c81ad0fbc33f1066.tar.bz2
historical-34d2d47e2ebebaa465ea3327c81ad0fbc33f1066.zip
Multilib fix
Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64
Diffstat (limited to 'dev-tcltk')
-rw-r--r--dev-tcltk/tcldom/ChangeLog5
-rw-r--r--dev-tcltk/tcldom/Manifest10
-rw-r--r--dev-tcltk/tcldom/tcldom-3.1.ebuild12
3 files changed, 16 insertions, 11 deletions
diff --git a/dev-tcltk/tcldom/ChangeLog b/dev-tcltk/tcldom/ChangeLog
index 3bae14acd1c5..d4dc5015d919 100644
--- a/dev-tcltk/tcldom/ChangeLog
+++ b/dev-tcltk/tcldom/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-tcltk/tcldom
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/ChangeLog,v 1.14 2010/12/07 12:51:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/ChangeLog,v 1.15 2010/12/07 17:01:46 jlec Exp $
+
+ 07 Dec 2010; Justin Lecher <jlec@gentoo.org> tcldom-3.1.ebuild:
+ Multilib fix
07 Dec 2010; Justin Lecher <jlec@gentoo.org> +files/3.1-ldflags.patch,
-tcldom-3.0.ebuild:
diff --git a/dev-tcltk/tcldom/Manifest b/dev-tcltk/tcldom/Manifest
index f71f0d8b47b6..b99cdbcd0530 100644
--- a/dev-tcltk/tcldom/Manifest
+++ b/dev-tcltk/tcldom/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
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-3.1.ebuild 1608 RMD160 f3a5bb66a34bcd48d467e9fbc40d76bafb700a39 SHA1 40aa9e3ced5fddded445edfe1b9bea2363a4c9ba SHA256 be65be8f5273aaed48edce49ae2ae9bd14198f1a5313e1910e318a6bbdd7eb30
-MISC ChangeLog 1582 RMD160 bc5d6f9facb8274984c84acff498062c12db261b SHA1 8c9124677b04092a3910f38705945ae2f0cdd746 SHA256 948b92fec603da40488b15ad6b2be68b7b6fe3ce4a94b8d4e355f8f1a27cb198
+EBUILD tcldom-3.1.ebuild 1636 RMD160 ada89c79e664dd0c9e34d4db00b91d69593f38d7 SHA1 2c709751336513afe313db5b4631c19e51ba6d25 SHA256 dab4d5f15e094ea274ec5331360cb989e7e3bc51de724e1c08584c309e70c12e
+MISC ChangeLog 1664 RMD160 88f6ac0f901324498c9ec9de95a6a182bba414e1 SHA1 fa60ce6ea463aa49e10ba96853c25165f845d8ba SHA256 e7a57d45bc1d31c327bf09fd1f3ea2cbece1b126cd3cf76ed762ac1dd029fd1f
MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkz+LckACgkQgAnW8HDreRbbsACeOe4piASAZYB2DoAwSscW+nAW
-WhwAn3SdMMWHlrmfUmT/9hiUhQh0exbb
-=3/hZ
+iEYEARECAAYFAkz+aH8ACgkQgAnW8HDreRZo9QCbBa8OTylaKn2IinNtQFlwpf7R
+5O8AoKncfrNSoOS+Lchq7unZfXfy13MA
+=ltuO
-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tcldom/tcldom-3.1.ebuild b/dev-tcltk/tcldom/tcldom-3.1.ebuild
index 9d34684a673a..2473104bfb4a 100644
--- a/dev-tcltk/tcldom/tcldom-3.1.ebuild
+++ b/dev-tcltk/tcldom/tcldom-3.1.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/tcldom/tcldom-3.1.ebuild,v 1.4 2010/12/07 12:49:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcldom/tcldom-3.1.ebuild,v 1.5 2010/12/07 17:01:46 jlec Exp $
inherit eutils multilib toolchain-funcs
@@ -40,6 +40,8 @@ src_compile() {
tc-export CC
+ export LDFLAGS_OPTIMIZE="${LDFLAGS}"
+
use threads && myconf="${myconf} --enable-threads"
if use xml ; then
@@ -49,8 +51,8 @@ src_compile() {
fi
if use expat ; then
cd "${S}/src"
- LDFLAGS="${LDFLAGS}" econf ${myconf}
- emake LDFLAGS_OPTIMIZE="${LDFLAGS}" || die
+ econf ${myconf} --with-libxml2-lib=/usr/$(get_libdir)
+ emake || die
fi
}
@@ -60,11 +62,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}"