remove old

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

11 files changed, 12 insertions, 898 deletions

diff --git a/media-gfx/pornview/ChangeLog b/media-gfx/pornview/ChangeLog
index 8a1bf06abd11..cb4e88c7df3d 100644
--- a/media-gfx/pornview/ChangeLog
+++ b/media-gfx/pornview/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-gfx/pornview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.53 2012/12/21 00:49:22 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/ChangeLog,v 1.54 2012/12/21 00:51:54 hasufell Exp $
+
+  21 Dec 2012; Julian Ospald <hasufell@gentoo.org>
+  -pornview-0.2.0_pre1-r2.ebuild, -files/pornview-0.2.0_pre1-4.diff,
+  -files/pornview-0.2.0_pre1-autoconf.patch,
+  -files/pornview-0.2.0_pre1-desktop-entry.patch,
+  -files/pornview-0.2.0_pre1-fix-array-boundaries.patch,
+  -files/pornview-0.2.0_pre1-fix-segfault-comment.patch,
+  -files/pornview-0.2.0_pre1-libpng15.patch,
+  -files/pornview-0.2.0_pre1-new-gtk-object-system.diff,
+  -files/pornview-0.2.0_pre1-underlinking.patch, -files/traypatch.diff:
+  remove old
 
   21 Dec 2012; Julian Ospald <hasufell@gentoo.org> pornview-0.2.2.ebuild:
   ppc stable wrt #445089
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-4.diff b/media-gfx/pornview/files/pornview-0.2.0_pre1-4.diff
deleted file mode 100644
index 41a9dd555fce..000000000000
--- a/media-gfx/pornview/files/pornview-0.2.0_pre1-4.diff
+++ /dev/null
@@ -1,61 +0,0 @@
---- pornview-0.2pre1.orig/src/support/image_loader.c
-+++ pornview-0.2pre1/src/support/image_loader.c
-@@ -81,7 +81,7 @@
- image_loader_stop (ImageLoader * il)
- {
- #ifdef USE_GTK2
--    GError *err;
-+    GError *err = NULL;
- #endif
- 
-     if (!il)
-@@ -174,7 +174,7 @@
-     gint    c;
- 
- #ifdef USE_GTK2
--    GError *err;
-+    GError *err = NULL;
- #endif
- 
-     if (!il)
-@@ -241,7 +241,7 @@
-     int     b;
- 
- #ifdef USE_GTK2
--    GError *err;
-+    GError *err = NULL;
- #endif
- 
-     if (!il->loader || il->pixbuf)
---- pornview-0.2pre1.orig/src/support/widgets/gtkxine.c
-+++ pornview-0.2pre1/src/support/widgets/gtkxine.c
-@@ -632,7 +632,7 @@
-      */
-     if (this->vo_driver != NULL)
- 	xine_close_video_driver (this->xine, this->vo_driver);
--    if (this->vo_driver != NULL)
-+    if (this->ao_driver != NULL)
- 	xine_close_audio_driver (this->xine, this->ao_driver);
- 
-     /*
-@@ -1920,7 +1920,7 @@
-  *  This function was pinched from filter_yuy2tov12.c, part of
-  *  transcode, a linux video stream processing tool
-  *
-- *  Copyright (C) Thomas ŽÖstreich - June 2001
-+ *  Copyright (C) Thomas ��streich - June 2001
-  *
-  *  Thanks Thomas
-  *      
---- pornview-0.2pre1.orig/src/support/widgets/zlist.c
-+++ pornview-0.2pre1/src/support/widgets/zlist.c
-@@ -634,7 +634,8 @@
- 					   CELL_X_FROM_COL (list, j), area->y,
- 					   list->cell_x_pad, area->height);
- 
--		cell = ZLIST_CELL_FROM_INDEX (list, idx);
-+		if (idx < list->cell_count)
-+		    cell = ZLIST_CELL_FROM_INDEX (list, idx);
- 
- 		cell_area.x = CELL_X_FROM_COL (list, j) + list->cell_x_pad;
- 		cell_area.y = CELL_Y_FROM_ROW (list, i) + list->cell_y_pad;
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-autoconf.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-autoconf.patch
deleted file mode 100644
index 980f0366475c..000000000000
--- a/media-gfx/pornview/files/pornview-0.2.0_pre1-autoconf.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -38,10 +38,6 @@
- dnl ******************************
- dnl required library version
- dnl ******************************
--GLIB_REQUIRED=1.2.10
--GTK_REQUIRED=1.2.10
--GDK_PIXBUF_REQUIRED=0.16.0
--XINE_OLD_REQUIRED=0.9.9
- XINE_REQUIRED=1.0.0
- 
- AC_SUBST(GLIB_REQUIRED)
-@@ -63,31 +59,20 @@
- dnl ******************************
- dnl Check for GTK
- dnl ******************************
--enable_gtk2=no
--AC_ARG_WITH(gtk2,
--   [  --with-gtk2             Use Gtk+-2.0 (experimental) [default=no]],
--   [enable_gtk2="${withval}"], [enable_gtk2=no])
--if test "$enable_gtk2" = yes; then
--   AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
--   PKG_CHECK_MODULES(GTK, [
--      glib-2.0 >= $GLIB2_REQUIRED
--      gmodule-2.0 >= $GMODULE2_REQUIRED
--      gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED
--      gtk+-2.0 >= $GTK2_REQUIRED
--   ], ,[
--      AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help)
--   ])
--   AC_SUBST(GTK_CFLAGS)
--   AC_SUBST(GTK_LIBS)
--   AC_DEFINE(USE_GTK2)
--   AC_DEFINE(USE_NORMAL_PANED)
--   AC_DEFINE(ENABLE_TREEVIEW)
--else
--   AM_PATH_GTK($GTK_REQUIRED, ,
--      AC_MSG_ERROR(Test for GTK failed. See the file 'INSTALL' for help))
--   AM_PATH_GDK_PIXBUF($GDK_PIXBUF_REQUIRED, ,
--     AC_MSG_ERROR(gdk-pixbuf 0.16.0 or higher is required))
--fi
-+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-+PKG_CHECK_MODULES(GTK, [
-+   glib-2.0 >= $GLIB2_REQUIRED
-+   gmodule-2.0 >= $GMODULE2_REQUIRED
-+   gdk-pixbuf-2.0 >= $GDK_PIXBUF2_REQUIRED
-+   gtk+-2.0 >= $GTK2_REQUIRED
-+], ,[
-+   AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help)
-+])
-+AC_SUBST(GTK_CFLAGS)
-+AC_SUBST(GTK_LIBS)
-+AC_DEFINE(USE_GTK2)
-+AC_DEFINE(USE_NORMAL_PANED)
-+AC_DEFINE(ENABLE_TREEVIEW)
- 
- enable_normal_paned=no
- AC_ARG_WITH(normal-paned,
-@@ -158,45 +143,20 @@
-    [enable_xine=yes], [enable_xine="${enableval}"])
- 
- if test "$enable_xine" = no; then
--AC_ARG_ENABLE(xine_old,
--   [  --enable-xine-old       Enable Xine library 0.9.x for movie [default=no]],
--   [enable_xine_old=yes], [enable_xine_old="${enableval}"])
--
--if test "$enable_xine_old" = no; then
- AC_ARG_ENABLE(mplayer,
-    [  --enable-mplayer        Enable MPlayer for movie [default=no]],
-    [enable_mplayer=yes], [enable_mplayer="${enableval}"])
- fi
--fi
- 
- MOVIELIB_CFLAGS=""
- MOVIELIB_LIBS=""
- 
- dnl ****************************
--dnl Check for Xine library 0.9.x
--dnl ****************************
--if test "$enable_xine_old" = yes; then
--   have_xine=no
--   AM_PATH_XINE($XINE_OLD_REQUIRED,
--      [have_xine=yes], [have_xine=no])
--   if test "$have_xine" = yes; then
--      MOVIELIB_CFLAGS=${XINE_CFLAGS}
--      MOVIELIB_LIBS=${XINE_LIBS}
--      AC_DEFINE(ENABLE_XINE_OLD)
--      AC_DEFINE(ENABLE_MOVIE)
--      movie_support="Xine 0.9.x"
--   else
--      AC_MSG_WARN(Did not find xine-lib installed)
--      enable_xine=no;
--   fi
--fi
--
--dnl ****************************
- dnl Check for Xine library
- dnl ****************************
- if test "$enable_xine" = yes; then
-    have_xine=no
--   AM_PATH_XINE($XINE_REQUIRED,
-+   PKG_CHECK_MODULES(XINE, libxine,
-       [have_xine=yes], [have_xine=no])
-    if test "$have_xine" = yes; then
-       MOVIELIB_CFLAGS=${XINE_CFLAGS}
-@@ -241,11 +201,6 @@
- localedir="\${datadir}/locale"
- AC_SUBST(localedir)
- 
--dnl *******************
--dnl for libcharset
--dnl *******************
--AM_LIBCHARSET
--
- dnl ******************************
- dnl enable/disable EXIF support
- dnl ******************************
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-desktop-entry.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-desktop-entry.patch
deleted file mode 100644
index ac8e6538689e..000000000000
--- a/media-gfx/pornview/files/pornview-0.2.0_pre1-desktop-entry.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur pornview-0.2.0pre1.orig/pornview.desktop pornview-0.2.0pre1/pornview.desktop
---- pornview-0.2.0pre1.orig/pornview.desktop	2002-12-11 21:28:51.000000000 +0200
-+++ pornview-0.2.0pre1/pornview.desktop	2008-04-21 16:49:47.000000000 +0300
-@@ -2,6 +2,7 @@
- Name=PornView
- Comment=Photo/Movie collection manager
- Exec=pornview
--Icon=pornview.png
--Terminal=0
-+Icon=pornview
-+Terminal=false
- Type=Application
-+Categories=GTK;Graphics;Viewer;
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-fix-array-boundaries.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-fix-array-boundaries.patch
deleted file mode 100644
index 918a3e2cfaa0..000000000000
--- a/media-gfx/pornview/files/pornview-0.2.0_pre1-fix-array-boundaries.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pornview-0.2.0pre1.old/src/support/file_utils.c b/pornview-0.2.0pre1/src/support/file_utils.c
-index fc88617..5eb7184 100644
---- a/pornview-0.2.0pre1.old/src/support/file_utils.c
-+++ b/pornview-0.2.0pre1/src/support/file_utils.c
-@@ -787,7 +787,7 @@ gid2str (gid_t gid)
- gchar  *
- mode2str (mode_t mode)
- {
--    gchar   permission[11] = { "----------" };
-+    gchar   permission[12] = { "----------" };
- 
-     switch (mode & S_IFMT)
-     {
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-fix-segfault-comment.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-fix-segfault-comment.patch
deleted file mode 100644
index d1477e9b08e7..000000000000
--- a/media-gfx/pornview/files/pornview-0.2.0_pre1-fix-segfault-comment.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN pornview-0.2.0pre1.old/src/comment.c pornview-0.2.0pre1/src/comment.c
---- pornview-0.2.0pre1.old/src/comment.c	2011-02-25 19:47:10.000000000 +0100
-+++ pornview-0.2.0pre1/src/comment.c	2011-02-25 20:05:43.000000000 +0100
-@@ -333,15 +333,7 @@
- 	entry->key = g_strdup (template->key);
- 	entry->display_name = g_strdup (template->display_name);
- 
--	if (comment->info && template->def_val_fn)
--	{
--	    entry->value = entry->def_val_fn (comment->info, NULL);
--	}
--	else
--	{
--	    entry->value = NULL;
--	}
--
-+	entry->value = NULL;
- 	comment->data_list = g_list_append (comment->data_list, entry);
-     }
- }
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch
deleted file mode 100644
index 8830a03edee9..000000000000
--- a/media-gfx/pornview/files/pornview-0.2.0_pre1-libpng15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/support/pixbuf_utils.c
-+++ src/support/pixbuf_utils.c
-@@ -60,7 +60,7 @@
- 	return FALSE;
-     }
- 
--    if (setjmp (png_ptr->jmpbuf))
-+    if (setjmp (png_jmpbuf(png_ptr)))
-     {
- 	png_destroy_write_struct (&png_ptr, &info_ptr);
- 	fclose (handle);
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-new-gtk-object-system.diff b/media-gfx/pornview/files/pornview-0.2.0_pre1-new-gtk-object-system.diff
deleted file mode 100644
index 6812e92836d8..000000000000
--- a/media-gfx/pornview/files/pornview-0.2.0_pre1-new-gtk-object-system.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- pornview-0.2pre1.orig/src/support/widgets/gtkcellrendererpixmap.c
-+++ pornview-0.2pre1/src/support/widgets/gtkcellrendererpixmap.c
-@@ -59,10 +59,10 @@
-     PROP_MASK_EXPANDER_CLOSED
- };
-
--GtkType
-+GType
- gtk_cell_renderer_pixmap_get_type (void)
- {
--    static GtkType cell_pixmap_type = 0;
-+    static GType cell_pixmap_type = 0;
-
-     if (!cell_pixmap_type)
-     {
---- pornview-0.2pre1.orig/src/support/widgets/gtkcellrendererpixmap.h
-+++ pornview-0.2pre1/src/support/widgets/gtkcellrendererpixmap.h
-@@ -32,11 +32,11 @@
- 
- 
- #define GTK_TYPE_CELL_RENDERER_PIXMAP			    (gtk_cell_renderer_pixmap_get_type ())
--#define GTK_CELL_RENDERER_PIXMAP(obj)			    (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
--#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
--#define GTK_IS_CELL_RENDERER_PIXMAP(obj)		    (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
--#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
--#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
-+#define GTK_CELL_RENDERER_PIXMAP(obj)			    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
-+#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
-+#define GTK_IS_CELL_RENDERER_PIXMAP(obj)		    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
-+#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
-+#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
- 
-     typedef struct GtkCellRendererPixmap_Tag GtkCellRendererPixmap;
-     typedef struct GtkCellRendererPixmapClass_Tag GtkCellRendererPixmapClass;
-@@ -66,7 +66,7 @@
- 	void            (*_gtk_reserved4) (void);
-     };
- 
--    GtkType         gtk_cell_renderer_pixmap_get_type (void);
-+    GType         gtk_cell_renderer_pixmap_get_type (void);
-     GtkCellRenderer *gtk_cell_renderer_pixmap_new (void);
- 
- #ifdef __cplusplus
diff --git a/media-gfx/pornview/files/pornview-0.2.0_pre1-underlinking.patch b/media-gfx/pornview/files/pornview-0.2.0_pre1-underlinking.patch
deleted file mode 100644
index 4dcf527657c3..000000000000
--- a/media-gfx/pornview/files/pornview-0.2.0_pre1-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Oct 28 20:22:14 UTC 2012
-Subject: build system
-
-	fix underlinking
-	https://bugs.gentoo.org/show_bug.cgi?id=403031
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -52,7 +52,7 @@
- pornview_LDFLAGS = \
- 	-export-dynamic
- 
--pornview_LDADD = $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(PNG_LIBS) $(MOVIELIB_LIBS) \
--	$(INTLLIBS) $(LIBICONV) $(LIBCHARSET) $(X_LIBS) $(XINERAMA_LIBS) \
--	prefs_ui/libprefs_ui.la  support/widgets/libsupport_widgets.la \
--	support/libsupport_utils.la $(LIBEXIF)
-+pornview_LDADD = prefs_ui/libprefs_ui.la  support/widgets/libsupport_widgets.la \
-+	support/libsupport_utils.la $(LIBEXIF) \
-+	$(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(PNG_LIBS) $(MOVIELIB_LIBS) \
-+	$(INTLLIBS) $(LIBICONV) $(LIBCHARSET) $(X_LIBS) $(XINERAMA_LIBS)
diff --git a/media-gfx/pornview/files/traypatch.diff b/media-gfx/pornview/files/traypatch.diff
deleted file mode 100644
index db7873ba09e1..000000000000
--- a/media-gfx/pornview/files/traypatch.diff
+++ /dev/null
@@ -1,536 +0,0 @@
-diff -Naur pornview-0.2.0pre1/src/dock.c pornview-0.2.0pre2/src/dock.c
---- pornview-0.2.0pre1/src/dock.c	2002-12-11 14:29:03.000000000 -0500
-+++ pornview-0.2.0pre2/src/dock.c	2005-05-21 23:10:58.000000000 -0400
-@@ -5,6 +5,7 @@
-  *                    trem0r <trem0r@tlen.pl>                    ) \=  ) (    *
-  *                           (c) 2002                           (.--' '--.)   *
-  *                                                              / (_)^(_) \   *
-+ *      Modified to use EggTrayIcon by freelight <evaykher@optonline.net>     *
-  *----------------------------------------------------------------------------*/
- 
- #include "pornview.h"
-@@ -15,7 +16,8 @@
- #include "about.h"
- #include "browser.h"
- #include "prefs.h"
--
-+#include "eggtrayicon.h"
-+#include "eggtrayicon.c"
- #include "pixmaps/dock.xpm"
- 
- #define dock_exit   browser_destroy
-@@ -38,7 +40,7 @@
- 
- static GtkItemFactory *popup_item_factory;
- static GtkWidget *popup_menu;
--static GtkWindow *dock = NULL;;
-+static EggTrayIcon *dock = NULL;
- 
- /*
-  *-------------------------------------------------------------------
-@@ -102,18 +104,20 @@
- }
- 
- static void
--dock_build (GtkWindow * dock)
-+dock_build ()
- {
-     GtkWidget *image;
-     GtkWidget *eventbox;
- 
-+    dock = egg_tray_icon_new ("Pornview");
-+    eventbox = gtk_event_box_new ();
-     image = pixbuf_create_pixmap_from_xpm_data (dock_xpm);
- 
-     GTK_WIDGET_SET_FLAGS (image, GTK_NO_WINDOW);
-     image->requisition.width = 22;
-     image->requisition.height = 22;
- 
--    eventbox = gtk_event_box_new ();
-+
- 
-     gtk_widget_set_events (GTK_WIDGET (eventbox),
- 			   gtk_widget_get_events (eventbox) |
-@@ -130,8 +134,7 @@
-     gtk_object_set_data (GTK_OBJECT (dock), "pixmapg", image);
-     gtk_container_add (GTK_CONTAINER (eventbox), image);
-     gtk_container_add (GTK_CONTAINER (dock), eventbox);
--
--    gtk_widget_show (image);
-+    gtk_widget_show_all (GTK_WIDGET (dock));
- 
-     /*
-      * add the popup menu 
-diff -Naur pornview-0.2.0pre1/src/eggtrayicon.c pornview-0.2.0pre2/src/eggtrayicon.c
---- pornview-0.2.0pre1/src/eggtrayicon.c	1969-12-31 19:00:00.000000000 -0500
-+++ pornview-0.2.0pre2/src/eggtrayicon.c	2005-05-21 23:10:58.000000000 -0400
-@@ -0,0 +1,389 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-+/* eggtrayicon.c
-+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
-+#include <string.h>
-+#include <gdk/gdkx.h>
-+#include "eggtrayicon.h"
-+
-+#define SYSTEM_TRAY_REQUEST_DOCK    0
-+#define SYSTEM_TRAY_BEGIN_MESSAGE   1
-+#define SYSTEM_TRAY_CANCEL_MESSAGE  2
-+         
-+static GtkPlugClass *parent_class = NULL;
-+
-+static void egg_tray_icon_init (EggTrayIcon *icon);
-+static void egg_tray_icon_class_init (EggTrayIconClass *klass);
-+
-+static void egg_tray_icon_unrealize (GtkWidget *widget);
-+
-+static void egg_tray_icon_update_manager_window (EggTrayIcon *icon);
-+
-+GType
-+egg_tray_icon_get_type (void)
-+{
-+  static GType our_type = 0;
-+
-+  our_type = g_type_from_name("EggTrayIcon");
-+
-+  if (our_type == 0)
-+    {
-+      static const GTypeInfo our_info =
-+      {
-+	sizeof (EggTrayIconClass),
-+	(GBaseInitFunc) NULL,
-+	(GBaseFinalizeFunc) NULL,
-+	(GClassInitFunc) egg_tray_icon_class_init,
-+	NULL, /* class_finalize */
-+	NULL, /* class_data */
-+	sizeof (EggTrayIcon),
-+	0,    /* n_preallocs */
-+	(GInstanceInitFunc) egg_tray_icon_init
-+      };
-+
-+      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
-+    }
-+  else if (parent_class == NULL) {
-+    /* we're reheating the old class from a previous instance -  engage ugly hack =( */
-+    egg_tray_icon_class_init((EggTrayIconClass *)g_type_class_peek(our_type));
-+  }
-+
-+  return our_type;
-+}
-+
-+static void
-+egg_tray_icon_init (EggTrayIcon *icon)
-+{
-+  icon->stamp = 1;
-+  
-+  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
-+}
-+
-+static void
-+egg_tray_icon_class_init (EggTrayIconClass *klass)
-+{
-+  GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
-+
-+  parent_class = g_type_class_peek_parent (klass);
-+
-+  widget_class->unrealize = egg_tray_icon_unrealize;
-+}
-+
-+static GdkFilterReturn
-+egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data)
-+{
-+  EggTrayIcon *icon = user_data;
-+  XEvent *xev = (XEvent *)xevent;
-+
-+  if (xev->xany.type == ClientMessage &&
-+      xev->xclient.message_type == icon->manager_atom &&
-+      xev->xclient.data.l[1] == icon->selection_atom)
-+    {
-+      egg_tray_icon_update_manager_window (icon);
-+    }
-+  else if (xev->xany.window == icon->manager_window)
-+    {
-+      if (xev->xany.type == DestroyNotify)
-+	{
-+	  egg_tray_icon_update_manager_window (icon);
-+	}
-+    }
-+  
-+  return GDK_FILTER_CONTINUE;
-+}
-+
-+static void
-+egg_tray_icon_unrealize (GtkWidget *widget)
-+{
-+  EggTrayIcon *icon = EGG_TRAY_ICON (widget);
-+  GdkWindow *root_window;
-+
-+  if (icon->manager_window != None)
-+    {
-+      GdkWindow *gdkwin;
-+
-+#if HAVE_GTK_MULTIHEAD
-+      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-+                                              icon->manager_window);
-+#else
-+      gdkwin = gdk_window_lookup (icon->manager_window);
-+#endif
-+
-+      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-+    }
-+
-+#if HAVE_GTK_MULTIHEAD
-+  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
-+#else
-+  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
-+#endif
-+
-+  gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
-+
-+  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-+    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-+}
-+
-+static void
-+egg_tray_icon_send_manager_message (EggTrayIcon *icon,
-+				    long         message,
-+				    Window       window,
-+				    long         data1,
-+				    long         data2,
-+				    long         data3)
-+{
-+  XClientMessageEvent ev;
-+  Display *display;
-+  
-+  ev.type = ClientMessage;
-+  ev.window = window;
-+  ev.message_type = icon->system_tray_opcode_atom;
-+  ev.format = 32;
-+  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
-+  ev.data.l[1] = message;
-+  ev.data.l[2] = data1;
-+  ev.data.l[3] = data2;
-+  ev.data.l[4] = data3;
-+
-+#if HAVE_GTK_MULTIHEAD
-+  display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-+#else
-+  display = gdk_display;
-+#endif
-+  
-+  gdk_error_trap_push ();
-+  XSendEvent (display,
-+	      icon->manager_window, False, NoEventMask, (XEvent *)&ev);
-+  XSync (display, False);
-+  gdk_error_trap_pop ();
-+}
-+
-+static void
-+egg_tray_icon_send_dock_request (EggTrayIcon *icon)
-+{
-+  egg_tray_icon_send_manager_message (icon,
-+				      SYSTEM_TRAY_REQUEST_DOCK,
-+				      icon->manager_window,
-+				      gtk_plug_get_id (GTK_PLUG (icon)),
-+				      0, 0);
-+}
-+
-+static void
-+egg_tray_icon_update_manager_window (EggTrayIcon *icon)
-+{
-+  Display *xdisplay;
-+  
-+#if HAVE_GTK_MULTIHEAD
-+  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-+#else
-+  xdisplay = gdk_display;
-+#endif
-+  
-+  if (icon->manager_window != None)
-+    {
-+      GdkWindow *gdkwin;
-+
-+#if HAVE_GTK_MULTIHEAD
-+      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-+					      icon->manager_window);
-+#else
-+      gdkwin = gdk_window_lookup (icon->manager_window);
-+#endif
-+      
-+      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-+    }
-+  
-+  XGrabServer (xdisplay);
-+  
-+  icon->manager_window = XGetSelectionOwner (xdisplay,
-+					     icon->selection_atom);
-+
-+  if (icon->manager_window != None)
-+    XSelectInput (xdisplay,
-+		  icon->manager_window, StructureNotifyMask);
-+
-+  XUngrabServer (xdisplay);
-+  XFlush (xdisplay);
-+  
-+  if (icon->manager_window != None)
-+    {
-+      GdkWindow *gdkwin;
-+
-+#if HAVE_GTK_MULTIHEAD
-+      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-+					      icon->manager_window);
-+#else
-+      gdkwin = gdk_window_lookup (icon->manager_window);
-+#endif
-+      
-+      gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-+
-+      /* Send a request that we'd like to dock */
-+      egg_tray_icon_send_dock_request (icon);
-+    }
-+}
-+
-+EggTrayIcon *
-+egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name)
-+{
-+  EggTrayIcon *icon;
-+  char buffer[256];
-+  GdkWindow *root_window;
-+
-+  g_return_val_if_fail (xscreen != NULL, NULL);
-+  
-+  icon = g_object_new (EGG_TYPE_TRAY_ICON, NULL);
-+  gtk_window_set_title (GTK_WINDOW (icon), name);
-+
-+#if HAVE_GTK_MULTIHEAD
-+  /* FIXME: this code does not compile, screen is undefined. Now try
-+   * getting the GdkScreen from xscreen (:. Dunno how to solve this
-+   * (there is prolly some easy way I cant think of right now)
-+   */
-+  gtk_plug_construct_for_display (GTK_PLUG (icon),
-+				  gdk_screen_get_display (screen), 0);
-+#else
-+  gtk_plug_construct (GTK_PLUG (icon), 0);
-+#endif
-+  
-+  gtk_widget_realize (GTK_WIDGET (icon));
-+
-+  /* Now see if there's a manager window around */
-+  g_snprintf (buffer, sizeof (buffer),
-+	      "_NET_SYSTEM_TRAY_S%d",
-+	      XScreenNumberOfScreen (xscreen));
-+  
-+  icon->selection_atom = XInternAtom (DisplayOfScreen (xscreen),
-+				      buffer, False);
-+  
-+  icon->manager_atom = XInternAtom (DisplayOfScreen (xscreen),
-+				    "MANAGER", False);
-+  
-+  icon->system_tray_opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
-+					       "_NET_SYSTEM_TRAY_OPCODE", False);
-+
-+  egg_tray_icon_update_manager_window (icon);
-+
-+#if HAVE_GTK_MULTIHEAD
-+  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (screen));
-+#else
-+  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
-+#endif
-+  
-+  /* Add a root window filter so that we get changes on MANAGER */
-+  gdk_window_add_filter (root_window,
-+			 egg_tray_icon_manager_filter, icon);
-+		      
-+  return icon;
-+}
-+
-+#if HAVE_GTK_MULTIHEAD
-+EggTrayIcon *
-+egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
-+{
-+  EggTrayIcon *icon;
-+  char buffer[256];
-+
-+  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-+
-+  return egg_tray_icon_new_for_xscreen (GDK_SCREEN_XSCREEN (screen), name);
-+}
-+#endif
-+
-+EggTrayIcon*
-+egg_tray_icon_new (const gchar *name)
-+{
-+  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);
-+}
-+
-+guint
-+egg_tray_icon_send_message (EggTrayIcon *icon,
-+			    gint         timeout,
-+			    const gchar *message,
-+			    gint         len)
-+{
-+  guint stamp;
-+  
-+  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
-+  g_return_val_if_fail (timeout >= 0, 0);
-+  g_return_val_if_fail (message != NULL, 0);
-+		     
-+  if (icon->manager_window == None)
-+    return 0;
-+
-+  if (len < 0)
-+    len = strlen (message);
-+
-+  stamp = icon->stamp++;
-+  
-+  /* Get ready to send the message */
-+  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
-+				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-+				      timeout, len, stamp);
-+
-+  /* Now to send the actual message */
-+  gdk_error_trap_push ();
-+  while (len > 0)
-+    {
-+      XClientMessageEvent ev;
-+      Display *xdisplay;
-+
-+#if HAVE_GTK_MULTIHEAD
-+      xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-+#else
-+      xdisplay = gdk_display;
-+#endif
-+      
-+      ev.type = ClientMessage;
-+      ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
-+      ev.format = 8;
-+      ev.message_type = XInternAtom (xdisplay,
-+				     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
-+      if (len > 20)
-+	{
-+	  memcpy (&ev.data, message, 20);
-+	  len -= 20;
-+	  message += 20;
-+	}
-+      else
-+	{
-+	  memcpy (&ev.data, message, len);
-+	  len = 0;
-+	}
-+
-+      XSendEvent (xdisplay,
-+		  icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
-+      XSync (xdisplay, False);
-+    }
-+  gdk_error_trap_pop ();
-+
-+  return stamp;
-+}
-+
-+void
-+egg_tray_icon_cancel_message (EggTrayIcon *icon,
-+			      guint        id)
-+{
-+  g_return_if_fail (EGG_IS_TRAY_ICON (icon));
-+  g_return_if_fail (id > 0);
-+  
-+  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
-+				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-+				      id, 0, 0);
-+}
-diff -Naur pornview-0.2.0pre1/src/eggtrayicon.h pornview-0.2.0pre2/src/eggtrayicon.h
---- pornview-0.2.0pre1/src/eggtrayicon.h	1969-12-31 19:00:00.000000000 -0500
-+++ pornview-0.2.0pre2/src/eggtrayicon.h	2005-05-21 23:10:58.000000000 -0400
-@@ -0,0 +1,76 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-+/* eggtrayicon.h
-+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the
-+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ * Boston, MA 02111-1307, USA.
-+ */
-+
-+#ifndef __EGG_TRAY_ICON_H__
-+#define __EGG_TRAY_ICON_H__
-+
-+#include <gtk/gtkplug.h>
-+#include <gdk/gdkx.h>
-+
-+G_BEGIN_DECLS
-+
-+#define EGG_TYPE_TRAY_ICON		(egg_tray_icon_get_type ())
-+#define EGG_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
-+#define EGG_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-+#define EGG_IS_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
-+#define EGG_IS_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
-+#define EGG_TRAY_ICON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-+	
-+typedef struct _EggTrayIcon	  EggTrayIcon;
-+typedef struct _EggTrayIconClass  EggTrayIconClass;
-+
-+struct _EggTrayIcon
-+{
-+  GtkPlug parent_instance;
-+
-+  guint stamp;
-+  
-+  Atom selection_atom;
-+  Atom manager_atom;
-+  Atom system_tray_opcode_atom;
-+  Window manager_window;
-+};
-+
-+struct _EggTrayIconClass
-+{
-+  GtkPlugClass parent_class;
-+};
-+
-+GType        egg_tray_icon_get_type       (void);
-+
-+#if EGG_TRAY_ENABLE_MULTIHEAD
-+EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
-+					   const gchar *name);
-+#endif
-+
-+EggTrayIcon *egg_tray_icon_new            (const gchar *name);
-+
-+guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
-+					   gint         timeout,
-+					   const char  *message,
-+					   gint         len);
-+void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
-+					   guint        id);
-+
-+
-+					    
-+G_END_DECLS
-+
-+#endif /* __EGG_TRAY_ICON_H__ */
diff --git a/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild b/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild
deleted file mode 100644
index c5a6901b1d71..000000000000
--- a/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pornview/pornview-0.2.0_pre1-r2.ebuild,v 1.9 2012/10/28 22:06:24 hasufell Exp $
-
-EAPI=3
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Image viewer/manager with optional support for MPEG movies"
-HOMEPAGE="http://pornview.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -hppa ppc x86"
-IUSE="exif nls"
-
-RDEPEND="
-	media-libs/libpng:0
-	virtual/jpeg
-	x11-libs/gtk+:2
-	exif? ( media-gfx/exiv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-4.diff \
-		"${FILESDIR}"/traypatch.diff \
-		"${FILESDIR}"/${P}-desktop-entry.patch \
-		"${FILESDIR}"/${P}-new-gtk-object-system.diff \
-		"${FILESDIR}"/${P}-fix-array-boundaries.patch \
-		"${FILESDIR}"/${P}-fix-segfault-comment.patch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-underlinking.patch \
-		"${FILESDIR}"/${P}-autoconf.patch
-
-	# $X_LIBS fails to bring in -lX11 and the build fails with undefined
-	# references with strict linker
-	sed -i -e 's:view_LDADD =:view_LDADD = -lX11 -lm:' src/Makefile.{am,in} || die
-	#Bug 325879
-	sed -i -e '1i #pragma GCC optimize ("O0")' src/comment.c || die
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable exif) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" desktopdir="/usr/share/applications" \
-		install || die "emake install failed."
-	dodoc AUTHORS NEWS README
-}