From: Christian Faulhammer Date: Fri, 17 Nov 2006 12:39:38 +0000 (+0000) Subject: that patch needs to stay X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=09be454070cd51cc2615b4864355555479778f93;p=gentoo.git that patch needs to stay Package-Manager: portage-2.1.1-r1 --- diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog index 5874870564e8..05e3f90ba8a4 100644 --- a/dev-lang/erlang/ChangeLog +++ b/dev-lang/erlang/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/erlang # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.39 2006/11/17 12:29:52 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.40 2006/11/17 12:39:38 opfer Exp $ + + 17 Nov 2006; Christian Faulhammer +files/9c.patch: + that patch needs to stay 17 Nov 2006; Christian Faulhammer -files/9c.patch, -erlang-8b.ebuild, -erlang-9c.ebuild, -erlang-9c-r1.ebuild, diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index e508aa16603a..4383206d7ed0 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -9,6 +9,10 @@ AUX 50erlang-gentoo.el 140 RMD160 fd086fc5e1c15e5c8753315cf0a2759e8f3cc666 SHA1 MD5 28397dc6ef4a633a8084ce44fbb1c6f3 files/50erlang-gentoo.el 140 RMD160 fd086fc5e1c15e5c8753315cf0a2759e8f3cc666 files/50erlang-gentoo.el 140 SHA256 2f494178e3e64af141398b4deac5d7f148b47d3cbc1cd8ec083229092f4aa3df files/50erlang-gentoo.el 140 +AUX 9c.patch 2005 RMD160 be4d3dd5ea72f653d95c517dfdf9275263b009d2 SHA1 6fb3de09cf5293fa449e5e7662eb1bdb45271c9b SHA256 634f9ef95cae47ab27f464802bbc144606ff6e24d318da0cb1276ada5568fd78 +MD5 e61c0249e23b7e44ef3629ea5dc5997a files/9c.patch 2005 +RMD160 be4d3dd5ea72f653d95c517dfdf9275263b009d2 files/9c.patch 2005 +SHA256 634f9ef95cae47ab27f464802bbc144606ff6e24d318da0cb1276ada5568fd78 files/9c.patch 2005 AUX erlang-10.2.6-export-TARGET.patch 242 RMD160 5f8443e482920358c6c13f85b1c554977bfcc950 SHA1 5c1b5d3c0ab48e7845eceba5ac99944847304962 SHA256 8e8ae39cb84c3196fbb773275f0aaaf68fb07fade632682f1866d2185b4dd54b MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242 RMD160 5f8443e482920358c6c13f85b1c554977bfcc950 files/erlang-10.2.6-export-TARGET.patch 242 @@ -51,10 +55,10 @@ EBUILD erlang-9c-r2.ebuild 1786 RMD160 cfcd3af93fa8a45da4068303b6bfebad8d076264 MD5 42753c3aa0334123ff5edc1ad619ca8c erlang-9c-r2.ebuild 1786 RMD160 cfcd3af93fa8a45da4068303b6bfebad8d076264 erlang-9c-r2.ebuild 1786 SHA256 7f1e9e7f8260d6975d9a58df64cc2c42ac4fddf41e0c93f0cc89e0beb9ed55db erlang-9c-r2.ebuild 1786 -MISC ChangeLog 7811 RMD160 d9b374a42fed87d691027a663542479aca6bc4c2 SHA1 a57f6d1da93d669daace2baf6838efe45c555cb3 SHA256 169b748f2c1a59de5c2ee6581233216c8f2bb78ec32ebf257f117e7c923fb4ef -MD5 65b228fcaada1a5155a488087545eefc ChangeLog 7811 -RMD160 d9b374a42fed87d691027a663542479aca6bc4c2 ChangeLog 7811 -SHA256 169b748f2c1a59de5c2ee6581233216c8f2bb78ec32ebf257f117e7c923fb4ef ChangeLog 7811 +MISC ChangeLog 7911 RMD160 f6027a2382ccd658cc841b32c5ee36778a8da473 SHA1 30b2b9a3bc04b85e6b6931a3766759f6774ca70d SHA256 c6a6efb3e838214d8efdeffef94f64538d1daca35c8227810d54603c78d99042 +MD5 60f94ab2d005f858d81ed4cee6f18179 ChangeLog 7911 +RMD160 f6027a2382ccd658cc841b32c5ee36778a8da473 ChangeLog 7911 +SHA256 c6a6efb3e838214d8efdeffef94f64538d1daca35c8227810d54603c78d99042 ChangeLog 7911 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402 @@ -77,7 +81,7 @@ SHA256 1e4ffb97ef49da9eecdb6affebda54e8e22b9c2707a099edeff382531b3b95c1 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFXauKNQqtfCuFneMRAvHEAKCb9f+50aqQWX04jeO+Til0RgM2DQCfQdJV -YmNoKc7RlYAfH8/FECm9A8Q= -=hlvM +iD8DBQFFXa2yNQqtfCuFneMRAvHSAJ4vShOvzJPxGraqccsLXpUMvnlitwCgnMBs +kMrWaDaIasGmUTw1/42O7Lg= +=NxaT -----END PGP SIGNATURE----- diff --git a/dev-lang/erlang/files/9c.patch b/dev-lang/erlang/files/9c.patch new file mode 100644 index 000000000000..61efafbeff2c --- /dev/null +++ b/dev-lang/erlang/files/9c.patch @@ -0,0 +1,55 @@ +diff -ru otp_src_R9B-1-orig/lib/kernel/src/inet_config.erl otp_src_R9B-1/lib/kernel/src/inet_config.erl +--- otp_src_R9B-1-orig/lib/kernel/src/inet_config.erl 2002-10-09 07:39:22.000000000 -0700 ++++ otp_src_R9B-1/lib/kernel/src/inet_config.erl 2003-07-03 17:43:37.000000000 -0700 +@@ -82,8 +82,13 @@ + 'bsd/os' -> + load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos); + linux -> +- load_resolv(filename:join(Etc,"host.conf"),host_conf_linux), +- ++ case load_resolv(filename:join(Etc,"host.conf"),host_conf_linux) of ++ ok -> ++ ok; ++ _Other -> ++ load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf) ++ end, ++ + % It may be the case that the domain name was not set + % because the hostname was short. But we can now look it + % up and get the long name and the domain name from it. +@@ -296,10 +301,12 @@ + case apply(inet_parse, Func, [File,{chars,Bin}]) of + {ok, Ls} -> inet_db:add_rc_list(Ls); + {error, Reason} -> +- error("parse error in file ~s: ~p", [File, Reason]) ++ error("parse error in file ~s: ~p", [File, Reason]), ++ {error, Reason} + end; + Error -> +- warning("file not found ~s~n", [File]) ++ warning("file not found ~s~n", [File]), ++ Error + end. + + %% +diff -ru otp_src_R9B-1-orig/lib/megaco/src/text/Makefile otp_src_R9B-1/lib/megaco/src/text/Makefile +--- otp_src_R9B-1-orig/lib/megaco/src/text/Makefile 2002-11-28 05:50:00.000000000 -0800 ++++ otp_src_R9B-1/lib/megaco/src/text/Makefile 2003-07-03 17:44:41.000000000 -0700 +@@ -48,10 +48,15 @@ + $(INTERNAL_YRL_FILES:%.yrl=%.erl) + + BEAM_TARGET_FILES = \ +- $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR)) \ + $(MODULES:%=$(EBIN)/%.$(EMULATOR)) + +-TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES) ++YRL_BEAM_TARGET_FILES = \ ++ $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR)) ++ ++ ++ ++TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES) $(YRL_BEAM_TARGETS) ++ + + + # ----------------------------------------------------