rework patches so they apply (bug #245998) - fix doc install location - disables tests

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

5 files changed, 90 insertions, 24 deletions

diff --git a/dev-libs/libtomcrypt/ChangeLog b/dev-libs/libtomcrypt/ChangeLog
index ffa522a8a14f..8f10e5f64d7b 100644
--- a/dev-libs/libtomcrypt/ChangeLog
+++ b/dev-libs/libtomcrypt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.36 2009/04/03 19:33:54 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.37 2009/12/07 11:27:04 bangert Exp $
+
+  07 Dec 2009; Thilo Bangert <bangert@gentoo.org> libtomcrypt-1.06.ebuild,
+  +files/libtomcrypt-1.06-makefile.diff,
+  +files/libtomcrypt-1.06-makefile.shared.diff:
+  rework patches so they apply (bug #245998) - fix doc install location -
+  disables tests
 
   03 Apr 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   libtomcrypt-1.17-r3.ebuild:
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 7a47c84e6a46..d31346164bd8 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libtomcrypt-1.06-makefile.diff 1388 RMD160 b985bae9af201ad79eae8bda5e011988de40b8e2 SHA1 d7e33ebdf142434723186a788a38ea908b0124fd SHA256 43b49f12fe0c5c027c7549208abd45390fba18ac7918761df0848e08415604f7
+AUX libtomcrypt-1.06-makefile.shared.diff 1163 RMD160 82951acb85f135d763153a18d33f88200a4db43d SHA1 43d4c443e692424e02932aff99499bdefb35887b SHA256 14463efa6b2799927157bb0d37bf598cc73cc4272e2d8684c81543d04de21e86
 AUX libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch 1695 RMD160 981b1db3cc0655148d8dd97fb8c74f83f21b2d37 SHA1 8eb4e9bfc6b4f7e7eb35c959af856b0581b2e00d SHA256 4a94c181fd397b041b95c5b7470af50d5437494d8da100e98dc8bb6c8eefecc9
 DIST crypt-1.06.tar.bz2 1160330 RMD160 20182dec72a461eea467a6fef8f5314337531909 SHA1 6b72a3dbf57a70d0ffa62d1fba498137d585f230 SHA256 9244bee6a5aa055d1d382767390af34e6433cd7e545c03eebce2a2bc2339ccb9
 DIST crypt-1.17.tar.bz2 1599215 RMD160 742d72d82fea2e6a9865d8c682c10cbaba69ea2f SHA1 9c746822c84e4276e432b64964f94d1d5ddd13ad SHA256 e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116
-DIST makefile.diff 1372 RMD160 0e5b3ec660f620e89b90cad19f00244de6fd6857 SHA1 45310500158d36955e73479af61ea3fbded0c583 SHA256 f4984376991e0e8db9c8df46752a455cd0b0013a2d449f65ed6930d4017b729e
-DIST makefile.shared.diff 1147 RMD160 4a6e1c199240fdbbe24ce7b70e430ad70eb56a19 SHA1 b4fa2f71500aca4cb0327cd39746125de2074cc2 SHA256 b03ed0b1a3ddf939068fd60d77fc73c9d171be2b6354d65027323dc20318ab29
-EBUILD libtomcrypt-1.06.ebuild 1295 RMD160 1848de2b5f2bb910d38f15957d020b53124c0020 SHA1 5870bd0ef913642d22edd0ccb5aae85a2b0e3428 SHA256 472a4a74430552db835eabc4a0c4f95bddda0995f9ca8bbab49b8d2c094655aa
+EBUILD libtomcrypt-1.06.ebuild 1274 RMD160 247b455f429a3a1baba8095d4c41800231e52e82 SHA1 5d7cd172feca5910cc709904ab65118362227e8c SHA256 08c9a8ac32daac15db64880ca6f410ecbdd8d0dcf69dabc9002b3e84ecb90068
 EBUILD libtomcrypt-1.17-r3.ebuild 1648 RMD160 63d3e799ad5f77dddf0372b5f71dd4a588e7a2ad SHA1 5d73dcec45c10e9d59e6f81716d70ce3df6b6203 SHA256 128e3207cf65628a79e433bd3dbbb932462f67a0fd92b85f6e584e9702b61ea8
-MISC ChangeLog 4861 RMD160 3b9810c8868441f6e27c76346d142a49b36d9185 SHA1 8b87f9c90e5947e285a5ee7050d1807981873529 SHA256 c906e9361c0a564e0536dccb7671429bbda48fd962c6c87bc1e8569054decb71
+MISC ChangeLog 5119 RMD160 8698d7af246220be843fc2398cb777c0dcaf9192 SHA1 bb6c97c288beb233b77b26c21c3721072953c2de SHA256 efa3e2c1da9fa820a3b3f488e455ad5568f78d7c8b832255e0b4861b71b57439
 MISC metadata.xml 2659 RMD160 f68fa867efa32fd3888e5989d62bd2ac3e6d7b25 SHA1 cdb5da8685cdaa27d1164e5e030d23a458edb133 SHA256 db2b941ba2acbd6daaac6d8317696d5a50c26c807dc570b6aa2192041598ecdb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iJwEAQECAAYFAknWZKgACgkQG7kqcTWJkGevVgP7BrEcnjkQy+2IuIONd+c6kExv
-dn9I5ErOIjaqI10EeAXsFc4wLilt3BixYeddAyj6RNfMm6f4gIXRCjEBVKe8Aumv
-flwNOIrMaOQ0Nb1jkXY8aBYoLMImD77at9uNNTeVQTZ4z62oPXbgk2TKDhbVxKPr
-2wrv+24tRiuVfGSX21A=
-=1/j2
------END PGP SIGNATURE-----
diff --git a/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
new file mode 100644
index 000000000000..b165e311749a
--- /dev/null
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
@@ -0,0 +1,41 @@
+--- makefile	2005-08-01 13:33:58.000000000 -0400
++++ makefile	2005-08-07 19:41:08.000000000 -0400
+@@ -4,7 +4,7 @@
+ # Modified by Clay Culver
+ 
+ # The version
+-VERSION=1.06
++VERSION=1.07
+ 
+ # Compiler and Linker Names
+ #CC=gcc
+@@ -254,16 +254,16 @@
+ 	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
+ 	install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DESTDIR)$(DATAPATH)
+ 
+-install_test: $(LIBTEST)
++install_test: testprof/$(LIBTEST)
+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
+-	install -g $(GROUP) -o $(USER) $(LIBTEST) $(DESTDIR)$(LIBPATH)
++	install -g $(GROUP) -o $(USER) testprof/$(LIBTEST) $(DESTDIR)$(LIBPATH)
+ 
+ profile:
+-	CFLAGS="$(CFLAGS) -fprofile-generate" make timing EXTRALIBS=-lgcov
++	CFLAGS="$(CFLAGS) -fprofile-generate" make timing EXTRALIBS="$(EXTRALIBS) -lgcov"
+ 	./timing
+ 	rm -f timing `find . -type f | grep [.][ao] | xargs`
+-	CFLAGS="$(CFLAGS) -fprofile-use" make timing EXTRALIBS=-lgcov
++	CFLAGS="$(CFLAGS) -fprofile-use" make timing EXTRALIBS="$(EXTRALIBS) -lgcov"
+ 
+ 
+ #This rule cleans the source tree of all compiled code, not including the pdf
+@@ -333,6 +333,6 @@
+ 
+ 
+ # $Source: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff,v $ 
+-# $Revision: 1.1 $ 
+-# $Date: 2009/12/07 11:27:03 $ 
++# $Revision: 1.1 $ 
++# $Date: 2009/12/07 11:27:03 $ 
+ 
diff --git a/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff
new file mode 100644
index 000000000000..c3288d57a333
--- /dev/null
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff
@@ -0,0 +1,28 @@
+--- makefile.shared	2005-08-01 13:33:58.000000000 -0400
++++ makefile.shared	2005-08-07 19:41:08.000000000 -0400
+@@ -6,7 +6,7 @@
+ # Tom St Denis
+ 
+ # The version
+-VERSION=0:106
++VERSION=0:107
+ 
+ # Compiler and Linker Names
+ CC=libtool --mode=compile gcc
+@@ -205,7 +205,7 @@
+ testprof/$(LIBTEST):
+ 	cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) make -f makefile.shared
+ 
+-$(LIBNAME): $(OBJECTS)
++$(LIBNAME): $(OBJECTS) testprof/$(LIBTEST)
+ 	libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
+ 	libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]o" | grep "src/" | xargs`  $(EXTRALIBS) -o $(LIBNAME_S)
+ 	ranlib $(LIBNAME_S)
+@@ -233,5 +233,5 @@
+ 	gcc -o $(TIMING) $(TIMINGS) -ltomcrypt_prof -ltomcrypt $(EXTRALIBS)
+ 
+ # $Source: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff,v $   
+-# $Revision: 1.1 $   
+-# $Date: 2009/12/07 11:27:03 $ 
++# $Revision: 1.1 $   
++# $Date: 2009/12/07 11:27:03 $ 
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.06.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.06.ebuild
index bd990786c31c..27c9c7469d7a 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.06.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.06.ebuild
@@ -1,14 +1,12 @@
-# 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.06.ebuild,v 1.5 2008/09/05 07:38:45 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-1.06.ebuild,v 1.6 2009/12/07 11:27:04 bangert Exp $
 
 inherit eutils flag-o-matic
 
 DESCRIPTION="modular and portable cryptographic toolkit"
 HOMEPAGE="http://libtomcrypt.org/"
-SRC_URI="http://libtomcrypt.org/files/crypt-${PV}.tar.bz2
-	http://libtomcrypt.org/files/patch-1.06/makefile.diff
-	http://libtomcrypt.org/files/patch-1.06/makefile.shared.diff"
+SRC_URI="http://libtomcrypt.org/files/crypt-${PV}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -24,7 +22,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack crypt-${PV}.tar.bz2
 	cd "${S}"
-	epatch "${DISTDIR}"/makefile{,.shared}.diff
+	epatch "${FILESDIR}"/libtomcrypt-1.06-makefile{,.shared}.diff
 	use doc || sed -i '/^install:/s:docs::' makefile
 }
 
@@ -34,8 +32,13 @@ src_compile() {
 	emake IGNORE_SPEED=1 || die
 }
 
+src_test() {
+	# Tests don't compile
+	true
+}
+
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" DATAPATH="/usr/share/doc/${P}" install || die
 	dodoc TODO changes
 	if use doc ; then
 		dodoc doc/*