Version bump, adds image writing (bug #518590, thanks to Rafał Mużyło). Add REQUIRED_USE (bug #521834, thanks to Karl Lindén). Drop old.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

4 files changed, 46 insertions, 17 deletions

diff --git a/app-cdr/cdemu/ChangeLog b/app-cdr/cdemu/ChangeLog
index 85fac7d6c07d..5ea1360d3564 100644
--- a/app-cdr/cdemu/ChangeLog
+++ b/app-cdr/cdemu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdemu
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.48 2014/01/26 11:38:06 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/ChangeLog,v 1.49 2015/02/21 22:55:37 tetromino Exp $
+
+*cdemu-3.0.0 (21 Feb 2015)
+
+  21 Feb 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cdemu-2.1.0-r2.ebuild, cdemu-2.1.1.ebuild, +cdemu-3.0.0.ebuild,
+  +files/cdemu-3.0.0-bash-completion-dir.patch:
+  Version bump, adds image writing (bug #518590, thanks to Rafał Mużyło).
+  Add REQUIRED_USE (bug #521834, thanks to Karl Lindén). Drop old.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> cdemu-2.1.1.ebuild:
   Stable for x86, wrt bug #494802
diff --git a/app-cdr/cdemu/cdemu-2.1.1.ebuild b/app-cdr/cdemu/cdemu-2.1.1.ebuild
index 24546eaecd7e..4bb13a6626bb 100644
--- a/app-cdr/cdemu/cdemu-2.1.1.ebuild
+++ b/app-cdr/cdemu/cdemu-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.3 2014/01/26 11:38:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.4 2015/02/21 22:55:37 tetromino Exp $
 
 EAPI="5"
 
@@ -18,6 +18,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
 IUSE="+cdemu-daemon"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild b/app-cdr/cdemu/cdemu-3.0.0.ebuild
index b7af325fafff..5e9aca33e8e3 100644
--- a/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild
+++ b/app-cdr/cdemu/cdemu-3.0.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.0-r2.ebuild,v 1.3 2013/07/20 11:11:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-3.0.0.ebuild,v 1.1 2015/02/21 22:55:37 tetromino Exp $
 
 EAPI="5"
 
 CMAKE_MIN_VERSION="2.8.5"
-PYTHON_COMPAT=( python2_6 python2_7 )
-PLOCALES="de fr no pl sl sv"
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="no sl sv"
 
 inherit bash-completion-r1 cmake-utils eutils fdo-mime l10n python-single-r1
 
@@ -16,12 +16,13 @@ SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="+cdemu-daemon"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	cdemu-daemon? ( app-cdr/cdemu-daemon:0/5 )"
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
 DEPEND="${RDEPEND}
 	dev-util/desktop-file-utils
 	>=dev-util/intltool-0.21
@@ -35,13 +36,7 @@ pkg_setup() {
 
 src_prepare() {
 	python_fix_shebang src/cdemu
-	epatch "${FILESDIR}/${PN}-2.1.0-bash-completion-dir.patch"
-	# build system doesn't respect LINGUAS :/
-	l10n_find_plocales_changes po "" ".po"
-	rm_po() {
-		rm po/$1.po || die
-	}
-	l10n_for_each_disabled_locale_do rm_po
+	epatch "${FILESDIR}/${PN}-3.0.0-bash-completion-dir.patch"
 }
 
 src_configure() {
@@ -53,6 +48,17 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	# Build system doesn't respect LINGUAS, and changing list of installed
+	# translations requires error-prone editing of CMakeLists.txt
+	rm_po() {
+		rm -r "${ED}"/usr/share/locale/$1 || die
+		ls "${ED}"/usr/share/locale/* &> /dev/null || rmdir "${ED}"/usr/share/locale || die
+	}
+	l10n_for_each_disabled_locale_do rm_po
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 }
diff --git a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
new file mode 100644
index 000000000000..54d11dab4d1b
--- /dev/null
+++ b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
@@ -0,0 +1,14 @@
+diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
+index 99b595e..e4f9b6e 100644
+--- a/cdemu-client/CMakeLists.txt
++++ b/cdemu-client/CMakeLists.txt
+@@ -39,7 +39,8 @@ install (
+ 
+ install (
+     FILES data/cdemu-bash-completion.sh
+-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
++    DESTINATION ${GENTOO_BASHCOMPDIR}
++    RENAME cdemu
+ )
+ 
+ install (