No longer require a patched vdr. Patch is from e-tobi.

Package-Manager: portage-2.1.5_rc6

4 files changed, 62 insertions, 3 deletions

diff --git a/media-plugins/vdr-decruft/ChangeLog b/media-plugins/vdr-decruft/ChangeLog
index 2ea864794638..80994cecad0c 100644
--- a/media-plugins/vdr-decruft/ChangeLog
+++ b/media-plugins/vdr-decruft/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-decruft
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-decruft/ChangeLog,v 1.4 2006/08/15 13:56:05 zzam Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-decruft/ChangeLog,v 1.5 2008/04/22 10:32:03 zzam Exp $
+
+*vdr-decruft-0.0.4-r1 (22 Apr 2008)
+
+  22 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-decruft-0.0.4-avoid-vdr-patch.diff,
+  +vdr-decruft-0.0.4-r1.ebuild:
+  No longer require a patched vdr. Patch is from e-tobi.
 
   15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
   vdr-decruft-0.0.4.ebuild:
diff --git a/media-plugins/vdr-decruft/Manifest b/media-plugins/vdr-decruft/Manifest
index f81579f9dafa..dd424af0f566 100644
--- a/media-plugins/vdr-decruft/Manifest
+++ b/media-plugins/vdr-decruft/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX vdr-decruft-0.0.4-avoid-vdr-patch.diff 748 RMD160 4de85e2b2ac10797333421fc702f4c8d603efbf7 SHA1 cbaadb0432ef042537fc1c96e81e0c274c564907 SHA256 6e53cfed31521941291e88153bcbbfd9542b1e60f4d036a9797bf0cfd5b4d281
 DIST vdr-decruft-0.0.4.tgz 15921 RMD160 42a6bc7724f094d7c26d7ee644ed47ded8984b1a SHA1 26ff5a0a3ad336f217e2671045436c382f6add39 SHA256 957b0d5ada79e69595424615df94da0b49d6b3c7af43c9d33591b82be3cd5345
+EBUILD vdr-decruft-0.0.4-r1.ebuild 693 RMD160 9f3ebee3ebd7f04b1fcd3cb45ec60128d1375344 SHA1 5b56f21d833d3b8433fd076b33fa435ff9973b7f SHA256 610ef1ed7e98f850fcfa5afe7ee56517e3f7163b1028cf55a00af6c7b7f5e491
 EBUILD vdr-decruft-0.0.4.ebuild 847 RMD160 6480354ff978447c82e058ac87606c3dfe16bce5 SHA1 2a57de417335b775551185a81f93399e272d9f3a SHA256 0e18da13e4def467d2ceef423216da484c7680dda73eab1b457acd14f366e201
-MISC ChangeLog 769 RMD160 c45f914d257ef1ddb447dc424b0c8ab47be43494 SHA1 bafa88b67d6e657241e7761cb22cbf2e55bbe640 SHA256 ede2c75d70263106116475df71002ed30c93b7c71893867ea410bf093e5cac8f
+MISC ChangeLog 998 RMD160 4f9fb45e141029df974a2a821238be60ce44dc43 SHA1 ed37fcd3ede3fb2f633bed9436946c3d1e1988f3 SHA256 18939c9833d3e62c8a8617fe9b2d1087af3520e94c70ae2d8d639c7f62fd7579
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgNvqkACgkQt2vP6XvVdOefQgCfXa1mxv9KTXCPT3jauo0G+rQA
+Cz4An12FnhVbTtXLo/6TjSqgr+E5oSrf
+=5VPv
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-decruft/files/vdr-decruft-0.0.4-avoid-vdr-patch.diff b/media-plugins/vdr-decruft/files/vdr-decruft-0.0.4-avoid-vdr-patch.diff
new file mode 100644
index 000000000000..926c33bc9577
--- /dev/null
+++ b/media-plugins/vdr-decruft/files/vdr-decruft-0.0.4-avoid-vdr-patch.diff
@@ -0,0 +1,17 @@
+diff -urNad vdr-plugin-decruft-0.0.4~/cruft.c vdr-plugin-decruft-0.0.4/cruft.c
+--- vdr-plugin-decruft-0.0.4~/cruft.c	2005-02-20 19:34:01.000000000 +0100
++++ vdr-plugin-decruft-0.0.4/cruft.c	2006-11-11 21:57:24.000000000 +0100
+@@ -535,8 +535,10 @@
+         /* Not defined, so define it */
+         if ( !groupSep ) {
+             groupSep = new cChannel();
+-            groupSep->SetName(settings->group_name,"","");
+-            groupSep->SetGroupSep(true);
++            char* groupSepString;
++            asprintf(&groupSepString, ":%s", settings->group_name);
++            groupSep->Parse(groupSepString);
++            free(groupSepString);
+             Channels.Add(groupSep);
+         }
+         /* Move the channel to the end of the group */
+
diff --git a/media-plugins/vdr-decruft/vdr-decruft-0.0.4-r1.ebuild b/media-plugins/vdr-decruft/vdr-decruft-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..ff27160fb496
--- /dev/null
+++ b/media-plugins/vdr-decruft/vdr-decruft-0.0.4-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2003-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-decruft/vdr-decruft-0.0.4-r1.ebuild,v 1.1 2008/04/22 10:32:03 zzam Exp $
+
+IUSE=""
+inherit vdr-plugin eutils
+
+DESCRIPTION="Video Disk Recorder DeCruft Plugin - Clean unwanted entries from channels.conf"
+HOMEPAGE="http://www.rst38.org.uk/vdr/decruft/"
+SRC_URI="http://www.rst38.org.uk/vdr/decruft/${P}.tgz"
+KEYWORDS="~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=media-video/vdr-1.3.21-r2"
+
+PATCHES=("${FILESDIR}/${P}-avoid-vdr-patch.diff")
+
+src_install() {
+	vdr-plugin_src_install
+	insinto /etc/vdr/plugins
+	doins examples/decruft.conf
+}