summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2004-02-29 12:16:32 +0000
committerTim Yamin <plasmaroo@gentoo.org>2004-02-29 12:16:32 +0000
commit5ce9425959f9d6fc0d49459aaf16359d392a1d49 (patch)
tree9ee99322ece70a81b5dc6da23dae85e1ee6966f9 /app-arch
parentUpdate copyright (Manifest recommit) (diff)
downloadgentoo-2-5ce9425959f9d6fc0d49459aaf16359d392a1d49.tar.gz
gentoo-2-5ce9425959f9d6fc0d49459aaf16359d392a1d49.tar.bz2
gentoo-2-5ce9425959f9d6fc0d49459aaf16359d392a1d49.zip
Added compatibility patch for 2.6 headers...
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/arj/ChangeLog6
-rw-r--r--app-arch/arj/arj-3.10.18.ebuild6
-rw-r--r--app-arch/arj/arj-3.10g.ebuild4
-rw-r--r--app-arch/arj/files/arj-3.10.18-2.6.headers.patch13
4 files changed, 23 insertions, 6 deletions
diff --git a/app-arch/arj/ChangeLog b/app-arch/arj/ChangeLog
index d2aa6792d9d6..b067f4f8178f 100644
--- a/app-arch/arj/ChangeLog
+++ b/app-arch/arj/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/arj
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.4 2004/02/25 11:34:57 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.5 2004/02/29 12:16:31 plasmaroo Exp $
+
+ 29 Feb 2004; <plasmaroo@gentoo.org> arj-3.10.18.ebuild,
+ files/arj-3.10.18-2.6.headers.patch:
+ Added patch for compatibility with 2.6 Linux headers; closes bug #42763.
25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> arj-3.10.18.ebuild:
Fix amd64 compilation. Closing #40936.
diff --git a/app-arch/arj/arj-3.10.18.ebuild b/app-arch/arj/arj-3.10.18.ebuild
index 9d7ac9df98f4..6742f6dc55e9 100644
--- a/app-arch/arj/arj-3.10.18.ebuild
+++ b/app-arch/arj/arj-3.10.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.18.ebuild,v 1.2 2004/02/25 11:34:57 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.18.ebuild,v 1.3 2004/02/29 12:16:31 plasmaroo Exp $
inherit gnuconfig
@@ -19,9 +19,9 @@ DEPEND="virtual/glibc"
RESTRICT=nostrip
src_unpack() {
- unpack ${A} ; cd ${S}
-
+ unpack ${A}; cd ${S}
epatch ${FILESDIR}/${P}-fPIC.patch
+ epatch ${FILESDIR}/${P}-2.6.headers.patch
}
src_compile() {
diff --git a/app-arch/arj/arj-3.10g.ebuild b/app-arch/arj/arj-3.10g.ebuild
index 01bb751cf9d4..8980b6e0e064 100644
--- a/app-arch/arj/arj-3.10g.ebuild
+++ b/app-arch/arj/arj-3.10g.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10g.ebuild,v 1.3 2003/09/20 20:33:54 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10g.ebuild,v 1.4 2004/02/29 12:16:31 plasmaroo Exp $
S=${WORKDIR}/${PN}
DESCRIPTION="Utility for opening arj archives."
diff --git a/app-arch/arj/files/arj-3.10.18-2.6.headers.patch b/app-arch/arj/files/arj-3.10.18-2.6.headers.patch
new file mode 100644
index 000000000000..3c4437d7c190
--- /dev/null
+++ b/app-arch/arj/files/arj-3.10.18-2.6.headers.patch
@@ -0,0 +1,13 @@
+--- environ.c 2003-06-27 09:58:04.000000000 +0100
++++ environ.c.plasmaroo 2004-02-29 12:04:33.000000000 +0000
+@@ -56,6 +56,10 @@
+ #if defined(linux)
+ #include <sys/ioctl.h>
+ #include <linux/fs.h>
++ #include <linux/version.h>
++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++ #include <sys/statfs.h>
++ #endif
+ #elif defined(__FreeBSD__)
+ #include <sys/param.h>
+ #include <sys/mount.h>