Update to latest upstream (0.4.8), and dropped the patches applied upstream. Removed 0.4.6 an d0.4.1-r1 (now that sparc has a newer stable).

(Portage version: 2.0.52-r1)

10 files changed, 15 insertions, 149 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index ac20c5cc6d9f..e5179b103fea 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.46 2005/09/10 14:05:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.47 2005/09/12 08:50:29 flameeyes Exp $
+
+*gxine-0.4.8 (12 Sep 2005)
+
+  12 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/gxine-0.4.4-secfix.patch, -files/gxine-0.4.6-literals.patch,
+  -files/gxine-0.4.6-mkstemp.patch, -gxine-0.4.1-r1.ebuild,
+  -gxine-0.4.6.ebuild, +gxine-0.4.8.ebuild:
+  Update to latest upstream (0.4.8), and dropped the patches applied upstream.
+  Removed 0.4.6 an d0.4.1-r1 (now that sparc has a newer stable).
 
   10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gxine-0.4.1-r1.ebuild,
   gxine-0.4.5.ebuild, gxine-0.4.6.ebuild:
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index c27a2bbf0c5b..a297eddf1961 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1b13944ca65db7357e2189f4cd0d4ecc ChangeLog 6608
-MD5 92aafcd346319a4d24749c1fdc89b818 gxine-0.4.6.ebuild 1618
+MD5 92aafcd346319a4d24749c1fdc89b818 gxine-0.4.8.ebuild 1618
+MD5 78ecf018d8063d4de4234538f1e75a29 gxine-0.4.6.ebuild 1538
 MD5 79d0920e2fdab22f9ef6792340afbdd8 gxine-0.4.5.ebuild 1512
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 be998b477dc7732be73c31e1476cb61d gxine-0.4.1-r1.ebuild 1461
@@ -11,12 +9,6 @@ MD5 a5dc1655a0734939aaf026899e7c97a8 files/gxine-0.4.4-secfix.patch 515
 MD5 8860a875faf80dd138c80c99b9d3375d files/gxine-0.4.6-literals.patch 541
 MD5 6681123d68137e59a504366751791a87 files/gxine-0.4.6-mkstemp.patch 1198
 MD5 f2e455a1b17385f10fa014eb9c7e14e3 files/digest-gxine-0.4.6 64
+MD5 d3f2297a49721a0558f863ba3f8ba2f0 files/digest-gxine-0.4.8 64
 MD5 fb579db8b42db43fb5c027ca8c78e951 files/digest-gxine-0.4.5 64
 MD5 69140a1cb8cc6acb6ffdca76e9301493 files/digest-gxine-0.4.1-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDIuhfj5H05b2HAEkRAtu1AJ4920K5MAUgTiU4gAi1vT1sE31kowCfXwPI
