Version bump. Update LICENSE and add doc, examples, and static-libs USE flags.

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

6 files changed, 122 insertions, 9 deletions

diff --git a/dev-libs/libtommath/ChangeLog b/dev-libs/libtommath/ChangeLog
index 220871c42c81..4cf82acca693 100644
--- a/dev-libs/libtommath/ChangeLog
+++ b/dev-libs/libtommath/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libtommath
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/ChangeLog,v 1.33 2011/03/07 21:07:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/ChangeLog,v 1.34 2011/06/10 00:57:30 radhermit Exp $
+
+*libtommath-0.42.0 (10 Jun 2011)
+
+  10 Jun 2011; Tim Harder <radhermit@gentoo.org> libtommath-0.36-r1.ebuild,
+  libtommath-0.41.ebuild, +libtommath-0.42.0.ebuild,
+  +files/libtommath-0.42.0-makefile.patch:
+  Version bump. Update LICENSE and add doc, examples, and static-libs USE
+  flags.
 
   07 Mar 2011; Jeroen Roovers <jer@gentoo.org> libtommath-0.41.ebuild:
   Stable for HPPA (bug #355133).
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index e9e404dde256..0e8803d0a2c4 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,11 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libtommath-0.36-CC.patch 2092 RMD160 069f257b8a4f69e9803dbe418cbc3c3d69c93a6f SHA1 e0246753a70cede88e887092f2ad80743daac70b SHA256 8e1379b42651c338f60b2785a91226285a91b39eed53075aaef1e54b86e51af9
 AUX libtommath-0.36-LDFLAGS.patch 1017 RMD160 fd42d3f614fcbf13dd72084a95a275c719b524b5 SHA1 060ececae235aeac62af2988fadc6b122a61c9df SHA256 d995282988eadb5a5bad6306025269ca1003523cff5e887a993e915a611c8dd7
 AUX libtommath-0.36-shared-lib.patch 948 RMD160 0dd3cd1bb4508623c24e4f57106d05975d81904f SHA1 6a65b2c21db1bfdfe342d78cff4204da495c6b06 SHA256 c09eae16b6094ba85e78413abc72b57437c51abfd9caff9aa87558223a385b23
 AUX libtommath-0.41-CC.patch 1853 RMD160 6d7447753799caa37a585b1fcc4b0adfbc32cdb0 SHA1 3d6b68fbecb5716f00ee7d92ed334970cf114f01 SHA256 d24c16c2949d3a0d44537362f4c512c5046af0531eb45e66d69e92c3e3530540
 AUX libtommath-0.41-LDFLAGS.patch 1238 RMD160 a2d084bd5fc0ad19bb0508e0b5702f029d0d8834 SHA1 62218b2de135c5670dae14d959cfa9194ee18083 SHA256 0aa280b6f8daf7d4a6f8851afe7945cb59c8ea4ef991c39331450c7d395b35eb
+AUX libtommath-0.42.0-makefile.patch 1791 RMD160 9440d64943188d1156a3b607ea0a24c4bae3c1c0 SHA1 645650d81a288161fad3165e5cb375bb44efd919 SHA256 093eb3d038c97e2c2413cffbc200c21f83d971828c0b6e5ed08f462c8b584e96
 DIST ltm-0.36.tar.bz2 1924150 RMD160 f9fc66d076913b7e6b0226470b5cff3caa704c2d SHA1 f62419350a13d3f771dd2912b688b37dc912666a SHA256 16243c61694a52553a2d65c097456e024d8dcd9e3571c8f712ca163eaa769c6b
 DIST ltm-0.41.tar.bz2 1972854 RMD160 de6de0aedba8eb37687b4f583263713f1882fec8 SHA1 a6db2221c64a1951c5c78d573dbf427f989fd346 SHA256 8e397fc42a12f520ea50c29e477a8768a6f974af2470636f6f807141c13a240c
-EBUILD libtommath-0.36-r1.ebuild 993 RMD160 a169bda6f9a6d84c9093008d76b03fff31cc3579 SHA1 0e26162117303897532863c1ea665d8423b78e05 SHA256 19ea24b694553a68425d12af6e371739cefaea4d0b2a0b738d3c422d85bab597
-EBUILD libtommath-0.41.ebuild 1223 RMD160 f08ecd12243d78e0e0a766cc5f9a7a8a8dc6ea4a SHA1 a544d4964ea3068e2ee1d285e7650fea001b0483 SHA256 cf571b98faf805bc5d46f52e8f306530f854ce034b0b65a69a8574d14c0b5a80
-MISC ChangeLog 4353 RMD160 f7a1d2bd3db12ca2cd38bcd742a9b0c12be3b2f0 SHA1 6c10699f9d1354cbca1cb3b1a7bd1850f62f158b SHA256 5e52234319180992eda40683e8aae348081931d50f7656bf515806ce5a80eb64
+DIST ltm-0.42.0.tar.bz2 1968961 RMD160 9994d60d7e847a066715d8c644ce9b125932bf92 SHA1 9b192701cf62b85e9bd65fbb4d622d04cfa5ee0d SHA256 7b5c258304c34ac5901cfddb9f809b9b3b8ac7d04f700cf006ac766a923eb217
+EBUILD libtommath-0.36-r1.ebuild 989 RMD160 0e0cc8ac7fb4f177f5968644237b2ed525d8ffdb SHA1 35ba28c2b2d739e26dab309202e8be80c244f169 SHA256 3fad5959897cf9e910c6a6774098f26bbf5c762d1b5d63f91f0d9c440eb4b964
+EBUILD libtommath-0.41.ebuild 1223 RMD160 59f5845e9d5c83f7f6bc3bf05bed6d9e83ace715 SHA1 d680f64642c39e7038a3fd3d753ad6934ec81a88 SHA256 dd398904917444bccde5cf6f3a4920b7352bd061d19478a5d218905d89efadf7
+EBUILD libtommath-0.42.0.ebuild 1253 RMD160 8dd5c13bb23a93fb60772999e57c0dc4c125f1c5 SHA1 4db2e9566d3bde8a6df2ffacbca53de5e0a1e12b SHA256 bcd554eae7fdb6e0ce5ee0dde5f0071faf091920347f79f0a454c94e987dfd92
+MISC ChangeLog 4649 RMD160 6e348c80026cea701b2fd43ca7c2b39965d27452 SHA1 3e4f13a9670087716f606d19a67814553c457c22 SHA256 a832b87cac80b81f8e797736274312371b5f7bc405a36af4a5610c216d7ab2a2
 MISC metadata.xml 2830 RMD160 1e104847dd2267a6f85eb8e1e7e3c9b75cbc45c8 SHA1 c2e1e9ad626d9f6c6cf4a2bdc7bb812066627c79 SHA256 1fdea6550a9bed99c76c1043e161d8d90712951347b3d8dd246cea0654f0ae0b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJN8WwBAAoJEEqz6FtPBkyjPoYH/2aEkUBVyEpGiJFoBCwUiwud
+8CbZeQNxszvYDQBDUcg6Ttob30DjsgIKWalQfYuHs6KI5K4edTlyp8Rz6E2KgNZF
+Cw1x41QAE+IW9ToqfG1WKYAOjUfvurUf5fXwnBbscmfeqKUIzgJUwa2YRRnPxAp3
+oV9bQ0bBEQi+lz0Cifzsqtfbcws/e2mDTgeudGfzs7Jp38bNEVyNIBk+TDZwrZPV
+y+Us9i6PyCYI4oqsTV8I0Tj+t7DmP+g84iKNnKIAW5hiifE4kzUIgewtgbXhD36T
+aVysOzw3IWeFyaIAuQuT57pr4ytwCNPUBjqmx1J5ihLdpAd+rvmg3oD/p11VFks=
+=0IPe
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch b/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch
new file mode 100644
index 000000000000..03dd5a25fda5
--- /dev/null
+++ b/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch
@@ -0,0 +1,44 @@
+--- libtommath-0.42.0/makefile.shared.orig
++++ libtommath-0.42.0/makefile.shared
+@@ -3,7 +3,7 @@
+ #Tom St Denis
+ VERSION=0:41
+ 
+-CC = libtool --mode=compile --tag=CC gcc
++LTCOMPILE = libtool --mode=compile --tag=CC $(CC)
+ 
+ CFLAGS  +=  -I./ -Wall -W -Wshadow -Wsign-compare
+ 
+@@ -82,21 +82,24 @@
+ 
+ objs: $(OBJECTS)
+ 
++.c.o:                                                                                                                                                                                                                                         
++	$(LTCOMPILE) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
++
+ $(LIBNAME):  $(OBJECTS)
+-	libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
++	libtool --mode=link --tag=CC $(CC) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
+ 
+ install: $(LIBNAME)
+-	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
++	install -d $(DESTDIR)$(LIBPATH)
+ 	libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME)
+-	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
+-	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
++	install -d $(DESTDIR)$(INCPATH)
++	install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH)
+ 
+ test: $(LIBNAME) demo/demo.o
+-	gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o
+-	libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S)
++	$(CC) $(CFLAGS) -c demo/demo.c -o demo/demo.o
++	libtool --mode=link $(CC) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S)
+ 	
+ mtest: test	
+-	cd mtest ; gcc $(CFLAGS) mtest.c -o mtest
++	cd mtest ; $(CC) $(CFLAGS) $(LDFLAGS) mtest.c -o mtest
+         
+ timing: $(LIBNAME)
+-	gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
++	libtool --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest
diff --git a/dev-libs/libtommath/libtommath-0.36-r1.ebuild b/dev-libs/libtommath/libtommath-0.36-r1.ebuild
index a12a6505cfb6..5665d4553902 100644
--- a/dev-libs/libtommath/libtommath-0.36-r1.ebuild
+++ b/dev-libs/libtommath/libtommath-0.36-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.36-r1.ebuild,v 1.14 2009/07/30 17:24:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.36-r1.ebuild,v 1.15 2011/06/10 00:57:30 radhermit Exp $
 
 inherit eutils multilib
 
