whitespace, old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 3 insertions, 95 deletions

diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index c489985c62e0..ca88922d57f4 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,9 +1,7 @@
-AUX xine-ui-0.99.5-libpng14.patch 366 RMD160 8ee1438d54c717f5ba87452a86aa789a7c456389 SHA1 88083818f8ff9eb71be484e5e4fdcabda925c9d8 SHA256 e500592651266debc8e7e1d6e319a5e9bd5597592fd2d2cab7976c6d5d446f38
 AUX xine-ui-0.99.5-new_libcaca_api.patch 1330 RMD160 3db1bca5b148e4ee035bcc3fd630f430bef75395 SHA1 3405a375e1618f510b6ca15fb161fd3e55ce75b1 SHA256 376efa9b23ff2a0de79e64943818b1f041ba6b4bafd76257a37edfb27bd0743d
 DIST xine-ui-0.99.5.tar.gz 2606481 RMD160 64cb69549d88d904d986ea7dd7b36a51d5b91756 SHA1 4f452516319f31cda01d08ea2779f195933af0bb SHA256 1368aa9cfd70433d14efde5bf0e70911f80f9463a026192c1f133a339be25e1e
 DIST xine-ui-0.99.6.tar.xz 1797144 RMD160 b5d27f112d2ebb861d18be684c17c5fe0e7b7fbd SHA1 abbdb331898c14025ee6b132f63ab7d3c1b5b31e SHA256 4eb1e3eb6c2ebba70f2e215a15d8b99bb3e2b0449c94105dc16e963a99a59ef3
 EBUILD xine-ui-0.99.5-r1.ebuild 2609 RMD160 750093e85741edb95d58bf75ea34a14fd6ee7e03 SHA1 522fa58f9bb53a110082af8415512a98013ee1d7 SHA256 8165fc350abf55170a244c90143328b585cc351d06b08aee9a3b1c8eefc01bdb
-EBUILD xine-ui-0.99.5-r2.ebuild 2100 RMD160 c30588b7546952b850568ed125d9b0c4f48115a8 SHA1 8138f611f65aa7aefbeb0cb9965de07ca56422d3 SHA256 e54cb620eff7e8cfee0bf9becca4bd706d6637ddbfb6d0db0fc2bd8ff97d2342
-EBUILD xine-ui-0.99.6.ebuild 2281 RMD160 75fe59821b23dc09f5bd8603469c1e6f9fa95386 SHA1 c34537c84a3fd1564da96893e39a322d76eb1122 SHA256 2abe44510463dc5a5e98adc4b97ea07631d6b8c49128b0e833f244964ecc4f35
+EBUILD xine-ui-0.99.6.ebuild 2280 RMD160 ded1c3e22dd3100bb706c24c228edcf824a040ba SHA1 be532abbf8f3dad39f72a8c319b53c0f1a22899e SHA256 e83020b9815ca6cbf1125770e0c94987a867dc3d16c95ea65b7ca3dcfb302107
 MISC ChangeLog 26042 RMD160 293ce6ffe7c191a3369b238cc38ddf267fb9b554 SHA1 7722716513363bdcdf5e68efcc7bd23112514704 SHA256 8c367983afcd438ddbbe6f5e1ee0783bbfca0b0ae386de9acef35fa25680bc92
 MISC metadata.xml 314 RMD160 2d0d208be3d3423e72e81e07d4e52855d84decdc SHA1 4a5be7be171c292f138e645ecc3719912e00375e SHA256 7d249cbdf83d624b16eca3d7a1dd04db70b4f168197c904397d76f86200e96da
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) \