Fix building with gcc-2.x.

Package-Manager: portage-2.0.53_rc5

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index f05db958ec4ebd893ac558c20856063595d785cc..3b744d52d1f6a15fa0f3ccaa38b48c9eb173da05 100644 (file)
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.147 2005/10/18 13:11:14 agriffis Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.148 2005/10/19 00:27:29 vapier Exp $
+
+  19 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/udev-070-gcc2.patch, udev-070.ebuild:
+  Fix building with gcc-2.x.
 
   18 Oct 2005; Aron Griffis <agriffis@gentoo.org> udev-070.ebuild:
   Mark 070 stable on alpha

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 454b2d0672770ce1843ba6b91baacea8875b40b3..89042139e0c26e62af0ff102130fb6db24e86b3e 100644 (file)
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,61 +1,62 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 448faa811f8b84803d2caef1c229666a udev-063.ebuild 5811
-MD5 8853cecf2a4fc6d2306d420947923ad9 udev-062.ebuild 5811
-MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
-MD5 f544a14d53abdd4fcd9449830156f7c7 udev-070.ebuild 6691
-MD5 3fd5842b6468f5fd506f0cbb9811db9d udev-064-r1.ebuild 6011
-MD5 7f59495ae7dd268fe374638d4239079b udev-045.ebuild 3615
-MD5 b4a0997abc3de0c28ee83f860f923862 ChangeLog 26696
-MD5 43820d124485c872fbebc855051bbe4a udev-030.ebuild 3525
-MD5 6ff199945dba1c1ad03d9cc6335c6d9a udev-066.ebuild 5914
-MD5 428e955c009eebb4173dd0e059327e96 udev-067.ebuild 5914
-MD5 9189ff86ab535dfff8bd6718860b40f2 udev-060.ebuild 5779
-MD5 d79f919d887e411742660e92adec76fd udev-065.ebuild 5917
-MD5 1a5f0127787af194bf038bc3f2338a6b udev-058.ebuild 5158
-MD5 0b0240991924922eab433e39cf1ca953 udev-068-r1.ebuild 6698
-MD5 e2a53fca2d5528fb8fd8830f52833c35 udev-064.ebuild 5876
-MD5 601369394beab8a50bd959614a33b261 udev-059.ebuild 5779
-MD5 274d69058f9dc59364249e2baf27705b udev-056.ebuild 4380
-MD5 bd19acabc0ff3c10b792a8ad7e102009 udev-068.ebuild 6646
-MD5 0bd16f42f1bd404a650da235c6eda855 udev-069.ebuild 6648
+MD5 45371d84374b3d62d837368d0fb14a5b ChangeLog 26821
+MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
+MD5 c104f1a0b8423e8f410aaa2fb7b6c745 files/digest-udev-045 61
 MD5 ce48708bcbf9e1e3fcfb02c02e412f54 files/digest-udev-056 61
-MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
-MD5 d03e92ce93131fd7d29fcae1b3f2627b files/digest-udev-068 61
-MD5 4bc32861744372ee3db7d0141a7f28e6 files/digest-udev-062 61
+MD5 69f45078068718e7c200b067da9a50e6 files/digest-udev-058 61
 MD5 38f3e2a01ee1ecea5233bf47176fe9fd files/digest-udev-059 61
-MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
-MD5 787f5b398376f9e3dbec228681150173 files/udev-stop.sh 2012
-MD5 d03e92ce93131fd7d29fcae1b3f2627b files/digest-udev-068-r1 61
-MD5 53e36b1847ba09f1cbd20ce63b0daa31 files/digest-udev-066 61
-MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064 61
+MD5 691dace731323137de690d8f677c582f files/digest-udev-060 61
+MD5 4bc32861744372ee3db7d0141a7f28e6 files/digest-udev-062 61
 MD5 c38ac07766ab6fffea0720beb0e465f6 files/digest-udev-063 61
