Add a patch to fix compilation with modern 2.6 kernels.

Package-Manager: portage-2.1.1_pre4-r4

5 files changed, 51 insertions, 5 deletions

diff --git a/app-misc/cdctl/ChangeLog b/app-misc/cdctl/ChangeLog
index e8a2267b003b..307f7a8f0812 100644
--- a/app-misc/cdctl/ChangeLog
+++ b/app-misc/cdctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/cdctl
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cdctl/ChangeLog,v 1.8 2006/01/28 12:56:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdctl/ChangeLog,v 1.9 2006/08/08 21:25:25 spock Exp $
+
+  08 Aug 2006; Michał Januszewski <spock@gentoo.org>
+  +files/cdctl-0.15-cdc_ioctls.patch, cdctl-0.15.ebuild:
+  Add a patch to fix compilation with modern 2.6 kernels.
 
   28 Jan 2006; Simon Stelling <blubb@gentoo.org>
   +files/cdctl-0.15-Makefile.in.patch, -files/00_all_Makefile.in.patch.bz2,
diff --git a/app-misc/cdctl/Manifest b/app-misc/cdctl/Manifest
index 93f5ad166a4f..1c677a70981c 100644
--- a/app-misc/cdctl/Manifest
+++ b/app-misc/cdctl/Manifest
@@ -1,4 +1,30 @@
-MD5 504e1de251c83034373cd01f5af51a98 ChangeLog 919
-MD5 ce4817d167b3e00762835ec9d9503372 cdctl-0.15.ebuild 645
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cdctl-0.15-Makefile.in.patch 1437 RMD160 66a9d6c8fc1613e743bd146c483796170b2829ec SHA1 c91ef9472ebe09d284904074fc9cedd2ad4023d8 SHA256 0b326ed6a090da952132fcc6ebda7224f06f4073ad62d1aeec7a771df698fb93
 MD5 2ea3bfb2935b2a417d3fc1d5545a6491 files/cdctl-0.15-Makefile.in.patch 1437
-MD5 c5efe4abf3b6a476cad53ea639ddf263 files/digest-cdctl-0.15 61
+RMD160 66a9d6c8fc1613e743bd146c483796170b2829ec files/cdctl-0.15-Makefile.in.patch 1437
+SHA256 0b326ed6a090da952132fcc6ebda7224f06f4073ad62d1aeec7a771df698fb93 files/cdctl-0.15-Makefile.in.patch 1437
+AUX cdctl-0.15-cdc_ioctls.patch 646 RMD160 10f20d88b92ba69d6c6907fb48180a9e380d19c9 SHA1 dfea7eca1991a1eb01e3fb5a6346ba93c69c7e11 SHA256 949983dc4d763b8d3750ab7e3d58bf98c6549f64e334a9b6772b7df4078f1d03
+MD5 c49e1f7a4b475b9a89403d10b57ea67b files/cdctl-0.15-cdc_ioctls.patch 646
+RMD160 10f20d88b92ba69d6c6907fb48180a9e380d19c9 files/cdctl-0.15-cdc_ioctls.patch 646
+SHA256 949983dc4d763b8d3750ab7e3d58bf98c6549f64e334a9b6772b7df4078f1d03 files/cdctl-0.15-cdc_ioctls.patch 646
+DIST cdctl-0.15.tar.gz 44163 RMD160 d75b4958d92dc143d25f78bf37ca59633bbe30f6 SHA1 58ad63a89bb4f04787713ef52b224d625fc4b94b SHA256 6e9b6cbc6824c5fab7e7a45878605296ad8c62692cac6db468d5e42296d51e39
+EBUILD cdctl-0.15.ebuild 688 RMD160 eb2f132476c72ec18392ceb30863261787f3b149 SHA1 dfedfc410d7bb618bc70ecb05b945c77b66ecf3b SHA256 8f203ee92cef33ea833b6cdf400b82c08bd4b9d733622e58fe430e2b7e72cfc2
+MD5 8a9d183a2b62e7a75dc4243361399fb6 cdctl-0.15.ebuild 688
+RMD160 eb2f132476c72ec18392ceb30863261787f3b149 cdctl-0.15.ebuild 688
+SHA256 8f203ee92cef33ea833b6cdf400b82c08bd4b9d733622e58fe430e2b7e72cfc2 cdctl-0.15.ebuild 688
+MISC ChangeLog 1089 RMD160 554e760281c19f147e1cf5fc0451ee3246f2d961 SHA1 c1a3e71af6e4e95e63f61bdcf43ca60d828b173a SHA256 7ec9220c2a080bb920fd7633d625194d0dccdd12203de9dc7be8af9e48fbf19d
+MD5 6d0620894d1e60082bbf5a0a9fe99a0a ChangeLog 1089
+RMD160 554e760281c19f147e1cf5fc0451ee3246f2d961 ChangeLog 1089
+SHA256 7ec9220c2a080bb920fd7633d625194d0dccdd12203de9dc7be8af9e48fbf19d ChangeLog 1089
+MD5 acca045799d447ee95209624a70a0a1a files/digest-cdctl-0.15 229
+RMD160 4053c3346252f73bb231f5d2117c411b3e68939d files/digest-cdctl-0.15 229
+SHA256 5f46ef4ab71eac54b1b39b0d44f75c029c896a533e5e5a1a63455fc46dede5d1 files/digest-cdctl-0.15 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE2QFUchej4aZK9/cRAtEGAJ459WcLTGDzke/Qkt4WZ3cpuVHDrACgh9+i
+S/bHwFqQBdz5qhFCsOnw2yM=
+=fCGU
+-----END PGP SIGNATURE-----
diff --git a/app-misc/cdctl/cdctl-0.15.ebuild b/app-misc/cdctl/cdctl-0.15.ebuild
index 5a7381444a6f..d80e349ad274 100644
--- a/app-misc/cdctl/cdctl-0.15.ebuild
+++ b/app-misc/cdctl/cdctl-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cdctl/cdctl-0.15.ebuild,v 1.16 2006/01/28 12:56:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdctl/cdctl-0.15.ebuild,v 1.17 2006/08/08 21:25:25 spock Exp $
 
 inherit eutils
 
