6 files changed, 89 insertions, 42 deletions
diff --git a/app-cdr/cdemu/ChangeLog b/app-cdr/cdemu/ChangeLog
index 1ab281111cdf..e8b5d415a59e 100644
--- a/app-cdr/cdemu/ChangeLog
+++ b/app-cdr/cdemu/ChangeLog
@@ -1,6 +1,15 @@
 # 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.36 2012/04/20 19:48:02 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.37 2013/01/28 00:22:41 tetromino Exp $
+
+*cdemu-2.0.0 (28 Jan 2013)
+
+  28 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -cdemu-1.4.0.ebuild,
+  cdemu-1.5.0.ebuild, +cdemu-2.0.0.ebuild,
+  +files/cdemu-2.0.0-bash-completion-dir.patch, metadata.xml:
+  Version bump (bug #451746, thanks to Agostino Sarubbo); cdemud was renamed to
+  cdemu-daemon. Update to python-single-r1.eclass and EAPI5. Update license.
+  Drop old.
 
   20 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> -cdemu-1.2.0.ebuild:
   old
diff --git a/app-cdr/cdemu/cdemu-1.4.0.ebuild b/app-cdr/cdemu/cdemu-1.4.0.ebuild
deleted file mode 100644
index 67a5a631160c..000000000000
--- a/app-cdr/cdemu/cdemu-1.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.4.0.ebuild,v 1.2 2012/01/18 12:08:27 ago Exp $
-
-EAPI="4"
-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-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
-}
diff --git a/app-cdr/cdemu/cdemu-1.5.0.ebuild b/app-cdr/cdemu/cdemu-1.5.0.ebuild
index dc9304675b0f..c7ab47357af5 100644
--- a/app-cdr/cdemu/cdemu-1.5.0.ebuild
+++ b/app-cdr/cdemu/cdemu-1.5.0.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5 2012/04/09 12:10:41 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-1.5.0.ebuild,v 1.6 2013/01/28 00:22:41 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
 
 inherit eutils python
 
-DESCRIPTION="Command-line tool for controlling the CDEmu daemon (cdemud)"
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
 HOMEPAGE="http://cdemu.org"
 SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
-IUSE="+cdemud"
+IUSE="+cdemu-daemon"
 
 RDEPEND="dev-python/dbus-python
-	cdemud? ( >=app-cdr/cdemud-1.4.0 )"
+	cdemu-daemon? ( ~app-cdr/cdemu-daemon-${PV} )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.21"
 
diff --git a/app-cdr/cdemu/cdemu-2.0.0.ebuild b/app-cdr/cdemu/cdemu-2.0.0.ebuild
new file mode 100644
index 000000000000..04115e68df7c
--- /dev/null
+++ b/app-cdr/cdemu/cdemu-2.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.0.0.ebuild,v 1.1 2013/01/28 00:22:41 tetromino Exp $
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+PYTHON_COMPAT=( python2_6 python2_7 )
+PLOCALES="de fr no pl sl sv"
+
+inherit cmake-utils eutils fdo-mime l10n python-single-r1
+
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="+cdemu-daemon"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/4 )"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	>=sys-devel/gettext-0.18"
+
+S=${WORKDIR}/cdemu-client-${PV}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	python_fix_shebang src/cdemu
+	epatch "${FILESDIR}/${PN}-2.0.0-bash-completion-dir.patch"
+	# build system doesn't respect LINGUAS :/
+	rm_po() {
+		rm po/$1.po || die
+	}
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+src_configure() {
+	DOCS="AUTHORS README"
+	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch
new file mode 100644
index 000000000000..58ad6d9f24eb
--- /dev/null
+++ b/app-cdr/cdemu/files/cdemu-2.0.0-bash-completion-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
+index 6f33b7c..5261c18 100644
+--- a/cdemu-client/CMakeLists.txt
++++ b/cdemu-client/CMakeLists.txt
+@@ -41,7 +41,7 @@ install (
+ 
+ install (
+     FILES data/cdemu-bashcomp
+-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
++    DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion
+     RENAME cdemu-client
+ )
+ 
diff --git a/app-cdr/cdemu/metadata.xml b/app-cdr/cdemu/metadata.xml
index 769dc0d844e7..3436c7ba1776 100644
--- a/app-cdr/cdemu/metadata.xml
+++ b/app-cdr/cdemu/metadata.xml
@@ -6,6 +6,6 @@
   <name>Alexandre Rostovtsev</name>
 </maintainer>
 <use>
-  <flag name='cdemud'>Pull <pkg>app-cdr/cdemud</pkg> dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.</flag>
+  <flag name='cdemu-daemon'>Pull <pkg>app-cdr/cdemu-daemon</pkg> dependency, useful in chroot environment (bug #315491). Do not disable until you know what you are doing.</flag>
 </use>
 </pkgmetadata>