Simplifyed patching and backported it to 1.0.0_pre3.

Package-Manager: portage-2.1.1_rc1-r7

5 files changed, 126 insertions, 23 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/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 2d1edd2cfc85..388ed1032d2d 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -3,18 +3,22 @@ Hash: SHA1
 
 DIST vdr-xineliboutput-1.0.0pre3.tgz 201048 RMD160 92dbef06aebb6a58b7efd40d344a39b8223e43e3 SHA1 1a769b8d803fcc919dc2a4ba540e772e0ba96c03 SHA256 84f1531d651d1f73faf8b16aea89e00a2f796963bc46e52959c29d06c57685fa
 DIST vdr-xineliboutput-1.0.0pre4.tgz 206483 RMD160 ed985c51aa53a3c798efdc4e43f3983ceda4536b SHA1 a02eaa34c187b5160a21116801f5b136828550bf SHA256 21c9ec2e8205f00138990e14663cc3fe2ae7d0540cf0aa62fbd0183e44e9abf0
+EBUILD vdr-xineliboutput-1.0.0_pre3-r1.ebuild 1790 RMD160 19d84ae8052635d5c0c186022be6a0de3ccf1a52 SHA1 1bd84f5f86e0efe66373ab7de62b5e0381aacb5d SHA256 17f8bcf8db261edc6121406ca12c6b8eeefe38e13fb296ddac1c2adad89a19fa
+MD5 626cc57e1076a231120f1211eee7f863 vdr-xineliboutput-1.0.0_pre3-r1.ebuild 1790
+RMD160 19d84ae8052635d5c0c186022be6a0de3ccf1a52 vdr-xineliboutput-1.0.0_pre3-r1.ebuild 1790
+SHA256 17f8bcf8db261edc6121406ca12c6b8eeefe38e13fb296ddac1c2adad89a19fa vdr-xineliboutput-1.0.0_pre3-r1.ebuild 1790
 EBUILD vdr-xineliboutput-1.0.0_pre3.ebuild 1630 RMD160 a2a42da4430c74c4deb0bd690c2906cdaabdc370 SHA1 bc9072ef4a581dda4d93a0c8fd1f6473bf582511 SHA256 9d900c0e141af6f9329643f0ade1df71b8c69f10eab7dfd7277a0a40d79b262b
 MD5 648d15eff996cf87b592b7701180f44a vdr-xineliboutput-1.0.0_pre3.ebuild 1630
 RMD160 a2a42da4430c74c4deb0bd690c2906cdaabdc370 vdr-xineliboutput-1.0.0_pre3.ebuild 1630
 SHA256 9d900c0e141af6f9329643f0ade1df71b8c69f10eab7dfd7277a0a40d79b262b vdr-xineliboutput-1.0.0_pre3.ebuild 1630
