Update

Needed for git as well.

autopatches/ebuild_unpack_post/media-gfx/xsane/001-xdg-open-as-default-browser.patch

@@ -1,11 +0,0 @@
---- a/src/xsane.h.orig2	2008-03-05 14:21:38.000000000 +0100
-+++ b/src/xsane.h	2008-03-05 14:30:58.000000000 +0100
-@@ -251,7 +251,7 @@
- # elif defined(HAVE_OS2_H)
- #  define DEFAULT_BROWSER "netscape"
- # else
--#  define DEFAULT_BROWSER "netscape"
-+#  define DEFAULT_BROWSER "xdg-open"
- # endif
- #endif
- 

autopatches/ebuild_unpack_post/media-gfx/xsane/002-close-fds.patch

@@ -1,81 +0,0 @@
-diff -up xsane-0.995/src/xsane.c.close-fds xsane-0.995/src/xsane.c
---- xsane-0.995/src/xsane.c.close-fds	2007-09-28 17:24:56.000000000 +0200
-+++ xsane-0.995/src/xsane.c	2008-07-18 16:10:30.000000000 +0200
-@@ -48,6 +48,8 @@
- 
- #include <sys/wait.h>
- 
-+#include <stdarg.h>
-+
- /* ---------------------------------------------------------------------------------------------------------------------- */
- 
- struct option long_options[] =
-@@ -3673,6 +3675,41 @@ static void xsane_show_gpl(GtkWidget *wi
- 
- /* ---------------------------------------------------------------------------------------------------------------------- */
- 
-+static void xsane_close_fds_for_exec(signed int first_fd_to_leave_open, ...)
-+{
-+ int open_max;
-+ signed int i;
-+
-+ va_list ap;
-+ unsigned char *close_fds;
-+
-+  open_max = (int) sysconf (_SC_OPEN_MAX);
-+
-+  close_fds = malloc (open_max);
-+
-+  memset (close_fds, 1, open_max);
-+
-+  va_start (ap, first_fd_to_leave_open);
-+
-+  for (i = first_fd_to_leave_open; i >= 0; i = va_arg (ap, signed int)) {
-+    if (i < open_max)
-+      close_fds[i] = 0;
-+  }
-+
-+  va_end (ap);
-+
-+  DBG(DBG_info, "closing unneeded file descriptors\n");
-+
-+  for (i = 0; i < open_max; i++) {
-+    if (close_fds[i])
-+      close (i);
-+  }
-+
-+  free (close_fds);
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------------------------- */
-+
- static void xsane_show_doc_via_nsr(GtkWidget *widget, gpointer data) /* show via netscape remote */
- {
-  char *name = (char *) data;
-@@ -3725,6 +3762,8 @@ static void xsane_show_doc_via_nsr(GtkWi
-         ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
-       }
- 
-+      xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1);
-+
-       DBG(DBG_info, "trying to change user id for new subprocess:\n");
-       DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
-       setuid(getuid());
-@@ -3767,6 +3806,8 @@ static void xsane_show_doc_via_nsr(GtkWi
-         ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
-       }
- 
-+      xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1);
-+
-       DBG(DBG_info, "trying to change user id for new subprocess:\n");
-       DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
-       setuid(getuid());
-@@ -3888,6 +3929,8 @@ static void xsane_show_doc(GtkWidget *wi
-         ipc_file = fdopen(xsane.ipc_pipefd[1], "w");
-       }
- 
-+      xsane_close_fds_for_exec (1, 2, xsane.ipc_pipefd[1], -1);
-+
-       DBG(DBG_info, "trying to change user id for new subprocess:\n");
-       DBG(DBG_info, "old effective uid = %d\n", (int) geteuid());
-       setuid(getuid());

autopatches/ebuild_unpack_post/media-gfx/xsane/004-ipv6-support.patch

@@ -1,128 +0,0 @@
-diff -up xsane-0.997/src/xsane-save.c.ipv6 xsane-0.997/src/xsane-save.c
---- xsane-0.997/src/xsane-save.c.ipv6	2008-09-20 22:48:29.000000000 +0200
-+++ xsane-0.997/src/xsane-save.c	2010-06-29 17:05:03.853290307 +0200
-@@ -29,6 +29,8 @@
- #include <time.h>
- #include <sys/wait.h> 
- 
-+#include <glib.h>
-+
- /* the following test is always false */
- #ifdef _native_WIN32
- # include <winsock.h>
-@@ -7462,55 +7464,81 @@ void write_email_attach_file(int fd_sock
- /* returns fd_socket if sucessfull, < 0 when error occured */
- int open_socket(char *server, int port)
- {
-- int fd_socket;
-- struct sockaddr_in sin;
-- struct hostent *he;
-+ int fd_socket, e;
-+
-+ struct addrinfo *ai_list, *ai;
-+ struct addrinfo hints;
-+ gchar *port_s;
-+ gint connected;
-+
-+  memset(&hints, '\0', sizeof(hints));
-+  hints.ai_flags = AI_ADDRCONFIG;
-+  hints.ai_socktype = SOCK_STREAM;
-+
-+  port_s = g_strdup_printf("%d", port);
-+  e = getaddrinfo(server, port_s, &hints, &ai_list);
-+  g_free(port_s);
- 
--  he = gethostbyname(server);
--  if (!he)
-+  if (e != 0)
-   {
--    DBG(DBG_error, "open_socket: Could not get hostname of \"%s\"\n", server);
-+    DBG(DBG_error, "open_socket: Could not lookup \"%s\"\n", server);
-    return -1;
-   }
--  else
-+
-+  connected = 0;
-+  for (ai = ai_list; ai != NULL && !connected; ai = ai->ai_next)
-   {
--    DBG(DBG_info, "open_socket: connecting to \"%s\" = %d.%d.%d.%d\n",
--        he->h_name,
--        (unsigned char) he->h_addr_list[0][0],
--        (unsigned char) he->h_addr_list[0][1],
--        (unsigned char) he->h_addr_list[0][2],
--        (unsigned char) he->h_addr_list[0][3]);
--  }
-+    gchar hostname[NI_MAXHOST];
-+    gchar hostaddr[NI_MAXHOST];
-+
-+    /* If all else fails */
-+    strncpy(hostname, "(unknown name)", NI_MAXHOST-1);
-+    strncpy(hostaddr, "(unknown address)", NI_MAXHOST-1);
-+
-+    /* Determine canonical name and IPv4/IPv6 address */
-+    (void) getnameinfo(ai->ai_addr, ai->ai_addrlen, hostname, sizeof(hostname),
-+                       NULL, 0, 0);
-+    (void) getnameinfo(ai->ai_addr, ai->ai_addrlen, hostaddr, sizeof(hostaddr),
-+                       NULL, 0, NI_NUMERICHOST);
-+
-+    DBG(DBG_info, "open_socket: connecting to \"%s\" (\"%s\"): %s\n",
-+        server, hostname, hostaddr);
-  
--  if (he->h_addrtype != AF_INET)
--  {
--    DBG(DBG_error, "open_socket: Unknown address family: %d\n", he->h_addrtype);
--   return -1;
--  }
-+    if ((ai->ai_family != AF_INET) && (ai->ai_family != AF_INET6))
-+    {
-+      DBG(DBG_error, "open_socket: Unknown address family: %d\n", ai->ai_family);
-+      continue;
-+    }
- 
--  fd_socket = socket(AF_INET, SOCK_STREAM, 0);
-+    fd_socket = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- 
--  if (fd_socket < 0)
--  {
--    DBG(DBG_error, "open_socket: Could not create socket: %s\n", strerror(errno));
--   return -1;
--  }
-+    if (fd_socket < 0)
-+    {
-+      DBG(DBG_error, "open_socket: Could not create socket: %s\n", strerror(errno));
-+      continue;
-+    }
- 
--/*  setsockopt (dev->ctl, level, TCP_NODELAY, &on, sizeof (on)); */
-+    /*  setsockopt (dev->ctl, level, TCP_NODELAY, &on, sizeof (on)); */
- 
--  sin.sin_port = htons(port);
--  sin.sin_family = AF_INET;
--  memcpy(&sin.sin_addr, he->h_addr_list[0], he->h_length);
-+    if (connect(fd_socket, ai->ai_addr, ai->ai_addrlen) != 0)
-+    {
-+      DBG(DBG_error, "open_socket: Could not connect with port %d of socket: %s\n", port, strerror(errno));
-+      continue;
-+    }
-+
-+    /* All went well */
-+    connected = 1;
-+  }
- 
--  if (connect(fd_socket, &sin, sizeof(sin)))
-+  if (!connected)
-   {
--    DBG(DBG_error, "open_socket: Could not connect with port %d of socket: %s\n", ntohs(sin.sin_port), strerror(errno));
--   return -1;
-+    DBG(DBG_info, "open_socket: Could not connect to any address");
-+    return -1;
-   }
- 
--  DBG(DBG_info, "open_socket: Connected with port %d\n", ntohs(sin.sin_port));
-+  DBG(DBG_info, "open_socket: Connected with port %d\n", port);
- 
-- return fd_socket;
-+  return fd_socket;
- }
- 
- /* ---------------------------------------------------------------------------------------------------------------------- */

autopatches/ebuild_unpack_post/media-gfx/xsane/006-preview-selection.patch

@@ -1,60 +0,0 @@
-From 81782eb74370afd321dbd394ca1aa60c01bead7f Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Wed, 1 Jun 2011 14:30:14 +0200
-Subject: [PATCH] patch: preview-selection
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Squashed commit of the following:
-
-commit 3a238ff28cf8c57d11f41624cf340d2fdbe15c83
-Author: Reinhard Fössmeier <info@ais-sanmarino.org>
-Date:   Wed May 12 20:23:18 2010 +0200
-
-    fixed a problem in mouse event processing
-
-    Fixed a problem in mouse event processing that interfered with selecting
-    the scan rectangle in the preview window.
----
- src/xsane-preview.c |    9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/xsane-preview.c b/src/xsane-preview.c
-index f089dd1..264c775 100644
---- a/src/xsane-preview.c
-+++ b/src/xsane-preview.c
-@@ -80,7 +80,6 @@
- #include "xsane-preview.h"
- #include "xsane-preferences.h"
- #include "xsane-gamma.h"
--#include <gdk/gdkkeysyms.h>
- 
- 
- #ifndef PATH_MAX
-@@ -3023,9 +3022,9 @@ static gint preview_motion_event_handler(GtkWidget *window, GdkEvent *event, gpo
-     preview_display_color_components(p, event->motion.x, event->motion.y);
- 
-     switch (((GdkEventMotion *)event)->state &
--            GDK_Num_Lock & GDK_Caps_Lock & GDK_Shift_Lock & GDK_Scroll_Lock) /* mask all Locks */
-+            (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) /* only check for mouse buttons */
-     {
--      case 256: /* left button */
-+      case GDK_BUTTON1_MASK: /* left button */
- 
-         DBG(DBG_info2, "left button\n");
- 
-@@ -3292,8 +3291,8 @@ static gint preview_motion_event_handler(GtkWidget *window, GdkEvent *event, gpo
-         }
-        break;
- 
--      case 512: /* middle button */
--      case 1024: /* right button */
-+      case GDK_BUTTON2_MASK: /* middle button */
-+      case GDK_BUTTON3_MASK: /* right button */
-         DBG(DBG_info2, "middle or right button\n");
- 
-         if (p->selection_drag)
--- 
-1.7.5.2
-

autopatches/ebuild_unpack_post/media-gfx/xsane/100-remove-non-working-help.patch

@@ -1,32 +0,0 @@
-Index: src/xsane.c
-===================================================================
---- a/src/xsane.c.orig
-+++ b/src/xsane.c
-@@ -4258,27 +4258,6 @@ static GtkWidget *xsane_help_build_menu(
-   gtk_widget_show(item);
- 
- 
--  /* Backend doc -> html viewer */
--
--  if (xsane.backend)
--  {
--    item = gtk_menu_item_new_with_label(MENU_ITEM_BACKEND_DOC);
--    gtk_menu_append(GTK_MENU(menu), item);
--    g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_show_doc, (void *) xsane.backend);
--    gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_F2, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED);
--    gtk_widget_show(item);
--  }
--
--
--  /* available backends -> html viewer */
--
--  item = gtk_menu_item_new_with_label(MENU_ITEM_AVAILABLE_BACKENDS);
--  gtk_menu_append(GTK_MENU(menu), item);
--  g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_show_doc, (void *) "sane-backends");
--  gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_F3, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED);
--  gtk_widget_show(item);
--
--  
-   /* problems -> html viewer */
- 
-   item = gtk_menu_item_new_with_label(MENU_ITEM_PROBLEMS);

