Bump, port to EAPI4, update description. Cdemud is now dbus-activated on use, so an init script is no longer needed. (bug #384331)

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

4 files changed, 59 insertions, 6 deletions

diff --git a/app-cdr/cdemud/ChangeLog b/app-cdr/cdemud/ChangeLog
index 4b90c19783fe..3f2829dbe247 100644
--- a/app-cdr/cdemud/ChangeLog
+++ b/app-cdr/cdemud/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/cdemud
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/ChangeLog,v 1.19 2011/11/22 20:34:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/ChangeLog,v 1.20 2011/11/23 10:13:58 tetromino Exp $
+
+*cdemud-1.4.0 (23 Nov 2011)
+
+  23 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> cdemud-1.2.0.ebuild,
+  cdemud-1.3.0.ebuild, +cdemud-1.4.0.ebuild:
+  Bump, port to EAPI4, update description. Cdemud is now dbus-activated on use,
+  so an init script is no longer needed. (bug #384331)
 
   22 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> metadata.xml:
   Add myself as maintainer.
diff --git a/app-cdr/cdemud/cdemud-1.2.0.ebuild b/app-cdr/cdemud/cdemud-1.2.0.ebuild
index b8f36e99b190..e278c1a2c560 100644
--- a/app-cdr/cdemud/cdemud-1.2.0.ebuild
+++ b/app-cdr/cdemud/cdemud-1.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/cdemud-1.2.0.ebuild,v 1.4 2010/02/01 20:27:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/cdemud-1.2.0.ebuild,v 1.5 2011/11/23 10:13:58 tetromino Exp $
 
 EAPI="2"
 
-DESCRIPTION="Daemon of the cdemu cd image mounting suite"
+DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
 HOMEPAGE="http://www.cdemu.org"
 SRC_URI="mirror://sourceforge/cdemu/cdemu-daemon-${PV}.tar.bz2"
 
diff --git a/app-cdr/cdemud/cdemud-1.3.0.ebuild b/app-cdr/cdemud/cdemud-1.3.0.ebuild
index ff5fe81e8aa5..e3d234d24c3d 100644
--- a/app-cdr/cdemud/cdemud-1.3.0.ebuild
+++ b/app-cdr/cdemud/cdemud-1.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/cdemud-1.3.0.ebuild,v 1.3 2011/08/04 15:34:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/cdemud-1.3.0.ebuild,v 1.4 2011/11/23 10:13:58 tetromino Exp $
 
 EAPI="2"
 
-DESCRIPTION="Daemon of the cdemu cd image mounting suite"
+DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
 HOMEPAGE="http://cdemu.org"
 SRC_URI="mirror://sourceforge/cdemu/cdemu-daemon-${PV}.tar.gz"
 
diff --git a/app-cdr/cdemud/cdemud-1.4.0.ebuild b/app-cdr/cdemud/cdemud-1.4.0.ebuild
new file mode 100644
index 000000000000..0adcd921f00f
--- /dev/null
+++ b/app-cdr/cdemud/cdemud-1.4.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/cdemud-1.4.0.ebuild,v 1.1 2011/11/23 10:13:58 tetromino Exp $
+
+EAPI="4"
+
+DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/cdemu-daemon-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pulseaudio"
+
+RDEPEND=">=dev-libs/dbus-glib-0.61
+	>=dev-libs/glib-2.14:2
+	>=dev-libs/libmirage-${PV}
+	>=media-libs/libao-0.8.0[pulseaudio?]
+	sys-apps/dbus
+	>=sys-fs/vhba-20101015
+	!pulseaudio? ( >=media-libs/libao-0.8.0[alsa] )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/cdemu-daemon-${PV}
+
+src_prepare() {
+	if ! use pulseaudio; then
+		sed -e 's:AUDIO_DRIVER=pulse:AUDIO_DRIVER=alsa:' \
+			-i session/cdemu-daemon-session.sh || die "sed failed"
+	fi
+}
+
+pkg_postinst() {
+	elog "You will need to load the vhba module to use cdemu devices:"
+	elog " # modprobe vhba"
+	elog "To automatically load the vhba module at boot time, edit your"
+	elog "/etc/conf.d/modules file."
+
+	if [[ -e "${ROOT}etc/conf.d/cdemud" ]]; then
+		elog
+		elog "${PN} no longer installs an init.d service; instead, it is"
+		elog "automatically activated when needed via dbus."
+		elog "You can therefore remove ${ROOT}etc/conf.d/cdemud"
+	fi
+}