Added upstream fix1.diff, fixing dependencies (using EAPI=2), ebuild cleanup, updated conf.d/init.d scripts (bugs #255402, #238431, #233904).

(Portage version: 2.1.6.7/cvs/Linux x86_64)

5 files changed, 121 insertions, 2 deletions

diff --git a/app-cdr/cdemud/ChangeLog b/app-cdr/cdemud/ChangeLog
index c45ce827e960..b08b1a5063c0 100644
--- a/app-cdr/cdemud/ChangeLog
+++ b/app-cdr/cdemud/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdemud
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/ChangeLog,v 1.6 2008/08/22 22:08:40 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/ChangeLog,v 1.7 2009/03/12 08:06:39 dev-zero Exp $
+
+*cdemud-1.1.0-r1 (12 Mar 2009)
+
+  12 Mar 2009; Tiziano Müller <dev-zero@gentoo.org>
+  +files/cdemud.conf.d-1.1.0, +files/cdemud.init.d-1.1.0,
+  +files/cdemu-daemon-1.1.0-fix1.diff, +cdemud-1.1.0-r1.ebuild:
+  Added upstream fix1.diff, fixing dependencies (using EAPI=2), ebuild
+  cleanup, updated conf.d/init.d scripts (bugs #255402, #238431, #233904).
 
   22 Aug 2008; Markus Meier <maekke@gentoo.org> cdemud-1.0.0.ebuild:
   amd64 stable, bug #232566
diff --git a/app-cdr/cdemud/cdemud-1.1.0-r1.ebuild b/app-cdr/cdemud/cdemud-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..de5be464a6dc
--- /dev/null
+++ b/app-cdr/cdemud/cdemud-1.1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/cdemud-1.1.0-r1.ebuild,v 1.1 2009/03/12 08:06:39 dev-zero Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Daemon of the cdemu cd image mounting suite"
+HOMEPAGE="http://www.cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/cdemu-daemon-${PV}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa pulseaudio"
+
+S="${WORKDIR}/cdemu-daemon-${PV}"
+
+RDEPEND=">dev-libs/dbus-glib-0.6
+	>=dev-libs/libdaemon-0.10
+	>=dev-libs/libmirage-1.1.1
+	media-libs/libao[alsa?,pulseaudio?]
+	>=sys-fs/vhba-1.0.0
+	>=sys-fs/sysfsutils-2.1.0"
+DEPEND="${RDEPEND}"
+
+
+src_prepare() {
+	epatch "${FILESDIR}/cdemu-daemon-${PV}-fix1.diff"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README
+
+	newconfd "${FILESDIR}/${PN}.conf.d-${PV}" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.d-${PV}" ${PN}
+}
+
+pkg_postinst() {
+	elog "Either cdemu group users can start"
+	elog "their own daemons or you can start"
+	elog "a systembus style daemon, adding"
+	elog "${PN} to the default runlevel by"
+	elog "	# rc-update add ${PN} default"
+	elog "as root. Systembus style daemons can be configured"
+	elog "in /etc/conf.d/{PN}"
+}
diff --git a/app-cdr/cdemud/files/cdemu-daemon-1.1.0-fix1.diff b/app-cdr/cdemud/files/cdemu-daemon-1.1.0-fix1.diff
new file mode 100644
index 000000000000..aeabac7cd1f9
--- /dev/null
+++ b/app-cdr/cdemud/files/cdemu-daemon-1.1.0-fix1.diff
@@ -0,0 +1,30 @@
+--- trunk/cdemu-daemon/src/cdemud-daemon.c	2008/07/25 20:39:19	406
++++ trunk/cdemu-daemon/src/cdemud-daemon.c	2008/07/25 20:39:47	407
+@@ -30,19 +30,19 @@
+ #define BUF_SIZE (512 * (MAX_SECTORS + OTHER_SECTORS))
+ 
+ struct vhba_request {
+-    __u32 tag;
+-    __u32 lun;
++    guint32 tag;
++    guint32 lun;
+ #define MAX_COMMAND_SIZE       16
+ 
+-    __u8 cdb[MAX_COMMAND_SIZE];
+-    __u8 cdb_len;
+-    __u32 data_len;
++    guint8 cdb[MAX_COMMAND_SIZE];
++    guint8 cdb_len;
++    guint32 data_len;
+ };
+ 
+ struct vhba_response {
+-    __u32 tag;
+-    __u32 status;
+-    __u32 data_len;
++    guint32 tag;
++    guint32 status;
++    guint32 data_len;
+ };
+ 
+ 
diff --git a/app-cdr/cdemud/files/cdemud.conf.d-1.1.0 b/app-cdr/cdemud/files/cdemud.conf.d-1.1.0
new file mode 100644
index 000000000000..02f0729f6e71
--- /dev/null
+++ b/app-cdr/cdemud/files/cdemud.conf.d-1.1.0
@@ -0,0 +1,9 @@
+# Config file for /etc/init.d/cdemu-daemon
+
+CDEMUD_DEVICES="1"
+
+# You can use all backends libao has been built with.
+# This includes for example: (<audio system> -> <driver name>)
+#   pulseaudio -> pulse
+#   alsa -> alsa
+CDEMUD_AUDIO_DRIVER="null"
diff --git a/app-cdr/cdemud/files/cdemud.init.d-1.1.0 b/app-cdr/cdemud/files/cdemud.init.d-1.1.0
new file mode 100644
index 000000000000..7ce4ff538138
--- /dev/null
+++ b/app-cdr/cdemud/files/cdemud.init.d-1.1.0
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/files/cdemud.init.d-1.1.0,v 1.1 2009/03/12 08:06:39 dev-zero Exp $
+
+depend() {
+	need dbus
+	[ "${CDEMUD_AUDIO_DRIVER}" == alsa ] && need alsasound
+}
+
+start() {
+	ebegin "Loading CDemu userspace daemon"
+
+	start-stop-daemon --quiet --start \
+		--exec /usr/bin/cdemud -- \
+		-s -d -c /dev/vhba_ctl -n ${CDEMUD_DEVICES:-1} -a ${CDEMUD_AUDIO_DRIVER:null}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping CDemu userspace daemon"
+	/usr/bin/cdemud -k; status=$?
+	eend "${status}"
+}