autopatches/ebuild_unpack_post/media-gfx/xsane/101-xsane_fix_pdf_floats.patch

@@ -1,64 +0,0 @@
-Fix saving pdfs
-http://lists.alioth.debian.org/pipermail/sane-devel/2009-June/025047.html
-
-diff -urNad xsane-0.996~/src/xsane-save.c xsane-0.996/src/xsane-save.c
---- xsane-0.996~/src/xsane-save.c	2008-09-20 22:48:29.000000000 +0200
-+++ xsane-0.996/src/xsane-save.c	2009-06-26 11:46:52.599585386 +0200
-@@ -26,6 +26,8 @@
- #include "xsane-back-gtk.h"
- #include "xsane-front-gtk.h"
- #include "xsane-save.h"
-+#include <locale.h>
-+#include <string.h>
- #include <time.h>
- #include <sys/wait.h> 
- 
-@@ -2411,6 +2413,7 @@
-                                               int flatedecode)
- {
-  int depth; 
-+ char *save_locale;
- 
-   depth = image_info->depth;
- 
-@@ -2428,8 +2431,15 @@
- 
-   fprintf(outfile, "%d rotate\n", degree);
-   fprintf(outfile, "%d %d translate\n", position_left, position_bottom);
-+
-+  save_locale = strdup(setlocale(LC_NUMERIC, NULL));
-+  setlocale(LC_NUMERIC, "POSIX");
-+
-   fprintf(outfile, "%f %f scale\n", width, height);
- 
-+  setlocale(LC_NUMERIC, save_locale);
-+  free(save_locale);
-+
-   fprintf(outfile, "<<\n");
-   fprintf(outfile, " /ImageType 1\n");
-   fprintf(outfile, " /Width %d\n", image_info->image_width);
-@@ -3889,6 +3899,7 @@
-  int position_left, position_bottom, box_left, box_bottom, box_right, box_top, depth;
-  int left, bottom;
-  float rad;
-+ char *save_locale;
- 
-   DBG(DBG_proc, "xsane_save_pdf_create_page_header\n");
- 
-@@ -4003,8 +4014,16 @@
- 
-   fprintf(outfile, "q\n");
-   fprintf(outfile, "1 0 0 1 %d %d cm\n", position_left, position_bottom); /* translate */
-+
-+  save_locale = strdup(setlocale(LC_NUMERIC, NULL));
-+  setlocale(LC_NUMERIC, "POSIX");
-+
-   fprintf(outfile, "%f %f -%f %f 0 0 cm\n", cos(rad), sin(rad), sin(rad), cos(rad)); /* rotate */
-   fprintf(outfile, "%f 0 0 %f 0 0 cm\n", width, height); /* scale */
-+
-+  setlocale(LC_NUMERIC, save_locale);
-+  free(save_locale);
-+
-   fprintf(outfile, "BI\n");
-   fprintf(outfile, "  /W %d\n", image_info->image_width);
-   fprintf(outfile, "  /H %d\n", image_info->image_height);

autopatches/ebuild_unpack_post/media-gfx/xsane/200-fix_options_handling_fix.patch

@@ -1,244 +0,0 @@
-Description: Fixup options handling
- Duplicate string values for options with constraint type of
- SANE_CONSTRAINT_STRING_LIST. The string list is not guaranteed to
- be stable, and actually isn't stable when the net backend is used.
-Author: Julien BLACHE <jblache@debian.org>
-
-Index: xsane-0.998/src/xsane-back-gtk.c
-===================================================================
---- xsane-0.998.orig/src/xsane-back-gtk.c	2010-11-16 21:24:59.000000000 +0100
-+++ xsane-0.998/src/xsane-back-gtk.c	2011-02-04 19:50:46.389016001 +0100
-@@ -2225,11 +2225,13 @@
- /* ----------------------------------------------------------------------------------------------------------------- */
- 
- void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],
--		 const char *val, DialogElement *elem,
-+		 const char *val, SANE_Constraint_Type constraint_type, DialogElement *elem,
- 		 GtkTooltips *tooltips, const char *desc, SANE_Int settable)
- {
-  GtkWidget *hbox, *label, *option_menu, *menu, *item;
-  MenuItem *menu_items;
-+ int dup_string;
-+ char *strval;
-  int i, num_items;
- 
-   DBG(DBG_proc, "xsane_back_gtk_option_menu_new(%s)\n", name);
-@@ -2247,16 +2249,23 @@
- 
-   menu_items = malloc((num_items + 1) * sizeof(menu_items[0]));
- 
-+  dup_string = (constraint_type == SANE_CONSTRAINT_STRING_LIST);
-+
-   menu = gtk_menu_new();
-   for (i = 0; i < num_items; ++i)
-   {
--    item = gtk_menu_item_new_with_label(_BGT(str_list[i]));
-+    if (dup_string)
-+      strval = strdup(str_list[i]);
-+    else
-+      strval = str_list[i];
-+
-+    item = gtk_menu_item_new_with_label(_BGT(strval));
-     gtk_container_add(GTK_CONTAINER(menu), item);
-     g_signal_connect(GTK_OBJECT(item), "activate", (GtkSignalFunc) xsane_back_gtk_option_menu_callback, menu_items + i);
- 
-     gtk_widget_show(item);
- 
--    menu_items[i].label = str_list[i];
-+    menu_items[i].label = strval;
-     menu_items[i].elem = elem;
-     menu_items[i].index = i;
-   }
-@@ -2402,14 +2411,15 @@
-   xsane.standard_hbox = NULL;
-   xsane.advanced_hbox = NULL;
- 
--  /* free the menu labels of integer/fix-point word-lists: */
-+  /* free the menu labels */
-   for (i = 0; i < xsane.num_elements; ++i)
-   {
-     if (xsane.element[i].menu)
-     {
-       opt = xsane_get_option_descriptor(xsane.dev, i);
-       elem = xsane.element + i;
--      if (opt->type != SANE_TYPE_STRING)
-+      if ((opt->type != SANE_TYPE_STRING)
-+	  || (opt->constraint_type == SANE_CONSTRAINT_STRING_LIST))
-       {
-         for (j = 0; j < elem->menu_size; ++j)
-         {
-Index: xsane-0.998/src/xsane-back-gtk.h
-===================================================================
---- xsane-0.998.orig/src/xsane-back-gtk.h	2007-02-24 01:56:54.000000000 +0100
-+++ xsane-0.998/src/xsane-back-gtk.h	2011-02-04 19:50:46.389016001 +0100
-@@ -117,7 +117,7 @@
- 	   gfloat quant, int automatic,
- 	   DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
- extern void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],
--           const char *val, DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
-+           const char *val, SANE_Constraint_Type constraint_type, DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
- extern void xsane_back_gtk_text_entry_new(GtkWidget *parent, const char *name, const char *val,
-                 DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
- extern void xsane_back_gtk_push_button_callback(GtkWidget *widget, gpointer data);
-Index: xsane-0.998/src/xsane-front-gtk.c
-===================================================================
---- xsane-0.998.orig/src/xsane-front-gtk.c	2010-11-16 21:25:33.000000000 +0100
-+++ xsane-0.998/src/xsane-front-gtk.c	2011-02-04 19:50:46.393016001 +0100
-@@ -64,10 +64,10 @@
-                                          int *state, void *xsane_toggle_button_callback);
- GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc,
-                                         void *xsane_button_callback, gpointer data);
--void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, int option_number, const char *desc,
-+void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, SANE_Constraint_Type constraint_type, int option_number, const char *desc,
-                            void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
- void xsane_option_menu_new_with_pixmap(GdkWindow *window, GtkBox *parent, const char *xpm_d[], const char *desc,
--                                       char *str_list[], const char *val,
-+                                       char *str_list[], const char *val, SANE_Constraint_Type constraint_type,
-                                        GtkWidget **data, int option,
-                                        void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
- void xsane_range_new(GtkBox *parent, char *labeltext, const char *desc,
-@@ -1011,12 +1011,14 @@
- 
- /* ---------------------------------------------------------------------------------------------------------------------- */
- 
--void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, int option_number, const char *desc,
-+void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, SANE_Constraint_Type constraint_type, int option_number, const char *desc,
-                            void *option_menu_callback, SANE_Int settable, const gchar *widget_name)
- {
-  GtkWidget *option_menu, *menu, *item;
-  MenuItem *menu_items;
-  DialogElement *elem;
-+ int dup_string;
-+ char *strval;
-  int i, num_items;
- 
-   DBG(DBG_proc, "xsane_option_menu_new\n");
-@@ -1035,9 +1037,16 @@
-     gtk_widget_set_name(menu, widget_name);
-   }
- 
-+  dup_string = (constraint_type == SANE_CONSTRAINT_STRING_LIST);
-+
-   for (i = 0; i < num_items; ++i)
-   {
--    item = gtk_menu_item_new_with_label(_BGT(str_list[i]));
-+    if (dup_string)
-+      strval = strdup(str_list[i]);
-+    else
-+      strval = str_list[i];
-+
-+    item = gtk_menu_item_new_with_label(_BGT(strval));
-     gtk_container_add(GTK_CONTAINER(menu), item);
- 
-     if (option_menu_callback)
-@@ -1051,7 +1060,7 @@
- 
-     gtk_widget_show(item);
- 
--    menu_items[i].label = str_list[i];
-+    menu_items[i].label = strval;
-     menu_items[i].elem  = elem;
-     menu_items[i].index = i;
-   }
-@@ -1079,7 +1088,7 @@
- /* ---------------------------------------------------------------------------------------------------------------------- */
- 
- void xsane_option_menu_new_with_pixmap(GdkWindow *window, GtkBox *parent, const char *xpm_d[], const char *desc,
--                                       char *str_list[], const char *val,
-+                                       char *str_list[], const char *val, SANE_Constraint_Type constraint_type,
-                                        GtkWidget **data, int option,
-                                        void *option_menu_callback, SANE_Int settable, const gchar *widget_name)
- {
-@@ -1098,7 +1107,7 @@
-   gtk_box_pack_start(GTK_BOX(hbox), pixmapwidget, FALSE, FALSE, 2);
-   gtk_widget_show(pixmapwidget);
- 
--  xsane_option_menu_new(hbox, str_list, val, option, desc, option_menu_callback, settable, widget_name);
-+  xsane_option_menu_new(hbox, str_list, val, constraint_type, option, desc, option_menu_callback, settable, widget_name);
-   gtk_widget_show(hbox);
- }
- 
-Index: xsane-0.998/src/xsane-front-gtk.h
-===================================================================
---- xsane-0.998.orig/src/xsane-front-gtk.h	2007-05-17 14:45:19.000000000 +0200
-+++ xsane-0.998/src/xsane-front-gtk.h	2011-02-04 19:50:46.453016001 +0100
-@@ -54,10 +54,10 @@
- extern GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc, 
-                                                void *xsane_button_callback, gpointer data);
- extern void xsane_pixmap_new(GtkWidget *parent, char *title, int width, int height, XsanePixmap *hist);
--extern void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, int option_number, const char *desc,
-+extern void xsane_option_menu_new(GtkWidget *parent, char *str_list[], const char *val, SANE_Constraint_Type constraint_type, int option_number, const char *desc,
-                                   void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
- extern void xsane_option_menu_new_with_pixmap(GdkWindow *window, GtkBox *parent, const char *xpm_d[], const char *desc,
--                                              char *str_list[], const char *val,
-+                                              char *str_list[], const char *val, SANE_Constraint_Type constraint_type,
-                                               GtkWidget **data, int option,
-                                               void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
- extern void xsane_range_new(GtkBox *parent, char *labeltext, const char *desc,
-Index: xsane-0.998/src/xsane.c
-===================================================================
---- xsane-0.998.orig/src/xsane.c	2011-02-04 19:50:40.957016002 +0100
-+++ xsane-0.998/src/xsane.c	2011-02-04 19:50:46.457016001 +0100
-@@ -876,7 +876,7 @@
-             str_list[j] = 0;
-             sprintf(str, "%d", (int) val);
- 
--            xsane_option_menu_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(parent), image_xpm, desc, str_list, str, &resolution_widget, well_known_option,
-+            xsane_option_menu_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(parent), image_xpm, desc, str_list, str, opt->constraint_type, &resolution_widget, well_known_option,
-                                               xsane_resolution_list_callback, SANE_OPTION_IS_SETTABLE(opt->cap), widget_name);
- 
-             free(str_list);
-@@ -931,7 +931,7 @@
- 
- 
-           xsane_option_menu_new_with_pixmap(xsane.xsane_window->window, GTK_BOX(parent), image_xpm, desc,
--                                            str_list, str, &resolution_widget, well_known_option,
-+                                            str_list, str, opt->constraint_type, &resolution_widget, well_known_option,
-                                             xsane_resolution_list_callback, SANE_OPTION_IS_SETTABLE(opt->cap), widget_name);
-           free(str_list);
-         }
-@@ -1496,7 +1496,7 @@
-           set = malloc(opt->size);
-           status = xsane_control_option(xsane.dev, xsane.well_known.scansource, SANE_ACTION_GET_VALUE, set, 0);
- 
--          xsane_option_menu_new(hbox, (char **) opt->constraint.string_list, set, xsane.well_known.scansource,
-+          xsane_option_menu_new(hbox, (char **) opt->constraint.string_list, set, opt->constraint_type, xsane.well_known.scansource,
-                                 _BGT(opt->desc), 0, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
-          }
-          break;
-@@ -1536,7 +1536,7 @@
-           set = malloc(opt->size);
-           status = xsane_control_option(xsane.dev, xsane.well_known.scanmode, SANE_ACTION_GET_VALUE, set, 0);
- 
--          xsane_option_menu_new(hbox, (char **) opt->constraint.string_list, set, xsane.well_known.scanmode,
-+          xsane_option_menu_new(hbox, (char **) opt->constraint.string_list, set, opt->constraint_type, xsane.well_known.scanmode,
-                                 _BGT(opt->desc), xsane_scanmode_menu_callback, SANE_OPTION_IS_SETTABLE(opt->cap), 0);
-         }
-          break;
-@@ -4646,7 +4646,7 @@
-               }
-               str_list[j] = 0;
-               sprintf(str, "%d", val);
--              xsane_back_gtk_option_menu_new(parent, title, str_list, str, elem, xsane.tooltips, _BGT(opt->desc),
-+              xsane_back_gtk_option_menu_new(parent, title, str_list, str, opt->constraint_type, elem, xsane.tooltips, _BGT(opt->desc),
-                                   SANE_OPTION_IS_SETTABLE(opt->cap));
-               free(str_list);
-               gtk_widget_show(parent->parent);
-@@ -4744,7 +4744,7 @@
-               }
-               str_list[j] = 0;
-               sprintf(str, "%g", SANE_UNFIX(val));
--              xsane_back_gtk_option_menu_new(parent, title, str_list, str, elem, xsane.tooltips, _BGT(opt->desc), SANE_OPTION_IS_SETTABLE(opt->cap));
-+              xsane_back_gtk_option_menu_new(parent, title, str_list, str, opt->constraint_type, elem, xsane.tooltips, _BGT(opt->desc), SANE_OPTION_IS_SETTABLE(opt->cap));
-               free (str_list);
-               gtk_widget_show(parent->parent);
-             }
-@@ -4789,7 +4789,7 @@
-                  (strcmp (opt->name, SANE_NAME_SCAN_SOURCE) != 0) ) /* do not show scansource */
-             {
-               /* use a "list-selection" widget */
--              xsane_back_gtk_option_menu_new(parent, title, (char **) opt->constraint.string_list, buf,
-+              xsane_back_gtk_option_menu_new(parent, title, (char **) opt->constraint.string_list, buf, opt->constraint_type,
-                                   elem, xsane.tooltips, _BGT(opt->desc), SANE_OPTION_IS_SETTABLE(opt->cap));
-               gtk_widget_show (parent->parent);
-             }

autopatches/ebuild_unpack_post/media-gfx/xsane/201-fix_pdf_xref.patch

@@ -1,20 +0,0 @@
-Description: Fix xref table generation
- Mark non-existent objects as free in the xref table.
-Author: Julien BLACHE <jblache@debian.org>
-Forwarded: yes
-
-Index: xsane-0.998/src/xsane-multipage-project.c
-===================================================================
---- xsane-0.998.orig/src/xsane-multipage-project.c	2010-11-16 21:25:50.000000000 +0100
-+++ xsane-0.998/src/xsane-multipage-project.c	2011-02-04 19:50:53.929016002 +0100
-@@ -973,6 +973,10 @@
-     else if (output_format == XSANE_PDF)
-     {
-       xsane_save_pdf_create_document_header(outfile, &xref, pages, preferences.save_pdf_flatedecoded);
-+
-+      /* Objects 4 and 5 are unused and do not exist */
-+      xref.obj[4] = 0;
-+      xref.obj[5] = 0;
-     }
-   }
- #ifdef HAVE_LIBTIFF

autopatches/ebuild_unpack_post/media-gfx/xsane/901-desktop-file.patch

@@ -1,17 +0,0 @@
---- a/src/xsane.desktop~	2008-03-29 10:32:18.000000000 +0100
-+++ b/src/xsane.desktop	2011-07-08 14:19:30.000000000 +0200
-@@ -1,9 +1,11 @@
- [Desktop Entry]
--Encoding=UTF-8
--Name=XSane - Scanning
-+Name=XSane Scanner Tool
-+GenericName=Scanner Tool
- Comment=Acquire images from a scanner
- Exec=xsane
-+TryExec=xsane
- Icon=xsane
- Terminal=false
- Type=Application
--Categories=Application;Graphics
-+Categories=Graphics;2DGraphics;RasterGraphics;Scanning;GTK;
-+StartupNotify=true

autopatches/ebuild_unpack_post/media-gfx/xsane/902-license-dialog.patch

@@ -1,70 +0,0 @@
-diff -up xsane-0.996/src/xsane.c.no-eula xsane-0.996/src/xsane.c
---- xsane-0.996/src/xsane.c.no-eula	2009-07-21 15:33:00.927455229 +0200
-+++ xsane-0.996/src/xsane.c	2009-07-21 15:39:28.661456472 +0200
-@@ -3524,10 +3524,13 @@ static void xsane_about_dialog(GtkWidget
-   snprintf(buf, sizeof(buf), "XSane %s %s\n"
-                              "%s %s\n"
-                              "\n"
-+                             "%s\n%s"
-+                             "\n\n"
-                              "%s %s\n"
-                              "%s %s\n",
-                              TEXT_VERSION, XSANE_VERSION,
-                              XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT,
-+                             TEXT_MODIFIED_BLURB, XSANE_BUGTRACKER_URL,
-                              TEXT_HOMEPAGE, XSANE_HOMEPAGE,
-                              TEXT_EMAIL_ADR, XSANE_EMAIL_ADR);
- 
-@@ -5714,6 +5717,7 @@ static int xsane_init(int argc, char **a
- 
-         case 'v': /* --version */
-           g_print("%s-%s %s %s\n", xsane.prog_name, XSANE_VERSION, XSANE_COPYRIGHT_SIGN, XSANE_COPYRIGHT_TXT);
-+          g_print("\n%s\n%s\n\n", TEXT_MODIFIED_BLURB, XSANE_BUGTRACKER_URL);
-           g_print("  %s %s\n", TEXT_EMAIL_ADR, XSANE_EMAIL_ADR);
-           g_print("  %s %s\n", TEXT_PACKAGE, XSANE_PACKAGE_VERSION);
-           g_print("  %s%d.%d.%d\n", TEXT_GTK_VERSION, GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-@@ -5840,17 +5844,9 @@ static int xsane_init(int argc, char **a
-   }
- 
- 
--  if (xsane_pref_restore()) /* restore preferences, returns TRUE if license is not accpted yet */
-+  if (xsane_pref_restore()) /* restore preferences, returns TRUE if the version is different from the last run */
-   {
--    if (xsane_display_eula(1)) /* show license and ask for accept/not accept */
--    {
--      DBG(DBG_info, "user did not accept eula, we abort\n");
--      return 1; /* User did not accept eula */
--    }
--    else /* User did accept eula */
--    {
--      xsane_pref_save();
--    }
-+    xsane_pref_save();
-   }
- 
-   xsane_pref_restore_media();
-diff -up xsane-0.996/src/xsane.h.no-eula xsane-0.996/src/xsane.h
---- xsane-0.996/src/xsane.h.no-eula	2009-07-21 15:33:00.921470546 +0200
-+++ xsane-0.996/src/xsane.h	2009-07-21 16:08:01.398707123 +0200
-@@ -98,6 +98,9 @@
- #define XSANE_EMAIL_ADR		"Oliver.Rauch@xsane.org"
- #define XSANE_HOMEPAGE		"http://www.xsane.org"
- #define XSANE_COPYRIGHT_TXT	XSANE_DATE " " XSANE_COPYRIGHT
-+#ifndef XSANE_BUGTRACKER_URL
-+#define XSANE_BUGTRACKER_URL             "http://bugs.gentoo.org"
-+#endif
- 
- /* ---------------------------------------------------------------------------------------------------------------------- */
- 
-diff -up xsane-0.996/src/xsane-text.h.no-eula xsane-0.996/src/xsane-text.h
---- xsane-0.996/src/xsane-text.h.no-eula	2007-08-13 09:16:43.000000000 +0200
-+++ xsane-0.996/src/xsane-text.h	2009-07-21 15:42:00.609707360 +0200
-@@ -230,6 +230,8 @@
-                                           "This program is distributed in the hope that it will be useful, but\n" \
-                                           "WITHOUT ANY WARRANTY; without even the implied warranty of\n" \
-                                           "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")
-+#define TEXT_MODIFIED_BLURB             _("This package is modified from the original version.\n" \
-+                                          "Please contact your vendor or report problems at")
- #define TEXT_EMAIL_ADR					_("E-mail:")
- #define TEXT_HOMEPAGE					_("Homepage:")
- #define TEXT_FILE					_("File:")

autopatches/ebuild_unpack_post/media-gfx/xsane/903-fix_broken_links.patch

@@ -1,18 +0,0 @@
-Description: Fix broken links in HTML documentation
- Fix/remove a couple of broken links.
-Author: Julien BLACHE <jblache@debian.org>
-
-Index: xsane-0.998/doc/sane-xsane-doc.html
-===================================================================
---- xsane-0.998.orig/doc/sane-xsane-doc.html	2007-03-03 14:11:32.000000000 +0100
-+++ xsane-0.998/doc/sane-xsane-doc.html	2011-02-04 19:51:09.289016000 +0100
-@@ -165,8 +165,7 @@
- <li><a href="sane-xsane-setup-display-doc.html">Display setup</a></li>
- <li><a href="sane-xsane-setup-enhancement-doc.html">Enhancement setup</a></li>
- <li><a href="sane-xsane-setup-fax-doc.html">Fax setup</a></li>
--<li><a href="sane-xsane-setup-image-doc.html">Image setup</a></li>
--<li><a href="sane-xsane-setup-mail-doc.html">Mail setup</a></li>
-+<li><a href="sane-xsane-setup-email-doc.html">Mail setup</a></li>
- <li><a href="sane-xsane-setup-save-doc.html">Saving setup</a></li>
- <li><a href="sane-xsane-setup-color-management-doc.html">Color management setup</a></li>
- </ul>

autopatches/ebuild_unpack_post/media-gfx/xsane/904-fix_message_typo.patch

@@ -1,493 +0,0 @@
-Description: Fix a typo in GUI messages
- Fix the "postsciptfile" typo in xsane-text.h and po files.
-Author: Stéphane Blondon <stephane.blondon@gmail.com>
-Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=569747
-Bug-Debian: http://bugs.debian.org/569747
-Forwarded: no
-
-Index: xsane-0.998/po/ca.po
-===================================================================
---- xsane-0.998.orig/po/ca.po	2007-11-21 20:18:25.000000000 +0100
-+++ xsane-0.998/po/ca.po	2011-02-04 19:51:14.781016002 +0100
-@@ -1969,11 +1969,11 @@
- msgstr "Valor gamma addicional de la component blava per a les fotocòpies"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr "Crea un fitxer PostScript que conté el perfil ICM de l'escàner"
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr "Crea un fitxer PostScript que conté el perfil ICM de la impressora"
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/cs.po
-===================================================================
---- xsane-0.998.orig/po/cs.po	2007-11-21 20:18:25.000000000 +0100
-+++ xsane-0.998/po/cs.po	2011-02-04 19:51:14.781016002 +0100
-@@ -2015,11 +2015,11 @@
- msgstr "DodateÄ<65>ná gama hodnota pro modrou komponentu pro kopírování"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/da.po
-===================================================================
---- xsane-0.998.orig/po/da.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/da.po	2011-02-04 19:51:14.801016002 +0100
-@@ -1960,11 +1960,11 @@
- msgstr "Supplerende gammaværdi for fotokopiering, blå farvedel"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr "Danner en postscriptfil der indeholder ICM-profilen for skanneren"
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr "Danner en postscriptfil der indeholder ICM-profilen for printeren"
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/de.po
-===================================================================
---- xsane-0.998.orig/po/de.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/de.po	2011-02-04 19:51:14.825016002 +0100
-@@ -1962,11 +1962,11 @@
- msgstr "Zusätzlicher Gammawert für blaue Komponente beim Fotokopieren"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr "Erzeugt eine Postscriptdatei die das ICM-Profil des Scammers enthält"
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr "Erzeugt eine Postscriptdatei die das ICM-Profil des Druckers enthält"
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/es.po
-===================================================================
---- xsane-0.998.orig/po/es.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/es.po	2011-02-04 19:51:14.853016001 +0100
-@@ -2048,11 +2048,11 @@
- msgstr "Valor de gamma adicional del valor azul para fotocopia"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/fi.po
-===================================================================
---- xsane-0.998.orig/po/fi.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/fi.po	2011-02-04 19:51:14.877016001 +0100
-@@ -1943,11 +1943,11 @@
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/fr.po
-===================================================================
---- xsane-0.998.orig/po/fr.po	2007-11-21 20:18:26.000000000 +0100
-+++ xsane-0.998/po/fr.po	2011-02-04 19:51:14.921016003 +0100
-@@ -2042,11 +2042,11 @@
- msgstr "Gamma additionnel pour la composante bleue pour la photocopie"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/hu.po
-===================================================================
---- xsane-0.998.orig/po/hu.po	2007-11-21 20:18:27.000000000 +0100
-+++ xsane-0.998/po/hu.po	2011-02-04 19:51:14.945016000 +0100
-@@ -2012,11 +2012,11 @@
- msgstr "Plusz kék gamma érték a fotómásoláshoz"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/it.po
-===================================================================
---- xsane-0.998.orig/po/it.po	2007-11-21 20:18:27.000000000 +0100
-+++ xsane-0.998/po/it.po	2011-02-04 19:51:14.965016001 +0100
-@@ -1965,11 +1965,11 @@
- msgstr "Valore aggiuntivo della gamma per la componente blu per la fotocopia"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr "Crea un file postscript che contiene il profilo ICM dello scanner"
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr "Crea un file postscript che contiene il profilo ICM della stampante"
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/ja.po
-===================================================================
---- xsane-0.998.orig/po/ja.po	2007-11-21 20:18:27.000000000 +0100
-+++ xsane-0.998/po/ja.po	2011-02-04 19:51:14.981016000 +0100
-@@ -2031,11 +2031,11 @@
- msgstr "焼ã<C2BC><C3A3>増ã<E28094>—ã<E28094>¸ã<C2B8>®é<C2AE>’æˆ<C3A6>分追加ガンマ値"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/nl.po
-===================================================================
---- xsane-0.998.orig/po/nl.po	2007-11-21 20:18:27.000000000 +0100
-+++ xsane-0.998/po/nl.po	2011-02-04 19:51:14.997016002 +0100
-@@ -2025,11 +2025,11 @@
- msgstr "Extra gammacorrectie voor blauw voor fotokopie"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/pa.po
-===================================================================
---- xsane-0.998.orig/po/pa.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/pa.po	2011-02-04 19:51:15.013016002 +0100
-@@ -1951,11 +1951,11 @@
- msgstr "ਫੋਟੋ-ਕਾਪੀ ਲਈ ਨੀਲੇ ਭਾਗ ਵਾਸਤੇ ਹੋਰ ਗਾਮਾ ਮà©<C3A0>ੱਲ"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr "ਇੱਕ ਪੋਸਟ-ਸਕà©<C3A0>ਰਿਪਟ ਫਾਇਲ ਬਣਾਓ, ਜੋ ਕਿ ਸਕੈਨਰ ਦਾ ICM ਪਰੋਫਾਇਲ ਰੱਖਦੀ ਹੋਵੇ।"
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr "ਇੱਕ ਪੋਸਟ-ਸਕà©<C3A0>ਰਿਪਟ ਫਾਇਲ ਬਣਾਓ, ਜੋ ਕਿ ਪਰਿੰਟਰ ਦਾ ICM ਪਰੋਫਾਇਲ ਰੱਖਦੀ ਹੋਵੇ।"
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/pl.po
-===================================================================
---- xsane-0.998.orig/po/pl.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/pl.po	2011-02-04 19:51:15.049016001 +0100
-@@ -2030,11 +2030,11 @@
- msgstr "Dodatkowy parametr gamma dla niebieskiej składowej kopii"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/pt.po
-===================================================================
---- xsane-0.998.orig/po/pt.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/pt.po	2011-02-04 19:51:15.065016001 +0100
-@@ -2040,11 +2040,11 @@
- msgstr "Valor gama adicional para o componente azul para fotocópia"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/pt_BR.po
-===================================================================
---- xsane-0.998.orig/po/pt_BR.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/pt_BR.po	2011-02-04 19:51:15.081016002 +0100
-@@ -2040,11 +2040,11 @@
- msgstr "Valor gama adicional para o componente azul para fotocópia"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/ro.po
-===================================================================
---- xsane-0.998.orig/po/ro.po	2007-11-21 20:18:28.000000000 +0100
-+++ xsane-0.998/po/ro.po	2011-02-04 19:51:15.097016002 +0100
-@@ -2043,11 +2043,11 @@
- msgstr "Valoare gamma adiţională componentă albastru pt. fotocopie"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/ru.po
-===================================================================
---- xsane-0.998.orig/po/ru.po	2007-11-21 20:18:29.000000000 +0100
-+++ xsane-0.998/po/ru.po	2011-02-04 19:51:15.133016000 +0100
-@@ -2024,11 +2024,11 @@
- msgstr "Дополнительное значение Ñ<>инего компонента гаммы при копировании"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/sk.po
-===================================================================
---- xsane-0.998.orig/po/sk.po	2007-11-21 20:18:29.000000000 +0100
-+++ xsane-0.998/po/sk.po	2011-02-04 19:51:15.149016002 +0100
-@@ -1971,11 +1971,11 @@
- msgstr "DodatoÄ<6F>ná gama hodnota pre modrý komponent fotokópie"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr "Vytvoriť postscript súbor obsahujúci ICM profil skenera"
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr "VytvoriÅ¥ postscript súbor obsahujúci ICM profil tlaÄ<61>iarne"
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/sl.po
-===================================================================
---- xsane-0.998.orig/po/sl.po	2007-11-21 20:18:29.000000000 +0100
-+++ xsane-0.998/po/sl.po	2011-02-04 19:51:15.165016000 +0100
-@@ -2015,11 +2015,11 @@
- msgstr "Dodatna vrednost gama za modro komponento pri fotokopiranju"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/sr.po
-===================================================================
---- xsane-0.998.orig/po/sr.po	2007-11-21 20:18:29.000000000 +0100
-+++ xsane-0.998/po/sr.po	2011-02-04 19:51:15.189016000 +0100
-@@ -1958,12 +1958,12 @@
- msgstr "Додатна вредноÑ<C2BE>Ñ‚ гама за плаву компоненту при фотокопирању"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
--msgstr "Ð<>аправи postscipt фајлу која Ñ<>адржи ICM профил Ñ<>кенера"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
-+msgstr "Ð<>аправи postscript фајлу која Ñ<>адржи ICM профил Ñ<>кенера"
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
--msgstr "Ð<>аправи postscipt фајлу која Ñ<>адржи ICM профил штампача"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
-+msgstr "Ð<>аправи postscript фајлу која Ñ<>адржи ICM профил штампача"
- 
- #. DESC_PRINTER_CMS_BPC
- msgid "Applies black point compensation"
-Index: xsane-0.998/po/sv.po
-===================================================================
---- xsane-0.998.orig/po/sv.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/sv.po	2011-02-04 19:51:15.209016000 +0100
-@@ -2043,11 +2043,11 @@
- msgstr "Extra gammavärde för den blåa komponeneten vid fotokopiering"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/tr.po
-===================================================================
---- xsane-0.998.orig/po/tr.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/tr.po	2011-02-04 19:51:15.409016001 +0100
-@@ -2023,11 +2023,11 @@
- msgstr "Fotokopi için mavi bileşenin ilave gamma değeri"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/vi.po
-===================================================================
---- xsane-0.998.orig/po/vi.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/vi.po	2011-02-04 19:51:15.425016002 +0100
-@@ -2061,11 +2061,11 @@
- msgstr "Giá trị gamma thêm cho thành phần màu xanh da trá»<C3A1>i cho photocopy"
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/xsane.pot
-===================================================================
---- xsane-0.998.orig/po/xsane.pot	2007-08-13 09:22:06.000000000 +0200
-+++ xsane-0.998/po/xsane.pot	2011-02-04 19:51:15.425016003 +0100
-@@ -1912,11 +1912,11 @@
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/zh.po
-===================================================================
---- xsane-0.998.orig/po/zh.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/zh.po	2011-02-04 19:51:15.457016001 +0100
-@@ -2011,11 +2011,11 @@
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/po/zh_CN.po
-===================================================================
---- xsane-0.998.orig/po/zh_CN.po	2007-11-21 20:18:30.000000000 +0100
-+++ xsane-0.998/po/zh_CN.po	2011-02-04 19:51:15.493016000 +0100
-@@ -1986,11 +1986,11 @@
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CSA
--msgid "Creates a postsciptfile that contains the ICM profile of the scanner"
-+msgid "Creates a postscript file that contains the ICM profile of the scanner"
- msgstr ""
- 
- #. DESC_PRINTER_EMBED_CRD
--msgid "Creates a postsciptfile that contains the ICM profile of the printer"
-+msgid "Creates a postscript file that contains the ICM profile of the printer"
- msgstr ""
- 
- #. DESC_PRINTER_CMS_BPC
-Index: xsane-0.998/src/xsane-text.h
-===================================================================
---- xsane-0.998.orig/src/xsane-text.h	2011-02-04 19:50:36.505016000 +0100
-+++ xsane-0.998/src/xsane-text.h	2011-02-04 19:51:15.493016001 +0100
-@@ -579,8 +579,8 @@
- #define DESC_PRINTER_GAMMA_RED		_("Additional gamma value for red component for photocopy")
- #define DESC_PRINTER_GAMMA_GREEN	_("Additional gamma value for green component for photocopy")
- #define DESC_PRINTER_GAMMA_BLUE		_("Additional gamma value for blue component for photocopy")
--#define DESC_PRINTER_EMBED_CSA		_("Creates a postsciptfile that contains the ICM profile of the scanner")
--#define DESC_PRINTER_EMBED_CRD		_("Creates a postsciptfile that contains the ICM profile of the printer")
-+#define DESC_PRINTER_EMBED_CSA		_("Creates a postscript file that contains the ICM profile of the scanner")
-+#define DESC_PRINTER_EMBED_CRD		_("Creates a postscript file that contains the ICM profile of the printer")
- #define DESC_PRINTER_CMS_BPC		_("Applies black point compensation")
- #define DESC_PRINTER_PS_FLATEDECODED	_("Create zlib compressed postscript image for printer (flatedecode).\n" \
-                                           "The printer has to understand postscript level 3!")

autopatches/ebuild_unpack_post/media-gfx/xsane/907-fix_spin_button_pagesize.patch

@@ -1,46 +0,0 @@
-Description: Fix spin buttons usage for newer versions of GTK+ 2.0
- Set adjustment page size to 0 for spin buttons. Fix for newer GTK
- versions, silences runtime warnings.
-Author: Julien BLACHE <jblache@debian.org>
-Forwarded: no
-
-Index: xsane-0.998/src/xsane-back-gtk.c
-===================================================================
---- xsane-0.998.orig/src/xsane-back-gtk.c	2011-02-04 19:50:46.000000000 +0100
-+++ xsane-0.998/src/xsane-back-gtk.c	2011-02-04 19:54:55.581016002 +0100
-@@ -2028,6 +2028,7 @@
-       digits = 5;
-     }
- #endif
-+    gtk_adjustment_set_page_size(GTK_ADJUSTMENT(elem->data), 0);
-     spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(elem->data), 0, digits);
- 
-     if (preferences.show_range_mode & 3) /* slider also visible */
-@@ -2129,6 +2130,7 @@
-     digits = 5;
-   }
- #endif
-+  gtk_adjustment_set_page_size(GTK_ADJUSTMENT(elem->data), 0);
-   spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(elem->data), 0, digits);
- 
-   if (preferences.show_range_mode & 3) /* sliders are visible */
-Index: xsane-0.998/src/xsane-front-gtk.c
-===================================================================
---- xsane-0.998.orig/src/xsane-front-gtk.c	2011-02-04 19:50:46.000000000 +0100
-+++ xsane-0.998/src/xsane-front-gtk.c	2011-02-04 19:54:55.581016002 +0100
-@@ -1163,6 +1163,7 @@
-   /* spinbutton */
-   if (preferences.show_range_mode & 4)
-   {
-+    gtk_adjustment_set_page_size(GTK_ADJUSTMENT(*data), 0);
-     spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(*data), 0, digits);
-     if (preferences.show_range_mode & 3) /* slider also visible */
-     {
-@@ -1255,6 +1256,7 @@
-   /* spinbutton */
-   if (preferences.show_range_mode & 4)
-   {
-+    gtk_adjustment_set_page_size(GTK_ADJUSTMENT(*data), 0);
-     spinbutton = gtk_spin_button_new(GTK_ADJUSTMENT(*data), 0, digits);
-     gtk_widget_set_size_request(spinbutton, 60, -1);
-     xsane_back_gtk_set_tooltip(xsane.tooltips, spinbutton, desc);

autopatches/ebuild_unpack_post/media-gfx/xsane/908-no-file-selected.patch

@@ -1,57 +0,0 @@
-Slightly modified version of the former 003 Fedora patch, in order to fix gentoo bug 396127
-
-diff -up xsane-0.997/src/xsane-back-gtk.c.no-file-selected xsane-0.997/src/xsane-back-gtk.c
---- xsane-0.997/src/xsane-back-gtk.c.no-file-selected	2002-10-02 13:05:52.000000000 +0200
-+++ xsane-0.997/src/xsane-back-gtk.c	2010-07-13 10:02:09.468118791 +0200
-@@ -1111,6 +1111,11 @@ static void xsane_back_gtk_filetype2_cal
- 
-   chooser_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filechooser));
- 
-+  if (!chooser_filename)
-+  {
-+    return;
-+  }
-+
-   if ((new_filetype) && (*new_filetype))
-   {
-     extension = strrchr(chooser_filename, '.');
-@@ -1501,12 +1506,19 @@ int xsane_back_gtk_get_filename(const ch
- #endif
- 
-     chooser_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filechooser));
--    strncpy(filename, chooser_filename, max_len - 1);
--    g_free(chooser_filename);
-+    if (chooser_filename)
-+    {
-+      strncpy(filename, chooser_filename, max_len - 1);
-+      g_free(chooser_filename);
- 
--    filename[max_len - 1] = '\0';
-+      filename[max_len - 1] = '\0';
- 
--    ok = TRUE;
-+      ok = TRUE;
-+    }
-+    else
-+    {
-+      ok = FALSE;
-+    }
-   }
- 
-   gtk_widget_destroy(filechooser);
-diff -up xsane-0.997/src/xsane-front-gtk.c.no-file-selected xsane-0.997/src/xsane-front-gtk.c
---- xsane-0.997/src/xsane-front-gtk.c.no-file-selected	2002-10-02 13:04:33.000000000 +0200
-+++ xsane-0.997/src/xsane-front-gtk.c	2010-07-13 09:59:31.005868940 +0200
-@@ -1339,7 +1339,11 @@ static void xsane_browse_filename_callba
-   snprintf(windowname, sizeof(windowname), "%s %s %s", xsane.prog_name, WINDOW_OUTPUT_FILENAME, xsane.device_text);
- 
-   umask((mode_t) preferences.directory_umask); /* define new file permissions */    
--  xsane_back_gtk_get_filename(windowname, filename, sizeof(filename), filename, &preferences.filetype, &preferences.cms_function, XSANE_FILE_CHOOSER_ACTION_SELECT_SAVE, show_extra_widgets, XSANE_FILE_FILTER_ALL | XSANE_FILE_FILTER_IMAGES, XSANE_FILE_FILTER_IMAGES);
-+  if (xsane_back_gtk_get_filename(windowname, filename, sizeof(filename), filename, &preferences.filetype, &preferences.cms_function, XSANE_FILE_CHOOSER_ACTION_SELECT_SAVE, show_extra_widgets, XSANE_FILE_FILTER_ALL | XSANE_FILE_FILTER_IMAGES, XSANE_FILE_FILTER_IMAGES) < 0)
-+  {
-+    xsane_set_sensitivity(TRUE);
-+    return;
-+  }
-   umask(XSANE_DEFAULT_UMASK); /* define new file permissions */    
- 
-   if (preferences.filename)