-OsohoTR9oHFEpecChF69xXI=
-=0B3a
------END PGP SIGNATURE-----
diff --git a/media-video/gxine/files/digest-gxine-0.4.1-r1 b/media-video/gxine/files/digest-gxine-0.4.1-r1
deleted file mode 100644
index 5358c15b173f..000000000000
--- a/media-video/gxine/files/digest-gxine-0.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a04df0d971a8952fb395b6eb0bc8dab gxine-0.4.1.tar.gz 1286144
diff --git a/media-video/gxine/files/digest-gxine-0.4.6 b/media-video/gxine/files/digest-gxine-0.4.6
deleted file mode 100644
index 1526149255ba..000000000000
--- a/media-video/gxine/files/digest-gxine-0.4.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62c2540ba3622b68af2df226778aa97b gxine-0.4.6.tar.gz 1323047
diff --git a/media-video/gxine/files/digest-gxine-0.4.8 b/media-video/gxine/files/digest-gxine-0.4.8
new file mode 100644
index 000000000000..dfcab99b3765
--- /dev/null
+++ b/media-video/gxine/files/digest-gxine-0.4.8
@@ -0,0 +1 @@
+MD5 bd0549aa73065a8221a71a4bc92742f1 gxine-0.4.8.tar.gz 1324873
diff --git a/media-video/gxine/files/gxine-0.4.4-secfix.patch b/media-video/gxine/files/gxine-0.4.4-secfix.patch
deleted file mode 100644
index 242b428ee745..000000000000
--- a/media-video/gxine/files/gxine-0.4.4-secfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gxine-0.4.4/src/utils.c gxine-0.4.4-secfix/src/utils.c
---- gxine-0.4.4/src/utils.c	2005-03-17 01:55:23.000000000 +0100
-+++ gxine-0.4.4-secfix/src/utils.c	2005-05-24 15:11:20.002943848 +0200
-@@ -164,7 +164,7 @@
-   va_end (ap);
- 
-   dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, type,
--				   GTK_BUTTONS_CLOSE, msg);
-+				   GTK_BUTTONS_CLOSE, "%s", msg);
-   gtk_window_set_title (GTK_WINDOW (dialog), title);
-   gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
- 
diff --git a/media-video/gxine/files/gxine-0.4.6-literals.patch b/media-video/gxine/files/gxine-0.4.6-literals.patch
deleted file mode 100644
index 7135c02c9cc6..000000000000
--- a/media-video/gxine/files/gxine-0.4.6-literals.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gxine-0.4.6/src/post.c gxine-0.4.6-literals/src/post.c
---- gxine-0.4.6/src/post.c	2005-05-19 02:25:43.000000000 +0200
-+++ gxine-0.4.6-literals/src/post.c	2005-08-01 21:47:19.613011536 +0200
-@@ -432,7 +432,7 @@
- {
-   const gxine_post_t *info = g_object_get_data (G_OBJECT(widget), "post");
-   memset (info->params + param->offset, 0, param->size);
--  snprintf (info->params + param->offset, param->size,
-+  snprintf (info->params + param->offset, param->size, "%s",
- 	    gtk_editable_get_chars (widget, 0, -1));
-   return FALSE;
- }
diff --git a/media-video/gxine/files/gxine-0.4.6-mkstemp.patch b/media-video/gxine/files/gxine-0.4.6-mkstemp.patch
deleted file mode 100644
index f84fb60fed81..000000000000
--- a/media-video/gxine/files/gxine-0.4.6-mkstemp.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -x '*~' -ur gxine-0.4.6/src/client.c gxine-0.4.6-mkstemp/src/client.c
---- gxine-0.4.6/src/client.c	2005-03-17 01:55:23.000000000 +0100
-+++ gxine-0.4.6-mkstemp/src/client.c	2005-08-01 22:35:54.497881680 +0200
-@@ -47,11 +47,11 @@
- 
- int main (int argc, char **argv) {
- 
--  int                fd;
-+  int                fd, tfd;
-   struct sockaddr_un cli_adr, serv_adr;
-   int                length = sizeof(struct sockaddr_un);
-   char               filename [1024];
--  char              *tstr;
-+  char               *tstr;
-   int		     ret = 0;
- 
-   signal (SIGPIPE, sigpipe);
-@@ -66,10 +66,14 @@
-   /* initialize the client address structure */
-   memset (&cli_adr, 0, sizeof (cli_adr));
-   cli_adr.sun_family = AF_UNIX;
--  tstr = tmpnam (NULL);
--  strcpy (cli_adr.sun_path, tstr);
--  
-+  tstr = strdup("/tmp/gxine_XXXXXX");
-+  if ( (tfd = mkstemp(tstr)) < 0 ) {
-+    perror ("mkstemp");
-+    exit (EXIT_FAILURE);
-+  }
-+  close(tfd);
-   unlink (tstr);
-+  strncpy(cli_adr.sun_path, tstr, 107);
- 
-   /* bind the socket to the client's address */
-   if (bind (fd, (struct sockaddr*) &cli_adr, length) < 0) {
-@@ -139,6 +143,7 @@
-   close(fd);
- 
-   unlink (tstr);
-+  free(tstr);
- 
-   return ret;
- }
diff --git a/media-video/gxine/gxine-0.4.1-r1.ebuild b/media-video/gxine/gxine-0.4.1-r1.ebuild
deleted file mode 100644
index 9179faf8a3b2..000000000000
--- a/media-video/gxine/gxine-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.1-r1.ebuild,v 1.5 2005/09/10 14:05:49 flameeyes Exp $
-
-inherit eutils nsplugins fdo-mime
-
-DESCRIPTION="GTK+ Front-End for libxine"
-HOMEPAGE="http://xine.sourceforge.net/"
-LICENSE="GPL-2"
-
-DEPEND="media-libs/libpng
-	>=media-libs/xine-lib-1_beta10
-	>=x11-libs/gtk+-2.4
-	>=dev-libs/glib-2.4
-	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-IUSE="nls lirc nsplugin"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 sparc x86"
-
-SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-menu-fix.patch
-
-	#fixes format string security bug #93532
-	epatch ${FILESDIR}/${PN}-0.4.4-secfix.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable lirc) \
-		$(use_with nsplugin browser-plugin) \
-		--disable-dependency-tracking || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins pixmaps/gxine-logo.png gxine.png
-
-	insinto /usr/share/pixmaps
-	doins pixmaps/gxine-logo.png
-
-	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/media-video/gxine/gxine-0.4.6.ebuild b/media-video/gxine/gxine-0.4.8.ebuild
index 7613ab4ff09e..e46a5d2c562a 100644
--- a/media-video/gxine/gxine-0.4.6.ebuild
+++ b/media-video/gxine/gxine-0.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.6.ebuild,v 1.3 2005/09/10 14:05:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.4.8.ebuild,v 1.1 2005/09/12 08:50:29 flameeyes Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -30,9 +30,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-literals.patch
-	epatch ${FILESDIR}/${P}-mkstemp.patch
-
 	# Fix icon as per icon theme specs.
 	sed -i -e 's:gxine-logo.png:gxine:' ${S}/gxine.desktop
 }