Added a patch to work with >media-lib/xine-lib-1.1.10.1, bug 209849.

Package-Manager: portage-2.1.4.4

diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 2997581f5dd40cf2ed18f696757348a3db9bedb5..5d0de8d278db030f634fdbc6d6938a71a3395740 100644 (file)
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdemultimedia
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.268 2008/02/18 23:57:27 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.269 2008/02/20 20:06:29 ingmar Exp $
+
+  20 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/kdemultimedia-3.5.8-xine-lib-1.1.10.1.patch,
+  kdemultimedia-3.5.8-r1.ebuild:
+  Added a patch to work with >media-lib/xine-lib-1.1.10.1, bug 209849.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -files/kdemultimedia-4.0.0-flac-1.1.3.patch,

diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index 6b69bf8e3fbbce24fe9a994422790b0cab21aa6b..3bc03f41b38a9433a07f29f4293b01a291870f49 100644 (file)
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX kdemultimedia-3.5.5+flac-1.1.3.patch 2456 RMD160 67dfbe88872adb5fc2064ad0cf545931a895500f SHA1 d6a5b9d518eb465b1174c127593f246fb44109e0 SHA256 bb337df8f696f49f1d121ca59113c95f7aef788bfd574ab20fdaf8c7e090021b
 AUX kdemultimedia-3.5.6-alsa-tests.patch 10263 RMD160 cf2099a97198c74bc3823d81114723028b34660c SHA1 acb40bbd515cd59e83299afedf57b242249d083c SHA256 18caf016dee9e68c2819aec8a223fcf6946a1e2cb861b6afa612af7fa81178ee
+AUX kdemultimedia-3.5.8-xine-lib-1.1.10.1.patch 1168 RMD160 cc5887a4c8f6384ba6ee5bbd93e2126633261015 SHA1 3fb98824faf523607df8236b8ab5316d514a96d5 SHA256 ead43b47559847131ebafa6c3b584ee810b2b7f2b72798cc670f4f5b3319bce8
 AUX kdemultimedia-kioslaves-3.5.8-freebsd.patch 894 RMD160 054c2d7b1e037ac1307281183f0a2ebc753ff26b SHA1 18afed5747e761444bda8788d30c98dd7838e27f SHA256 da6dbdf3939534e5efc6019244321113814de93f4e709f9831a51d57d8902abf
 AUX kmix-3.5.8-198015_XF86Audio.patch 1612 RMD160 c985f996766a4543afb502b6a721142e39ea974a SHA1 2ee82546ebc0885fde05682b145712513aacdab9 SHA256 f2ce302e9b8ba27bd1d70997db94dd51fac5f952a18d75e45355e710c762712c
 DIST kdemultimedia-3.5.8.tar.bz2 6316739 RMD160 5fcb8d282e2d49baca4daa9fb4e24b5216df92ee SHA1 fd70cf7f7378653e92c03fa0b9d9a5368451632c SHA256 07fc79e38bd7d50a8e2b9910a5d78ef565557b2a746b31d5d440829e9f05b0c1
-EBUILD kdemultimedia-3.5.8-r1.ebuild 2852 RMD160 a9a58ba4661d02c31289cb17f1041461f5816bd5 SHA1 f08c40782c64b054eaa5112495ad412a618c9b99 SHA256 54ab57b16e3506c9b42ba211f14b76a453cd9a42926da3b1a9516793e8aa88ca
-MISC ChangeLog 38637 RMD160 f8d7ac6b68dfd2601576ae6da695ad4a1cb09525 SHA1 f2100fe880909f12b139b455e67fba17ae42f987 SHA256 b70ffe585dad7d40c0b9aeb81b64bfdb581efcf3ccd9cb3a516863559774dc90
+EBUILD kdemultimedia-3.5.8-r1.ebuild 2910 RMD160 6360d39a79d672203648e13511de13c3018b7b88 SHA1 fd8edfee6d35d16a379c92d4345b82e023a20564 SHA256 e3f52770816bdb76b02ea008ed55b863ceb15c986f82e8a62905d19d3d8224be
+MISC ChangeLog 38848 RMD160 bb6cbc0c9f45b539b0836b37d1bc6cfd11975f37 SHA1 37f2e96ff14694c6d4404e9d8369f0ea2b9a342c SHA256 e341e518727597c8ea829e7e91afd90711a27e52badfc5e670a141f0cb384a8d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHuhsxB18eXLOpYdkRAjLqAJwLP5i5Y496p4un0oYkxK5+fTFCMQCgn2Q6
-ysGoFhs2TmYpeAnNqn6zQ00=
-=37Ic
+iD8DBQFHvIf5B18eXLOpYdkRAhPZAJ4ib5rzRGa5vx6zQunGA/chBFbE2QCgpjOy
+ioRn3leppHiBlc8Pf5np/UU=
+=bSjv
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.5.8-xine-lib-1.1.10.1.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.5.8-xine-lib-1.1.10.1.patch
new file mode 100644 (file)
index 0000000..8d42ff5
--- /dev/null
+++ b/kde-base/kdemultimedia/files/kdemultimedia-3.5.8-xine-lib-1.1.10.1.patch
@@ -0,0 +1,17 @@
+--- kdemultimedia-3.5.8.orig/xine_artsplugin/configure.in.in   2005-09-10 10:20:09.000000000 +0200
++++ kdemultimedia-3.5.8/xine_artsplugin/configure.in.in        2008-02-13 23:15:48.000000000 +0100
+@@ -69,11 +69,11 @@
+       XINE_CFLAGS=`$XINE_CONFIG $xine_config_args --cflags`
+       XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs`
+       xine_config_major_version=`$XINE_CONFIG $xine_config_args --version | \
+-             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+       xine_config_minor_version=`$XINE_CONFIG $xine_config_args --version | \
+-             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+       xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \
+-             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+       xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir`
+       xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir`
+       xine_locale_dir=`$XINE_CONFIG $xine_config_args --localedir`

diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.8-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.8-r1.ebuild
index 9130be4b07ad5e1ce0635692002f6244423d8160..98b34b1345c5b2ea7c8adf75ee5d8fcc742fbab3 100644 (file)
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.8-r1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.8-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/kde-base/kdemultimedia/kdemultimedia-3.5.8-r1.ebuild,v 1.7 2008/01/31 02:26:57 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.8-r1.ebuild,v 1.8 2008/02/20 20:06:29 ingmar Exp $
 
 inherit kde-dist flag-o-matic
 
@@ -35,8 +35,9 @@ DEPEND="${DEPEND}
        dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kdemultimedia-3.5.5+flac-1.1.3.patch
-               ${FILESDIR}/kdemultimedia-kioslaves-3.5.8-freebsd.patch
-               ${FILESDIR}/kmix-3.5.8-198015_XF86Audio.patch"
+               ${FILESDIR}/kdemultimedia-kioslaves-${PV}-freebsd.patch
+               ${FILESDIR}/kmix-${PV}-198015_XF86Audio.patch
+               ${FILESDIR}/kdemultimedia-${PV}-xine-lib-1.1.10.1.patch"
 
 pkg_setup() {
        kde_pkg_setup