@@ -19,6 +19,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-Makefile.in.patch
+	epatch ${FILESDIR}/${P}-cdc_ioctls.patch 
 }
 
 src_install() {
diff --git a/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch b/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch
new file mode 100644
index 000000000000..8e440955907b
--- /dev/null
+++ b/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch
@@ -0,0 +1,13 @@
+diff -Naurp cdctl-0.15-orig/cdctl.c cdctl-0.15/cdctl.c
+--- cdctl-0.15-orig/cdctl.c	2006-08-08 23:18:44.000000000 +0200
++++ cdctl-0.15/cdctl.c	2006-08-08 23:19:33.000000000 +0200
+@@ -337,7 +337,9 @@ int do_print_capabilities(int cdrom) {
+ 	printf("Can report media change: %i\n", (ret & CDC_MEDIA_CHANGED)?1:0);
+ 	printf("Can play audio discs   : %i\n", (ret & CDC_PLAY_AUDIO)?1:0);
+ 	printf("Can do a hard reset    : %i\n", (ret & CDC_RESET)?1:0);
++#ifdef CDC_IOCTLS
+ 	printf("Has non-standard ioctls: %i\n", (ret & CDC_IOCTLS)?1:0);
++#endif
+ 	printf("Can report drive status: %i\n", (ret & CDC_DRIVE_STATUS)?1:0);
+ 
+ #ifdef CDROM_CHANGER_NSLOTS
diff --git a/app-misc/cdctl/files/digest-cdctl-0.15 b/app-misc/cdctl/files/digest-cdctl-0.15
index 4a90bff36c55..51bfe698948a 100644
--- a/app-misc/cdctl/files/digest-cdctl-0.15
+++ b/app-misc/cdctl/files/digest-cdctl-0.15
@@ -1 +1,3 @@
 MD5 0c969093d6845021f23f90ec1334d524 cdctl-0.15.tar.gz 44163
+RMD160 d75b4958d92dc143d25f78bf37ca59633bbe30f6 cdctl-0.15.tar.gz 44163
+SHA256 6e9b6cbc6824c5fab7e7a45878605296ad8c62692cac6db468d5e42296d51e39 cdctl-0.15.tar.gz 44163