bashrc

@@ -2,9 +2,27 @@ CHOST="x86_64-pc-linux-gnu"
 x86_64_pc_linux_gnu_CFLAGS="-march=native -pipe -O2"
 x86_64_pc_linux_gnu_CXXFLAGS="-march=native -pipe -O2"
 x86_64_pc_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
-i686_pc_linux_gnu_CFLAGS="-march=native -pipe -O2"
-i686_pc_linux_gnu_CXXFLAGS="-march=native -pipe -O2"
+i686_pc_linux_gnu_CFLAGS="-march=i686 -pipe -O2"
+i686_pc_linux_gnu_CXXFLAGS="-march=i686 -pipe -O2"
 i686_pc_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+armv7_unknown_linux_gnueabi_CFLAGS="-march=armv7-a -pipe -O2"
+armv7_unknown_linux_gnueabi_CXXFLAGS="-march=armv7-a -pipe -O2"
+armv7_unknown_linux_gnueabi_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+armv7_unknown_linux_gnueabihf_CFLAGS="-march=armv7-a -mfpu=neon -pipe -O2"
+armv7_unknown_linux_gnueabihf_CXXFLAGS="-march=armv7-a -mfpu=neon -pipe -O2"
+armv7_unknown_linux_gnueabihf_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+aarch64_unknown_linux_gnueabi_CFLAGS="-march=armv8-a -pipe -O2"
+aarch64_unknown_linux_gnueabi_CXXFLAGS="-march=armv8-a -pipe -O2"
+aarch64_unknown_linux_gnueabi_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+aarch64_unknown_linux_musleabi_CFLAGS="-march=armv8-a -pipe -O2"
+aarch64_unknown_linux_musleabi_CXXFLAGS="-march=armv8-a -pipe -O2"
+aarch64_unknown_linux_musleabi_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+ia64_unknown_linux_gnu_CFLAGS="-march=native -pipe -O2"
+ia64_unknown_linux_gnu_CXXFLAGS="-march=native -pipe -O2"
+ia64_unknown_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
+powerpc64_unknown_linux_gnu_CFLAGS="-march=native -pipe -O2"
+powerpc64_unknown_linux_gnu_CXXFLAGS="-march=native -pipe -O2"
+powerpc64_unknown_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
 
 
 #GIT_WRAPPER="sudo -u hasufell -g paludisbuild"
