diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2003-12-05 17:08:28 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2003-12-05 17:08:28 +0000 |
| commit | 882b74888f251bf53b142c5b2d6063e7bd3645fb (patch) | |
| tree | 219ed631d57182009126344ead1f174ec425d95e /sys-apps | |
| parent | Whoops, ppc still needs testing. (diff) | |
| download | gentoo-2-882b74888f251bf53b142c5b2d6063e7bd3645fb.tar.gz gentoo-2-882b74888f251bf53b142c5b2d6063e7bd3645fb.tar.bz2 gentoo-2-882b74888f251bf53b142c5b2d6063e7bd3645fb.zip | |
Fixed the package to work with 2.6. kernels. Closed bug #35088.
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/eject/ChangeLog | 15 | ||||
| -rw-r--r-- | sys-apps/eject/Manifest | 24 | ||||
| -rw-r--r-- | sys-apps/eject/files/eject-2.0.12-kernel25-support.patch | 6 | ||||
| -rw-r--r-- | sys-apps/eject/files/eject-2.0.13-kernel25-support.patch | 2 |
4 files changed, 26 insertions, 21 deletions
diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog index 868f3173e9d7..6dff79e978ca 100644 --- a/sys-apps/eject/ChangeLog +++ b/sys-apps/eject/ChangeLog @@ -1,15 +1,20 @@ # ChangeLog for sys-apps/eject # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.15 2003/11/15 02:21:36 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.16 2003/12/05 17:08:19 plasmaroo Exp $ + + 05 Dec 2003; <plasmaroo@gentoo.org> + files/eject-2.0.12-kernel25-support.patch, + files/eject-2.0.13-kernel25-support.patch: + Fixed the patches to work happily with 2.6. kernels; closing bug #35088. 14 Nov 2003; Aron Griffis <agriffis@gentoo.org> eject-2.0.12-r1.ebuild: - Stable on ia64 + Stable on ia64. *eject-2.0.13 (08 Nov 2003) 08 Nov 2003; Martin Holzer <mholzer@gentoo.org> eject-2.0.13.ebuild, files/eject-2.0.13-kernel25-support.patch: - Version bumped. Closes #32953 + Version bumped. Closes bug #32953. 06 Mar 2003; Martin Schlemmer <azarah@gentoo.org> eject-2.0.12-r1.ebuild : Get eject to build with kernel-2.5.x. @@ -35,10 +40,10 @@ *eject-2.0.12 (05 Nov 2002) 21 Feb 2003; Aron Griffis <agriffis@gentoo.org> eject-2.0.12.ebuild : - Mark stable on Alpha + Mark stable on Alpha. 05 Dec 2002; Will Woods <wwoods@gentoo.org> eject-2.0.10.ebuild, eject-2.0.12.ebuild: - added alpha keyword. + Added 'alpha' keyword. 06 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> : Version bump. diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest index 53dabc596881..a29bbc8ae0d9 100644 --- a/sys-apps/eject/Manifest +++ b/sys-apps/eject/Manifest @@ -1,15 +1,15 @@ -MD5 ac6f2a99fba8a90f778b44468d52d7ec eject-2.0.6.ebuild 834 +MD5 63e4cc97a6c4aac5b7e22d861ce71e1e ChangeLog 2642 MD5 0c6e67c7c4c4184a76625fdf35e0f72f eject-2.0.12.ebuild 839 -MD5 b84674293450f0dab61ed0af08dac6bb files/eject-2.0.12-gentoo.security.patch 406 -MD5 404e43cb4c87c1d4e594a5057e6e7e68 files/digest-eject-2.0.6 62 -MD5 0be093fc73fcb931944eecca3111bdd8 files/eject-2.0.13-kernel25-support.patch 508 -MD5 6225e895d76b4a648a529c73d72e08ac files/eject-2.0.12-kernel25-support.patch 534 -MD5 56bca47a22682dc0a0ad2919e80fde16 files/digest-eject-2.0.10 63 -MD5 82c97e826738221130b24eebca6fbb65 files/digest-eject-2.0.12 63 -MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13 63 -MD5 82c97e826738221130b24eebca6fbb65 files/digest-eject-2.0.12-r1 63 -MD5 04fccbbd90534a83ca43b6c510a2daff eject-2.0.13.ebuild 1089 MD5 4abbe18bd8824879aed713d37f9b5a27 eject-2.0.10.ebuild 944 -MD5 112ee800bc17499c7880055261b1c49e ChangeLog 2428 -MD5 b458954abf1107a3e08d9370f1b47b29 eject-2.0.12-r1.ebuild 1133 +MD5 ac6f2a99fba8a90f778b44468d52d7ec eject-2.0.6.ebuild 834 MD5 e6543624c262cae90cc830cde90ad3ae metadata.xml 165 +MD5 b458954abf1107a3e08d9370f1b47b29 eject-2.0.12-r1.ebuild 1133 +MD5 04fccbbd90534a83ca43b6c510a2daff eject-2.0.13.ebuild 1089 +MD5 56bca47a22682dc0a0ad2919e80fde16 files/digest-eject-2.0.10 63 +MD5 82c97e826738221130b24eebca6fbb65 files/digest-eject-2.0.12-r1 63 +MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13 63 +MD5 b84674293450f0dab61ed0af08dac6bb files/eject-2.0.12-gentoo.security.patch 406 +MD5 2ea43f67de2a8c93ca5594396045248c files/eject-2.0.12-kernel25-support.patch 447 +MD5 82c97e826738221130b24eebca6fbb65 files/digest-eject-2.0.12 63 +MD5 404e43cb4c87c1d4e594a5057e6e7e68 files/digest-eject-2.0.6 62 +MD5 c948ce559d97f8710824e40ffffb606e files/eject-2.0.13-kernel25-support.patch 447 diff --git a/sys-apps/eject/files/eject-2.0.12-kernel25-support.patch b/sys-apps/eject/files/eject-2.0.12-kernel25-support.patch index f443260f68fb..71c1868c6250 100644 --- a/sys-apps/eject/files/eject-2.0.12-kernel25-support.patch +++ b/sys-apps/eject/files/eject-2.0.12-kernel25-support.patch @@ -1,11 +1,11 @@ ---- eject-2.0.12/eject.c.orig 2003-03-06 22:38:27.000000000 +0200 -+++ eject-2.0.12/eject.c 2003-03-06 22:41:07.000000000 +0200 +--- eject.c.orig 2002-12-09 22:28:08.000000000 +0000 ++++ eject.c 2003-11-08 17:06:43.000000000 +0000 @@ -56,7 +56,13 @@ #include <sys/ioctl.h> #include <sys/wait.h> #include <sys/mtio.h> -#include <linux/types.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) /* 2.5.x breaks things again */ ++#ifndef __KERNEL__ +# define __KERNEL__ +# include <linux/types.h> +# undef __KERNEL__ diff --git a/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch b/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch index 4a161242cb2b..7cafe9e51759 100644 --- a/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch +++ b/sys-apps/eject/files/eject-2.0.13-kernel25-support.patch @@ -5,7 +5,7 @@ #include <sys/wait.h> #include <sys/mtio.h> -#include <linux/types.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) /* 2.5.x breaks things again */ ++#ifndef __KERNEL__ +# define __KERNEL__ +# include <linux/types.h> +# undef __KERNEL__ |