no need to gzip smallish patches

Package-Manager: portage-2.1_pre3-r1

5 files changed, 150 insertions, 26 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 3193be97e1c5..ddc84c9d9365 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/erlang
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.26 2005/12/03 11:29:17 ferdy Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.27 2006/01/28 19:06:51 blubb Exp $
+
+  28 Jan 2006; Simon Stelling <blubb@gentoo.org> +files/erlang-9c.patch,
+  -files/erlang-9c.patch.gz, erlang-9c-r1.ebuild:
+  no need to gzip smallish patches
 
   03 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> erlang-10.2.7.ebuild:
   marked ~alpha wrt bug #91132
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 9a092d03ad48..4b50e31ad653 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,37 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 363c1727652dbfbd85dbff66e246b467 erlang-10.2.5.ebuild 2944
-MD5 952017d9165b65d7786b75dbf44a10e2 erlang-9c-r1.ebuild 1686
+MD5 6aac9a779d7c4fbf8e575dd9aed23e44 ChangeLog 4973
 MD5 dc1d9134a5f6e8146cc4ca6c5e130f0a erlang-10.2.0.ebuild 2372
+MD5 363c1727652dbfbd85dbff66e246b467 erlang-10.2.5.ebuild 2944
+MD5 f710894b1b9115ed6aa49b7abf22e22f erlang-10.2.6.ebuild 2938
 MD5 85b2cea64e7e0b81aac2e79a2c3dd3c2 erlang-10.2.7.ebuild 3090
 MD5 f947170e5f0fef952a0efc7dcc947f37 erlang-8b.ebuild 1178
+MD5 1312109e62858b6c8261dc42b2c42eca erlang-9c-r1.ebuild 1680
+MD5 4df8bcb2597f95b5d00f898f0dbc9e96 erlang-9c-r2.ebuild 1808
 MD5 92087ace1ec7f4f5fafb31419db5fafa erlang-9c-r3.ebuild 1822
 MD5 888709019e83eac37f3e95c7739de933 erlang-9c.ebuild 1505
-MD5 f710894b1b9115ed6aa49b7abf22e22f erlang-10.2.6.ebuild 2938
-MD5 4df8bcb2597f95b5d00f898f0dbc9e96 erlang-9c-r2.ebuild 1808
-MD5 3a12493b39eaf7c69c99d052beced762 ChangeLog 4814
-MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
 MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.6-manpage-emacs-gentoo.patch 1348
+MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.7-manpage-emacs-gentoo.patch 1348
+MD5 28397dc6ef4a633a8084ce44fbb1c6f3 files/50erlang-gentoo.el 140
+MD5 e61c0249e23b7e44ef3629ea5dc5997a files/9c.patch 2005
 MD5 f3de2b6ca821b977f0e1811a1f0a1409 files/digest-erlang-10.2.0 67
 MD5 915a9f490e6f58cafe26c3f6f6aeb54d files/digest-erlang-10.2.5 209
 MD5 935d6f9403c781eb7c3234136b1684e0 files/digest-erlang-10.2.6 210
 MD5 9a4549378412ae567bc58f2d7a9336a3 files/digest-erlang-10.2.7 280
-MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242
-MD5 e61c0249e23b7e44ef3629ea5dc5997a files/9c.patch 2005
-MD5 28397dc6ef4a633a8084ce44fbb1c6f3 files/50erlang-gentoo.el 140
 MD5 0ef311d4fbeb2b5e16aab201dcf37297 files/digest-erlang-8b 67
 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c 66
 MD5 9a235de49a6c0988f033448fdac8a0a8 files/digest-erlang-9c-r1 66
 MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r2 66
 MD5 ae2205c16664d70f5ea47d249b2e566f files/digest-erlang-9c-r3 66
-MD5 e88b4d733b41026e691a981320ac7806 files/erlang-9c.patch.gz 1503
+MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242
 MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.7-export-TARGET.patch 242
-MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.7-manpage-emacs-gentoo.patch 1348
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDkYGgViELBEf1JB0RAibRAJ0cqGJDMJ6+zSY0dDBH9WwKiBg7CwCfd1X+
-LWX5hwFDixOb7O0hVtGd73E=
-=J/rK
------END PGP SIGNATURE-----
+MD5 162a0f246dd57cae2c3a6908d8446944 files/erlang-9c.patch 4868
+MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
diff --git a/dev-lang/erlang/erlang-9c-r1.ebuild b/dev-lang/erlang/erlang-9c-r1.ebuild
index 45279eb10083..957c0a6590ee 100644
--- a/dev-lang/erlang/erlang-9c-r1.ebuild
+++ b/dev-lang/erlang/erlang-9c-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r1.ebuild,v 1.7 2004/06/24 22:48:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-9c-r1.ebuild,v 1.8 2006/01/28 19:06:51 blubb Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ src_unpack(){
 	unpack ${A}
 	cd ${S}
 	#combines nsswitch.conf parsing and a fix for strange install behaviour on some systems
-	epatch ${FILESDIR}/${P}.patch.gz
+	epatch ${FILESDIR}/${P}.patch
 }
 
 src_compile() {
diff --git a/dev-lang/erlang/files/erlang-9c.patch b/dev-lang/erlang/files/erlang-9c.patch
new file mode 100644
index 000000000000..2a6f111e6900
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-9c.patch
@@ -0,0 +1,130 @@
+diff -ru otp_src_R9B-1-orig/lib/cosNotification/src/Makefile otp_src_R9B-1/lib/cosNotification/src/Makefile
+--- otp_src_R9B-1-orig/lib/cosNotification/src/Makefile	2002-10-02 15:01:31.000000000 -0700
++++ otp_src_R9B-1/lib/cosNotification/src/Makefile	2003-07-03 17:44:41.000000000 -0700
+@@ -363,7 +363,7 @@
+ 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) $(RELSYSDIR)/ebin
+ 	$(INSTALL_DIR) $(RELSYSDIR)/src
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) $(GEN_YECC_ERL_FILES) $(GEN_YECC_HRL_FILES) $(RELSYSDIR)/src
++	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES)  $(GEN_YECC_HRL_FILES) $(RELSYSDIR)/src
+ 	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) $(YECC_FILES) $(RELSYSDIR)/src
+ 	$(INSTALL_DIR) $(RELSYSDIR)/include
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) $(RELSYSDIR)/include
+diff -ru otp_src_R9B-1-orig/lib/gs/src/Makefile otp_src_R9B-1/lib/gs/src/Makefile
+--- otp_src_R9B-1-orig/lib/gs/src/Makefile	2001-10-12 07:18:38.000000000 -0700
++++ otp_src_R9B-1/lib/gs/src/Makefile	2003-07-03 17:44:41.000000000 -0700
+@@ -114,7 +114,7 @@
+ 	$(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \
+ 		$(GSTK_GENERIC) $(RELSYSDIR)/src
+ 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
+-	$(INSTALL_DATA) $(TARGET_FILES) $(KEEP_AS_IS) $(RELSYSDIR)/ebin
++	$(INSTALL_DATA) $(TARGET_FILES)  $(RELSYSDIR)/ebin
+ 
+ 
+ release_docs_spec:
+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)
++
+ 
+ 
+ # ----------------------------------------------------
+@@ -65,6 +70,10 @@
+ # ERL_COMPILE_FLAGS += +native
+ # endif
+ 
++# ifeq ($(USE_HIPE),true)
++# ERL_COMPILE_FLAGS += +native
++# endif
++
+ ifeq ($(WARN_UNUSED_WARS),true)
+ ERL_COMPILE_FLAGS += +warn_unused_vars
+ endif
+@@ -94,6 +103,8 @@
+ 	@echo ""
+ 	@echo "INTERNAL_HRL_FILES = $(INTERNAL_HRL_FILES)"
+ 	@echo ""
++	@echo "BEAM_TARGET_FILES = $(BEAM_TARGET_FILES) "
++	@echo ""
+ 
+ 
+ # ----------------------------------------------------
+ôÏÌØËÏ × otp_src_R9B-1/lib/megaco/src/text: Makefile.orig
+diff -ru otp_src_R9B-1-orig/lib/orber/priv/Makefile otp_src_R9B-1/lib/orber/priv/Makefile
+--- otp_src_R9B-1-orig/lib/orber/priv/Makefile	2002-10-02 15:17:29.000000000 -0700
++++ otp_src_R9B-1/lib/orber/priv/Makefile	2003-07-03 17:44:41.000000000 -0700
+@@ -37,7 +37,6 @@
+ 	blank.html \
+ 	info_frames.html \
+ 	main_frame.html \
+-	orber_help.txt \
+ 	start_info.html
+ 
+ #
+diff -ru otp_src_R9B-1-orig/lib/snmp/mibs/Makefile otp_src_R9B-1/lib/snmp/mibs/Makefile
+--- otp_src_R9B-1-orig/lib/snmp/mibs/Makefile	2002-10-02 14:48:43.000000000 -0700
++++ otp_src_R9B-1/lib/snmp/mibs/Makefile	2003-07-03 17:44:41.000000000 -0700
+@@ -59,13 +59,9 @@
+ FUNCS_FILES = \
+ 	STANDARD-MIB.funcs \
+ 	SNMPv2-MIB.funcs \
+-	SNMP-COMMUNITY-MIB.mib \
+-	SNMP-FRAMEWORK-MIB.mib \
+-	SNMP-MPD-MIB.mib \
+ 	SNMP-NOTIFICATION-MIB.funcs \
+-	SNMP-TARGET-MIB.funcs \
+-	SNMP-USER-BASED-SM-MIB.mib \
+-	SNMP-VIEW-BASED-ACM-MIB.mib
++	SNMP-TARGET-MIB.funcs 
++
+ 
+ V1_MIB_FILES= v1/OTP-SNMPEA-MIB.mib.v1
+ 
diff --git a/dev-lang/erlang/files/erlang-9c.patch.gz b/dev-lang/erlang/files/erlang-9c.patch.gz
deleted file mode 100644
index 027a08f296b8..000000000000
--- a/dev-lang/erlang/files/erlang-9c.patch.gz
+++ /dev/null