-EBUILD vdr-xineliboutput-1.0.0_pre4.ebuild 1918 RMD160 728d48c8a8a963ed5289d6998e43f0d9b7c7849c SHA1 0c148f420db68d46038b9ebeadce912efe7cb4c0 SHA256 01dbccf2f205c758a1daf8b31246d905d336e30c22898032af4207d0812bd2d3
-MD5 b3ed9577761174759d00ff9f28c3a4c5 vdr-xineliboutput-1.0.0_pre4.ebuild 1918
-RMD160 728d48c8a8a963ed5289d6998e43f0d9b7c7849c vdr-xineliboutput-1.0.0_pre4.ebuild 1918
-SHA256 01dbccf2f205c758a1daf8b31246d905d336e30c22898032af4207d0812bd2d3 vdr-xineliboutput-1.0.0_pre4.ebuild 1918
-MISC ChangeLog 2464 RMD160 9bff9170fa6bf283be2715a23a8ef314a14a24fb SHA1 f30631c7d583fbce0f231d608a4993055da6fdfb SHA256 0ce5b23a29850591a8f851966c3f791cfd9e0a4eb31814a788f51d433a912313
-MD5 e759374ff5b53ee77c04a03a62a696d3 ChangeLog 2464
-RMD160 9bff9170fa6bf283be2715a23a8ef314a14a24fb ChangeLog 2464
-SHA256 0ce5b23a29850591a8f851966c3f791cfd9e0a4eb31814a788f51d433a912313 ChangeLog 2464
+EBUILD vdr-xineliboutput-1.0.0_pre4.ebuild 1787 RMD160 1e6428dde8406b27718996835957af4ce590114e SHA1 89f635a78dcc7cd9e2f0a255a9368e5cd8cf3ae4 SHA256 86b6cce6c2126de53c46f9267831d138f75dcbf2307683dffd15e6a4650d8fa3
+MD5 dac76463f01c32187caee2e302b60058 vdr-xineliboutput-1.0.0_pre4.ebuild 1787
+RMD160 1e6428dde8406b27718996835957af4ce590114e vdr-xineliboutput-1.0.0_pre4.ebuild 1787
+SHA256 86b6cce6c2126de53c46f9267831d138f75dcbf2307683dffd15e6a4650d8fa3 vdr-xineliboutput-1.0.0_pre4.ebuild 1787
+MISC ChangeLog 2703 RMD160 b22af3daedf1fbc9108a1d696d291e2dbfbdb515 SHA1 02928e4253b59e9cf9f6fe49b7234ddfd8bbf422 SHA256 1b12b39d22a8ad36a66bf4c0eb9ef0f2c4b981ac07ccb8d5f815312e68f99a64
+MD5 a94018958a02631570ba998ef472263c ChangeLog 2703
+RMD160 b22af3daedf1fbc9108a1d696d291e2dbfbdb515 ChangeLog 2703
+SHA256 1b12b39d22a8ad36a66bf4c0eb9ef0f2c4b981ac07ccb8d5f815312e68f99a64 ChangeLog 2703
 MISC metadata.xml 353 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e SHA1 a8466ebe913ea08351d9415bca28ee107e54a7cb SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359
 MD5 3ca7be3c0a30822246151344759d8d7e metadata.xml 353
 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e metadata.xml 353
@@ -22,13 +26,16 @@ SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359 metadata
 MD5 0ad6ff87b76139ed0a49e6ca55748395 files/digest-vdr-xineliboutput-1.0.0_pre3 274
 RMD160 f1dbaa247c10ccb681b6b218246a72fbb268a0f8 files/digest-vdr-xineliboutput-1.0.0_pre3 274
 SHA256 b1c82a3033c74dc6410e5a87ca7d90002d61ccd54d020271dec55896666cb845 files/digest-vdr-xineliboutput-1.0.0_pre3 274
+MD5 0ad6ff87b76139ed0a49e6ca55748395 files/digest-vdr-xineliboutput-1.0.0_pre3-r1 274
+RMD160 f1dbaa247c10ccb681b6b218246a72fbb268a0f8 files/digest-vdr-xineliboutput-1.0.0_pre3-r1 274
+SHA256 b1c82a3033c74dc6410e5a87ca7d90002d61ccd54d020271dec55896666cb845 files/digest-vdr-xineliboutput-1.0.0_pre3-r1 274
 MD5 a071c62537c03c1b254e914bb25255f2 files/digest-vdr-xineliboutput-1.0.0_pre4 274
 RMD160 fb87af3549e3e8a78069c711655d7951b73518b3 files/digest-vdr-xineliboutput-1.0.0_pre4 274
 SHA256 2cb492889a004ab4470f35445d08ae1992f5d3970695f76329f4bb5198309993 files/digest-vdr-xineliboutput-1.0.0_pre4 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFAG81t2vP6XvVdOcRAm6iAKDSHUWpksvGJE/DyGYMfOt5PyVSqACaAhMI
-otuoFp/9F0t6mtCTPTPwIxc=
-=80we
+iD8DBQFFAZB9t2vP6XvVdOcRAvSUAKDgN9rNArVI01GupvaOlZRNReBF5ACcCd2t
+Y0uwGQ91f0Cv34uwqebBuHc=
+=FiBx
 -----END PGP SIGNATURE-----
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
 }