@@ -16,7 +34,8 @@ i686_pc_linux_gnu_LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
 case "${CATEGORY}/${PN}" in
     x11-wm/i3)
         scm_user_customize () {
-            SCM_REPOSITORY="https://github.com/hasufell/i3wm.git"
+            SCM_REPOSITORY="https://github.com/hasufell/i3-window-icons.git"
+            SCM_BRANCH="4.17.1/icons"
         }
         ;;
 	games-fps/urbanterror)
@@ -24,5 +43,11 @@ case "${CATEGORY}/${PN}" in
 		;;
 esac
 
+case "${REPOSITORY}" in
+	hasufell-binhost)
+		EXTRA_WGET="--no-check-certificate"
+		;;
+esac
+
 # idiotic mysql package dies in pkg_pretend otherwise
 MYSQL_MAJOR_UPGRADE="YesPlease"

hooks/ebuild_install_post/prune_libtool_files.bash

@@ -70,7 +70,7 @@ prune_libtool_files() {
 					local pc_libs=()
 					if [[ ! ${removing_all} ]]; then
 						local pc
-						local tf=${T}/prune-lt-files.pc
+						local tf=${TEMP}/prune-lt-files.pc
 						local pkgconf=${PKG_CONFIG}
 
 						while IFS= read -r -d '' pc; do # for all .pc files
@@ -138,6 +138,7 @@ if [[ "${CATEGORY}/${PN}" != "sys-devel/gcc" &&
 		"${CATEGORY}/${PN}" != "sys-apps/dbus" &&
 		"${CATEGORY}/${PN}" != "sys-apps/util-linux" &&
 		"${CATEGORY}/${PN}" != "media-libs/freetype" &&
+		"${CATEGORY}/${PN}" != "dev-libs/libunistring" &&
 		"${CATEGORY}/${PN}" != "dev-libs/expat"
 	]] ; then
 	prune_libtool_files --all

hooks/ebuild_install_post/xflock4.bash

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+source "${PALUDIS_EBUILD_DIR}/echo_functions.bash"
+
+if [[ "${CATEGORY}/${PN}" == "xfce-base/xfce4-session" ]] ; then
+	elog "Replacing /usr/$(exhost --target)/bin/xflock4!"
+
+	cat << EOF > "${IMAGE}"/usr/$(exhost --target)/bin/xflock4
+#!/bin/sh
+
+PATH=/bin:/usr/bin
+export PATH
+
+# else run another access locking utility, if installed
+for lock_cmd in \
+  "i3lock -c 000000"
+  do
+    set -- \$lock_cmd
+    if command -v -- \$1 >/dev/null 2>&1; then
+        \$lock_cmd >/dev/null 2>&1 &
+	# turn off display backlight:
+	xset dpms force off
+        exit
+    fi
+done
+
+# else access locking failed
+exit 1
+EOF
+
+fi

options.conf

@@ -1,5 +1,5 @@
 # system, general, other
-*/*  -gnutls acpi bash-completion cdr cscope css dv fat glib gobject-introspection gpm hddtemp icq icu ipv6 jabber libnotify lm_sensors nsplugin ntfs oscar pdf python raw sse sse2 ssse3 tcpd threads udev unicode usb vim-syntax zsh-completion
+*/*  -gnutls acpi bash-completion cdr cscope css dv efi fat glib gobject-introspection gpm hddtemp icq icu ipv6 jabber libnotify lm_sensors nsplugin ntfs oscar pdf postscript python raw sse sse2 ssse3 tcpd threads udev unicode usb vim-syntax zsh-completion
 
 # parts
 */* parts: openrc
@@ -12,9 +12,10 @@
 
 # video, ffmpeg, streaming
 */* a52 dvd dvdr ffmpeg gstreamer h264 matroska mp4 mpeg v4l vcd vdpau x264 xvid
+*/* providers: ffmpeg -libav
 
 # opengl, video, X
-*/* dri opengl sdl -wayland xv xvmc X
+*/* dri opengl sdl wayland xv xvmc X
 */* video_drivers: nouveau intel vesa
 
 # image formats
@@ -34,16 +35,24 @@
 */* build_options: symbols=split jobs=8 -optional_tests -recommended_tests -expensive_tests
 
 # targets
-*/* targets: x86_64-pc-linux-gnu
+*/* targets: x86_64-pc-linux-gnu armv7-unknown-linux-gnueabihf aarch64-unknown-linux-gnueabi i686-pc-linux-gnu
+dev-lang/rust targets: -* x86_64-pc-linux-gnu
 
 # SSL
 */* providers: -openssl libressl
 
+*/* providers: -krb5 heimdal
+
 # jpeg
 */* providers: -ijg-jpeg jpeg-turbo
 
 # no systemd
-*/* providers: -systemd eudev rsyslog
+*/* providers: -systemd eudev rsyslog -systemd-logind
 */* -systemd consolekit
 */* providers: -runit -sinit sysvinit
 
+# sql
+*/* providers: -percona mysql -mariadb
+
+# GHC
+virtual/GHC providers: -* GHC

options.conf.d/desktop.conf

@@ -1,3 +1,8 @@
+media-libs/libsndfile opus
+
+# phone mounting
+gnome-desktop/gvfs mtp
+
 # evince, gimp
 app-text/poppler glib
 
@@ -16,7 +21,7 @@ x11-libs/wxGTK:3.0 providers: gtk2 gtk3
 dev-lang/python sqlite
 
 # libsoup, dep-cycle of GPaste
-dev-libs/glib-networking gnutls
+dev-libs/glib-networking providers: -libressl -openssl gnutls
 
 gnome-desktop/GPaste applet
 
@@ -28,19 +33,19 @@ net-im/pidgin-opensteamworks providers: libressl
 media/mplayer LINGUAS: -* de
 
 # gnome
-media-sound/audacious-plugins gtk
-media-sound/audacious gtk
+media-sound/audacious-plugins gtk qt5 notify osd
+media-sound/audacious gtk qt5
 dev-libs/vte gnutls
 
 # no systemd
 x11-libs/qtbase -journald
+net-analyzer/wireshark -journald
 
 # kde
 x11-libs/qtbase sql sqlite
 media-libs/phonon qt4
 
 # xfce
-xfce-base/libxfce4ui gtk3
 x11-apps/xscreensaver gtk
 
 # qt stuff
@@ -51,13 +56,14 @@ x11-libs/qt sql sqlite opengl ssl
 x11-libs/qt webkit
 
 x11-wm/i3 icons
+x11-misc/polybar i3 network curl
 
 # teamspeak
 app-arch/quazip qt5
 
 # blink
 x11-libs/qt qt3support
-dev-python/PyQt5 webkit
+dev-python/PyQt5 webkit webchannel
 media/ffmpeg h264
 
 net-misc/youtube-viewer gtk
@@ -147,3 +153,20 @@ media-gfx/xsane lcms gimp
 # media-video/peek
 media-plugins/gst-plugins-good GSTREAMER_PLUGINS: vpx
 media/ffmpeg vpx
+
+# firefox
+dev-lang/node bundled-openssl
+net-www/firefox eme
+
+x11-dri/mesa opencl llvm xa va sensors
+
+# because of dconf-editor
+gnome-desktop/dconf vapi
+
+# net-www/qutebrowser
+dev-python/PyQt5 sql
+
+net-irc/weechat perl python
+
+# cheese
+media-plugins/gst-plugins-good GSTREAMER_PLUGINS: v4l

options.conf.d/development.conf

@@ -5,10 +5,7 @@ dev-lang/ghc llvm bootstrap
 sys-libs/ncurses compat-libs
 
 # haskell
-*/* profile hscolour
-#dev-haskell/* doc
-#dev-lang/ghc doc
-
+dev-lang/GHC llvm
 
 dev-scm/git tk
 
@@ -31,6 +28,8 @@ dev-lang/rust internal-llvm force-bootstrap
 app-editors/emacs freetype xim
 app-editors/emacs providers: gtk3
 
+# node
+dev-lang/node bundled-openssl
 
 # monodevelop
 dev-dotnet/mono-addins gui
@@ -39,3 +38,8 @@ app-editors/vim ruby
 app-editors/gvim ruby
 
 dev-util/universal-ctags json xml yaml
+
+dev-db/sqlite readline
+
+# java
+=virtual/jdk-12.0 providers: openjdk-bin

options.conf.d/emulation.conf

@@ -1,2 +1,9 @@
 # Exactly one of options ( multibuild_c:32, multibuild_c:64 ) must be met
 app-emulation/wine MULTIBUILD_C: -* 64
+app-emulation/wine ffmpeg staging vulkan
+
+
+app-virtualization/qemu amd64 mips mipsel arm aarch64 ppc ppc64 x86 virtio-gpu virtfs vde usb-passthrough usb-redirection ssh-block-dev spice snappy smartcard sdl2 sdl-image sasl rbd nfs lzo gtk3 bluetooth async xattr
+media-plugins/gst-plugins-ugly GSTREAMER_PLUGINS: h264
+virtualization-lib/spice smartcard
+sys-cluster/ceph client

options.conf.d/games.conf

@@ -13,7 +13,7 @@ games-roguelike/dungeon-crawl-stone-soup tiles
 
 games-rpg/pillars-of-eternity pre-order-items white-march-1 white-march-2
 
-games-strategy/freeciv lua_abis: 5.2
+games-strategy/freeciv lua_abis: -* 5.3
 games-strategy/freeciv gtk3
 
 games-fps/eduke32 offensive hires-textures -tools vpx
@@ -29,3 +29,8 @@ games-rpg/gemrb opengl sdl2
 
 
 games-roguelike/FTL gog
+
+# teeworlds
+dev-util/bam lua_abis: -* 5.1
+
+x11-dri/mesa vulkan-overlay

options.conf.d/networking.conf

@@ -1,7 +1,12 @@
-net-apps/NetworkManager compat-libs connection-check wifi
-net-apps/NetworkManager providers: nss consolekit -dhcpcd dhcp
+net-apps/NetworkManager compat-libs connection-check wifi -journald
+net-apps/NetworkManager providers: -gnutls nss consolekit -dhcpcd dhcp wpa_supplicant
 net-wireless/wpa_supplicant nl80211
 net-scanner/nmap gtk utils
 
 # broken parallel build
 net-fs/samba build_options: jobs=1
+
+net-analyzer/wireshark -journald
+
+# for gns3
+dev-python/PyQt5 websockets

options.conf.d/python-abis.conf

@@ -1,23 +1,43 @@
 # python
-*/* python_abis: 2.7 3.6
+*/* python_abis: -* 2.7 3.6
 
 # exactly one of
-app-virtualization/docker-compose python_abis: -* 3.6
-dev-lang/llvm      python_abis: -* 3.6
-dev-libs/libxml2   python_abis: -* 3.6
-dev-python/Sphinx  python_abis: -* 3.6
-dev-scm/subversion python_abis: -* 3.6
-dev-util/itstool   python_abis: -* 3.6
-sys-process/ctop   python_abis: -* 2.7
-sys-apps/paludis   python_abis: -* 2.7
-app-editors/gvim   python_abis: -* 2.7
-app-editors/vim    python_abis: -* 2.7
-net-libs/miniupnpc python_abis: -* 2.7
 app-crypt/volume_key python_abis: -* 2.7
-base/libblockdev python_abis: -* 2.7
-games-board/pysolfc python_abis: -* 2.7
-dev-libs/gexiv2 python_abis: -* 3.6
 app-doc/gtk-doc-autotools python_abis: -* 3.6
+app-editors/gvim python_abis: -* 3.6
+app-editors/vim python_abis: -* 3.6
+app-office/libreoffice python_abis: -* 3.6
+app-text/calibre python_abis: -* 2.7
+app-virtualization/docker-compose python_abis: -* 3.6
+base/libblockdev python_abis: -* 2.7
+dev-db/postgresql python_abis: -* 3.6
+dev-lang/clang python_abis: -* 3.6
+dev-lang/llvm python_abis: -* 2.7
+dev-libs/gexiv2 python_abis: -* 3.6
+dev-libs/libxml2 python_abis: -* 2.7 3.6
+dev-python/Sphinx python_abis: -* 3.6
+dev-scm/mercurial python_abis: -* 3.6
+dev-scm/subversion python_abis: -* 2.7
+dev-util/itstool python_abis: -* 3.6
+dev-util/meld python_abis: -* 3.6
+games-board/pysolfc python_abis: -* 2.7
+media-gfx/fontforge python_abis: -* 3.6
+media-gfx/graphviz python_abis: -* 3.6
+media-sound/pulseeffects python_abis: -* 3.6
+net-libs/miniupnpc python_abis: -* 2.7
+net-wireless/blueman python_abis: -* 3.6
+sys-apps/paludis python_abis: -* 2.7
+sys-devel/meson python_abis: -* 3.6 
+sys-fs/btrfs-progs python_abis: -* 3.6
+sys-fs/fuse python_abis: -* 3.6
+sys-libs/newt python_abis: -* 3.6
+sys-process/ctop python_abis: -* 2.7
+sys-sound/alsa-lib python_abis: -* 3.6
+x11-dri/mesa python_abis: -* 3.6
+x11-misc/zim python_abis: -* 3.6
+sys-libs/openmp python_abis: -* 3.6
+dev-lang/coconut python_abis: -* 3.6
+app-editors/vint python_abis: -* 3.6
 
 # inox
 app-speech/speechd python_abis: -* 3.6
@@ -31,3 +51,9 @@ net-im/pidgin python_abis: -* 2.7
 dev-util/glade python_abis: -* 2.7
 
 dev-libs/compiler-rt python_abis: -* 2.7
+
+# sqlitebrowser
+app-editors/QScintilla python_abis: -* 2.7
+
+# peter
+dev-libs/mbedtls python_abis: -* 3.6

options.conf.d/system.conf

@@ -14,10 +14,12 @@ x11-drivers/nvidia-drivers tools
 
 sys-auth/ConsoleKit2 cgroups polkit
 
-dev-lang/python tk
+dev-lang/python tk readline
 
 # needed for valgrind
 sys-libs/glibc build_options: symbols=preserve
 
 # dracut
 sys-apps/coreutils xattr
+
+sys-apps/man-db berkdb

options.conf.d/wayland.conf

@@ -0,0 +1,10 @@
+x11-server/xorg-server xwayland
+compositor/sway xwayland tray gdk-pixbuf
+wayland-apps/swaybg gdk-pixbuf
+sys-libs/wlroots xwayland
+
+
+sys-auth/elogind providers: -* openrc
+compositor/sway providers: eudev elogind
+
+wayland-apps/Waybar tray network

package_env.conf

@@ -6,3 +6,4 @@ dev-db/wxsqlite3 debug
 net-www/inox fpermissive
 
 base/syslinux no-as-needed
+net-im/purple-xmpp-http-upload no-as-needed

package_mask.conf

@@ -5,11 +5,14 @@
 >=sys-apps/iproute2-3.19
 
 # steam
->x11-drivers/nvidia-drivers-364.20
+#>x11-drivers/nvidia-drivers-396.24
 
 # breaks tahoma font
 #>=media-libs/fontconfig-2.12
 #>=media-libs/freetype-2.6.4
 
 # incompatible with signal
->=dev-lang/node-9
+#>=dev-lang/node-9
+
+# keruspe committing broken crap
+>=virtual/mysql-8.0

package_unmask.conf

@@ -6,6 +6,9 @@ x11-apps/dzen2
 media-libs/SDL:2
 
 # scm unmask
+x11-plugins/i3status[~scm]
+sys-fs/simple-mtpfs[~scm]
+x11-misc/fsearch[~scm]
 app-editors/neovim[~scm]
 app-vim/vim-colors-solarized[~scm]
 games-emulation/gambatte[~scm]
@@ -39,6 +42,11 @@ games-rpg/flare[~scm]
 sci-apps/z3[~scm]
 dev-lang/fstar[~scm]
 dev-lang/fsharp[~scm]
+x11-drivers/xf86-video-wayland[~scm]
+wayland-apps/Waybar[~scm]
+x11-misc/polybar[~scm]
+dev-util/universal-ctags[~scm]
+net-im/purple-xmpp-http-upload[~scm]
 
 # valyriatear
 media-libs/SDL_ttf:2
@@ -71,3 +79,26 @@ dev-lang/guile:1.8
 
 # pnmixer-rs
 dev-lang/rust:nightly
+
+# neovim-gtk
+app-editors/neovim-gtk[~scm]
+
+virtual/jre:9.0
+virtual/jdk:9.0
+virtual/jre:10.0
+virtual/jdk:10.0
+
+# security vulnerability
+media-libs/giflib:5.1
+net-dns/libidn2:4.0
+
+# deprecated
+x11-libs/qt:4
+dev-lang/openjdk10
+dev-lang/openjdk9
+virtual/jre:12.0
+virtual/jdk:12.0
+dev-lang/openjdk-bin:12.0
+dev-lang/openjdk12:12.0
+
+dev-db/mysql

sets/desktop.conf

@@ -1,11 +1,8 @@
 * app-admin/hardinfo
-* app-diagram/dia
 * app-editors/gvim
+* app-diagram/dia
 * app-ergonomics/workrave
-* app-office/abiword
-* app-office/gnucash
 * app-text/texmaker
-* gnome-desktop/GPaste
 * gnome-desktop/evince
 * kde/marble
 * mail-client/thunderbird
@@ -19,28 +16,25 @@
 * media-sound/pnmixer-rs
 * media-video/guvcview
 * media/livestreamer
+* media/smplayer
 * media/mpv
 * net-ftp/filezilla
 * net-misc/remmina
 * net-misc/x11vnc
 * net-misc/youtube-viewer
-* net-p2p/pybitmessage
+#* net-p2p/pybitmessage
 * net-www/firefox
 * net-www/google-chrome-bin
-* net-www/inox
-* net-www/inox-widevine-plugin
 * net-www/links
 * voip/blink
 * voip/mumble
 * voip/teamspeak-client-bin
-* x11-apps/dzen2
+* x11-apps/alacritty
 * x11-apps/redshift
 * x11-apps/sakura
 * x11-apps/setxkbmap
-
 * x11-apps/spacefm
 * sys-apps/udevil
-
 * x11-apps/xbindkeys
 * x11-apps/xdotool
 * x11-apps/xhost
@@ -52,11 +46,23 @@
 * x11-drivers/xf86-input-keyboard
 * x11-drivers/xf86-input-mouse
 * x11-drivers/xf86-video-nouveau
-* x11-misc/dmenu
 * x11-misc/zim
 * x11-utils/xclip
+
+# i3
+* x11-apps/i3lock
+* x11-apps/picom
+* x11-misc/rofi
 * x11-wm/i3
 
+# polybar
+* dev-python/fontawesome
+* dev-python/i3ipc
+* fonts/fontawesome
+* fonts/unifont
+* x11-misc/polybar
+
+
 # unpacking
 * app-arch/p7zip
 * app-arch/unrar
@@ -71,7 +77,6 @@
 * net-wireless/blueman
 * net-wireless/bluez
 * media-sound/pulseaudio
-* media-sound/pulseeffects
 
 # password management
 * app-admin/keepassxc
@@ -84,6 +89,9 @@
 * net-im/pidgin-otr
 * net-im/pidgin-save-conv-order
 * net-im/lurch
+* net-im/telegram-purple
+* net-im/purple-gowhatsapp
+* net-im/purple-xmpp-http-upload
 
 * voip/skypeforlinux
 * voip/umurmur
@@ -96,3 +104,46 @@
 * media-gfx/xsane
 
 * media-video/peek
+
+* media-sound/pavucontrol
+
+* net-www/brave-browser-dev
+
+* net-misc/dropbox
+
+* net-im/slack
+* net-im/telegram-desktop
+* app-crypt/keybase
+
+# epub
+* app-text/calibre
+
+* sys-apps/lsd
+* app-misc/hunter
+
+* app-misc/ripgrep-all
+
+* app-shells/fish
+
+# neomutt
+* mail-client/notmuch
+* dev-db/lmdb
+* net-dns/libidn2
+* dev-libs/libunistring
+* dev-libs/pcre2
+* dev-db/sqlite
+* app-arch/lz4
+* sys-libs/zlib
+* net-www/w3m
+
+# weechat
+* net-irc/weechat
+* net-libs/cyrus-sasl
+* mail-client/notmuch
+
+# weechat slack
+* dev-python/websocket-client
+
+* app-misc/tree
+
+

sets/development.conf

@@ -1,17 +1,15 @@
 # exherbo
 * app-vim/exheres-syntax
-#* app-emacs/exheres-mode
-#* dev-util/exherbo-cabal
 
 # haskell
-#* dev-haskell/Cabal
-#* dev-haskell/cabal-install
-#* dev-lang/ghc
-#* dev-haskell/haddock
+* dev-lang/GHC:8.6.5
+* dev-haskell/cabal-install-bin
 
 # VCSes and VCS-tools
 * dev-scm/mercurial
 * dev-util/tig
+* dev-scm/git-imerge
+* dev-scm/git-interactive-rebase-tool
 
 # C
 * app-doc/doxygen
@@ -20,10 +18,10 @@
 * dev-util/cloc
 * dev-util/cppcheck
 * dev-util/cunit
-* dev-util/nemiver
 * dev-util/splint
 * dev-util/valgrind
 * media-gfx/graphviz
+* sys-devel/gdb
 
 # GTK
 * dev-util/glade
@@ -51,30 +49,19 @@
 * app-doc/doxygen
 * media-gfx/graphviz
 
-# java
-* virtual/jdk
-
 # font
 * fonts/FiraCode
 
 # rust
 * dev-lang/rust:stable
 * dev-lang/rust:nightly
-
-# scala
-* dev-lang/scala-bin
-* dev-scala/sbt
-
-# erlang
-* dev-erlang/rebar
-* dev-lang/erlang
-
-# leksah
-#* net-libs/webkit:3.0
+# cargo seems to link against it, wtf
+* dev-libs/libunwind
+* dev-util/rusty-tags
 
 # js
 * dev-lang/node
-
+* dev-node/yarn
 
 # java
 * virtual/jdk
@@ -82,28 +69,54 @@
 # font
 * fonts/FiraCode
 
-# fstar
-* dev-lang/fstar
-* dev-lang/fsharp
-
 # python
 * dev-lang/python:2.7
 * dev-lang/python:3.6
 * dev-lang/python
 * dev-lang/coconut
 * dev-python/mypy
+* dev-python/flake8
+* dev-python/pylint
+* dev-python/autopep8
+* dev-python/pep8
+* dev-util/jedi
+* app-editors/python-language-server
 
 # databases
 * dev-db/mysql-workbench
-* dev-db/mysql
+* virtual/mysql
 * dev-db/pgmodeler
 * dev-db/postgresql
 
-# clojure
-* app-misc/rlwrap
-* dev-lang/clojure
-* net-misc/socat
-
 # others
-* dev-lang/elixir
 * dev-lang/openjdk8
+
+# vim
+* app-editors/gvim
+* app-editors/vim
+# * app-editors/vint # TODO: broken
+* app-editors/efm-langserver
+
+# neovim
+#* app-editors/neovim
+#* dev-python/neovim-python
+#* dev-ruby/neovim-ruby
+#* app-editors/neovim-gtk
+
+* dev-util/the_silver_searcher
+
+* sys-apps/fd
+* app-text/jq
+
+# IDEs
+* app-editors/vscode-bin
+ 
+* dev-util/universal-ctags
+
+
+# vim
+* app-editors/vint
+
+* dev-util/gitui
+
+* db/sqlitebrowser

sets/emulation.conf

@@ -1,6 +1,5 @@
 * app-emulation/dosbox
 * app-emulation/wine
 * app-virtualization/moby
-* app-virtualization/docker-compose
 * app-virtualization/virtualbox-bin
 * sys-process/ctop

sets/games-proprietary.conf

@@ -1,3 +1,2 @@
-* games-roguelike/FTL
+#* games-roguelike/FTL
 * games-rpg/pillars-of-eternity
-

sets/games.conf

@@ -1,41 +1,23 @@
-* games-action/supertuxkart
-* games-action/trosh
-* games-arcade/Commander-Genius
 * games-board/awale
-* games-board/capicity
 * games-board/pioneers
 * games-board/pysolfc
-* games-emulation/gambatte
 * games-engines/openmw
 * games-engines/renpy
-* games-engines/renpy:6.99
 * games-roguelike/dungeon-crawl-stone-soup
-* games-roguelike/tome4
 * games-rpg/arx-libertatis
-* games-rpg/flare
 * games-rpg/gemrb
 * games-rpg/sumwars
-* games-rpg/valyriatear
-* games-rpg/zsdx
-* games-rpg/zsxd
 * games-simulation/minetest
 * games-strategy/0ad
 * games-strategy/dunelegacy
-* games-strategy/freeciv
-* games-strategy/freecol
-* games-strategy/freeorion
-* games-strategy/freeserf
 * games-strategy/freesynd
 * games-strategy/ja2-stracciatella
 * games-strategy/openra:release
-* games-strategy/openra:playtest
 * games-strategy/s25rttr
 
 * games-action/teeworlds
-* games-engines/OpenJK
-* games-rpg/freedink
-* games-rpg/punch-club
-* games-rpg/zelda-roth-se
-* games-strategy/wargus
-* games-strategy/wesnoth
 * games-strategy/zod-engine
+
+# peter
+* games-rpg/exult
+

sets/laptop.conf

@@ -1,11 +1,20 @@
 # laptop specific stuff
 
 * firmware/linux-firmware
-* x11-apps/gsynaptics
 * x11-misc/cbatticon
 
 # networkmanager
 * net-apps/NetworkManager
 * net-apps/NetworkManager-openvpn
 * net-apps/NetworkManager-vpnc
-* net-misc/NetworkManager-openconnect
+# * net-misc/NetworkManager-openconnect # broken dep
+
+# crypt
+* sys-fs/cryptsetup
+
+# input
+* sys-libs/libinput
+* x11-drivers/xf86-input-libinput
+
+* x11-drivers/xf86-video-intel
+* x11-drivers/intel-driver

sets/mysystem.conf

@@ -1,3 +1,4 @@
+* sys-apps/evrouter
 * app-admin/ktsuss
 * app-admin/sudo
 * app-admin/verynice
@@ -55,3 +56,13 @@
 
 * net-fs/davfs2
 * sys-apps/usbutils
+
+# X seems to link against it
+* dev-libs/libbsd
+
+* sys-apps/earlyoom
+
+* monitor/s-tui
+* sys-apps/man-db
+
+* sys-apps/dmidecode

sets/networking.conf

@@ -3,8 +3,7 @@
 * net-analyzer/traceroute
 * net-analyzer/wireshark
 * net-firewall/iptables
-* net-fs/samba
-* net-mail/swaks
+#* net-fs/samba
 * net-misc/iputils
 * net-scanner/nmap
 * sys-apps/net-tools

sets/non-laptop.conf

@@ -1,19 +1,3 @@
-* games-action/openclonk
-* games-arcade/duckmarines
-* games-arcade/hawkthorne-journey
-* games-arcade/mari0
-* games-arcade/mrrescue
-* games-arcade/notpacman
-* games-arcade/nottetris2
-* games-arcade/opensonic
-* games-arcade/orthorobot
-* games-engines/stratagus
-* games-fps/eduke32
-* games-fps/sauerbraten
-* games-fps/urbanterror
-* games-fps/warsow
-* games-fps/xonotic
-
 * net-misc/dhcpcd
 * net-misc/netifrc
 * sys-apps/ethtool

sets/themes-and-icons.conf

@@ -1,8 +1,10 @@
 * fonts/font-bitstream-100dpi
 * fonts/font-bitstream-75dpi
+* fonts/google-web-fonts
 * fonts/liberation-fonts
+* fonts/noto
 * x11-themes/clearlooks-phenix
 * x11-themes/hicolor-icon-theme
-* x11-themes/human-icon-theme
+* x11-themes/papirus-icon-theme
 * x11-themes/tango-icon-theme
 * xfce-base/xfce4-icon-theme

sets/wayland.conf

@@ -0,0 +1,3 @@
+* compositor/sway
+* x11-apps/xkeyboard-config
+* wayland-apps/Waybar

sets/xfce-set.conf

@@ -18,3 +18,6 @@
 * xfce-extra/xfce4-screenshooter
 * xfce-extra/xfce4-pulseaudio-plugin
 * xfce-extra/xfce4-notifyd
+
+# peter
+* xfce-extra/xfce4-whiskermenu-plugin

suggestions.conf

@@ -0,0 +1,2 @@
+# sys-apps/coreutils[acl] causes paludis errors
+sys-apps/acl -sys-apps/coreutils