Punt unused version. Remove USE gstreamer from another. GStreamer 0.8 is going away.

(Portage version: 2.1.3.7)

8 files changed, 7 insertions, 202 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 5916734fd4f9..8dcf225c1662 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.75 2007/07/30 22:51:22 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.76 2007/08/30 17:00:11 drac Exp $
+
+  30 Aug 2007; Samuli Suominen <drac@gentoo.org> kaffeine-0.8.3.ebuild:
+  Remove USE gstreamer as 0.8 is going away.
 
 *kaffeine-0.8.5 (30 Jul 2007)
 
diff --git a/media-video/kaffeine/files/digest-kaffeine-0.7.1-r2 b/media-video/kaffeine/files/digest-kaffeine-0.7.1-r2
deleted file mode 100644
index 21e82a1a8d49..000000000000
--- a/media-video/kaffeine/files/digest-kaffeine-0.7.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 afde61516eb8f6cf2c3bf085a22ef427 kaffeine-0.7.1.tar.bz2 2276747
-RMD160 b609bc47dd7cc11753c016bf0da3214f54fa8df0 kaffeine-0.7.1.tar.bz2 2276747
-SHA256 7e2611ba4fb4cc5b6a1802250a5c404b22cca434ce1d3bbe83088f6189bfa145 kaffeine-0.7.1.tar.bz2 2276747
diff --git a/media-video/kaffeine/files/kaffeine-0.7.1-input-http.patch b/media-video/kaffeine/files/kaffeine-0.7.1-input-http.patch
deleted file mode 100644
index 796d07c18a4e..000000000000
--- a/media-video/kaffeine/files/kaffeine-0.7.1-input-http.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Index: kaffeine/kaffeine/player-parts/http.c
-===================================================================
---- kaffeine/kaffeine/player-parts/http.c	(revision 521094)
-+++ kaffeine/kaffeine/player-parts/http.c	(working copy)
-@@ -308,7 +308,7 @@ static http_t *http_open (const char *mr
- 
-   http_t   *this;
-   char     *proxy;
--  int       done,len,linenum;
-+  int       done,len,linenum,buflen;
-   char      mime_type[BUFSIZE+1];
- 
-   this = malloc (sizeof (http_t));
-@@ -362,13 +362,13 @@ static http_t *http_open (const char *mr
-   {
-     char buf[256];
- 
--    sprintf (buf, "http: opening >/%s< on host >%s<",
-+    snprintf (buf, sizeof(buf), "http: opening >/%s< on host >%s<",
- 	     this->filename, this->host);
- 
-     if (proxy != NULL)
--      sprintf(buf, "%s via proxy >%s<", buf, this->proxyhost);
-+      snprintf(buf, sizeof(buf), "%s via proxy >%s<", buf, this->proxyhost);
- 
--    sprintf(buf, "%s\n", buf);
-+    snprintf(buf, sizeof(buf), "%s\n", buf);
- 
-     printf (buf);
-   }
-@@ -389,35 +389,42 @@ static http_t *http_open (const char *mr
- 
-   if (proxy != NULL)
-     if (this->port != DEFAULT_HTTP_PORT)
--      sprintf (this->buf, "GET http://%s:%d/%s HTTP/1.0\015\012",
--	       this->host, this->port, this->filename);
-+      snprintf (this->buf, BUFSIZE, "GET http://%s:%d/%s HTTP/1.0\015\012",
-+	        this->host, this->port, this->filename);
-     else
--      sprintf (this->buf, "GET http://%s/%s HTTP/1.0\015\012",
--	       this->host, this->filename);
-+      snprintf (this->buf, BUFSIZE, "GET http://%s/%s HTTP/1.0\015\012",
-+	        this->host, this->filename);
-   else
--    sprintf (this->buf, "GET /%s HTTP/1.0\015\012", this->filename);
-+    snprintf (this->buf, BUFSIZE, "GET /%s HTTP/1.0\015\012", this->filename);
- 
-+  buflen = strlen(this->buf);
-   if (this->port != DEFAULT_HTTP_PORT)
--    sprintf (this->buf + strlen(this->buf), "Host: %s:%d\015\012",
--	     this->host, this->port);
-+    snprintf (this->buf + buflen, BUFSIZE - buflen, "Host: %s:%d\015\012",
-+	      this->host, this->port);
-   else
--    sprintf (this->buf + strlen(this->buf), "Host: %s\015\012",
--	     this->host);
-+    snprintf (this->buf + buflen, BUFSIZE - buflen, "Host: %s\015\012",
-+	      this->host);
- 
--  if (this->proxyuser != NULL)
--    sprintf (this->buf + strlen(this->buf), "Proxy-Authorization: Basic %s\015\012",
--	     this->proxyauth);
-+  buflen = strlen(this->buf);
-+  if (this->proxyuser != NULL) {
-+    snprintf (this->buf + buflen, BUFSIZE - buflen, "Proxy-Authorization: Basic %s\015\012",
-+	      this->proxyauth);
-+    buflen = strlen(this->buf);
-+  }
- 
--  if (this->user != NULL)
--    sprintf (this->buf + strlen(this->buf), "Authorization: Basic %s\015\012",
--	     this->auth);
-+  if (this->user != NULL) {
-+    snprintf (this->buf + buflen, BUFSIZE - buflen, "Authorization: Basic %s\015\012",
-+	      this->auth);
-+    buflen = strlen(this->buf);
-+  }
- 
--  sprintf (this->buf + strlen(this->buf), "User-Agent: xine/%s\015\012",
-+  snprintf (this->buf + buflen, BUFSIZE - buflen, "User-Agent: xine/%s\015\012",
- 	   VERSION);
- 
--  strcat (this->buf, "Accept: */*\015\012");
--
--  strcat (this->buf, "\015\012");
-+  buflen = strlen(this->buf);
-+  snprintf (this->buf + buflen, BUFSIZE - buflen, "Accept: */*\015\012");
-+  buflen = strlen(this->buf);
-+  snprintf (this->buf + buflen, BUFSIZE - buflen, "\015\012");
- 
-   if (write (this->fh, this->buf, strlen(this->buf)) != (ssize_t)strlen(this->buf)) {
-     free (this);
diff --git a/media-video/kaffeine/files/kaffeine-0.7.1-respectflags.patch b/media-video/kaffeine/files/kaffeine-0.7.1-respectflags.patch
deleted file mode 100644
index 91037f61eaae..000000000000
--- a/media-video/kaffeine/files/kaffeine-0.7.1-respectflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: kaffeine-0.7.1/configure.in.in
-===================================================================
---- kaffeine-0.7.1.orig/configure.in.in
-+++ kaffeine-0.7.1/configure.in.in
-@@ -13,7 +13,7 @@ AC_ARG_WITH(xinit-workaround,
- 
- dnl -----  Checks for X11 extensions -----
- ac_save_ldflags="$LDFLAGS"
--LDFLAGS="$X_LDFLAGS"
-+LDFLAGS="${LDFLAGS} $X_LDFLAGS"
- 
- dnl ---------------------------------------------
- dnl Check for Xtest-Extension
-@@ -36,6 +36,8 @@ AC_CHECK_LIB(Xinerama, XineramaQueryExte
-              $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)
- AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
- 
-+LDFLAGS="${ac_save_ldflags}"
-+
- dnl ---------------------------------------------
- dnl Check for xine-lib
- dnl ---------------------------------------------
diff --git a/media-video/kaffeine/files/kaffeine-0.7.1-systemproto.patch b/media-video/kaffeine/files/kaffeine-0.7.1-systemproto.patch
deleted file mode 100644
index c97da5b4ea96..000000000000
--- a/media-video/kaffeine/files/kaffeine-0.7.1-systemproto.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kaffeine-0.7.1/kaffeine/kaffeineapp.cpp.orig	2005-08-28 16:19:27.000000000 +0100
-+++ kaffeine-0.7.1/kaffeine/kaffeineapp.cpp	2006-01-03 15:29:02.436692994 +0000
-@@ -95,7 +95,7 @@
-   QString device = args->getOption("device");
-   if (device == "default")
-     device = QString::null;
--  else if (device.startsWith("media:/"))
-+  else if (device.startsWith("media:/") || device.startsWith("system:/"))
-   {
-     KURL devicePath(device);
-     DCOPRef mediamanager("kded","mediamanager");
diff --git a/media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch b/media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch
deleted file mode 100644
index 9fc37002f9d1..000000000000
--- a/media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: kaffeine/configure.in.in
-===================================================================
---- kaffeine/configure.in.in	(revision 497089)
-+++ kaffeine/configure.in.in	(working copy)
-@@ -26,11 +26,16 @@
- dnl
- dnl Checks for Xinerama extension
- dnl
--AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-+AC_ARG_WITH([xinerama],
-+  AS_HELP_STRING([--without-xinerama], [Disable xinerama support (defaut: check)]))
-+
-+if test "x$with_xinerama" != "xno"; then
-+  AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-              X_PRE_LIBS="$X_PRE_LIBS -lXinerama"
-              AC_DEFINE(HAVE_XINERAMA,,[Define this if you have libXinerama installed])
-              ac_have_xinerama="yes",,
-              $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)
-+fi
- AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
- 
- dnl ---------------------------------------------
diff --git a/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild b/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
deleted file mode 100644
index c75051b85550..000000000000
--- a/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1-r2.ebuild,v 1.6 2007/07/22 08:52:44 dberkholz Exp $
-
-inherit eutils kde
-
-DESCRIPTION="Media player for KDE using xine and gstreamer backends."
-HOMEPAGE="http://kaffeine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kaffeine/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
-IUSE="dvb gstreamer xinerama"
-
-RDEPEND="x11-base/xorg-server
-	>=media-libs/xine-lib-1
-	gstreamer? ( =media-libs/gstreamer-0.8*
-		=media-libs/gst-plugins-0.8* )
-	xinerama? ( x11-libs/libXinerama )"
-
-DEPEND="${RDEPEND}
-	xinerama? ( x11-proto/xineramaproto )
-	dvb? ( media-tv/linuxtv-dvb-headers )
-	dev-util/pkgconfig"
-
-# the dependency on xorg-x11 is meant to avoid bug #59746
-
-PATCHES="${FILESDIR}/${P}-systemproto.patch
-	${FILESDIR}/${P}-xinerama.patch
-	${FILESDIR}/${P}-respectflags.patch
-	${FILESDIR}/${P}-input-http.patch"
-
-need-kde 3.2
-
-src_compile() {
-	rm ${S}/configure
-
-	myconf="${myconf}
-		$(use_with xinerama)
-		$(use_with dvb)
-		$(use_with gstreamer)"
-
-	kde_src_compile
-}
diff --git a/media-video/kaffeine/kaffeine-0.8.3.ebuild b/media-video/kaffeine/kaffeine-0.8.3.ebuild
index 2388cb9bd47a..6cc4a1604713 100644
--- a/media-video/kaffeine/kaffeine-0.8.3.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.3.ebuild,v 1.6 2007/02/18 16:03:40 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.8.3.ebuild,v 1.7 2007/08/30 17:00:11 drac Exp $
 
 inherit eutils kde flag-o-matic
 
@@ -11,12 +11,9 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="dvb gstreamer xinerama vorbis encode kdehiddenvisibility"
+IUSE="dvb xinerama vorbis encode kdehiddenvisibility"
 
 RDEPEND=">=media-libs/xine-lib-1
-	gstreamer? ( =media-libs/gstreamer-0.8*
-		=media-libs/gst-plugins-0.8*
-		=media-plugins/gst-plugins-xvideo-0.8* )
 	media-sound/cdparanoia
 	encode? ( media-sound/lame )
 	vorbis? ( media-libs/libvorbis )
@@ -36,7 +33,7 @@ src_compile() {
 	local myconf="${myconf}
 		$(use_with xinerama)
 		$(use_with dvb)
-		$(use_with gstreamer)
+		--without-gstreamer
 		$(use_with vorbis oggvorbis)
 		$(use_with encode lame)"