stable amd64 x86; cleanup, this will fix wrt bug 538060, thx to T.Foerster

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

4 files changed, 12 insertions, 66 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index 568ce7dd7532..9d0b2c9e2571 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.46 2015/01/28 14:56:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.47 2015/01/29 23:46:33 hd_brummy Exp $
+
+  29 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-live-0.2.0.ebuild,
+  vdr-live-0.3.0_p20130504-r1.ebuild:
+  stable amd64 x86; cleanup, this will fix wrt bug 538060, thx to T.Foerster
 
 *vdr-live-0.3.0_p20130504-r2 (28 Jan 2015)
 
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 4a88da286f68..abea48971607 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -10,18 +10,16 @@ AUX rc-addon.sh 180 SHA256 d9c9eca9f12362c1f8c162a9bb948feebdb8acc87413a611ecf5f
 AUX vdr-1.7.28-compatibility.patch 1146 SHA256 52bc7f9315db8102a5531a788e164bc347dae0deb3078c157a6722500b16041a SHA512 c7e48330e5e3dcd09e8bf830748308553a994e46bc89c6633e2a0daf03fd00c2fcaf7272a53b7977a33731b5c8e0e36f1e2f19e0806f0af932300e2dd4d16772 WHIRLPOOL a35b74aebfb763367f88bfbdef351642a193fb9c349d666f30ed26e185e1619456bc1207325bedd680dbbc57b481df42c036d3bd8a375e5d9bded8b96334d917
 AUX vdr-live-0.3.0_p20130504_vdr-2.1.2.diff 2722 SHA256 60ac1cbec3863fedf4620a9c30661139a3c5ee62c843fc809c5f3e53e79370eb SHA512 813e17202fb9dd921e38492127ad8518fc4aa2f6240ce9284990bf3e0a40c04b3b56efcaf667ce5f4aedf9b6e76422e2bb73c3218d124f3d8452b3b7979ba0b2 WHIRLPOOL 0571dbd5fc091aa3eead30179d162186b74a5adaa61a930734159111b61bc2316041b2e96484612742b94fbf6186235aae1f1f5249bfa9a8fed55e4fc48648e4
 AUX vdr-live_pcre.patch 586 SHA256 290fe19ec39c638a78ca4b7f21ab9d337aa85657491e77871fbf0ab175873c94 SHA512 fb48fea6b6e1e54fbdcb541da9a0e4563ecf0f7ecb2b74836282ad3afc22475f4434feaeee8a5dcda0cdad0086aa16ae2f756e9245a3e9a717e8fba5d555352a WHIRLPOOL 3c517b6e3e67d76a90362c176bfaf04cc056bbc168ea6ee2549750d8af71b6f91a7e3fa51381053c0609e53e31a592834494d8339df169aa6c92c861712475c0
-DIST vdr-live-0.2.0.tar.gz 560582 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
 DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 SHA256 edd577580b9e99de88bcd3794fcf792bee7df7ccc41bfebaeebef22bac5c78a7 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1 WHIRLPOOL 7f8d7ff69914d90af41d4c550df6f57a658e8263d320167fed84f4990063a5323c1f5d58d44283682807c673af81c8e32cd44e13a9aa57e849e3640b4ecac936
