Version bump, adds support for non-blocking I/O and device addition/removal (bug #472784, thanks to Henrik Stokseth and Rafał Mużyło).

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

4 files changed, 102 insertions, 10 deletions

diff --git a/app-cdr/cdemu-daemon/ChangeLog b/app-cdr/cdemu-daemon/ChangeLog
index 8fbd280d37bb..740810b2f51e 100644
--- a/app-cdr/cdemu-daemon/ChangeLog
+++ b/app-cdr/cdemu-daemon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdemu-daemon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/ChangeLog,v 1.1 2013/01/28 00:22:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/ChangeLog,v 1.2 2013/06/17 04:18:40 tetromino Exp $
+
+*cdemu-daemon-2.1.0 (17 Jun 2013)
+
+  17 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +cdemu-daemon-2.1.0.ebuild,
+  +files/cdemu-daemon-2.1.0-DISABLE_DEPRECATED.patch:
+  Version bump, adds support for non-blocking I/O and device addition/removal
+  (bug #472784, thanks to Henrik Stokseth and Rafał Mużyło).
 
 *cdemu-daemon-2.0.0 (28 Jan 2013)
 *cdemu-daemon-1.5.0 (28 Jan 2013)
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 24cc07d73213..708cb4aa9515 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX cdemu-daemon-2.1.0-DISABLE_DEPRECATED.patch 1479 SHA256 00199cd43d7f887f7d30cb6b821e874a20722359c948d46629e07a57e29575b2 SHA512 84201d2d16a685c82a5942bd83d38fe9826ff3d1a12a18baaf18cee7cf6704ade4dcd7e0209c5e925ce328b9879d770b4ed782fa8f7219efa26ffdd134631bdf WHIRLPOOL 34eda50f34859172883fe5b24a8d01efce5249fa3522dca8400a1ef40799d54a2a326f2d2c5479cf8c4a751b061651a7b5b8f776295688cfd43a4d27017db770
 DIST cdemu-daemon-1.5.0.tar.bz2 133865 SHA256 d0e122c7769ba11b640bb140657d1f31dc827904578437ac1d5aa84dcc88a74f SHA512 bd8a0bc1aafe23422f73832463bcf36003f221595d149b7859594791c0e08c752e2b7b136f228468cb2df0575bdf3a4c24913338e94f549d8b06271e7d75423c WHIRLPOOL 1f15fb77b6dcbce8c26e4bc495ef923a96d3284516dd3adba6da049761af4b7008178583d1c00548787e4e591206c5f33849ae8b2e6ac2e7f1c6f25a694a2b11
 DIST cdemu-daemon-2.0.0.tar.bz2 61590 SHA256 9def5ac371bdc64ed1b7b8fd3dffa9573561deaa7cf4b52c8a2744d852dfc53f SHA512 71daf0c745df2daf4c0344e8c85d146de8c3f68b1f0a8f8f402a1bcfee7a29e32e6c0fb54fac873e2abd2912327eca9a8bbbe3584ba7afc70dd151057575bbd6 WHIRLPOOL 8aa953fcf26570492a5b959e172f9b287c858e0578fd271b269c2884c29324624787ee27e9133827a2734b1c5267e7afb5b14c8d624065d9e6025ee8ebab2012
+DIST cdemu-daemon-2.1.0.tar.bz2 62540 SHA256 8224a5d8d16cbd9a2294e9c7ab544d61059d9870023e48705699af7366846580 SHA512 8e7ab25c64b8567664c4d0c69f26341a2c8fe4cc98faa34b768965097d017f1c361672129b8dd5224b48a02ba7b4623b6a66ca0eb3fd50d5d8446bc758277f82 WHIRLPOOL 8e515fc2aae7d160ed97a164b092db6acee91ae7370cb562a786ce4b7612dbe45f5b28ba196aca92cacab344fa4a68f431b1e6392726307c15a7e4f3a713bdb8
 EBUILD cdemu-daemon-1.5.0.ebuild 1288 SHA256 1927c19fd3af3118fd0aa7e861252c0d0b4674e7db9fa227c3d4c9a5660bfa43 SHA512 9ddeb78f6f095a3e3ae3e625420bc78cc5da875ef094e3db45080628621e9b7234debb49028b8cd962bed4993ab7b7a404a523b7dcf9e5f0fd502ff38da641c1 WHIRLPOOL 3e5e167b192dc3a54695bd19f1e7d72af5f7b7dc1d476f97f7b5f88aa1af4cc709391fea0bbe25d0cdee04da06259a18bfc0504e87f723de589a524fc5c7fcab
 EBUILD cdemu-daemon-2.0.0.ebuild 1509 SHA256 6d8ff594a733d0c1c86687c8e9e2a6cd50e1aae4f2f2f18a2123c0dade66e9e4 SHA512 2fc5cc480fd09c07dbc45bccf223852ef770392715cca64ce846a2b2b83377639314fa4b6b35b2f2326df3dead4e5a70d9dfce6f2240b15431dd04f996a4ae46 WHIRLPOOL 094d6bb918701ca2825f36c63d94c95201ad6894a1ae315cb241f7eb839ca6af333677e00dc9a8f586657e414278588fbe93127afd9bcecdaab8471af68e9d7f
-MISC ChangeLog 4999 SHA256 ac856628847926b6dc8454f6a4149c7f9a3ad9eca7906e4a4faf5ee5b1c0d23c SHA512 1a4fffe8444ffe47086bab858258980f14367f0afea6da46ba72588e9400faa4d5c65195c637604e44ea2dca0dd571b331362620b536cd02dd45a7a0470c4290 WHIRLPOOL 43d48794d775032776e492021e62ff28653de2e8b39d8c896fe70304e0266fca65b9e6372377cd3684525f5457bd20ac40aad654d15f6552adc9920372ddd341
+EBUILD cdemu-daemon-2.1.0.ebuild 1322 SHA256 c1af3e6044b601ae9c911b0771c91216178da5042b455951a01152f8af5715ad SHA512 e71705e9d3d04af6f063927760ef1e21c9b37f08d462567ce7f892a73ef706b02e3548a031b918837e3e5ff31cd9ea27a60fab017623225c13c53e95e89d700f WHIRLPOOL bdec835034d4a7a1f93dad4b8498a874cdaac81aba41a2e81b0e9adae5de3440d39f9742d2f6fa140930509a3219330c45c875ff4001b040f1104a2e4dec83a7
+MISC ChangeLog 5320 SHA256 0f377e53826fe4a97458c8a7073d3e186b96dcb751570fbffe53099e56b7b71a SHA512 73413f0152f06e8fe68a26ec5d6b3985475a1f9feeaccaa5eac0133f50ac227173fb3c425955f7cfdb73898b52204ef1646492f14f4a45305b75f7b10fd6bc4f WHIRLPOOL 4d7476d99382b5338bd586914f08c440985f3c4425d49345877bbea356e92688ce028055bb15e2579ebe3483d5df2211a5351310d9b7a49aa3ddcd476d5936b8
 MISC metadata.xml 240 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477 SHA512 14c9405275f11667ad7e035376fe7e5caf99ac982596621cda18a2f8a99e9a9b2464806be5d016d1a4c2fa794bf8b1400a5cb658a7a874e65d825b8baea69d62 WHIRLPOOL 0e2fbd97c0146322cf226d3086acf3e95dc86d17409f3d350ba2de1b81a2d93b0dc3f370d5c444475e129fa511791ea5b48ca00c47583cedc6ed60ef9e61fae7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRBcSsAAoJEJ0WA1zPCt1hiWAH/iB9Y0QewUO/wiqGyMtt5Fb3
-iRt8XGpTTYQzKVi8lttc9qSTQjLXAgxyL3FL1LgBQaqevPScWiXtU+J46rEm+kKz
-CD7yv68laUl3Y3RyQVieSTmru9erTkUO1FGOsWF/5ikA7fW6IMRZB32xsmNq4IM8
-QQJfJMJtdOnTubc/1cDFO8AeeWMk5gmkecimGG6rUY1Cf3w/jcPxckFYc4DamP7H
-P8FNMLWXo7AmYm5CvN6fgJXftsbF+3inueUvWW7Hy3kcvZ3rx4Ii2LYzp1oCM6E0
-PT7VbEuYb68RI0aYcg+KGVJ4d9nXV4djz6HlvhWfmowJLQInF8HY7qr+3vhynhE=
-=gjnX
+iQEcBAEBCAAGBQJRvo4iAAoJEJ0WA1zPCt1hpAYIALW/NV6XLa8km/iMLxJFwkXe
+EamakHAtYuHEGrkHPEQAJ3hTWdgYlCOqnRgHqG2oaSN3+cSpxrdOM1gBtQBf95iA
+OvQEUlAwfZ28xpnZpGydfWsIWDYhTtefpcUPmYJ2/CASxCb0v1GdPOCKeKfCWJfO
+8L30XtNXTrMKwhY9DWuZqCMwhRrxQXoAvdLzDeiKj7UijWDEJdPm8AUzyi0mNxK+
+Unj9Ps9kRCSw9WI58fC7S7jNDCpCoTHbWsxSiZa2w6O5b1Q1HoE1op5YDWOqT4ku
+4z866j71ajy2K3maRh7NqZ4thJSl9jbQwVz0Y2wz6vZapJagwRBynGdNBfpIFsA=
+=64+0
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-2.1.0.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-2.1.0.ebuild
new file mode 100644
index 000000000000..085613c99c78
--- /dev/null
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-2.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/cdemu-daemon-2.1.0.ebuild,v 1.1 2013/06/17 04:18:40 tetromino Exp $
+
+EAPI="5"
+
+CMAKE_MIN_VERSION="2.8.5"
+
+inherit cmake-utils eutils
+
+DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/5" # subslot = CDEMU_DAEMON_INTERFACE_VERSION in CMakeLists.txt
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.26:2
+	>=dev-libs/libmirage-${PV}:=
+	>=media-libs/libao-0.8.0:=
+	sys-apps/dbus
+	>=sys-fs/vhba-20130607"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	DOCS="AUTHORS README"
+	PATCHES=( "${FILESDIR}/${P}-DISABLE_DEPRECATED.patch" )
+	cmake-utils_src_prepare
+}
+
+pkg_postinst() {
+	elog "You will need to load the vhba module to use cdemu devices:"
+	elog " # modprobe vhba"
+	elog "To automatically load the vhba module at boot time, edit your"
+	elog "/etc/conf.d/modules file."
+
+	if [[ -e "${ROOT}etc/conf.d/cdemud" ]]; then
+		elog
+		elog "${PN} no longer installs an init.d service; instead, it is"
+		elog "automatically activated when needed via dbus."
+		elog "You can therefore remove ${ROOT}etc/conf.d/cdemud"
+	fi
+}
diff --git a/app-cdr/cdemu-daemon/files/cdemu-daemon-2.1.0-DISABLE_DEPRECATED.patch b/app-cdr/cdemu-daemon/files/cdemu-daemon-2.1.0-DISABLE_DEPRECATED.patch
new file mode 100644
index 000000000000..399bb59cbf77
--- /dev/null
+++ b/app-cdr/cdemu-daemon/files/cdemu-daemon-2.1.0-DISABLE_DEPRECATED.patch
@@ -0,0 +1,35 @@
+From 0d9ce2618014c41b5aefce8355af95b0d1119d85 Mon Sep 17 00:00:00 2001
+From: Henrik Stokseth <hstokset@users.sourceforge.net>
+Date: Mon, 10 Jun 2013 03:42:49 +0200
+Subject: [PATCH] All: Stop defining G_DISABLE_DEPRECATED.
+
+Defining G_DISABLE_DEPRECATED is a bad idea. For one it means deprecated
+functions etc. is effectively removed by the preprocessor. This breaks
+compilation on certain setups (read: Launchpad compiler farm), since
+the functions are not declared and therefore you get warnings about
+the calls being implicit. And on setups that compiles the code, the
+resulting code might result in undefined behaviour, in particular on
+64-bit platforms.
+
+Note that on supported compilers such as GCC, you will still get warnings
+about calling deprecated functions without this define in place.
+---
+ cdemu-daemon/CMakeLists.txt   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cdemu-daemon/CMakeLists.txt b/cdemu-daemon/CMakeLists.txt
+index 1320266..11e6b33 100644
+--- a/cdemu-daemon/CMakeLists.txt
++++ b/cdemu-daemon/CMakeLists.txt
+@@ -49,7 +49,7 @@ configure_file (
+ 
+ # Global definitions
+ add_definitions (-std=gnu99) #NOTE: Compilation bugs out on using signals and -std=c99
+-add_definitions (-DHAVE_CONFIG_H -DG_DISABLE_DEPRECATED)
++add_definitions (-DHAVE_CONFIG_H)
+ 
+ if (CMAKE_COMPILER_IS_GNUCC)
+     add_definitions (-Wall -Wextra -Wshadow -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align)
+-- 
+1.8.2.1
+