Simplifyed patching and backported it to 1.0.0_pre3.

(Portage version: 2.1.1_rc1-r7)

4 files changed, 108 insertions, 12 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 3eb829f31e52..bb4c423b61e5 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.8 2006/09/07 19:12:43 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.9 2006/09/08 15:47:02 zzam Exp $
+
+*vdr-xineliboutput-1.0.0_pre3-r1 (08 Sep 2006)
+
+  08 Sep 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-xineliboutput-1.0.0_pre3-r1.ebuild,
+  vdr-xineliboutput-1.0.0_pre4.ebuild:
+  Simplifyed patching and backported it to 1.0.0_pre3.
 
 *vdr-xineliboutput-1.0.0_pre4 (07 Sep 2006)
 
diff --git a/media-plugins/vdr-xineliboutput/files/digest-vdr-xineliboutput-1.0.0_pre3-r1 b/media-plugins/vdr-xineliboutput/files/digest-vdr-xineliboutput-1.0.0_pre3-r1
new file mode 100644
index 000000000000..e2f49fd23605
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/digest-vdr-xineliboutput-1.0.0_pre3-r1
@@ -0,0 +1,3 @@
+MD5 ef496292ea50372d1e6cf1da2332372d vdr-xineliboutput-1.0.0pre3.tgz 201048
+RMD160 92dbef06aebb6a58b7efd40d344a39b8223e43e3 vdr-xineliboutput-1.0.0pre3.tgz 201048
+SHA256 84f1531d651d1f73faf8b16aea89e00a2f796963bc46e52959c29d06c57685fa vdr-xineliboutput-1.0.0pre3.tgz 201048
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre3-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre3-r1.ebuild
new file mode 100644
index 000000000000..78a2ed54d73c
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre3-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre3-r1.ebuild,v 1.1 2006/09/08 15:47:02 zzam Exp $
+
+inherit vdr-plugin eutils multilib
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+HOMEPAGE="http://users.tkk.fi/~phintuka/vdr/vdr-xineliboutput/"
+SRC_URI="http://users.tkk.fi/~phintuka/vdr/${PN}/${MY_P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE="fbcon X"
+
+RDEPEND=">=media-video/vdr-1.3.42
+		>=media-libs/xine-lib-1.1.1
+		media-libs/jpeg
+		X? (
+			|| ( (
+					x11-proto/xextproto
+					x11-proto/xf86vidmodeproto
+					x11-proto/xproto
+				)
+				virtual/x11
+			)
+		)"
+
+DEPEND="${RDEPEND}
+		sys-kernel/linux-headers
+		X? (
+			|| ( (
+					x11-libs/libX11
+					x11-libs/libXv
+					x11-libs/libXext
+				)
+				virtual/x11
+			)
+		)"
+
+S=${WORKDIR}/xineliboutput-${MY_PV}
+
+enable_in_makefile() {
+	local opt
+	for opt; do
+		sed -i "/^#${opt}.*= 1/s-^#--" Makefile
+	done
+}
+
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	cd ${S}
+
+	XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h)
+
+	enable_in_makefile XINELIBOUTPUT_VDRPLUGIN XINELIBOUTPUT_XINEPLUGIN
+	use fbcon && enable_in_makefile XINELIBOUTPUT_FB
+	use X && enable_in_makefile XINELIBOUTPUT_X11
+
+	# patching makefile to work with this
+	# $ rm ${outdir}/file; cp file ${outdir}/file
+	# work in the sandbox
+	sed -i Makefile \
+		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:"
+	mkdir -p ${WORKDIR}/lib
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	dobin vdr-fbfe vdr-sxfe
+
+	insinto ${VDR_PLUGIN_DIR}
+	doins *.so.${MY_PV}
+
+	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}
+	doins xineplug_inp_xvdr.so
+}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre4.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre4.ebuild
index bb2ed4b40772..17a2b36a2916 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre4.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre4.ebuild,v 1.1 2006/09/07 19:12:43 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre4.ebuild,v 1.2 2006/09/08 15:47:02 zzam Exp $
 
 inherit vdr-plugin eutils multilib
 
@@ -43,26 +43,29 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/xineliboutput-${MY_PV}
 
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h)
-	BUILD_PARAMS="XINELIBOUTPUT_VDRPLUGIN=1 XINELIBOUTPUT_XINEPLUGIN=1"
-	use fbcon && BUILD_PARAMS="${BUILD_PARAMS} XINELIBOUTPUT_FB=1"
-	use X && BUILD_PARAMS="${BUILD_PARAMS} XINELIBOUTPUT_X11=1"
+enable_in_makefile() {
+	local opt
+	for opt; do
+		sed -i "/^#${opt}.*= 1/s-^#--" Makefile
+	done
 }
 
+
 src_unpack() {
 	vdr-plugin_src_unpack
 
 	cd ${S}
-	# disable hardcoded detect-routine to set options via make-command-line
-	sed -i.orig Makefile -e '/^[[:space:]]*XINELIBOUTPUT_\(FB\|X11\|XINEPLUGIN\)/s/^/#/'
+
+	XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h)
+
+	enable_in_makefile XINELIBOUTPUT_VDRPLUGIN XINELIBOUTPUT_XINEPLUGIN
+	use fbcon && enable_in_makefile XINELIBOUTPUT_FB
+	use X && enable_in_makefile XINELIBOUTPUT_X11
 
 	# patching makefile to work with this
 	# $ rm ${outdir}/file; cp file ${outdir}/file
 	# work in the sandbox
-	sed -i.orig Makefile \
+	sed -i Makefile \
 		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:"
 	mkdir -p ${WORKDIR}/lib
 }