summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2006-08-08 21:25:25 +0000
committerMichael Januszewski <spock@gentoo.org>2006-08-08 21:25:25 +0000
commit3e0a26eb504ea7867a015c1b2a0de541a581a2f9 (patch)
tree46f82ead4d39b75d79a7922a05d53ba27908d258 /app-misc
parentBump as requested in #143251. (diff)
downloadgentoo-2-3e0a26eb504ea7867a015c1b2a0de541a581a2f9.tar.gz
gentoo-2-3e0a26eb504ea7867a015c1b2a0de541a581a2f9.tar.bz2
gentoo-2-3e0a26eb504ea7867a015c1b2a0de541a581a2f9.zip
Add a patch to fix compilation with modern 2.6 kernels.
(Portage version: 2.1.1_pre4-r4)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/cdctl/ChangeLog6
-rw-r--r--app-misc/cdctl/cdctl-0.15.ebuild3
-rw-r--r--app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch13
-rw-r--r--app-misc/cdctl/files/digest-cdctl-0.152
4 files changed, 22 insertions, 2 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/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