Version bump; bad sector emulation is now off by default. Remove old.

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

3 files changed, 28 insertions, 35 deletions

diff --git a/app-cdr/cdemu-daemon/ChangeLog b/app-cdr/cdemu-daemon/ChangeLog
index 1765509b9d6f..ec398ffb250c 100644
--- a/app-cdr/cdemu-daemon/ChangeLog
+++ b/app-cdr/cdemu-daemon/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2013/07/20 11:11:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/ChangeLog,v 1.8 2013/10/08 16:52:06 tetromino Exp $
+
+*cdemu-daemon-2.1.1 (08 Oct 2013)
+
+  08 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -cdemu-daemon-2.0.0.ebuild, +cdemu-daemon-2.1.1.ebuild:
+  Version bump; bad sector emulation is now off by default. Remove old.
 
   20 Jul 2013; Agostino Sarubbo <ago@gentoo.org> cdemu-daemon-2.1.0.ebuild:
   Stable for x86, wrt bug #477004
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index cd47a7ac5b2c..5fc026916a1c 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cdemu-daemon-2.1.0-DISABLE_DEPRECATED.patch 1479 SHA256 00199cd43d7f887f7d30cb6b821e874a20722359c948d46629e07a57e29575b2 SHA512 84201d2d16a685c82a5942bd83d38fe9826ff3d1a12a18baaf18cee7cf6704ade4dcd7e0209c5e925ce328b9879d770b4ed782fa8f7219efa26ffdd134631bdf WHIRLPOOL 34eda50f34859172883fe5b24a8d01efce5249fa3522dca8400a1ef40799d54a2a326f2d2c5479cf8c4a751b061651a7b5b8f776295688cfd43a4d27017db770
-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-2.0.0.ebuild 1501 SHA256 b048d0e5d76426f06256a6193ae14b06dcd3777430b27ad8eb079ba106d1eb33 SHA512 2957430929e46b4892ad0ea7d152bd49b37c5705108f629374d2d7054a1629e70afd54d5da2bf4453df471d2bb921cf743245da8c492059faaf4f65e561e492d WHIRLPOOL 8c273040d269491736a7c2fc33ec759feda5c35fe5a8f895ec68cafeb75cf8e8c6d638265a24266f9b8514f23fd06c321cf62c6536653aa2e593d1a450f4ad31
+DIST cdemu-daemon-2.1.1.tar.bz2 62600 SHA256 d26782071184d555b06ad5def7d1c22916cbeb73377328879499b91e1196f36f SHA512 be59bf12e326855ccdfe5cec72a813b7a80dcc2cb408c3f19b9abe66eeb8d092e2755b1ba9f746ac7d3c1b27276ed857947ce1b2509d8cbf07eb1c6663f3536d WHIRLPOOL fd6ad9aa28ae9c821934099a3be271a1fe85db684dcc1ca9b65d499281ce65b27ac63d44c8570309d1fc3fbd486eadb165e15cec285c81bb07b10c709a1f6f42
 EBUILD cdemu-daemon-2.1.0.ebuild 1314 SHA256 7dc41c607f6cf605b818a7bb984f6da118556d8218feceb0eb88e8452acf0e50 SHA512 8a3e82fe07c12d769035bbf2d52e6c6afa67bca3aba5b84f77fe5a9c0832d175aa6e1daec1ec731646333f0ce2726d532462e81e90e3a3e03ba016ccdbe599c3 WHIRLPOOL 83d3690b9bda5188222d5e46f1bc1f681a2583d56bdb063a59b034131ea0b6e081b4c235b5c93a11cd14751b6e4a0a9d32e45ea7ed7578189dc73e2796cd03e2
-MISC ChangeLog 5865 SHA256 67da4de7874d59950bb94a507c74bb4896627718cd647f170a0b2dbd6ee2eb7d SHA512 54d757095a9e4db1b939e699aef42dc6094a70c82eb714fe90e2afeece055198c8aa50ebdd181c80b7815a051fa95222097e4821b2e3c4be0ab8af04cde62f37 WHIRLPOOL 66cd6404fbef76f8e6acb67d3e349d82fdfe02a35cb142f6c16f424737d5bd9e6c9940b9dc01fca4ab6eaf5e539e1b24a496441a6dff891efa4450e8e3ad9132
+EBUILD cdemu-daemon-2.1.1.ebuild 1265 SHA256 1ad0f529c64151147ee01d9d8195c2e649a1fc2d9f5e36749778a8ce3d75de5f SHA512 69cf800ea22b9473d2100579310368035d28302e780f2fe20bbf9224c2bbe71b7d9f80b777e6eb31e7305e9d993531f17dc8033b6222f6798203694ace4a263d WHIRLPOOL 94d6e7d688ba47818245bf97df712bf9d71110ed0889784bd882d5719752aed02c651ec95818c7fdcf091f214f912620acd9150487bfb50cd340ea15e5619a95
+MISC ChangeLog 6096 SHA256 c248a80343e67ef54db16e64d7af1ba7dbad2e30dcdc92000ee68c911a2d55ee SHA512 12b131bbe46b28e98e2eeb85f7268af371bf75df8372a9b93cba6ba9dedfbe935d7648b0e6ecb00169b286036ba8b8f43dd53642e62dc70a8aa3fdc35c100ef3 WHIRLPOOL 07674d8d98df8f0c92d7a57d1d378724375a257dc2b4e1b69483d6fdf4f17a286740d684d9fdcf7362905346b2d0cb05267bb350b86eb12d308ae50d9c1686ce
 MISC metadata.xml 240 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477 SHA512 14c9405275f11667ad7e035376fe7e5caf99ac982596621cda18a2f8a99e9a9b2464806be5d016d1a4c2fa794bf8b1400a5cb658a7a874e65d825b8baea69d62 WHIRLPOOL 0e2fbd97c0146322cf226d3086acf3e95dc86d17409f3d350ba2de1b81a2d93b0dc3f370d5c444475e129fa511791ea5b48ca00c47583cedc6ed60ef9e61fae7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR6nBMAAoJELp701BxlEWfy5IP/23/Pz5GXnuXcrhDcmg7H8Ll
