Add patch to disable xinerama checking and linking as it's not used at all (--as-needed dropped it, too).

Package-Manager: portage-2529-svn

4 files changed, 33 insertions, 9 deletions

diff --git a/media-tv/kdetv/ChangeLog b/media-tv/kdetv/ChangeLog
index f58a85e4c945..8e58e5610410 100644
--- a/media-tv/kdetv/ChangeLog
+++ b/media-tv/kdetv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/kdetv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.16 2006/01/03 23:07:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/ChangeLog,v 1.17 2006/01/12 01:13:07 flameeyes Exp $
+
+  12 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdetv-0.8.8-xinerama.patch, kdetv-0.8.8-r1.ebuild:
+  Add patch to disable xinerama checking and linking as it's not used at all
+  (--as-needed dropped it, too).
 
 *kdetv-0.8.8-r1 (03 Jan 2006)
 
diff --git a/media-tv/kdetv/Manifest b/media-tv/kdetv/Manifest
index c6039ec8cdca..b6eedf1ed547 100644
--- a/media-tv/kdetv/Manifest
+++ b/media-tv/kdetv/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5368688966c66f9ff9d4a585523d7031 ChangeLog 2172
+MD5 45d03381f2a36da5668e9e013ef75610 ChangeLog 2396
 MD5 ce407b1306184d33a91829ef0b8c942d files/digest-kdetv-0.8.8 65
 MD5 ce407b1306184d33a91829ef0b8c942d files/digest-kdetv-0.8.8-r1 65
-MD5 26489d3837bc3842258f009a9b066e69 kdetv-0.8.8-r1.ebuild 1674
+MD5 0224e812128d13ec149838f2f5a3f25d files/kdetv-0.8.8-xinerama.patch 633
+MD5 a3381f5d92f7f9f6b95875cfb3a06427 kdetv-0.8.8-r1.ebuild 1717
 MD5 93cd475d4d71a22fd9bd13ef80a71203 kdetv-0.8.8.ebuild 1179
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDuwPkAiZjviIA2XgRAi5iAJ9yMDB/mq6tC442eZLNxyc0Iidu8QCeIufK
-0XagpD/RnCEUhsYdQu48XJs=
-=XM0X
+iD8DBQFDxa0wAiZjviIA2XgRAh5UAJ4mXSEpPzd1IpB/aP+JaWA6IYpYPgCdEb50
+Be6TD0zSNMC9LXNw6n054Jw=
+=53D6
 -----END PGP SIGNATURE-----
diff --git a/media-tv/kdetv/files/kdetv-0.8.8-xinerama.patch b/media-tv/kdetv/files/kdetv-0.8.8-xinerama.patch
new file mode 100644
index 000000000000..f88a43261d86
--- /dev/null
+++ b/media-tv/kdetv/files/kdetv-0.8.8-xinerama.patch
@@ -0,0 +1,15 @@
+Index: kdetv-0.8.8/kdetv/configure.in.in
+===================================================================
+--- kdetv-0.8.8.orig/kdetv/configure.in.in
++++ kdetv-0.8.8/kdetv/configure.in.in
+@@ -46,10 +46,6 @@ dnl DPMSQueryExtension is included in Xl
+         KDETV_LIBS="-lXdpms $KDETV_LIBS",,
+         -L/usr/X11R6/lib $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+ 
+-    KDE_CHECK_LIB(Xinerama, XineramaQueryExtension,
+-        KDETV_LIBS="-lXinerama $KDETV_LIBS",,
+-        -L/usr/X11R6/lib $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)
+-
+ AC_SUBST(KDETV_LIBS)
+ 
+ if test $ac_cv_lib_Xxf86dga_XF86DGAQueryExtension = yes; then
diff --git a/media-tv/kdetv/kdetv-0.8.8-r1.ebuild b/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
index 86595beba3be..28bd5b22fb12 100644
--- a/media-tv/kdetv/kdetv-0.8.8-r1.ebuild
+++ b/media-tv/kdetv/kdetv-0.8.8-r1.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-tv/kdetv/kdetv-0.8.8-r1.ebuild,v 1.1 2006/01/03 23:07:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kdetv/kdetv-0.8.8-r1.ebuild,v 1.2 2006/01/12 01:13:07 flameeyes Exp $
 
 inherit kde
 
@@ -17,8 +17,7 @@ RDEPEND="zvbi? ( >=media-libs/zvbi-0.2.4 )
 	lirc? ( app-misc/lirc )
 	opengl? ( virtual/opengl )
 	media-libs/alsa-lib
-	|| ( ( x11-libs/libXinerama
-		x11-libs/libICE
+	|| ( ( x11-libs/libICE
 		x11-libs/libXxf86dga
 		x11-libs/libXrandr
 		x11-libs/libX11
@@ -40,6 +39,8 @@ DEPEND="${RDEPEND}
 
 need-kde 3.2
 
+PATCHES="${FILESDIR}/${P}-xinerama.patch"
+
 src_unpack() {
 	LANGS="bg ca br da de cs cy el es et fi ga fr gl hu is it lt nb mt nl pa pl pt ro ru rw ta sr sv tr en_GB pt_BR zh_CN sr@Latn"
 	LANGS_DOC="da et fr it nl pt ru sv"
@@ -50,6 +51,8 @@ src_unpack() {
 	kde_src_unpack
 	sed -i -r -e "s:^SUBDIRS =.*:SUBDIRS = ${MAKE_PO}:" ${S}/po/Makefile.in || die "sed for locale failed"
 	sed -i -r -e "s:^SUBDIRS =.*:SUBDIRS = \. ${MAKE_DOC} kdetv:" ${S}/doc/Makefile.in || die "sed for locale failed"
+
+	rm -f ${S}/configure
 }
 
 src_compile() {