Revision bump, remove optional tomsfastmath dependency, remove older revisions

(Portage version: 2.2.0_alpha85-r1/cvs/Linux x86_64)

5 files changed, 22 insertions, 118 deletions

diff --git a/dev-libs/libtomcrypt/ChangeLog b/dev-libs/libtomcrypt/ChangeLog
index 35c1dcf1526b..c5c403e86d46 100644
--- a/dev-libs/libtomcrypt/ChangeLog
+++ b/dev-libs/libtomcrypt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libtomcrypt
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.43 2011/06/10 01:16:36 radhermit Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.44 2012/02/12 21:06:16 tommy Exp $
+
+*libtomcrypt-1.17-r6 (12 Feb 2012)
+
+  12 Feb 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -libtomcrypt-1.17-r3.ebuild, -libtomcrypt-1.17-r4.ebuild,
+  -libtomcrypt-1.17-r5.ebuild, +libtomcrypt-1.17-r6.ebuild:
+  Revision bump, remove optional tomsfastmath dependency, remove older
+  revisions
 
   10 Jun 2011; Tim Harder <radhermit@gentoo.org> libtomcrypt-1.06.ebuild,
   libtomcrypt-1.17-r3.ebuild, libtomcrypt-1.17-r4.ebuild,
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.17-r3.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.17-r3.ebuild
deleted file mode 100644
index 6139a002ef5b..000000000000
--- a/dev-libs/libtomcrypt/libtomcrypt-1.17-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-1.17-r3.ebuild,v 1.4 2011/06/10 01:16:36 radhermit Exp $
-
-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="WTFPL-2"
-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_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() {
-	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() {
-	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
-}
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild
deleted file mode 100644
index 781b11f388a7..000000000000
--- a/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 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.3 2011/06/10 01:16:36 radhermit 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="WTFPL-2"
-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() {
-	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
-}
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.17-r5.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.17-r6.ebuild
index e06100df9857..5a1ba57d8d22 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.17-r5.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.17-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-1.17-r5.ebuild,v 1.2 2011/06/10 01:16:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-1.17-r6.ebuild,v 1.1 2012/02/12 21:06:16 tommy Exp $
 
 EAPI="2"
 
@@ -13,11 +13,9 @@ SRC_URI="http://libtom.org/files/crypt-${PV}.tar.bz2"
 LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc libtommath tomsfastmath"
+IUSE="doc"
 
-RDEPEND="libtommath? ( dev-libs/libtommath )
-	tomsfastmath? ( >=dev-libs/tomsfastmath-0.12 )
-	!libtommath? ( !tomsfastmath? ( dev-libs/libtommath ) )"
+RDEPEND="dev-libs/libtommath"
 DEPEND="${RDEPEND}
 	doc? ( virtual/latex-base app-text/ghostscript-gpl )"
 
@@ -31,16 +29,19 @@ src_prepare() {
 }
 
 src_compile() {
-	local extraflags=""
-	use libtommath && append-flags -DLTM_DESC && extraflags="-ltommath"
-	use tomsfastmath && append-flags -DTFM_DESC && extraflags="${extraflags} -ltfm"
-	EXTRALIBS="${extraflags}" \
+	append-flags -DLTM_DESC
+	EXTRALIBS="-ltommath" \
 		CC=$(tc-getCC) \
 		IGNORE_SPEED=1 \
 		emake -f makefile.shared \
 		|| die "emake failed"
 }
 
+src_test() {
+	# Tests don't compile
+	true
+}
+
 src_install() {
 	emake -f makefile.shared DESTDIR="${D}" install ||\
 		die "emake install failed"
diff --git a/dev-libs/libtomcrypt/metadata.xml b/dev-libs/libtomcrypt/metadata.xml
index f8c02492ba49..ba9b9b599dc6 100644
--- a/dev-libs/libtomcrypt/metadata.xml
+++ b/dev-libs/libtomcrypt/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+    <email>tommy@gentoo.org</email>
   </maintainer>
   <longdescription>
     LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit