No longer kill ShmClient at vdr-restart, as it seems to work now without that.

(Portage version: 2.1.2_rc2-r1)
 (Signed Manifest commit)

3 files changed, 18 insertions, 154 deletions

diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index e3cd26421cc9..676efb9c75f0 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -5,10 +5,10 @@ AUX confd 431 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 SHA1 f58d450430066
 MD5 dacfaa95c10d3b9ae3c1e08ff04dcc65 files/confd 431
 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 files/confd 431
 SHA256 5a82e32365ff3c77dfdad50884be7ae6f7d5f54e249c69308fc041cdce61290e files/confd 431
-AUX rc-addon.sh 529 RMD160 fe223c84fa13a7427b1d64306b0ddc82253abc67 SHA1 052bfe1bc480d5767c39efa8bffc90264ebee7dc SHA256 343e312d3edee038db1f0b7083599101712a482bab64922b94c580ba6b68391d
-MD5 775393019b942662d3cf11bab316a095 files/rc-addon.sh 529
-RMD160 fe223c84fa13a7427b1d64306b0ddc82253abc67 files/rc-addon.sh 529
-SHA256 343e312d3edee038db1f0b7083599101712a482bab64922b94c580ba6b68391d files/rc-addon.sh 529
+AUX rc-addon.sh 325 RMD160 583102f24bface0fadb4b1a6378246daec5eb9de SHA1 d4b14243782d1fd36ced9ef0a054f6e6266489b0 SHA256 82af787d8d96e3c21076a326b02def7626d89381530661a090b2f49271d59fd6
+MD5 c968f05e0abe7bf8aafc14699617ac1c files/rc-addon.sh 325
+RMD160 583102f24bface0fadb4b1a6378246daec5eb9de files/rc-addon.sh 325
+SHA256 82af787d8d96e3c21076a326b02def7626d89381530661a090b2f49271d59fd6 files/rc-addon.sh 325
 AUX softdevice-cvs-xinerama-configure-opts.patch 758 RMD160 fe4b6d46d3721bcc8d5332bccb0289ddf9df84e8 SHA1 d7986ae138de94752afec5a76471ffc15cf3f81a SHA256 8eb0467383004b3f43d1e868d78bb76d8c0afc09841edce978d373f65cdc3ad0
 MD5 e8fe69985f1d48b7b62c32c1151912b0 files/softdevice-cvs-xinerama-configure-opts.patch 758
 RMD160 fe4b6d46d3721bcc8d5332bccb0289ddf9df84e8 files/softdevice-cvs-xinerama-configure-opts.patch 758
@@ -31,14 +31,14 @@ EBUILD vdr-softdevice-0.3.0-r1.ebuild 3386 RMD160 ed9379861664e914c1accd14673ad4
 MD5 33f2a278d27996d3446b01ee969101ba vdr-softdevice-0.3.0-r1.ebuild 3386
 RMD160 ed9379861664e914c1accd14673ad4ab64989fe1 vdr-softdevice-0.3.0-r1.ebuild 3386
 SHA256 ae10137293fc83cd7b20961318f7e8783718b3041f9ff63d42b436d8b213cadf vdr-softdevice-0.3.0-r1.ebuild 3386
-EBUILD vdr-softdevice-0.3.1-r1.ebuild 3394 RMD160 95db3e3e55cb3af4104325d7bc01086a2a7f5db8 SHA1 ed45cb42a2d955d3a2aff3103f015cefed8c64de SHA256 20a4a82cad651ccb63217583d178a724f602bb06a4b71196a3774a862c390a3e
-MD5 ded3844fc4d86f52509b3719601311d5 vdr-softdevice-0.3.1-r1.ebuild 3394
-RMD160 95db3e3e55cb3af4104325d7bc01086a2a7f5db8 vdr-softdevice-0.3.1-r1.ebuild 3394
-SHA256 20a4a82cad651ccb63217583d178a724f602bb06a4b71196a3774a862c390a3e vdr-softdevice-0.3.1-r1.ebuild 3394
-MISC ChangeLog 6880 RMD160 a6afe62fa061a4f1744190ff579ffe64cdd7a43b SHA1 a2b24efc102ba5060b66ab86f9df91c773fb3aaf SHA256 42a4d24e1dd130db74720b5a849d6b584b8f8d2129411fe355c44f4542a7f8bc
-MD5 f197c20c0e49503717903e76e11cb419 ChangeLog 6880
-RMD160 a6afe62fa061a4f1744190ff579ffe64cdd7a43b ChangeLog 6880
-SHA256 42a4d24e1dd130db74720b5a849d6b584b8f8d2129411fe355c44f4542a7f8bc ChangeLog 6880
+EBUILD vdr-softdevice-0.3.1-r2.ebuild 3394 RMD160 66d0f4c260068b6d141476d110cd5bf939322f79 SHA1 b6bf74a4cc10a3e51a9a5f2b71f69cbdd4480617 SHA256 932ff2d55d3b601d9473eb6e27ffd50174a2914c02e4fe9dfc404e0022ce1634
+MD5 28e971e64cc89bd3f40a0f96c6997a97 vdr-softdevice-0.3.1-r2.ebuild 3394
+RMD160 66d0f4c260068b6d141476d110cd5bf939322f79 vdr-softdevice-0.3.1-r2.ebuild 3394
+SHA256 932ff2d55d3b601d9473eb6e27ffd50174a2914c02e4fe9dfc404e0022ce1634 vdr-softdevice-0.3.1-r2.ebuild 3394
+MISC ChangeLog 7142 RMD160 a3b0e5b8228e405bc461fc9b62daa28c1dd95324 SHA1 6bb6a237dcfccc744a4efc9e1010f9d79246931c SHA256 8e7ee5fa2c521ed17c41644c707818102d4dc556cbb87991ad211f177981f45d
+MD5 5591f119f09a62b7b2a3f57345ff298e ChangeLog 7142
+RMD160 a3b0e5b8228e405bc461fc9b62daa28c1dd95324 ChangeLog 7142
+SHA256 8e7ee5fa2c521ed17c41644c707818102d4dc556cbb87991ad211f177981f45d ChangeLog 7142
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -46,13 +46,13 @@ SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 metadata
 MD5 1a99e63b0950911ea31f51ca8a438eb1 files/digest-vdr-softdevice-0.3.0-r1 253
 RMD160 2f9b5df740163dbee55f753866ca320381b1f123 files/digest-vdr-softdevice-0.3.0-r1 253
 SHA256 34eb4ff82a39af8ee4198902db6ae1551dd16194d1e668d50e52a1b209c65125 files/digest-vdr-softdevice-0.3.0-r1 253