@@ -8,7 +8,7 @@ DESCRIPTION="highly optimized and portable routines for integer based number the
 HOMEPAGE="http://www.libtom.org/"
 SRC_URI="http://www.libtom.org/files/ltm-${PV}.tar.bz2"
 
-LICENSE="public-domain"
+LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
diff --git a/dev-libs/libtommath/libtommath-0.41.ebuild b/dev-libs/libtommath/libtommath-0.41.ebuild
index 86356437aa51..4133a2a96b5c 100644
--- a/dev-libs/libtommath/libtommath-0.41.ebuild
+++ b/dev-libs/libtommath/libtommath-0.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.41.ebuild,v 1.7 2011/03/07 21:07:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.41.ebuild,v 1.8 2011/06/10 00:57:30 radhermit Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ DESCRIPTION="highly optimized and portable routines for integer based number the
 HOMEPAGE="http://www.libtom.org/"
 SRC_URI="http://www.libtom.org/files/ltm-${PV}.tar.bz2"
 
-LICENSE="public-domain"
+LICENSE="WTFPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
diff --git a/dev-libs/libtommath/libtommath-0.42.0.ebuild b/dev-libs/libtommath/libtommath-0.42.0.ebuild
new file mode 100644
index 000000000000..1c95d4e2023a
--- /dev/null
+++ b/dev-libs/libtommath/libtommath-0.42.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtommath/libtommath-0.42.0.ebuild,v 1.1 2011/06/10 00:57:31 radhermit Exp $
+
+EAPI=4
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="highly optimized and portable routines for integer based number theoretic applications"
+HOMEPAGE="http://www.libtom.org/"
+SRC_URI="http://www.libtom.org/files/ltm-${PV}.tar.bz2"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc examples static-libs"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	[[ ${CHOST} == *-darwin* ]] && \
+		sed -i -e 's/libtool/glibtool/g' makefile.shared
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) -f makefile.shared IGNORE_SPEED=1 LIBPATH="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake -f makefile.shared install DESTDIR="${ED}" LIBPATH="${EPREFIX}/usr/$(get_libdir)" INCPATH="${EPREFIX}/usr/include"
+	dodoc changes.txt
+
+	use doc && dodoc *.pdf
+
+	if use examples ; then
+		docinto demo
+		dodoc demo/*.c
+	fi
+
+	use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
+}