amd64 stable, bug #296868. Dropped old.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

5 files changed, 8 insertions, 144 deletions

diff --git a/app-cdr/cdemud/ChangeLog b/app-cdr/cdemud/ChangeLog
index 68a6be6a9c44..6841f310d170 100644
--- a/app-cdr/cdemud/ChangeLog
+++ b/app-cdr/cdemud/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdemud
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/ChangeLog,v 1.11 2010/01/16 17:38:10 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/ChangeLog,v 1.12 2010/02/01 20:19:40 pva Exp $
+
+  01 Feb 2010; Peter Volkov <pva@gentoo.org> -cdemud-1.1.0.ebuild,
+  -cdemud-1.1.0-r1.ebuild, -files/cdemu-daemon-1.1.0-fix1.diff,
+  cdemud-1.2.0.ebuild:
+  amd64 stable, bug #296868. Dropped old.
 
   16 Jan 2010; Christian Faulhammer <fauli@gentoo.org> cdemud-1.2.0.ebuild:
   stable x86, bug 296868
diff --git a/app-cdr/cdemud/cdemud-1.1.0-r1.ebuild b/app-cdr/cdemud/cdemud-1.1.0-r1.ebuild
deleted file mode 100644
index 303da15fec76..000000000000
--- a/app-cdr/cdemud/cdemud-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.2 2009/03/14 23:27:13 mr_bones_ 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/cdemud-1.1.0.ebuild b/app-cdr/cdemud/cdemud-1.1.0.ebuild
deleted file mode 100644
index 6c59348ebfe5..000000000000
--- a/app-cdr/cdemud/cdemud-1.1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.2 2008/08/09 17:24:10 vanquirius Exp $
-
-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"
-
-S="${WORKDIR}/cdemu-daemon-${PV}"
-
-DEPEND=">dev-libs/dbus-glib-0.6
-	>=dev-libs/libdaemon-0.10
-	>=dev-libs/libmirage-1.0.0
-	alsa? ( >=media-libs/alsa-lib-1.0.0
-	>=media-libs/libsndfile-1.0.0 )
-	dev-util/unifdef
-	>=media-libs/libao-0.8.0"
-RDEPEND=">dev-libs/dbus-glib-0.6
-	>=dev-libs/libdaemon-0.10
-	>=dev-libs/libmirage-1.1.0
-	alsa? ( >=media-libs/alsa-lib-1.0.0
-	>=media-libs/libsndfile-1.0.0 )
-	>=sys-fs/vhba-1.0.0
-	>=sys-fs/sysfsutils-2.1.0"
-
-src_compile() {
-	local myconf
-
-	myconf="--sysconfdir=/etc $(use_enable alsa)"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS ChangeLog README TODO
-	unifdef "${FILESDIR}/${PN}.conf.d" \
-		-$(use alsa && echo D || echo U)ALSA \
-		>"${T}/${PN}"
-	doconfd "${T}/${PN}"
-	unifdef "${FILESDIR}/${PN}.init.d" \
-		-$(use alsa && echo D || echo U)ALSA \
-		>"${T}/${PN}"
-	doinitd "${T}/${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}.conf"
-	echo
-}
diff --git a/app-cdr/cdemud/cdemud-1.2.0.ebuild b/app-cdr/cdemud/cdemud-1.2.0.ebuild
index 4752bb4ef622..bafb58a5eaa2 100644
--- a/app-cdr/cdemud/cdemud-1.2.0.ebuild
+++ b/app-cdr/cdemud/cdemud-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.2 2010/01/16 17:38:10 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemud/cdemud-1.2.0.ebuild,v 1.3 2010/02/01 20:19:40 pva Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/cdemu/cdemu-daemon-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa pulseaudio"
 
 RDEPEND=">dev-libs/dbus-glib-0.6
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
deleted file mode 100644
index aeabac7cd1f9..000000000000
--- a/app-cdr/cdemud/files/cdemu-daemon-1.1.0-fix1.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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;
- };
- 
-