-MD5 05abfc4c9a5cad86f814161806c97148 files/digest-udev-069 61
-MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
-MD5 f1a1ae2d8dd0af1e1f5a2df7aa4bc33b files/digest-udev-067 61
-MD5 0c9207a0cede79a3c37bb7a96a6f2b03 files/digest-udev-065 61
-MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
+MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064 61
 MD5 32729a00b41bf72823f2c1fded68c97e files/digest-udev-064-r1 61
-MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
+MD5 0c9207a0cede79a3c37bb7a96a6f2b03 files/digest-udev-065 61
+MD5 53e36b1847ba09f1cbd20ce63b0daa31 files/digest-udev-066 61
+MD5 f1a1ae2d8dd0af1e1f5a2df7aa4bc33b files/digest-udev-067 61
+MD5 d03e92ce93131fd7d29fcae1b3f2627b files/digest-udev-068 61
+MD5 d03e92ce93131fd7d29fcae1b3f2627b files/digest-udev-068-r1 61
+MD5 05abfc4c9a5cad86f814161806c97148 files/digest-udev-069 61
+MD5 760a25fb7cc243e76c1889076b6ec829 files/digest-udev-070 61
+MD5 f00e3e0d3382e93cbd0c64fcef99f826 files/udev-021-udev_add_c-gcc295-compat.patch 493
 MD5 7b0a35c905183730e4dfdcf29f5a1816 files/udev-050-udev_volume_id.patch 388
-MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
-MD5 6df9e08cd088f74720689640de2ffcd6 files/udev.rules-018 4365
-MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
-MD5 511c376c4c6346bcbf51531ef811f00c files/digest-udev-030 61
-MD5 3aad55bdfbf9067a104a325e23dda0f4 files/udev.rules-064-r1 9146
+MD5 b4fe7fdaaa57f99e5c6468632f42cfed files/udev-070-gcc2.patch 340
 MD5 622f085dff7fb6138f3e2c992d569593 files/udev-start.sh 2460
+MD5 787f5b398376f9e3dbec228681150173 files/udev-stop.sh 2012
+MD5 233bf645719657d9b8265f34a66d20e2 files/udev.conf 1183
+MD5 bbacca394d27aae427e503317b4bebfe files/udev.conf.post_024 1188
+MD5 cfbfb29a9510ce993eecb3d52a0304e8 files/udev.conf.post_046 1186
 MD5 6b567c4f93075da2ae54aa4512173624 files/udev.conf.post_050 1070
-MD5 69f45078068718e7c200b067da9a50e6 files/digest-udev-058 61
 MD5 e6bf08ab2e77d344f5cd03e30e38ba9a files/udev.conf.post_059 730
-MD5 760a25fb7cc243e76c1889076b6ec829 files/digest-udev-070 61
-MD5 c104f1a0b8423e8f410aaa2fb7b6c745 files/digest-udev-045 61
+MD5 77692161d3e1d624773ff10aec89b318 files/udev.hotplug.empty 106
+MD5 f558b841afc8ac6381903fc371331507 files/udev.permissions 3549
+MD5 d8da5df6f7d3c8a80bde23618ae8a797 files/udev.rules 3553
+MD5 6df9e08cd088f74720689640de2ffcd6 files/udev.rules-018 4365
+MD5 3aad55bdfbf9067a104a325e23dda0f4 files/udev.rules-064-r1 9146
 MD5 7f23fbfcba51c7c4b8c29a8c08429996 files/udev.rules.post_012 4184
