summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2010-09-19 04:37:17 +0000
committerJeroen Roovers <jer@gentoo.org>2010-09-19 04:37:17 +0000
commit0b9403ea3f5e57ae03d51595f21ac4a69e5c0af7 (patch)
treeb1a17f6db4d8fe364e85a74f58efa0c9448b066d /dev-libs/libtomcrypt
parentMove patching to proper phase. Do not hard-wire CC. Respect LDFLAGS (bug #334... (diff)
downloadgentoo-2-0b9403ea3f5e57ae03d51595f21ac4a69e5c0af7.tar.gz
gentoo-2-0b9403ea3f5e57ae03d51595f21ac4a69e5c0af7.tar.bz2
gentoo-2-0b9403ea3f5e57ae03d51595f21ac4a69e5c0af7.zip
Remove testing cruft. Clean up patches.
(Portage version: 2.2_rc83/cvs/Linux i686)
Diffstat (limited to 'dev-libs/libtomcrypt')
-rw-r--r--dev-libs/libtomcrypt/ChangeLog8
-rw-r--r--dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff4
-rw-r--r--dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff4
-rw-r--r--dev-libs/libtomcrypt/files/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch8
-rw-r--r--dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild3
5 files changed, 16 insertions, 11 deletions
diff --git a/dev-libs/libtomcrypt/ChangeLog b/dev-libs/libtomcrypt/ChangeLog
index f7085eedbc9e..7d39a151d928 100644
--- a/dev-libs/libtomcrypt/ChangeLog
+++ b/dev-libs/libtomcrypt/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/libtomcrypt
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.40 2010/09/19 04:35:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/ChangeLog,v 1.41 2010/09/19 04:37:17 jer Exp $
+
+ 19 Sep 2010; Jeroen Roovers <jer@gentoo.org>
+ files/libtomcrypt-1.06-makefile.diff,
+ files/libtomcrypt-1.06-makefile.shared.diff, libtomcrypt-1.17-r4.ebuild,
+ files/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch:
+ Remove testing cruft. Clean up patches.
*libtomcrypt-1.17-r4 (19 Sep 2010)
diff --git a/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
index 4426a6ef153c..1b018b1c1436 100644
--- a/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
@@ -1,5 +1,5 @@
---- makefile.orig 2005-08-01 13:33:58.000000000 -0400
-+++ makefile 2005-08-07 19:41:08.000000000 -0400
+--- a/makefile 2005-08-01 13:33:58.000000000 -0400
++++ b/makefile 2005-08-07 19:41:08.000000000 -0400
@@ -4,7 +4,7 @@
# Modified by Clay Culver
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 892eb3f6fc1c..016c37f3f928 100644
--- a/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff
@@ -1,5 +1,5 @@
---- makefile.shared 2005-08-01 13:33:58.000000000 -0400
-+++ makefile.shared 2005-08-07 19:41:08.000000000 -0400
+--- a/makefile.shared 2005-08-01 13:33:58.000000000 -0400
++++ b/makefile.shared 2005-08-07 19:41:08.000000000 -0400
@@ -6,7 +6,7 @@
# Tom St Denis
diff --git a/dev-libs/libtomcrypt/files/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch b/dev-libs/libtomcrypt/files/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch
index c49bee8bff33..694ba254cb2e 100644
--- a/dev-libs/libtomcrypt/files/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch
@@ -1,5 +1,5 @@
---- makefile.shared.orig 2009-03-16 11:07:19.000000000 +0100
-+++ makefile.shared 2009-03-16 11:30:25.000000000 +0100
+--- a/makefile.shared 2009-03-16 11:07:19.000000000 +0100
++++ b/makefile.shared 2009-03-16 11:30:25.000000000 +0100
@@ -9,7 +9,7 @@
VERSION=0:117
@@ -27,8 +27,8 @@
libtool --silent --mode=install install -c libtomcrypt.la $(DESTDIR)$(LIBPATH)/libtomcrypt.la
install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
---- testprof/makefile.shared.orig 2009-03-16 11:26:19.000000000 +0100
-+++ testprof/makefile.shared 2009-03-16 11:26:47.000000000 +0100
+--- a/testprof/makefile.shared 2009-03-16 11:26:19.000000000 +0100
++++ b/testprof/makefile.shared 2009-03-16 11:26:47.000000000 +0100
@@ -1,4 +1,4 @@
-CC=libtool --mode=compile gcc
+CC=libtool --mode=compile --tag CC gcc
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild
index 61330aa87cd9..320a133a5265 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.1 2010/09/19 04:35:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/libtomcrypt-1.17-r4.ebuild,v 1.2 2010/09/19 04:37:17 jer Exp $
EAPI="2"
@@ -22,7 +22,6 @@ DEPEND="${RDEPEND}
doc? ( virtual/latex-base app-text/ghostscript-gpl )"
src_prepare() {
-cp -av makefile.shared{,.orig}
use doc || sed -i '/^install:/s:docs::' makefile
epatch "${FILESDIR}"/libtomcrypt-1.17-r2-libtool-tag-and-make-fix.patch
sed -i \