summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThilo Bangert <bangert@gentoo.org>2010-08-09 10:08:42 +0000
committerThilo Bangert <bangert@gentoo.org>2010-08-09 10:08:42 +0000
commit16233e1b3963acab384988c81162fe3ab236d1b3 (patch)
tree5497f45f3afc99f9697d1530997abc174f5c9ac1 /dev-libs/libtomcrypt
parentAutomated update of use.local.desc (diff)
downloadhistorical-16233e1b3963acab384988c81162fe3ab236d1b3.tar.gz
historical-16233e1b3963acab384988c81162fe3ab236d1b3.tar.bz2
historical-16233e1b3963acab384988c81162fe3ab236d1b3.zip
fix patches that failed to apply (#331427)
Package-Manager: portage-2.2_rc67/cvs/Linux i686
Diffstat (limited to 'dev-libs/libtomcrypt')
-rw-r--r--dev-libs/libtomcrypt/ChangeLog9
-rw-r--r--dev-libs/libtomcrypt/Manifest6
-rw-r--r--dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff11
-rw-r--r--dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff8
4 files changed, 11 insertions, 23 deletions
diff --git a/dev-libs/libtomcrypt/ChangeLog b/dev-libs/libtomcrypt/ChangeLog
index ba7c0bafaf3b..b2c36bedfe3c 100644
--- a/dev-libs/libtomcrypt/ChangeLog
+++ b/dev-libs/libtomcrypt/ChangeLog
@@ -1,6 +1,11 @@
# 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.38 2009/12/26 17:33:08 pva Exp $
+# 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 $
+
+ 09 Aug 2010; Thilo Bangert <bangert@gentoo.org>
+ files/libtomcrypt-1.06-makefile.diff,
+ files/libtomcrypt-1.06-makefile.shared.diff:
+ fix patches that failed to apply (#331427)
26 Dec 2009; Peter Volkov <pva@gentoo.org> libtomcrypt-1.06.ebuild,
libtomcrypt-1.17-r3.ebuild:
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index ac2431591585..71d6d428d226 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,9 +1,9 @@
-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.06-makefile.diff 1160 RMD160 6e64de57be7dbc2d44681ca915d310fe31b70d5c SHA1 7cea9a9186500c9665eb74993f341b8f25375c5f SHA256 7b30228e8549d3bd2d32e3a296afbace87d2d88577fbf66f0a275f8a48db63be
+AUX libtomcrypt-1.06-makefile.shared.diff 851 RMD160 2f967ff82939529eb578e44d5f5ba1e2e78843ef SHA1 0ac0cf2115c4395ee0c8612ac73d761920f21f94 SHA256 74f1db5e25ac5751b698c8240915f332f689e69ebc930a80e1b54ca6abf33acb
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
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 5328 RMD160 a002be90450ea2bd548a5d2ae9e86cbcc0334df6 SHA1 2c96ef8a8b714819e6068f13f65396ce672123fb SHA256 a19be3a55ac702f1a5899c07312cd28b2e21122eee5ce468727430025eaa6a1d
+MISC ChangeLog 5515 RMD160 a8de660bfb25cfda6d6f93dcaf503a0b82d1ffe0 SHA1 811a90b1656507da7423d8f2ea3f13d94712f857 SHA256 fa1d3221667708039e45fd07a10c39797430431365591ac34d695d1a3bf04de9
MISC metadata.xml 2659 RMD160 f68fa867efa32fd3888e5989d62bd2ac3e6d7b25 SHA1 cdb5da8685cdaa27d1164e5e030d23a458edb133 SHA256 db2b941ba2acbd6daaac6d8317696d5a50c26c807dc570b6aa2192041598ecdb
diff --git a/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
index b165e311749a..4426a6ef153c 100644
--- a/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
@@ -1,4 +1,4 @@
---- makefile 2005-08-01 13:33:58.000000000 -0400
+--- makefile.orig 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
@@ -30,12 +30,3 @@
#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
index c3288d57a333..892eb3f6fc1c 100644
--- a/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff
@@ -18,11 +18,3 @@
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 $