Really fix bug 239583, fix linking against optional deps, fix compiler usage for cross compile

(Portage version: 2.2_rc26/cvs/Linux x86_64)

3 files changed, 20 insertions, 52 deletions

diff --git a/dev-libs/libtomcrypt/ChangeLog b/dev-libs/libtomcrypt/ChangeLog
index d0ef29199011..972d31239e2f 100644
--- a/dev-libs/libtomcrypt/ChangeLog
+++ b/dev-libs/libtomcrypt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libtomcrypt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.33 2009/03/16 10:45:13 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.34 2009/03/18 20:35:01 tommy Exp $
+
+*libtomcrypt-1.17-r3 (18 Mar 2009)
+
+  18 Mar 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -libtomcrypt-1.17-r1.ebuild, -libtomcrypt-1.17-r2.ebuild,
+  +libtomcrypt-1.17-r3.ebuild:
+  Really fix bug 239583, fix linking against optional deps, fix compiler usage 
+  for cross compile
 
 *libtomcrypt-1.17-r2 (16 Mar 2009)
 
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.17-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.17-r2.ebuild
deleted file mode 100644
index 41904d619bda..000000000000
--- a/dev-libs/libtomcrypt/libtomcrypt-1.17-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-1.17-r2.ebuild,v 1.1 2009/03/16 10:45:13 bangert Exp $
-
-inherit eutils
-
-DESCRIPTION="modular and portable cryptographic toolkit"
-HOMEPAGE="http://libtom.org/?page=features&whatfile=crypt"
-SRC_URI="http://libtom.org/files/crypt-${PV}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc libtommath tomsfastmath"
-
-RDEPEND="libtommath? ( dev-libs/libtommath )
-	tomsfastmath? ( dev-libs/tomsfastmath )
-	!libtommath? ( !tomsfastmath? ( dev-libs/libtommath ) )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base virtual/ghostscript )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use doc || sed -i '/^install:/s:docs::' makefile
-	epatch "${FILESDIR}"/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch
-}
-
-src_compile() {
-	use libtommath && append-flags -DLTM_DESC
-	use tomsfastmath && append-flags -DTFM_DESC
-	emake -f makefile.shared IGNORE_SPEED=1 || die "emake failed"
-}
-
-src_install() {
-	#jobserver unavailable
-	make -f makefile.shared DESTDIR="${D}" install ||\
-		die "make install failed"
-	dodoc TODO changes
-	if use doc ; then
-		dodoc doc/*
-		docinto notes ; dodoc notes/*
-		docinto demos ; dodoc demos/*
-	fi
-}
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.17-r1.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.17-r3.ebuild
index 606fdcfb63f3..14f2d6f9fc91 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.17-r1.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.17-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-1.17-r1.ebuild,v 1.1 2008/09/25 16:09:39 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-1.17-r3.ebuild,v 1.1 2009/03/18 20:35:01 tommy Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="modular and portable cryptographic toolkit"
 HOMEPAGE="http://libtom.org/?page=features&whatfile=crypt"
@@ -23,12 +23,17 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	use doc || sed -i '/^install:/s:docs::' makefile
+	epatch "${FILESDIR}"/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch
 }
 
 src_compile() {
-	use libtommath && append-flags -DLTM_DESC
-	use tomsfastmath && append-flags -DTFM_DESC
-	emake -f makefile.shared IGNORE_SPEED=1 || die "emake failed"
+	local extraflags=""
+	use libtommath && append-flags -DLTM_DESC && extraflags="-ltommath"
+	use tomsfastmath && append-flags -DTFM_DESC && extraflags="${extraflags} -ltfm"
+	sed -i -e "s:gcc:$(tc-getCC):g" \
+		-e "s:--mode=link gcc:--mode=link $(tc-getCC) --tag CC $(tc-getCC):g" \
+		{,testprof/}makefile.shared
+	EXTRALIBS="${extraflags}" emake -f makefile.shared IGNORE_SPEED=1 || die "emake failed"
 }
 
 src_install() {