diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2010-08-09 10:08:42 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2010-08-09 10:08:42 +0000 |
| commit | c3c8f986c5c12ac339d462a85686cfd52c879523 (patch) | |
| tree | 3d8ddc2c031ea9d3d052fba612420063b03ba62a /dev-libs/libtomcrypt | |
| parent | x86 stable, bug 322791 (diff) | |
| download | gentoo-2-c3c8f986c5c12ac339d462a85686cfd52c879523.tar.gz gentoo-2-c3c8f986c5c12ac339d462a85686cfd52c879523.tar.bz2 gentoo-2-c3c8f986c5c12ac339d462a85686cfd52c879523.zip | |
fix patches that failed to apply (#331427)
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'dev-libs/libtomcrypt')
| -rw-r--r-- | dev-libs/libtomcrypt/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff | 11 | ||||
| -rw-r--r-- | dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff | 8 |
3 files changed, 8 insertions, 20 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/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 $ |