4 files changed, 73 insertions, 49 deletions
diff --git a/app-cdr/cdemu/ChangeLog b/app-cdr/cdemu/ChangeLog
index 867f05904518..82cad1a21cc6 100644
--- a/app-cdr/cdemu/ChangeLog
+++ b/app-cdr/cdemu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/cdemu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.30 2012/01/18 12:08:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.31 2012/01/22 00:30:41 tetromino Exp $
+
+*cdemu-1.5.0 (22 Jan 2012)
+
+  22 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -cdemu-1.3.0.ebuild,
+  +cdemu-1.5.0.ebuild:
+  Bump, now with color, bash completion, and raw CSS-encrypted DVD image
+  support (see man page). Drop old.
 
   18 Jan 2012; Agostino Sarubbo <ago@gentoo.org> cdemu-1.4.0.ebuild:
   Stable for amd64, wrt bug #397709
diff --git a/app-cdr/cdemu/cdemu-1.3.0.ebuild b/app-cdr/cdemu/cdemu-1.3.0.ebuild
deleted file mode 100644
index af4f70df439e..000000000000
--- a/app-cdr/cdemu/cdemu-1.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-1.3.0.ebuild,v 1.4 2011/12/31 21:22:20 tetromino Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Command-line tool for controlling the CDEmu daemon (cdemud)"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cdemud"
-
-RDEPEND="dev-python/dbus-python
-	cdemud? ( ~app-cdr/cdemud-${PV} )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# disable compilation of python modules
-	echo '#!/bin/sh' > py-compile || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc AUTHORS ChangeLog README
-}
-
-pkg_postinst() {
-	python_mod_optimize cdemu
-	python_need_rebuild
-}
-
-pkg_postrm() {
-	python_mod_cleanup cdemu
-}
diff --git a/app-cdr/cdemu/cdemu-1.5.0.ebuild b/app-cdr/cdemu/cdemu-1.5.0.ebuild
new file mode 100644
index 000000000000..9f80900ce9a8
--- /dev/null
+++ b/app-cdr/cdemu/cdemu-1.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-1.5.0.ebuild,v 1.1 2012/01/22 00:30:41 tetromino Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit eutils python
+
+DESCRIPTION="Command-line tool for controlling the CDEmu daemon (cdemud)"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cdemud"
+
+RDEPEND="dev-python/dbus-python
+	cdemud? ( >=app-cdr/cdemud-1.4.0 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.21"
+
+S=${WORKDIR}/cdemu-client-${PV}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 src
+	# 
+	epatch "${FILESDIR}/${P}-man-paragraph.patch"
+}
+
+src_install() {
+	# Don't install into /etc/bash_completion.d/
+	MAKEOPTS="${MAKEOPTS} bashcompdir=/usr/share/bash-completion" default
+	mv "${ED}"/usr/share/bash-completion/cdemu{-bashcomp,} || die
+}
diff --git a/app-cdr/cdemu/files/cdemu-1.5.0-man-paragraph.patch b/app-cdr/cdemu/files/cdemu-1.5.0-man-paragraph.patch
new file mode 100644
index 000000000000..559fcb9e9be0
--- /dev/null
+++ b/app-cdr/cdemu/files/cdemu-1.5.0-man-paragraph.patch
@@ -0,0 +1,24 @@
+From ead7336eac14a4dc8f8bce842a13d59b806aa934 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 21 Jan 2012 17:02:42 -0500
+Subject: [PATCH] cdemu-client: missing paragraph break in man page
+
+---
+ cdemu-client/man/cdemu.1 |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/cdemu-client/man/cdemu.1 b/cdemu-client/man/cdemu.1
+index 1c5dfdf..31fcb5a 100644
+--- a/cdemu-client/man/cdemu.1
++++ b/cdemu-client/man/cdemu.1
+@@ -57,6 +57,7 @@ the client will prompt for it using standard input without echo.
+ Allows an encoding for text-based image format (such as CUE) to be specified. This
+ might be needed if the image descriptor file contains non-ASCII characters and does
+ not use Unicode.
++.TP
+ .B --dvd-report-css <true/false>
+ Mark the DVD image as CSS-encrypted. This influences the generation of fake
+ Disc Structure 0x01, and as such works only with images of DVD videos that do
+-- 
+1.7.8.4
+