whitespace, old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 2 insertions, 92 deletions

diff --git a/media-video/xine-ui/files/xine-ui-0.99.5-libpng14.patch b/media-video/xine-ui/files/xine-ui-0.99.5-libpng14.patch
deleted file mode 100644
index 4f0d5e14a8f0..000000000000
--- a/media-video/xine-ui/files/xine-ui-0.99.5-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xine-ui-0.99.5/src/xitk/Imlib-light/load.c	Mon Jul 14 22:44:10 2003
-+++ xine-ui-0.99.5-new/src/xitk/Imlib-light/load.c	Sat Jan 30 04:37:54 2010
-@@ -193,7 +193,7 @@
-     return 0;
-   fread(buf, 1, 8, f);
-   rewind(f);
--  return (int)png_check_sig(buf, 8);
-+  return (int) !png_sig_cmp(buf, 0, 8);
- }
- 
- ImlibImage * Imlib_load_image(ImlibData * id, char *file) {
diff --git a/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild b/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild
deleted file mode 100644
index f4e38bc532fe..000000000000
--- a/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.5-r2.ebuild,v 1.3 2010/02/15 22:28:19 hanno Exp $
-
-EAPI=2
-
-# WANT_AUTOCONF=latest
-# WANT_AUTOMAKE=latest
-
-inherit eutils toolchain-funcs flag-o-matic autotools
-
-#PATCHLEVEL="11"
-DESCRIPTION="Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-#	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="X nls lirc aalib libcaca readline curl vdr xinerama debug"
-
-RDEPEND=">=media-libs/libpng-1.2.8
-	>=media-libs/xine-lib-1.1.0[aalib?,libcaca?]
-	lirc? ( app-misc/lirc )
-	aalib? ( media-libs/aalib )
-	libcaca? ( media-libs/libcaca )
-	curl? ( >=net-misc/curl-7.10.2 )
-	X? ( x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/libXv
-		x11-libs/libXtst
-		x11-libs/libXft
-		xinerama? ( x11-libs/libXinerama ) )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	X? ( x11-libs/libXt
-		x11-proto/xf86vidmodeproto
-		x11-proto/inputproto
-		xinerama? ( x11-proto/xineramaproto ) )
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-new_libcaca_api.patch"
-	epatch "${FILESDIR}/${P}-libpng14.patch"
-	AT_M4DIR="m4" eautoreconf
-
-	rm misc/xine-bugreport
-}
-
-src_configure() {
-	econf \
-		$(use_enable lirc) \
-		$(use_enable nls) \
-		$(use_enable vdr vdr-keys) \
-		$(use_enable xinerama) \
-		$(use_enable debug) \
-		$(use_with X x) \
-		$(use_with aalib) \
-		$(use_with libcaca caca) \
-		$(use_with curl) \
-		$(use_with readline) \
-		--without-ncurses \
-		|| die "econf failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" docsdir="/usr/share/doc/${PF}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# Remove on next snapshot (after 20070303)
-	dodir /usr/share/applications
-	mv "${D}/usr/share/xine/desktop/xine.desktop" "${D}/usr/share/applications"
-}
diff --git a/media-video/xine-ui/xine-ui-0.99.6.ebuild b/media-video/xine-ui/xine-ui-0.99.6.ebuild
index a1466334cbfb..e031eee9db1b 100644
--- a/media-video/xine-ui/xine-ui-0.99.6.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.6.ebuild,v 1.3 2010/04/02 14:18:11 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.6.ebuild,v 1.4 2010/04/02 14:20:30 ssuominen Exp $
 
 EAPI=3
 inherit fdo-mime gnome2-utils
@@ -52,7 +52,7 @@ src_configure() {
 		--disable-dependency-tracking \
 		$(use_enable nls) \
 		$(use_enable xinerama) \
-		$(use_enable lirc) LIRC_CFLAGS=" " LIRC_LIBS="-llirc_client" \
+		$(use_enable lirc) LIRC_CFLAGS="" LIRC_LIBS="-llirc_client" \
 		$(use_enable vdr vdr-keys) \
 		--disable-nvtvsimple \
 		$(use_enable debug) \