old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

4 files changed, 6 insertions, 119 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index e01d3e60f850..4dbd7c59f813 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.183 2014/06/22 17:52:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.184 2014/06/22 17:53:25 ssuominen Exp $
+
+  22 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xine-ui-0.99.6-curl-headers.patch,
+  -files/xine-ui-0.99.6-libpng15.patch, -xine-ui-0.99.6.ebuild:
+  old
 
   22 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> xine-ui-0.99.7.ebuild:
   ppc stable wrt #451350
diff --git a/media-video/xine-ui/files/xine-ui-0.99.6-curl-headers.patch b/media-video/xine-ui/files/xine-ui-0.99.6-curl-headers.patch
deleted file mode 100644
index 0c90b74ea674..000000000000
--- a/media-video/xine-ui/files/xine-ui-0.99.6-curl-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/xitk/download.c b/src/xitk/download.c
-index 99d8489..c83d0d1 100644
---- a/src/xitk/download.c
-+++ b/src/xitk/download.c
-@@ -28,7 +28,6 @@
- 
- #ifdef HAVE_CURL
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #endif
- 
diff --git a/media-video/xine-ui/files/xine-ui-0.99.6-libpng15.patch b/media-video/xine-ui/files/xine-ui-0.99.6-libpng15.patch
deleted file mode 100644
index 6a5fb5522bd7..000000000000
--- a/media-video/xine-ui/files/xine-ui-0.99.6-libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xine-ui-0.99.6/src/xitk/Imlib-light/load.c
-===================================================================
---- xine-ui-0.99.6.orig/src/xitk/Imlib-light/load.c
-+++ xine-ui-0.99.6/src/xitk/Imlib-light/load.c
-@@ -61,7 +61,7 @@ unsigned char *_LoadPNG(ImlibData * id,
-       png_destroy_read_struct(&png_ptr, NULL, NULL);
-       return NULL;
-     }
--  if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-+  if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
-     {
-       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-       return NULL;
diff --git a/media-video/xine-ui/xine-ui-0.99.6.ebuild b/media-video/xine-ui/xine-ui-0.99.6.ebuild
deleted file mode 100644
index ba78f2e2362e..000000000000
--- a/media-video/xine-ui/xine-ui-0.99.6.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 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.15 2012/05/05 08:58:59 jdhore Exp $
-
-EAPI=3
-inherit fdo-mime gnome2-utils eutils
-
-DESCRIPTION="Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
-
-RDEPEND=">=media-libs/libpng-1.4
-	>=media-libs/xine-lib-1.1.17[aalib?,libcaca?]
-	aalib? ( media-libs/aalib )
-	curl? ( >=net-misc/curl-7.10.2 )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	readline? ( sys-libs/readline )
-	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 ) )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	X? ( x11-libs/libXt
-		x11-proto/xf86vidmodeproto
-		x11-proto/inputproto
-		xinerama? ( x11-proto/xineramaproto ) )
-	virtual/pkgconfig
-	app-arch/xz-utils"
-
-src_prepare() {
-	rm -f misc/xine-bugreport
-	epatch "${FILESDIR}/${P}-libpng15.patch" \
-		"${FILESDIR}/${P}-curl-headers.patch"
-}
-
-src_configure() {
-	if use lirc; then
-		export LIRC_CFLAGS="-I/usr/include/lirc" LIRC_LIBS="-llirc_client"
-	fi
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable lirc) \
-		$(use_enable vdr vdr-keys) \
-		--disable-nvtvsimple \
-		$(use_enable debug) \
-		$(use_with X x) \
-		$(use_with readline) \
-		$(use_with curl) \
-		$(use_with aalib) \
-		$(use_with libcaca caca)
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" \
-		docsdir="/usr/share/doc/${PF}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	dodir /usr/share/applications
-	mv -vf "${D}"/usr/share/xine/desktop/xine.desktop "${D}"/usr/share/applications
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}