diff options
author | Chris White <chriswhite@gentoo.org> | 2005-11-20 22:31:17 +0000 |
---|---|---|
committer | Chris White <chriswhite@gentoo.org> | 2005-11-20 22:31:17 +0000 |
commit | e074c917373650d561c64fae3ce39f8a15e61195 (patch) | |
tree | 42962a3c6af4de878c95a48fa09168660d6cd06d /dev-util | |
parent | Stable on alpha wrt security bug #112482 (diff) | |
download | gentoo-2-e074c917373650d561c64fae3ce39f8a15e61195.tar.gz gentoo-2-e074c917373650d561c64fae3ce39f8a15e61195.tar.bz2 gentoo-2-e074c917373650d561c64fae3ce39f8a15e61195.zip |
Revision bump to -r3 to force upgrade for fix in bug #103893. Removed old -r2.
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/jam/ChangeLog | 8 | ||||
-rw-r--r-- | dev-util/jam/Manifest | 20 | ||||
-rw-r--r-- | dev-util/jam/files/digest-jam-2.5-r3 (renamed from dev-util/jam/files/digest-jam-2.5-r2) | 0 | ||||
-rw-r--r-- | dev-util/jam/files/jam-2.5-dependency.patch | 23 | ||||
-rw-r--r-- | dev-util/jam/jam-2.5-r3.ebuild (renamed from dev-util/jam/jam-2.5-r2.ebuild) | 2 |
5 files changed, 26 insertions, 27 deletions
diff --git a/dev-util/jam/ChangeLog b/dev-util/jam/ChangeLog index 31bb179588ca..590bfef8f1d5 100644 --- a/dev-util/jam/ChangeLog +++ b/dev-util/jam/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/jam # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/ChangeLog,v 1.16 2005/09/03 08:31:26 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/ChangeLog,v 1.17 2005/11/20 22:31:17 chriswhite Exp $ + +*jam-2.5-r3 (20 Nov 2005) + + 20 Nov 2005; Chris White <chriswhite@gentoo.org> + files/jam-2.5-dependency.patch, -jam-2.5-r2.ebuild, +jam-2.5-r3.ebuild: + Revision bump to -r3 to force upgrade for fix in bug #103893. Removed old -r2. 03 Sep 2005; Chris White <chriswhite@gentoo.org> +files/jam-2.5-dependency.patch, jam-2.5-r2.ebuild: diff --git a/dev-util/jam/Manifest b/dev-util/jam/Manifest index 8c52a68828ce..f2d96cbb2319 100644 --- a/dev-util/jam/Manifest +++ b/dev-util/jam/Manifest @@ -1,19 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 6cd983f2856797ca40a0a0ecf7a1f20f ChangeLog 2207 -MD5 fc05f97cb4dbabde210cb0237a504cca jam-2.5-r2.ebuild 983 -MD5 a5686e3c1ed6f476191f125c7589d421 jam-2.5.ebuild 788 MD5 d16e0e772acf4a3bf1cf907dc4cafafd metadata.xml 324 +MD5 2301aa09af9f2af3e0a14841437ab4a6 ChangeLog 2442 +MD5 a5686e3c1ed6f476191f125c7589d421 jam-2.5.ebuild 788 +MD5 fc05f97cb4dbabde210cb0237a504cca jam-2.5-r3.ebuild 983 +MD5 7301e635c156f9b803a27cf6aee186de files/digest-jam-2.5-r3 56 MD5 7301e635c156f9b803a27cf6aee186de files/digest-jam-2.5 56 -MD5 7301e635c156f9b803a27cf6aee186de files/digest-jam-2.5-r2 56 +MD5 0add93cb0929ead47d332051dea533ef files/jam-2.5-dependency.patch 939 MD5 355cd982c580f42f3401def29ad621fe files/jam-2.5-amd64.patch 334 MD5 d1bfd7c9f477fe91b1cc27f0324591a0 files/jam-2.5-cxx.patch 1089 -MD5 a1600ae1d2409408663200c6c0643e68 files/jam-2.5-dependency.patch 907 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDGVhHFdQwWVoAgN4RAvbxAJ9MOXmgHmUFGFhsHMK+wZ+E6BIFqQCg+pmU -hpAJBA9yRVi7UckDeC00nbA= -=qqbB ------END PGP SIGNATURE----- diff --git a/dev-util/jam/files/digest-jam-2.5-r2 b/dev-util/jam/files/digest-jam-2.5-r3 index c6bba9924280..c6bba9924280 100644 --- a/dev-util/jam/files/digest-jam-2.5-r2 +++ b/dev-util/jam/files/digest-jam-2.5-r3 diff --git a/dev-util/jam/files/jam-2.5-dependency.patch b/dev-util/jam/files/jam-2.5-dependency.patch index e171888de9f9..eba137b6f456 100644 --- a/dev-util/jam/files/jam-2.5-dependency.patch +++ b/dev-util/jam/files/jam-2.5-dependency.patch @@ -1,5 +1,3 @@ -Fixes dependencies of headers included by headers in another directory. - --- jam-2.5/Jambase +++ jam-2.5/Jambase @@ -710,7 +710,7 @@ @@ -7,21 +5,26 @@ Fixes dependencies of headers included by headers in another directory. Includes $(<) : $(s) ; - SEARCH on $(s) = $(HDRSEARCH) ; -+ SEARCH on $(s) = $(<:D) $(HDRSEARCH) ; ++ SEARCH on $(s) = $(3:D) $(HDRSEARCH) ; NoCare $(s) ; # Propagate on $(<) to $(>) --- jam-2.5/headers.c +++ jam-2.5/headers.c -@@ -67,7 +67,7 @@ - - lol_init( &lol ); - -- lol_add( &lol, list_new( L0, t->name, 1 ) ); -+ lol_add( &lol, list_new( L0, t->boundname, 1 ) ); +@@ -71,7 +71,13 @@ lol_add( &lol, headers1( t->boundname, hdrscan ) ); if( lol_get( &lol, 1 ) ) ++ { ++ /* The third argument to HDRRULE is the bound name of ++ * $(<) */ ++ lol_add( &lol, list_new( L0, t->boundname, 1 ) ); ++ + list_free( evaluate_rule( hdrrule->string, &lol, L0 ) ); ++ } + + /* Clean up */ + --- jam-2.5/jambase.c +++ jam-2.5/jambase.c @@ -452,7 +452,7 @@ @@ -29,7 +32,7 @@ Fixes dependencies of headers included by headers in another directory. "local s = $(>:G=$(HDRGRIST:E)) ;\n", "Includes $(<) : $(s) ;\n", -"SEARCH on $(s) = $(HDRSEARCH) ;\n", -+"SEARCH on $(s) = $(<:D) $(HDRSEARCH) ;\n", ++"SEARCH on $(s) = $(3:D) $(HDRSEARCH) ;\n", "NoCare $(s) ;\n", "HDRSEARCH on $(s) = $(HDRSEARCH) ;\n", "HDRSCAN on $(s) = $(HDRSCAN) ;\n", diff --git a/dev-util/jam/jam-2.5-r2.ebuild b/dev-util/jam/jam-2.5-r3.ebuild index 997ac4f9a886..94a9183fc66b 100644 --- a/dev-util/jam/jam-2.5-r2.ebuild +++ b/dev-util/jam/jam-2.5-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/jam-2.5-r2.ebuild,v 1.2 2005/09/03 08:31:26 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/jam/jam-2.5-r3.ebuild,v 1.1 2005/11/20 22:31:17 chriswhite Exp $ inherit eutils |