Move patching to proper phase. Do not hard-wire CC. Respect LDFLAGS (bug #334999).

Package-Manager: portage-2.2_rc83/cvs/Linux i686

3 files changed, 67 insertions, 2 deletions

diff --git a/dev-libs/libtomcrypt/ChangeLog b/dev-libs/libtomcrypt/ChangeLog
index b2c36bedfe3c..f7085eedbc9e 100644
--- a/dev-libs/libtomcrypt/ChangeLog
+++ b/dev-libs/libtomcrypt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libtomcrypt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.39 2010/08/09 10:08:42 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.40 2010/09/19 04:35:35 jer Exp $
+
+*libtomcrypt-1.17-r4 (19 Sep 2010)
+
+  19 Sep 2010; Jeroen Roovers <jer@gentoo.org> +libtomcrypt-1.17-r4.ebuild:
+  Move patching to proper phase. Do not hard-wire CC. Respect LDFLAGS (bug
+  #334999).
 
   09 Aug 2010; Thilo Bangert <bangert@gentoo.org>
   files/libtomcrypt-1.06-makefile.diff,
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 71d6d428d226..145afb8feef0 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -5,5 +5,6 @@ DIST crypt-1.06.tar.bz2 1160330 RMD160 20182dec72a461eea467a6fef8f5314337531909
 DIST crypt-1.17.tar.bz2 1599215 RMD160 742d72d82fea2e6a9865d8c682c10cbaba69ea2f SHA1 9c746822c84e4276e432b64964f94d1d5ddd13ad SHA256 e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116
 EBUILD libtomcrypt-1.06.ebuild 1275 RMD160 5e05000578590dee4551387570bbf2faf086efff SHA1 c7981bf0ccddcfdeeb94c6d5565f8c72b68df360 SHA256 ebb18cc33d38129b73148fad4b74acdb288a4fb2510254a80f44b965fde1bf7b
 EBUILD libtomcrypt-1.17-r3.ebuild 1651 RMD160 e83eff5712998bc185f804485982dae76ab98a32 SHA1 3a212220373ceaa57b0234f52cffd1a464fe88da SHA256 8cdc4ff68d68111c237be60c857a641e87381762a181f0255beae8747b1a38ed
-MISC ChangeLog 5515 RMD160 a8de660bfb25cfda6d6f93dcaf503a0b82d1ffe0 SHA1 811a90b1656507da7423d8f2ea3f13d94712f857 SHA256 fa1d3221667708039e45fd07a10c39797430431365591ac34d695d1a3bf04de9
+EBUILD libtomcrypt-1.17-r4.ebuild 1818 RMD160 ab84268215fa43bb90195121fbfd99cb6683ecd6 SHA1 a3c5d5dc0c874e88a954362376b85a05aefeae88 SHA256 068f43cbf5311bcb41e93ba86c642d100e45de9d890f8f0aebdc4b44ebdd8474
+MISC ChangeLog 5711 RMD160 9d7faf93d33ce09dd6ea4a7a057b0f445101e2a2 SHA1 55051df1bf002b357389e9142543412e0a18c739 SHA256 1af40d678379eb8661870629c2aa9085635745256a7adebc92fa611a98ad519e
 MISC metadata.xml 2659 RMD160 f68fa867efa32fd3888e5989d62bd2ac3e6d7b25 SHA1 cdb5da8685cdaa27d1164e5e030d23a458edb133 SHA256 db2b941ba2acbd6daaac6d8317696d5a50c26c807dc570b6aa2192041598ecdb
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild
new file mode 100644
index 000000000000..61330aa87cd9
--- /dev/null
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild,v 1.1 2010/09/19 04:35:35 jer Exp $
+
+EAPI="2"
+
+inherit flag-o-matic toolchain-funcs
+
+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-0.12 )
+	!libtommath? ( !tomsfastmath? ( dev-libs/libtommath ) )"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base app-text/ghostscript-gpl )"
+
+src_prepare() {
+cp -av makefile.shared{,.orig}
+	use doc || sed -i '/^install:/s:docs::' makefile
+	epatch "${FILESDIR}"/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch
+	sed -i \
+		-e 's|	gcc|	$(CC)|g' \
+		-e '/^CC=/{
+			s|^CC=|COMPILE=|g;
+			s|gcc|--mode=compile $(CC) --tag CC $(CC)|g
+		}' \
+		-e 's|--mode=link gcc|--mode=link $(CC) $(LDFLAGS) --tag CC $(CC)|g' \
+		{,testprof/}makefile.shared || die "sed makefile.shared"
+}
+
+src_compile() {
+	local extraflags=""
+	use libtommath && append-flags -DLTM_DESC && extraflags="-ltommath"
+	use tomsfastmath && append-flags -DTFM_DESC && extraflags="${extraflags} -ltfm"
+	EXTRALIBS="${extraflags}" \
+		CC=$(tc-getCC) \
+		IGNORE_SPEED=1 \
+		emake -f makefile.shared \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake -f makefile.shared DESTDIR="${D}" install ||\
+		die "emake install failed"
+	dodoc TODO changes || die "dodoc failed"
+	if use doc ; then
+		dodoc doc/* || die "dodoc failed"
+		docinto notes ; dodoc notes/* || die "dodoc failed"
+		docinto demos ; dodoc demos/* || die "dodoc failed"
+	fi
+}