old

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

diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 5ce56522b18ae86c30baaffe9001545c2327c968..29d25b5b4c923bdd724f534b626ffd92c2a1dda4 100644 (file)
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,7 +1,4 @@
-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.6.ebuild 2216 RMD160 25be9ba264121b2c44b6faeec56367f926d06000 SHA1 77c0d7aeb4a4922342bd0ab03dc22f26f3c74022 SHA256 0c818b172bf00c5d77dceba8c63252671e76f752a84b0495be0ffb3e59796744
 MISC ChangeLog 26531 RMD160 7dbdc015ce4d505f9aeb262eee31b74f8f85034b SHA1 4b5f87ce649c487a54d7fcf7183b25cbd6118a1a SHA256 c5593ad864a2be8305a81b4d3b6436deb3cccafdb4c20d6d0eb79df443bdc1e8
 MISC metadata.xml 314 RMD160 2d0d208be3d3423e72e81e07d4e52855d84decdc SHA1 4a5be7be171c292f138e645ecc3719912e00375e SHA256 7d249cbdf83d624b16eca3d7a1dd04db70b4f168197c904397d76f86200e96da

diff --git a/media-video/xine-ui/files/xine-ui-0.99.5-new_libcaca_api.patch b/media-video/xine-ui/files/xine-ui-0.99.5-new_libcaca_api.patch
deleted file mode 100644 (file)
index ae573d7..0000000
--- a/media-video/xine-ui/files/xine-ui-0.99.5-new_libcaca_api.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: xine-ui-0.99.5/configure.ac
-===================================================================
---- xine-ui-0.99.5.orig/configure.ac
-+++ xine-ui-0.99.5/configure.ac
-@@ -364,6 +364,13 @@ if test "x$with_caca" != "xno"; then
-    if test "x$with_caca" = "xyes" && test "x$have_caca" = "xno"; then
-       AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
-    fi
-+   AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h> 
-+                                        caca_event_t ev;]], 
-+                                        [[ev.type = 0;]] 
-+                       )],
-+                       [],
-+                       [AC_DEFINE(CACA_EVENT_OPAQUE, [1], ["Define if struct caca_event is opaque and must not be accessed directly"])]
-+   )
- fi
- 
- AM_CONDITIONAL([HAVE_CACA], [test "x$have_caca" = "xyes"])
-Index: xine-ui-0.99.5/src/aaui/main.c
-===================================================================
---- xine-ui-0.99.5.orig/src/aaui/main.c
-+++ xine-ui-0.99.5/src/aaui/main.c
-@@ -593,8 +593,12 @@ static int aaxine_get_key_event(void) {
-   while ( !caca_get_event(aaxine.display, CACA_EVENT_KEY_PRESS, &ev, 50000) && aaxine.running ) ;
- 
-   if (!aaxine.running) return 0;
-+#ifdef CACA_EVENT_OPAQUE
-+  return caca_get_event_key_ch( &ev );
-+#else
-   return ev.data.key.ch;
- #endif
-+#endif
- }
- 
- /*

diff --git a/media-video/xine-ui/xine-ui-0.99.5-r1.ebuild b/media-video/xine-ui/xine-ui-0.99.5-r1.ebuild
deleted file mode 100644 (file)
index 0f6eea2..0000000
--- a/media-video/xine-ui/xine-ui-0.99.5-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.6 2008/08/10 17:30:50 klausman Exp $
-
-# 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
-       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"
-
-pkg_setup() {
-       if use aalib && ! built_with_use media-libs/xine-lib aalib; then
-               eerror "To enable the AA frontend in xine-ui you need"
-               eerror "to enable the aalib video output in media-libs/xine-lib."
-               die "Missing aalib USE flag on media-libs/xine-lib."
-       fi
-
-       if use libcaca && ! built_with_use media-libs/xine-lib libcaca; then
-               eerror "To enable the CACA frontend in xine-ui you need"
-               eerror "to enable the libcaca video output in media-libs/xine-lib."
-               die "Missing libcaca USE flag on media-libs/xine-lib."
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/${P}-new_libcaca_api.patch"
-       AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-       rm misc/xine-bugreport
-
-       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."
-       emake || die "emake 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"
-}