Using correct way to determine xine-plugin-directory.

Package-Manager: portage-2.1.4.4

3 files changed, 25 insertions, 9 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 6d70f7315f34..2b3547fff63a 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.34 2008/02/17 21:52:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.35 2008/02/18 13:33:58 zzam Exp $
+
+  18 Feb 2008; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild:
+  Using correct way to determine xine-plugin-directory.
 
 *vdr-xineliboutput-1.0.0_rc2_p20080120-r1 (17 Feb 2008)
 
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 8d66cb3b1400..a93098d86400 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d4591f1a2525cdebbda53636c1138cf3563e592 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b
 AUX vdr-xineliboutput-1.0.0_rc2-vdr-1.5.3.diff 712 RMD160 520c285cb48887ae496d12a598cf356bf9b02843 SHA1 b77920e533d878e445847b9520d4653280c4b3b5 SHA256 a453eb5692f6e85bec1cc7297dd61e25405fac09a01504508262aa7f5246d668
 AUX vdr-xineliboutput-1.0.0_rc2-vdr-1.5.9.diff 2852 RMD160 58f70d95046ae634fa2415643a05df2a395d7cf0 SHA1 4376acebfeed2c9ea35e076778a89c217da15ddb SHA256 6ac4301424dbeaf1227004824e744af3067e4fd69d8f8c6ce1ea187c5f303e09
@@ -6,7 +9,14 @@ DIST vdr-xineliboutput-1.0.0rc2.tgz 266010 RMD160 406e48f343258c07e337460754181c
 DIST vdr-xineliboutput-cvs-20080120.tar.bz2 244376 RMD160 2256079c9a2cbab5fd4f47232aaee282ca4b7d57 SHA1 d8ba0f859b3be5ffe5f8fb37518996bb6b6082ef SHA256 54aa155c79a23669e9bb6f376846012a008ec13cd3f05e48bdae7acc9f6e155e
 EBUILD vdr-xineliboutput-1.0.0_rc1.ebuild 2009 RMD160 ce783135d9b4db3497c5bff020b85d199e0f9d7b SHA1 40e363ccc09450f0dc94f586d47cfdeb0e7f4cc1 SHA256 882e66a2629ecb2de41f6b71085b8006a2ad9e98dbbea924e5a26b96685be7f9
 EBUILD vdr-xineliboutput-1.0.0_rc2.ebuild 2103 RMD160 8bd467b1964acb5d36dc6ae3b2d9dba92077c250 SHA1 8d5889e03676d9c6ad8dc851c090b89f7e34b4a6 SHA256 127a5b57f47755c2320d0f4810c9d92a866e58ac8468953f4509ac05b453ddd2
-EBUILD vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild 2509 RMD160 31083dce72e17065554554b5d0635ec432f4a21d SHA1 6edb6c9c662c47b6c234be830daf8c006d4a8325 SHA256 8a7c013bbd187fe842aae4f3657a8fcb311f740d439fb1d79ceec48ea637ca9f
+EBUILD vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild 2393 RMD160 2a90140f2141df5ecc4e5e45e668f53edfa3e0f3 SHA1 f203ca6e7431aea6480a16b5d811a56c1c3c1b5b SHA256 68d461ee932b37cd6700114bb50ba63603c121efe2d777f3cd3d6fb174b93d80
 EBUILD vdr-xineliboutput-1.0.0_rc2_p20080120.ebuild 2355 RMD160 77087b90ccb62f7e5aebdbde06186c44a5efef28 SHA1 214864c4dc0bc07a1a35e19ec710f08e4fb0446a SHA256 cb04940896bb094eff04bfa946a70cdd9acdfa965137e25e6a0c7aa80447dade
-MISC ChangeLog 7503 RMD160 b0a8aae054eb593d199982e8adda2234ebc3459a SHA1 85d057a26e532cd57459dab5341d8dfae9bca634 SHA256 6eb9534051d3d16419f3ac590491a207320b75b70c850e5cf3529e23a3bcaea8
+MISC ChangeLog 7664 RMD160 20266ba1596578ebf00149515a5d0252560c9148 SHA1 20dd72e261d6b9b951a00ec9c65cea1d7771bc93 SHA256 a0d83260695307e253e1a5a2cd7f9c04b11102ec9a7ad118f28b11ce38215b05
 MISC metadata.xml 353 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e SHA1 a8466ebe913ea08351d9415bca28ee107e54a7cb SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHuYlRt2vP6XvVdOcRAocGAJ94/fKfcpAUSBJTg3X3zG1G+dYhnQCgkZte
+eoOsIAbj1rPR0NdUYNB5lPc=
+=fpRS
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild
index e2c0d129f9f8..7d45413a20fc 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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_rc2_p20080120-r1.ebuild,v 1.2 2008/02/18 00:40:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_rc2_p20080120-r1.ebuild,v 1.3 2008/02/18 13:33:58 zzam Exp $
 
 inherit vdr-plugin eutils multilib versionator
 
@@ -67,9 +67,11 @@ src_unpack() {
 
 	cd "${S}"
 
-	XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h)
-	XINE_LIB_VERSION=$(get_version_component_range 1-3 "${XINE_LIB_VERSION}")
-	einfo "Compiling against xine-lib version ${XINE_LIB_VERSION}"
+	XINE_PLUGIN_DIR=$(xine-config --plugindir)
+	if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
+		eerror "Could not find xine plugin dir"
+		die "Could not find xine plugin dir"
+	fi
 
 	set_var_in_makefile VDRPLUGIN 1
 	set_var_in_makefile XINEPLUGIN 1
@@ -94,9 +96,9 @@ src_install() {
 	insinto ${VDR_PLUGIN_DIR}
 	doins *.so.${SO_VERSION} || die "could not install sub-plugins"
 
-	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}
+	insinto "${XINE_PLUGIN_DIR}"
 	doins xineplug_inp_*.so
 
-	insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}/post
+	insinto "${XINE_PLUGIN_DIR}"/post
 	doins xineplug_post_*.so
 }