-EBUILD vdr-live-0.2.0.ebuild 1228 SHA256 e68db52ddbb83bc48dc1e9630abb441773c9e40cddbba01bd79b13b8448500cd SHA512 279e7c195e57ffa60322c7f221f9894d0922c29dc718b1c6a867736f3c2e93b5d69e9ba0a71ba99382bef59581436c645b38ba521b722ad19f34bf8321622b50 WHIRLPOOL 1d55af5846f4b84b9cb50b87f5b903b1d145bee16f79de5aadd004c0fe2d0dc425175fdb2768ab39b2b7fb94243880311d1ac0ace9dc85c5e7b5ac431985eadd
-EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2616 SHA256 2c0622fc241751ac3b8b82f3ac62104792f8569b4303f716700c76a49bafa27d SHA512 a9460ceee7e9abc111dc56552e05700e5a805ae5f34fa1bcbf7920015bffeaaad68a0ee7278fdffcdfd70e6751e5a293b52ac2420bb54a5fb3125b64958a6b70 WHIRLPOOL f574c3392d0023da1d4819f96693b73c8e6059de1553d12388404889d006162c6356bc0b0d8b1b22d06c23160de0ad20f216d3b540715e463cb1c435918a3c84
+EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2614 SHA256 e66c227e07bf5f1b22df4b59fb4f72bef82c9b226ff871fc66738f2f85800dea SHA512 4b18ab586582644b9f458fb667220b5d1075bfd334eaba5609565a18615c3af21827f628890867ac016e858d36779501e8a60a5e87f0f2a199fb062cea458af8 WHIRLPOOL 59dad4b8074a372cba5ec20b0c0f5b7ed296ec9f76999cdcb6b58c61f23b64d410b3d4f374633d4be98e4fa05535dbc75ea8352617a148b1eee39e407e0a843f
 EBUILD vdr-live-0.3.0_p20130504-r2.ebuild 2690 SHA256 37574d34d3caccadb3b551e9ab4f78b9e1f25a037f104241335fc35332a2604f SHA512 0cefff792bfe247a0d70eb6930aa12eae989458a43af6c3701692ac31069fbaace4ee48fc3e4e17cc469f0f03db7aa07a08d87150b4fcd98fba23912edaa4e22 WHIRLPOOL 8ed544644104cc075a396f994d6fb1e3b90d3bd848d0e8670c916e2e5f792b8af095dc3dbe3443b0bc7d6bad08ffebe56543c47f1cd4d133f3a96e2e67b57367
-MISC ChangeLog 8844 SHA256 60193ba9f757adc823cfe1ae5e0adaeeb2cbf84bd7fe5905079542a5e5e614f3 SHA512 720678df1728afbf7dd2f689357c6ab6c0f9d734e3569354613ba9a50c76117e6d75e969adbf8ff55290248b234150d3c8f8f15910cb0ff50612f4163ceeedc3 WHIRLPOOL 4803ce58e5710dc09146670bb2dbbb725b237a58cc4acad5db7bb6654079b84c240a2f34f943d47e26c4da039122833a1894989dbb2adbbb731f28ddd09ee3a1
+MISC ChangeLog 9039 SHA256 d28bd49fd9274e838a4069b65d945ffc4ebb0f869967f6c50c05e94d34612ce5 SHA512 2f0bb7bbb8cc95b9ea8fe60dc2ddd8ffe5f1c93ac1cf4c54e821ce7b3e527793fdd600353bd6d161a0050111a245593629dbb828434f3e7f0a63773247fd24b6 WHIRLPOOL e0a7b75bf7dc451f558c39b402f7e849e26462e9ffab31c3501cda7bb6fb81d60d18b7408f3e274d57dd7418feb3e105c3954f16a12f97dd096fdb7a9171891b
 MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFUyPipdn07HTTCgIoRCMDBAKCosQOtD6IaSRdr3vCDIt5CoGvb6wCfWmLr
-TNyHRlbjBMcNidFJzb9W2Bg=
-=pVZm
+iD8DBQFUysZfdn07HTTCgIoRCG1kAJ0d2H/PT8sSst+eOvxW/7EVffLBRgCfadD6
+TS82OvcLeL0AfdBG8N8VAPg=
+=iJJr
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0.ebuild
deleted file mode 100644
index 5538d2050ae6..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0.ebuild,v 1.7 2014/01/08 13:20:17 hd_brummy Exp $
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-SRC_URI="http://live.vdr-developer.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="media-video/vdr
-	>=dev-libs/tntnet-1.5.3
-	>=dev-libs/cxxtools-1.4.3"
-RDEPEND="${DEPEND}"
-
-DEPEND="${DEPEND}
-	|| ( >=sys-devel/gcc-4.1 >=dev-libs/boost-1.33.0 )"
-
-S="${WORKDIR}/${VDRPLUGIN}-${PV}"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	sed -e "18s/==/=/" -i  buildutil/version-util
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	cd "${S}/live"
-	insinto /etc/vdr/plugins/live
-	doins -r *
-
-	chown vdr:vdr -R "${D}"/etc/vdr/plugins/live
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "Use for login:pass"
-	elog "admin:live"
-	elog "on first install"
-	elog
-	elog "To be able to use all functions of vdr-live"
-	elog "you should emerge and enable vdr-epgsearch"
-	elog
-	elog "\temerge vdr-epgsearch"
-	elog "\teselect vdr-plugin enable epgsearch"
-}
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
index 8d10db7c056f..0bc0e56906a9 100644
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild,v 1.3 2015/01/28 14:56:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild,v 1.4 2015/01/29 23:46:33 hd_brummy Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pcre ssl"
 
 DEPEND="media-video/vdr