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.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

7 files changed, 109 insertions, 47 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/Manifest b/app-cdr/cdemu/Manifest
index 7f629e402c34..667b074124d0 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,7 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cdemu-1.5.0-man-paragraph.patch 952 SHA256 7b533de5f4a198a15bfe9908057baa8f02952be5e29dd2ceb9a5b9d690e70236 SHA512 0d9ab97c97a3dd93e7b7bc1f684f0c1c263b4e61e92ce8beb2e97e9dda16f18b5107d58660605172d9d521c9f2789f039604bb33e9e75baf0ed654cc17ce5558 WHIRLPOOL 4476a93929812b99863124a0bad6f9c5edde076760c1784e5310a4cbd9c6298e0c0a66710d71003cc26d7ac3c01742887b5ae0692c92a0eb5e457187a6b0b5bd
-DIST cdemu-client-1.4.0.tar.gz 119584 SHA256 d3223c9410217f45cd1df25a85cf3dc3cf361410e31911840efc79c729202ed2 SHA512 20da8d801bcd82f34e6ddfbee873f2e32c1f836777961dec01b09aaa6932e257cc0f27d4b7f0e0b8be5f5e90bb13d0f62f654faf3d4cf668fedb381c53a3d5cc WHIRLPOOL 597ea50cd2707491f9d73c1890d2f24213a413e3e8600f165683b1624b667bb860e1396a6c6356090a41f2ee1920470823fa6ac3028a16b75ecd6970a0909ad4
+AUX cdemu-2.0.0-bash-completion-dir.patch 392 SHA256 507efb0d806f15b398d9c9473beedf7063b3faa8a453e2eb52384d353f40ccbc SHA512 c508bc0b7a4f6af34d17907938fc769f523e2cb9f8455d038ffcc29b046f489fbff0be0ba1ab30e374f48f682647790a5a85d0bc8ca6f0348476e47cf4e8883c WHIRLPOOL 024a54cfcc10cb4b72e747164391eb4ba46da5f38cb986a3781eba19ab35d8175b634dfe26ddf0cfdc9ac23dc04c9ef9ed29d50b0f4714934cb0d3b419d90971
 DIST cdemu-client-1.5.0.tar.bz2 97987 SHA256 d4d7e3d232f799830c1c480d69f8789468552602e2737b0b0207f4d449095f99 SHA512 42e43e3a0fb240107c2500d1d4b3f9ed1e1df352c768e6b9ecb019a03f561a4a086df0ae16c744cb22e86db4ed1d3aed1a4171c4e881b89920b9897e6e41cdfd WHIRLPOOL ddf8908f2e80971206d8402fcd1ad0884ffe74314eecefa445359907b7fc94d08ea251250ea825cbc0e589eb691439d3a50e680b2c901e0604966806b011aeab
