gentoo resync : 28.04.2019

3 files changed, 2 insertions, 46 deletions

diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 26ff484b19de..23058e65cc95 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST cdemu-daemon-3.2.1.tar.bz2 82426 BLAKE2B 282b1a62ca3a770e709ff31ee7b72ed9f5e102c5f318a765a99421c93881e9ecacfdc5867af494e69dddda40603c8eb6cc8904a7c82fec004a6d5644a28a9f87 SHA512 399dbb818de8a550bd31784a5a7f0adb9d2e35d922ba71f341df81d20fd7e5ebaba5f31db1554caca17919325773f9ec6bb3d5ae99afa5d6eaf5b22142e010ee
 DIST cdemu-daemon-3.2.2.tar.bz2 82366 BLAKE2B d21436a5dbf1c6d953aa7ceb58e5d4580931391ea407c45de8f7c7154c181aef76535833bf02999d77d3a9e0c624db1124a9d333d028e206844a1256b3c5dde0 SHA512 4010bad27d5f595d20e1666700d32c2fb3f943f2e50645317bcc8fbbbba58cd61b3f6d3276e91fff55f449e44291abc776a56ded7c4f0bb7901ac247da72d7fe
-EBUILD cdemu-daemon-3.2.1.ebuild 1140 BLAKE2B 3a9168913ac901d268b46137fe8f705866df375172dce36e67a8302d9191ec2c991804a264972260b0f2c59f66d15adffb4fab1cd0132211a34d2926b0d50b21 SHA512 747f5c96c441723873e147f6111d12dca95be0da67dc7658b7fe2a395e524f6af24369b4b932c3de328c46bd4b4a73f258c935e285ee8d9d47398cd68d911f3e
-EBUILD cdemu-daemon-3.2.2.ebuild 1142 BLAKE2B 07c239beaf56df21bf2f393dd46f84a153addc57960eace12844eebec433f24d3f31b256379927220c7aa99544c996b53f358a01cdac75551e6b6321c6b11171 SHA512 79d525f7a96deffb5169ee926e2b0947db816c4eeb3db0ed8c67eb0e67e0f7339fa6847507f3ff7c5c3204a1fad8676b398da72c256e760c5acfe8a9841bd78b
+EBUILD cdemu-daemon-3.2.2.ebuild 1140 BLAKE2B 37bf7e266dcbf187004b9e6184176791873d8a6ef29d11e2a0348d606affd72ae5fe8a0ced71e44c460ec218cdb41dd4073539000920fc290adfa7a7a10c2383 SHA512 2e05466f5bdec9615e5bc03343706b2abd1c310532364fb09454170aa2389f70bb490a1538e2097dadb73131907f2820e4b9ca8f774f12c1a94d1e922e322adf
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild
deleted file mode 100644
index 6db965c48f29..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-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/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/libmirage-3.2.0:=
-	>=media-libs/libao-0.8.0:="
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-
-DOCS=( AUTHORS README )
-
-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/cdemu-daemon-3.2.2.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.2.ebuild
index f4972c2ba6b5..d69d9e612cee 100644
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.2.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-libs/glib-2.38:2