-MD5 5c83d0a75504c4936e5a075cc9a1be98 files/digest-vdr-softdevice-0.3.1-r1 253
-RMD160 c657f1b00221b635b1bf9394bb360eb5925f46a7 files/digest-vdr-softdevice-0.3.1-r1 253
-SHA256 a776d0acfd3bebf0e41af293f315bbaa0f3ddd428cc5ae4751808589d25f5d28 files/digest-vdr-softdevice-0.3.1-r1 253
+MD5 5c83d0a75504c4936e5a075cc9a1be98 files/digest-vdr-softdevice-0.3.1-r2 253
+RMD160 c657f1b00221b635b1bf9394bb360eb5925f46a7 files/digest-vdr-softdevice-0.3.1-r2 253
+SHA256 a776d0acfd3bebf0e41af293f315bbaa0f3ddd428cc5ae4751808589d25f5d28 files/digest-vdr-softdevice-0.3.1-r2 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFWYv4t2vP6XvVdOcRAif5AJ9g7htpjiwThTf/NLiZ2Q+k5z1p2ACgknQj
-cFtjn/TbpH3zY+b9Wjuwf7U=
-=XJmh
+iD8DBQFFZZent2vP6XvVdOcRAnkJAJ9eVP+zODeCNWeptCj2tBvyPyJXwQCeJna2
+LNh0FS3FbB1uara6B0k7h5o=
+=gfee
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1-r1 b/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1-r1
deleted file mode 100644
index bdd142b55ec4..000000000000
--- a/media-plugins/vdr-softdevice/files/digest-vdr-softdevice-0.3.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 269777294df93a027ac9dc849af0edb2 vdr-softdevice-0.3.1.tgz 154509
-RMD160 b582215eca1c0ce954eca54045456145488b1b34 vdr-softdevice-0.3.1.tgz 154509
-SHA256 d88fc234ad6d3686b95d4848519ffdb97ee22a1fcd8cff60d737c0ecb1a43252 vdr-softdevice-0.3.1.tgz 154509
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1-r1.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1-r1.ebuild
deleted file mode 100644
index 760ce53e1175..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.3.1-r1.ebuild,v 1.1 2006/11/14 09:27:13 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-SRC_URI="mirror://gentoo/${P}.tgz
-		http://dev.gentoo.org/~zzam/distfiles/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="xv fbcon directfb mmx mmxext xinerama"
-
-RDEPEND=">=media-video/vdr-1.3.36
-	>=media-video/ffmpeg-0.4.9_pre1
-	directfb? (
-		dev-libs/DirectFB
-		dev-libs/DFB++
-	)
-	media-libs/alsa-lib
-	xv? ( || ( ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXv
-				xinerama? ( x11-libs/libXinerama )
-			)
-			virtual/x11
-		) )"
-
-DEPEND="${RDEPEND}
-	xv? ( || ( ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-			virtual/x11
-	) )
-	fbcon? ( sys-kernel/linux-headers )
-	dev-util/pkgconfig"
-
-
-PATCHES="
-		${FILESDIR}/vdr-softdevice-0.2.3-shm-fullscreen.diff
-		${FILESDIR}/softdevice-cvs-xinerama-configure-opts.patch
-		${FILESDIR}/vdr-softdevice-0.3.1-osdmode-software-default.diff"
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if use !xv && use !fbcon && use !directfb; then
-		ewarn "You need to set at least one of these use-flags: xv fbcon directfb"
-		die "no output-method enabled"
-	fi
-
-	COMPILE_SHM=0
-	if has_version ">=media-video/vdr-1.3.0"; then
-		if use xv; then
-			COMPILE_SHM=1
-		else
-			einfo "SHM does only support xv at the moment"
-		fi
-	else
-		einfo "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	einfo "SHM support will not be compiled." ;;
-		1)	einfo "SHM support will be compiled." ;;
-	esac
-
-	# Check for ffmpeg relying on libtheora without pkg-config-file
-	# Bug #142250
-	if built_with_use media-video/ffmpeg theora	&& \
-		has_version "<media-libs/libtheora/libtheora-1.0_alpha4"; then
-
-			eerror "This package will not work when using ffmpeg with"
-			eerror "USE=\"theora\" combined with media-libs/libtheora"
-			eerror "older than version 1.0_alpha4."
-			eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
-			die "Please update to at least media-libs/libtheora-1.0_alpha4."
-	fi
-}
-
-src_compile() {
-	local MYOPTS=""
-	MYOPTS="${MYOPTS} --disable-vidix"
-	use xv || MYOPTS="${MYOPTS} --disable-xv"
-	use fbcon || MYOPTS="${MYOPTS} --disable-fb"
-	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
-
-	# MMX-Support
-	# hardcode mmx for amd64 - do not disable even without use-flag
-	if ! use amd64; then
-		use mmx || MYOPTS="${MYOPTS} --disable-mmx"
-		use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
-
-		if use !mmx && use !mmxext; then
-			ewarn "${PN}"' does not compile with USE="-mmx -mmxext".'
-			ewarn 'Please enable at least one of these two use-flags.'
-			die "${PN}"' does not compile with USE="-mmx -mmxext".'
-		fi
-	fi
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	cd ${S}
-	einfo configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-
-	vdr-plugin_src_compile
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd ${S}
-
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libsoftdevice-*.so.*
-
-	if [[ "${COMPILE_SHM}" = "1" ]]; then
-		exeinto "/usr/bin"
-		doexe ShmClient
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}
-