-MD5 691dace731323137de690d8f677c582f files/digest-udev-060 61
+MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
+MD5 43820d124485c872fbebc855051bbe4a udev-030.ebuild 3525
+MD5 7f59495ae7dd268fe374638d4239079b udev-045.ebuild 3615
+MD5 274d69058f9dc59364249e2baf27705b udev-056.ebuild 4380
+MD5 1a5f0127787af194bf038bc3f2338a6b udev-058.ebuild 5158
+MD5 601369394beab8a50bd959614a33b261 udev-059.ebuild 5779
+MD5 9189ff86ab535dfff8bd6718860b40f2 udev-060.ebuild 5779
+MD5 8853cecf2a4fc6d2306d420947923ad9 udev-062.ebuild 5811
+MD5 448faa811f8b84803d2caef1c229666a udev-063.ebuild 5811
+MD5 3fd5842b6468f5fd506f0cbb9811db9d udev-064-r1.ebuild 6011
+MD5 e2a53fca2d5528fb8fd8830f52833c35 udev-064.ebuild 5876
+MD5 d79f919d887e411742660e92adec76fd udev-065.ebuild 5917
+MD5 6ff199945dba1c1ad03d9cc6335c6d9a udev-066.ebuild 5914
+MD5 428e955c009eebb4173dd0e059327e96 udev-067.ebuild 5914
+MD5 0b0240991924922eab433e39cf1ca953 udev-068-r1.ebuild 6698
+MD5 bd19acabc0ff3c10b792a8ad7e102009 udev-068.ebuild 6646
+MD5 0bd16f42f1bd404a650da235c6eda855 udev-069.ebuild 6648
+MD5 72655a260a70e822b27e42775b83e905 udev-070.ebuild 6731
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDVPSHJrHF4yAQTrARAmzCAKCABli/4DEDuNUo14dJp5BihsksOQCgksny
-gEhbeq6vYwV1SpxGAbXwTGE=
-=dkhm
+iD8DBQFDVZOGgIKl8Uu19MoRAvdbAJ0drgej3FTiSRPqBRuAWz+vnD3LEQCfXny1
+9f+loSBhtq+dRsLV/r1fp80=
+=lY6s
 -----END PGP SIGNATURE-----

diff --git a/sys-fs/udev/files/udev-070-gcc2.patch b/sys-fs/udev/files/udev-070-gcc2.patch
new file mode 100644 (file)
index 0000000..8de0928
--- /dev/null
+++ b/sys-fs/udev/files/udev-070-gcc2.patch
@@ -0,0 +1,22 @@
+So we can compile with gcc-2.x
+
+--- udev_rules.h
++++ udev_rules.h
+@@ -93,7 +93,7 @@
+                    ignore_remove:1;
+ 
+       size_t bufsize;
+-      char buf[];
++      char *buf;
+ };
+ 
+ struct udev_rules {
+--- udevd.h
++++ udevd.h
+@@ -76,5 +76,5 @@
+       char *physdevpath;
+       unsigned int timeout;
+       char *envp[UEVENT_NUM_ENVP+1];
+-      char envbuf[];
++      char *envbuf;
+ };

diff --git a/sys-fs/udev/udev-070.ebuild b/sys-fs/udev/udev-070.ebuild
index 1ee1a3f9b3107b9fd1276678ca5bf2a7ce4e35ea..052f824665d47743369109e7d5f2e27f905503be 100644 (file)
--- a/sys-fs/udev/udev-070.ebuild
+++ b/sys-fs/udev/udev-070.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/sys-fs/udev/udev-070.ebuild,v 1.7 2005/10/18 13:11:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-070.ebuild,v 1.8 2005/10/19 00:27:29 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,8 +19,7 @@ RDEPEND="${DEPEND}
 # We need some changes for devfs type layout
 PROVIDE="virtual/dev-manager"
 
-if use static
-then
+if use static ; then
        USE_KLIBC=true
 else
        USE_KLIBC=false
@@ -38,10 +37,11 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
 
-       cd ${S}
+       cd "${S}"
 
        # patches go here...
        #epatch ${FILESDIR}/${P}-udev_volume_id.patch
+       epatch "${FILESDIR}"/${P}-gcc2.patch
 
        # No need to clutter the logs ...
        sed -ie '/^DEBUG/ c\DEBUG = false' Makefile