-fNJGId0bNWB1RcWhBb8C0Qk2danMulYuQFKai9EfFh2OyZB9zaKiH6lvlcmpZjmb
-cJ6y/WDsXdENO9BfXSTGPvmjz4apxo2oBnBEOcbe25+bV5MUQ+kBfrQxVXxQz6Eu
-cF7RbH/9HgXqFNajdW0ieaL3XAyxGe2d/ufNtyLJdE/MP+OszWiJqpd+26K75T4j
-cJSdxOzXWluY2EtFuI72+ZNXY/h60fT6mByKLFU1wpDCUKUdTZGuzb7LQkTksSpg
-52iPyzqMfncYM6jTy6g0P0vBDrxi0Rf6X7C39MivaVuXM0pPcKDCaM7D8RHx8zSj
-yVy6cv+zzQrwxUnkXRPI1Qs9dMGEDAILukmVgbvA+hiNjl/lskNL4XcmffQKluNI
-9gzvqtx9P4SQbtsdK+yWtn3TrAADF/fvt7wdEbNIF+LcqU7YXpltaNWJDFcXC9gj
-PgT7qKyQGpJmPJ8w0MicRCm6k1Ga4e6dQeaoWJHAQM5dCppHblGyDo/6bs/AsMg8
-FIAzpcCvRwa7UJ8kx2LPzxkSwO1YHx6VymNfTOr1vTWOonw2rWkkQHjjjxUQ31pK
-+2NlJLGq392AbG4LAwPQWFlZfqMooig/MMnSzWfjU7NLD2FBS7yem9S1PO6EMnCr
-tb1uH988NsL7XM+MCSld
-=K60e
+iQEcBAEBCAAGBQJSVDg2AAoJEJ0WA1zPCt1hwtIH/is3xEuridWit6NJ66KmJLsW
+8wH1N+IpS84/JjwJSWN2xZ9THn8eg90TDQDkOwAMqf4x8ePfDRD/+IBgOGzWJo0J
+SnO+iAuisNMY/zeto7WV0EppEO6EjI+EWMPTgjXbstK7h0Kbd9NKMrMFBMZ/lByP
+xXmk+3C+0qeuLzngzTKR3B6SiGzBgqVZJP0Bdcn1PwFm+Ev4w1+2XZKl6uASlRcu
+MpIRTRlvKg8hZJkOke5B1bacLBQ+pNRQmXzm5F4s0qkfZlQuilaNB0vRnlPnUl90
+Z9OQKzUtDmF7Y92kPYydBF7iskJioh0fRASn9yzUjBurzD/n3LlcvKFO7LECOcQ=
+=vV5K
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-2.0.0.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild
index c583cd60251b..3c0b0353aca5 100644
--- a/app-cdr/cdemu-daemon/cdemu-daemon-2.0.0.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild
@@ -1,40 +1,33 @@
 # 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.0.0.ebuild,v 1.3 2013/06/25 16:56:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild,v 1.1 2013/10/08 16:52:06 tetromino Exp $
 
 EAPI="5"
 
 CMAKE_MIN_VERSION="2.8.5"
 
-inherit cmake-utils
+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/4" # subslot = CDEMU_DAEMON_INTERFACE_VERSION in CMakeLists.txt
-KEYWORDS="amd64 ~hppa x86"
-IUSE="pulseaudio"
+SLOT="0/6" # subslot = CDEMU_DAEMON_INTERFACE_VERSION in CMakeLists.txt
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.26:2
+RDEPEND=">=dev-libs/glib-2.32:2
 	>=dev-libs/libmirage-${PV}:=
-	>=media-libs/libao-0.8.0[pulseaudio?]
+	>=media-libs/libao-0.8.0:=
 	sys-apps/dbus
-	>=sys-fs/vhba-20101015
-	!pulseaudio? ( >=media-libs/libao-0.8.0[alsa] )"
+	>=sys-fs/vhba-20130607"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
 	DOCS="AUTHORS README"
-
-	sed -e 's/-DG_DISABLE_DEPRECATED//' -i CMakeLists.txt || die
-
-	if ! use pulseaudio; then
-		sed -e 's:AUDIO_DRIVER=pulse:AUDIO_DRIVER=alsa:' \
-			-i session/cdemu-daemon-session.sh || die "sed failed"
-	fi
+	cmake-utils_src_prepare
 }
 
 pkg_postinst() {