-EBUILD cdemu-1.4.0.ebuild 750 SHA256 b0bfc3efd10702acbf84ff40087b7b704a576c5779aae58816365a673a38c33e SHA512 f9c47c18c369a11651c6bb4df37c195d9eafb1f26ecf090caaeb933b7e442a52663c845d5cbd24c8251ad34bb2dc687d2060f83203569f4cc15e1dfbcddf9601 WHIRLPOOL 8421bcc2203e8df743af6845c4853828a7781b5fa1ad81617ec0812b8ee59bf32f165652b9125bba92e1adb6fe78a56d6fe56810a315aa5fa21545a24df3d5a6
-EBUILD cdemu-1.5.0.ebuild 1099 SHA256 9699ddf13489744698c6f189d789800806168b56a5cb7f75cf0abfc45e5efdc8 SHA512 4e4e0b1bc801523358d5be506ab561fdf588a6469d865f917ad928db3c96f2819c7efcdaf2a4118ae15c2a3b94d188d90d959c790c51ce0ed40ed7a8284e1bae WHIRLPOOL 0b0f8f89edcd02e83e4f9486757653d6e2ef41d97bee6fcbbd93c7a0b1ce152765a8015e5d9412eab55ab01d34111fac16b8be97fbdd10b65d7a172d634a5316
-MISC ChangeLog 5358 SHA256 237bc58528284a2ced8ba03e10afe1d0fb2ed7e2f0c24fb1a397a4eebb8edd9c SHA512 070f93a73a8a84d0d90bf20737e03fff73f4cceed1f568e2eb153d9cdedb445a1461b891b18572abbeb94bccf99de2bf8e9744cb952037725f2665fb78dfefa5 WHIRLPOOL fd2826db79d260b3eecbe6df9e15159592c49576ab7c1a4e0ec6c661ee7ffd98fcf6eae59ca3bdf75cdf0af696f162c47907abd81751404ebd02c29a13aad467
-MISC metadata.xml 419 SHA256 9eb3f5eed30c61f51d2d6a24fcb6b30935dd358df4d329a4972726b35f04f11b SHA512 53d5d6ec048f96193c5cdddf797ce78a50d4b89be28d51f593ba7ff40a8a03bb893ee54c59267c0f9590fdc2e7f0fdfc47d6610535d9934e16f18ddefa677025 WHIRLPOOL 267e640fffe03ab8e6450459aff7c40af8f6bbd844e5c55f57a3bb562457788e987236f888ea444949d0dbd106557890d152a55b065c195c689b77966a31705e
+DIST cdemu-client-2.0.0.tar.bz2 28346 SHA256 a049df0d97b46bedf8604123c9ac6207f6b506855da6c379550513cb40e45603 SHA512 c510087a3c2a343beb99f4a02c9db0407ee4a27fb640af5343fac081aab10afa616ce3477fc2baf7aefbcde12b2de0c80e330be33e82ed7f60cf6eb3b03f854f WHIRLPOOL 1e3843d3ce6dab95726f563ea385e9a091055585f537b57942b2e51a547b342369c7577bf55f63a75fa378f95300c1eeaf8c00be0a42a04384654a13bff42fae
+EBUILD cdemu-1.5.0.ebuild 1107 SHA256 89369a4c0f4d02d03058dd4192a43aed159ed77d36f9739c69c3cbdf524fec97 SHA512 37588694f4dae28bfa8f467c841d372f3a7e2218283af5d77b9e8ae99cce4ea7386c6c10af1fd42d3ad65fdda53d94e3ac24422a32531df63e0b693dd8d11d6d WHIRLPOOL 524b6251daff63f63ffe234019548aa391db531cba8c66916ab8ed22f75a11249691b3719e65f8db6f2caee4f2332f89b4edaf443c68741a455166b06ad9e3f4
+EBUILD cdemu-2.0.0.ebuild 1354 SHA256 6c5ac37437d18df239eaf3e082b4b7457dcf113f6f26261b403f50d75bbef4be SHA512 b0109eb52cd417eb930a2ca2b84c1bccfdf305acf34ad2aad7f7d84889588d4439886ee55e4e39e7b8d965c5de49a1fa2bfec1305e55b43a7ef75aa988583547 WHIRLPOOL ecb5e4a4839c7b46ba7af2cdfffa0a866839ecd086811047280a35efd24788dcecefa93c0de4f2ad5b3754d94d0e560d2300f333f3a418d967acdf9261e4050c
+MISC ChangeLog 5741 SHA256 a5a6abdf50fc45dd10d2af0e93fdb5afeb3bd3ee081b90e203d350e05d56033c SHA512 49bf3247e2f54bcb36f4937fa30a0428f593479fc4506c3fba1ca1c64af521f8bd8f9e93019c97c9c531c0482889f5351df48e397980bacf272b655fb5264d50 WHIRLPOOL d5000adbe89c9bfb499c169d8f598f449aa5f381586cbfb793ae05f90c0d26e3bfc8aaafd84ec18eea1e3e7820cf8ebefcd420da98ed0cddb1d497a61fe91ae0
+MISC metadata.xml 431 SHA256 48171f5b68cda683ad7bad2680218da9430ed068dbe441d86d5639dd9c9c3c07 SHA512 c62007c25bd76a0a5673e29e1c391d48c6d6f83e84a6fa30fc6bc7fac2d1924139fbd463f0025779bec87d0359cd28dcdb4d6df2778d5f0035b7811845da2900 WHIRLPOOL d86cb4f30b390600d7eae7c82783961a1e22d33d9459a99a7afe5eb49c42797b30a19b9a054f7f0b7cb415f427c6973b73fcfbc5e571af84d07aa06e8234fe82
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRBcTSAAoJEJ0WA1zPCt1h3h8IALV7oMTEIxvihXQ6wdarSIl6
+0oRqRuFqpR0YT+9HO001pb8CMNZc1E6j4VEw4/Tkb5+Y4fbi5BDE9vpXuuA7z7wK
+cCStJTu+Hxb66h58+NC3hQSowQByPFTYN9YnmZFroIVjVmTs3ft22l78fbFTpYQU
+ZxU73PqBYGUtpJfbnFlkDKt8+Q83urvIXGgs/9W+h7M7r9vDcprPO5JNnalNgCpm
+uI6r+HWmBJoaJYuSo6BOM1sV0msLXC0g2j+G4qOLQ84kC13OSbJpPJCIrrSomjeO
+GohTJ4IOxpvaeGviUITyYqQkowNAH2nvOZWgKBbjAKQqpjrh3CwKo829EQaC4iU=
+=q9MG
+-----END PGP SIGNATURE-----
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>