Add custom ruling / invert colors patch by Jonathan R Young, gi1242, and Witold Piłat, bug 414729; remove old

Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64

6 files changed, 33 insertions, 477 deletions

diff --git a/app-text/xournal/ChangeLog b/app-text/xournal/ChangeLog
index c60247544ba2..c30e0e00332d 100644
--- a/app-text/xournal/ChangeLog
+++ b/app-text/xournal/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/xournal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.35 2012/06/24 11:03:29 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/ChangeLog,v 1.36 2012/06/24 11:08:44 dilfridge Exp $
+
+*xournal-0.4.6-r1 (24 Jun 2012)
+
+  24 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -xournal-0.4.5_p20111022-r1.ebuild,
+  -files/xournal-0.4.5_p20111022-aspectratio.patch,
+  -files/xournal-0.4.5_p20111022-gtk-recent.patch,
+  -files/xournal-0.4.5_p20111022-underlinking.patch, +xournal-0.4.6-r1.ebuild:
+  Add custom ruling / invert colors patch by Jonathan R Young, gi1242, and
+  Witold Piłat, bug 414729; remove old
 
   24 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   xournal-0.4.5_p20111022-r2.ebuild,
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
index 3935a9bdd4d9..b9bf9ed14ac1 100644
--- a/app-text/xournal/Manifest
+++ b/app-text/xournal/Manifest
@@ -1,34 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX xournal-0.4.5_p20111022-aspectratio.patch 3547 RMD160 fc53a86e58b7f5c0de3d3e31c43506d88b120a11 SHA1 fdb8fdaeeb4cfb8022c1a0c899a5bf024e2c29e1 SHA256 27791e240551c2987088d8d979a9389a9dbbb9fda836d537f3637e7966af52ac
-AUX xournal-0.4.5_p20111022-gtk-recent.patch 11391 RMD160 411e88bbe51468cb58ff0debe999d46b53ad79a6 SHA1 8bde995a0757ee691afbca0afa3efc5ddab76339 SHA256 d9b8bf35b527e4283554b804acd0a455f66a8e08fa753370bca34ae543d1f58c
 AUX xournal-0.4.5_p20111022-underlinking-2.patch 575 RMD160 ce938f4b1f830f2b34b36f4e890c21ae95e0ed49 SHA1 318df9a69c1e063638007de6049d3ab4468dadd9 SHA256 10c01e25c737fa396abb052de3e59d646bd80a7067cf22bf802c30e98ecb550d
-AUX xournal-0.4.5_p20111022-underlinking.patch 792 RMD160 6516d38a26159f63f2a2daae8a1f24448ce0a06d SHA1 583ead6936d06b9c07e57920f93e9d40fe3f1f05 SHA256 2e44dc7deafd62dcd01d1aca848a7bcb5bf93d648625e76715f0be03c45386c5
 DIST xournal-0.4.5_p20111022-r2-patchset.tar.xz 35776 RMD160 a166eb7d6ba7aecce8161d3c9c5d7566d9c3dede SHA1 29cab6debcd2228a70adcffa4c920db50c8ba9db SHA256 4375f116ff82cae1e9497f1b76797a519319bf4012d4aa1262caee75406aeea4
-DIST xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz 21551 RMD160 6048a996fdb7b43e05beff67cf5ae0da53cff840 SHA1 0ff950726a7ad5b0012421c158406d6d49d2c38d SHA256 88b050483fc27f37f307adb358b3e5c4bfc0b600b7d3427599dea4c1ffe87fc2
 DIST xournal-0.4.5_p20111022.tar.xz 332700 RMD160 6578c037ad536c0173c533758c5f86ffc046dfbe SHA1 69f66e1125ba3de3deea14be1eb6d7e8f07abe61 SHA256 46573706645a78f1cbdd9e3eed0b2409ab61947eb5f78be9c1b7d7e4535f721f
 DIST xournal-0.4.6-gentoo.patch.xz 32720 RMD160 4cab7d7580d98ae9186fa39ab7ced7b9975ca15a SHA1 349acbf691b3c72a64defbffb2fb2f9baf203a7f SHA256 e8f03410cb1e31b50cac3b646fc5670f349f7ebc68854a481e2046de71ce38bf
+DIST xournal-0.4.6-r1-gentoo.patch.xz 40772 RMD160 a67ef0dc0118ee96e7876bc35fa6c8d7c58906b9 SHA1 bd1b53601dc8a5da3cc34b76746daa06a0a41a64 SHA256 96eb1cab0c6f18aaec0d90acb91c3a50e9c6a97c50f33c455ef11d9582b16f17
 DIST xournal-0.4.6.tar.xz 335128 RMD160 76ce8b2ac642c8a61dc22d821c0830b86c85cdb7 SHA1 7ad0654ed0c96ee874d6bcbb04c66413066a8a2e SHA256 4310fe579b8e99a66c40ba923fe0dce2e8543ad69c7660a01a675637970057d3
-EBUILD xournal-0.4.5_p20111022-r1.ebuild 1354 RMD160 11f1306ea61e3cfceb1366e39c380df4bcd77f0a SHA1 8502d5f5bb2cede515811077434a2a9d338aa61c SHA256 f6d6a3f982f9e00fa1f22a1f16f7213db5748b81c2fb40934f47f15f7d2e5c26
 EBUILD xournal-0.4.5_p20111022-r2.ebuild 1382 RMD160 3fd523cd1efd23f34cacf5774739270f6b79254e SHA1 290573311d46d03cdb4f6109ebfca3935ca11ef1 SHA256 8f0e2bdad9bc0f009d4062fec2f4364ebc2de71d67574bb76486b4a94d0492d8
+EBUILD xournal-0.4.6-r1.ebuild 1304 RMD160 4c5ede44b23a8ea28e7a8c4d0edb159d44223389 SHA1 91a04ee5451fa706f4ca0cddba9ebc1ef9ad8773 SHA256 37f149181b1557b31e466bb3565b695bdc9d3b91c4454f1a4582e72a072da4de
 EBUILD xournal-0.4.6.ebuild 1285 RMD160 16a425fbea060b1490030f6a91b57c20b4eb6ca5 SHA1 5fb65840ed5e78099fdfdffcc5de44e45ee0dd7a SHA256 349216a1e6d17a36c8338e94751cfbccd47f13f4b0ec120bde6fe8cff4ece3eb
-MISC ChangeLog 6123 RMD160 71becb857629d9f9f3ef3d654a76b36280c88f69 SHA1 65b43a7766bc2d3333da160256f34fda80299e30 SHA256 d90abc4846fcb0422293ddeba2fa39f9791de84a89eebcae24c427ccecfd5033
+MISC ChangeLog 6549 RMD160 0a8c33ecc7ae32ea297f983ac65a869e3c1f717c SHA1 c29abb45e097377741df9cdf5fcf7a72669a4611 SHA256 7777f935dadd9e46f73e270f0da46a834e68a18afcfeb3c4b9c66363c6a77fbf
 MISC metadata.xml 561 RMD160 994fde5a7482cd84910d37246072d1fd848da7c5 SHA1 cc77d272a12b97e7e08a2764086c78746fc919e4 SHA256 e0c14d0d41505ee0ff810d8bfd6f6ac751b287e84d171d114f5a48becf91b7c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP5vRLAAoJEEb+UGWnxTyH2lAQAJ2hWk+k+JbNoJnJxh20Dm1j
-K2wU/tT1pge/FWuLDpfynOMIXMtOvABE8KZAHTt3we0GtCZsMp/79NA1Cy0K4dk3
-Y4VzoyumXcVzd+kQuLABvE919bcqHb4mt2mmEMdXhKc9MeYROBFBm0ihCPWeIOBU
-wzPIRLTpou59PrjTlBstiBdicF1Wk0IIMHlMg9gCzqImLks058/Saxbpl9peBN5L
-fNKM9Uhu6bJFDsC1s2mrQsUgJjnT1tuGKwKsEsv2nlUe4yu/NYZFDXNVKY9cx6sc
-q3uChY7wSGoqddUk4QJpeVVWk9+DZ4mE42KJFbIE1j7ekUdbkBstTbNIx+Lmt4Od
-ehPqVcb7kU2CBjdwUhXeGMu1tDWBoPqGgT/D743aQu6kF8j37wJypbWNZT668C8Z
-MqzpSumcA8wxtAVmA91cmrlFIl6VpBWxCgmT9+0xz58ODkYGUueo4c+N94ggjgPh
-hUg70qioVrOQhMhAERy1ayosSKTjl6BnmxvqHLHW+TYWZLn+85JpntCrtTox2wLA
-tkW7EeSd8efgobwEq2Xpi1UCVm/7iRdQhy6YuDHU5mv484QGNlRoUijTR0i17xoA
-zQHqX0gaKhmPCzJtewv7RCw2LzUoBbNTTe25H4YWRfc0eA1v17PMz3DqRoGIRcOl
-p23PXoGUxn18GN8Og+h1
-=6VMG
+iQIcBAEBCgAGBQJP5vWBAAoJEEb+UGWnxTyHAJcP/216zdbJq4RqGOHBHN2G98/b
+sF1rb4yqU5BZ9TNjrSPbV6A4TluGcPU/aAWRi3o3ewQ/eEPpShHVmVrJZsNDPNBg
+sEMKRzAZg0d3kcxy4EKkcWSFEl9u/hnL1f39KjPyNdI35x8WU0EWStPYfAl8HTJ9
+HLwM/6DteCpEJUsPZpuRAkzB1UwpfWicsa7Yzs5WHpTF93960/9xSsexM7VcLJ6p
+eBoGKl94LABMQw1JBHNHXwZ0ES48/+Z1bIr+oNqLIBoHQu37E02Nvgazh2fpuJK9
+3ng9c+OiWoxu374WVztoTp9ktwkua0oUq411UhpE5VuUhoH/D2to2yyCWIefF1cC
+rnyvd71Uq5QM/TJ0cLI5nZFPHIKlfNoETXRUBbpfYMAPVxikZtcY0DkkhD52263K
+pyqkFxgZctjgw6zWBtPGF24iU+aEeTbEX3aDNLoeQnxZhOnyt5IY6/BpqkOlYPRq
+9z+dy/Hbr7upb1l5DsIGC12i5CMw9WqWX9AKy3Mao8ZOqjJ+XvSR5O/ZyLKj4Qz+
+9w5DabTk3zFOZlCQ4dufahanZnN45lAswuoc2eop/6eGW59NzKYCNSXdEkhA/pbC
+xfqkIYRut1N7Muez+SEsF05IfoNiKnfo4Ev2X0R5T16E9zFb4dAOJ0vq/+SmKijn
+FHS7nE5Dm0o6zEVOPthU
+=qVeC
 -----END PGP SIGNATURE-----
diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-aspectratio.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-aspectratio.patch
deleted file mode 100644
index 3ce12bfd4528..000000000000
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-aspectratio.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3082301&group_id=163434&atid=827735
-To make the image patch even more useful, I've written this patch to allow the aspect ratio 
-to be preserved when resizing selections. (It doesn't just apply to images.) Simply resize using the right 
-mouse button (button-3) rather than the left mouse button.
-This patch should be applied after the enhanced image patch. (Though it'd be easy enough to make the
-changes to the raw 0.4.5 source directly since it doesn't change any of the image patch related areas.)
-David Barton ( db9052 ) - 2010-10-06 09:30:56 PDT
-
-diff -ur xournal-0.4.5/src/xo-paint.c xournal-0.4.5-aspectratio/src/xo-paint.c
---- xournal-0.4.5/src/xo-paint.c	2010-10-06 16:45:01.000000000 +0100
-+++ xournal-0.4.5-aspectratio/src/xo-paint.c	2010-10-06 17:10:19.000000000 +0100
-@@ -609,6 +609,12 @@
-     ui.selection->new_x2 = ui.selection->bbox.right;
-     gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL);
-     update_cursor_for_resize(pt);
-+
-+    // Check whether we should preserve the aspect ratio
-+    if (event->button.button == 3)
-+    	ui.cur_brush->tool_options |= TOOLOPT_SELECT_PRESERVE;
-+    else
-+    	ui.cur_brush->tool_options &= ~TOOLOPT_SELECT_PRESERVE;
-     return TRUE;
-   }
-   return FALSE;
-@@ -740,6 +746,38 @@
-   if (ui.selection->resizing_left) ui.selection->new_x1 = pt[0];
-   if (ui.selection->resizing_right) ui.selection->new_x2 = pt[0];
- 
-+  if (ui.cur_brush->tool_options & TOOLOPT_SELECT_PRESERVE) {
-+	  double aspectratio = (ui.selection->bbox.top - ui.selection->bbox.bottom)/(ui.selection->bbox.right - ui.selection->bbox.left);
-+	  double newheight = ui.selection->new_y1 - ui.selection->new_y2;
-+	  double newwidth = ui.selection->new_x2 - ui.selection->new_x1;
-+	  gboolean boundheight;
-+
-+	  // Resizing from top or bottom only
-+	  if ((ui.selection->resizing_top || ui.selection->resizing_bottom) && !(ui.selection->resizing_left || ui.selection->resizing_right))
-+		  boundheight = 0;
-+	  // Resizing from right or left only
-+	  else if (!(ui.selection->resizing_top || ui.selection->resizing_bottom) && (ui.selection->resizing_left || ui.selection->resizing_right))
-+		  boundheight = 1;
-+	  // Resizing from a corner
-+	  else if (newheight/aspectratio > newwidth)
-+		  boundheight = 0;
-+	  else
-+		  boundheight = 1;
-+
-+	  if (boundheight) {
-+		  // Bound the height
-+		  newheight = newwidth*aspectratio;
-+		  if (ui.selection->resizing_top) ui.selection->new_y1 = ui.selection->new_y2 + newheight;
-+		  else ui.selection->new_y2 = ui.selection->new_y1 - newheight;
-+	  }
-+	  else {
-+		  // Bound the width
-+		  newwidth = newheight/aspectratio;
-+		  if (ui.selection->resizing_left) ui.selection->new_x1 = ui.selection->new_x2 - newwidth;
-+		  else ui.selection->new_x2 = ui.selection->new_x1 + newwidth;
-+	  }
-+  }
-+
-   gnome_canvas_item_set(ui.selection->canvas_item, 
-     "x1", ui.selection->new_x1, "x2", ui.selection->new_x2,
-     "y1", ui.selection->new_y1, "y2", ui.selection->new_y2, NULL);
-diff -ur xournal-0.4.5/src/xournal.h xournal-0.4.5-aspectratio/src/xournal.h
---- xournal-0.4.5/src/xournal.h	2010-10-06 16:45:01.000000000 +0100
-+++ xournal-0.4.5-aspectratio/src/xournal.h	2010-10-06 16:31:07.000000000 +0100
-@@ -130,6 +130,7 @@
- #define TOOLOPT_ERASER_STANDARD     0
- #define TOOLOPT_ERASER_WHITEOUT     1
- #define TOOLOPT_ERASER_STROKES      2
-+#define TOOLOPT_SELECT_PRESERVE     1 // Preserve the aspect ratio of the selection when resizing
- 
- extern double predef_thickness[NUM_STROKE_TOOLS][THICKNESS_MAX];
- 
diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-gtk-recent.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-gtk-recent.patch
deleted file mode 100644
index 3bddbeeed81b..000000000000
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-gtk-recent.patch
+++ /dev/null
@@ -1,347 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3249971&group_id=163434&atid=827735
-When using GtkRecent for the management of recently used files, Xournal's recently used 
-files also appear in the shell. That's very convenient for the new document-centric shells 
-such as Gnome Shell and Unity.
-Timo Kluck ( tkluck ) - 2011-03-27 10:40:08 PDT
-
-=== modified file 'src/main.c'
---- src/main.c	2011-03-10 18:14:21 +0000
-+++ src/main.c	2011-03-27 16:32:52 +0000
-@@ -334,7 +334,6 @@
-   
-   if (bgpdf.status != STATUS_NOT_INIT) shutdown_bgpdf();
- 
--  save_mru_list();
-   if (ui.auto_save_prefs) save_config_to_file();
-   
-   return 0;
-
-=== modified file 'src/xo-callbacks.c'
---- src/xo-callbacks.c	2011-03-10 18:14:21 +0000
-+++ src/xo-callbacks.c	2011-03-27 16:32:52 +0000
-@@ -3101,32 +3101,36 @@
- 
- 
- void
--on_mru_activate                        (GtkMenuItem     *menuitem,
-+on_mru_activate                        (GtkRecentChooser *recentChooser,
-                                         gpointer         user_data)
- {
--  int which;
-   gboolean success;
-+  gchar *uri, *name;
-   GtkWidget *dialog;
-   
-   end_text();
-   if (!ok_to_close()) return; // user aborted on save confirmation
-   
--  for (which = 0 ; which < MRU_SIZE; which++) {
--    if (ui.mrumenu[which] == GTK_WIDGET(menuitem)) break;
--  }
--  if (which == MRU_SIZE || ui.mru[which] == NULL) return; // not found...
--
-+  uri = gtk_recent_chooser_get_current_uri (recentChooser);
-+  name = g_filename_from_uri (uri, NULL, NULL);
-   set_cursor_busy(TRUE);
--  success = open_journal(ui.mru[which]);
-+  success = open_journal(name);
-   set_cursor_busy(FALSE);
--  if (success) return;
-+  if (success) {
-+    g_free(uri);
-+    g_free(name);
-+    return;
-+  }
- 
-   /* open failed */
-   dialog = gtk_message_dialog_new(GTK_WINDOW (winMain), GTK_DIALOG_DESTROY_WITH_PARENT,
--    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), ui.mru[which]);
-+    GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error opening file '%s'"), name);
-   gtk_dialog_run(GTK_DIALOG(dialog));
-   gtk_widget_destroy(dialog);
--  delete_mru_entry(which);
-+
-+  delete_mru_entry(name);
-+  g_free(uri);
-+  g_free(name);
- }
- 
- 
-
-=== modified file 'src/xo-callbacks.h'
---- src/xo-callbacks.h	2011-03-10 18:14:21 +0000
-+++ src/xo-callbacks.h	2011-03-27 16:32:52 +0000
-@@ -481,7 +481,7 @@
-                                         gpointer         user_data);
- 
- void
--on_mru_activate                        (GtkMenuItem     *menuitem,
-+on_mru_activate                        (GtkRecentChooser *recentChooser,
-                                         gpointer         user_data);
- 
- void
-
-=== modified file 'src/xo-file.c'
---- src/xo-file.c	2011-03-10 18:14:21 +0000
-+++ src/xo-file.c	2011-03-27 17:09:20 +0000
-@@ -1211,99 +1211,53 @@
-   }
- }
- 
--// initialize the recent files list
-+// initialize GtkRecentManager. Also backwards compatibility: import recent files into GtkRecentManager
- void init_mru(void)
- {
--  int i;
-+  GtkRecentFilter *recentFilter = gtk_recent_filter_new ();
-+  gtk_recent_filter_add_application ( recentFilter, "xournal");
-+  gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (GET_COMPONENT("fileRecentFiles_menu")), recentFilter);
-+
-   gsize lfptr;
--  char s[5];
-   GIOChannel *f;
--  gchar *str;
-+  gchar *str, *uri;
-   GIOStatus status;
-+  GtkRecentManager *recentManager = gtk_recent_manager_get_default ();
-   
--  g_strlcpy(s, "mru0", 5);
--  for (s[3]='0', i=0; i<MRU_SIZE; s[3]++, i++) {
--    ui.mrumenu[i] = GET_COMPONENT(s);
--    ui.mru[i] = NULL;
--  }
-   f = g_io_channel_new_file(ui.mrufile, "r", NULL);
-   if (f) status = G_IO_STATUS_NORMAL;
-   else status = G_IO_STATUS_ERROR;
--  i = 0;
--  while (status == G_IO_STATUS_NORMAL && i<MRU_SIZE) {
-+  while (status == G_IO_STATUS_NORMAL) {
-     lfptr = 0;
-     status = g_io_channel_read_line(f, &str, NULL, &lfptr, NULL);
-     if (status == G_IO_STATUS_NORMAL && lfptr>0) {
-       str[lfptr] = 0;
--      ui.mru[i] = str;
--      i++;
-+      uri = g_filename_to_uri (str, NULL, NULL);
-+      gtk_recent_manager_add_item (recentManager, uri);
-+      g_free(uri);
-+      g_free(str);
-     }
-   }
-   if (f) {
-     g_io_channel_shutdown(f, FALSE, NULL);
-     g_io_channel_unref(f);
-   }
--  update_mru_menu();
--}
--
--void update_mru_menu(void)
--{
--  int i;
--  gboolean anyone = FALSE;
--  gchar *tmp;
-   
--  for (i=0; i<MRU_SIZE; i++) {
--    if (ui.mru[i]!=NULL) {
--      tmp = g_strdup_printf("_%d %s", i+1,
--               g_strjoinv("__", g_strsplit_set(g_basename(ui.mru[i]),"_",-1)));
--      gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(ui.mrumenu[i]))),
--          tmp);
--      g_free(tmp);
--      gtk_widget_show(ui.mrumenu[i]);
--      anyone = TRUE;
--    }
--    else gtk_widget_hide(ui.mrumenu[i]);
--  }
--  gtk_widget_set_sensitive(GET_COMPONENT("fileRecentFiles"), anyone);
-+  g_unlink (ui.mrufile);
- }
- 
- void new_mru_entry(char *name)
- {
--  int i, j;
--  
--  for (i=0;i<MRU_SIZE;i++) 
--    if (ui.mru[i]!=NULL && !strcmp(ui.mru[i], name)) {
--      g_free(ui.mru[i]);
--      for (j=i+1; j<MRU_SIZE; j++) ui.mru[j-1] = ui.mru[j];
--      ui.mru[MRU_SIZE-1]=NULL;
--    }
--  if (ui.mru[MRU_SIZE-1]!=NULL) g_free(ui.mru[MRU_SIZE-1]);
--  for (j=MRU_SIZE-1; j>=1; j--) ui.mru[j] = ui.mru[j-1];
--  ui.mru[0] = g_strdup(name);
--  update_mru_menu();
--}
--
--void delete_mru_entry(int which)
--{
--  int i;
--  
--  if (ui.mru[which]!=NULL) g_free(ui.mru[which]);
--  for (i=which+1;i<MRU_SIZE;i++) 
--    ui.mru[i-1] = ui.mru[i];
--  ui.mru[MRU_SIZE-1] = NULL;
--  update_mru_menu();
--}
--
--void save_mru_list(void)
--{
--  FILE *f;
--  int i;
--  
--  f = fopen(ui.mrufile, "w");
--  if (f==NULL) return;
--  for (i=0; i<MRU_SIZE; i++)
--    if (ui.mru[i]!=NULL) fprintf(f, "%s\n", ui.mru[i]);
--  fclose(f);
-+  gchar *uri = g_filename_to_uri (name, NULL, NULL);
-+  gtk_recent_manager_add_item (gtk_recent_manager_get_default(), uri);
-+  g_free(uri);
-+}
-+
-+void delete_mru_entry(char *name)
-+{
-+  gchar *uri = g_filename_to_uri(name, NULL, NULL);
-+  gtk_recent_manager_remove_item(gtk_recent_manager_get_default(), uri, NULL);
-+  g_free(uri);
- }
- 
- void init_config_default(void)
-
-=== modified file 'src/xo-file.h'
---- src/xo-file.h	2011-03-10 18:14:21 +0000
-+++ src/xo-file.h	2011-03-27 16:32:52 +0000
-@@ -28,10 +28,8 @@
- void bgpdf_update_bg(int pageno, struct BgPdfPage *bgpg);
- 
- void init_mru(void);
--void update_mru_menu(void);
- void new_mru_entry(char *name);
--void delete_mru_entry(int which);
--void save_mru_list(void);
-+void delete_mru_entry(char *name);
- 
- void init_config_default(void);
- void load_config_from_file(void);
-
-=== modified file 'src/xo-interface.c'
---- src/xo-interface.c	2011-03-10 18:14:21 +0000
-+++ src/xo-interface.c	2011-03-27 17:09:20 +0000
-@@ -43,14 +43,6 @@
-   GtkWidget *separator1;
-   GtkWidget *fileRecentFiles;
-   GtkWidget *fileRecentFiles_menu;
--  GtkWidget *mru0;
--  GtkWidget *mru1;
--  GtkWidget *mru2;
--  GtkWidget *mru3;
--  GtkWidget *mru4;
--  GtkWidget *mru5;
--  GtkWidget *mru6;
--  GtkWidget *mru7;
-   GtkWidget *separator22;
-   GtkWidget *filePrintOptions;
-   GtkWidget *image624;
-@@ -397,41 +389,9 @@
-   gtk_widget_show (fileRecentFiles);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), fileRecentFiles);
- 
--  fileRecentFiles_menu = gtk_menu_new ();
-+  fileRecentFiles_menu = gtk_recent_chooser_menu_new_for_manager (gtk_recent_manager_get_default ());
-   gtk_menu_item_set_submenu (GTK_MENU_ITEM (fileRecentFiles), fileRecentFiles_menu);
--
--  mru0 = gtk_menu_item_new_with_mnemonic (_("0"));
--  gtk_widget_show (mru0);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru0);
--
--  mru1 = gtk_menu_item_new_with_mnemonic (_("1"));
--  gtk_widget_show (mru1);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru1);
--
--  mru2 = gtk_menu_item_new_with_mnemonic (_("2"));
--  gtk_widget_show (mru2);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru2);
--
--  mru3 = gtk_menu_item_new_with_mnemonic (_("3"));
--  gtk_widget_show (mru3);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru3);
--
--  mru4 = gtk_menu_item_new_with_mnemonic (_("4"));
--  gtk_widget_show (mru4);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru4);
--
--  mru5 = gtk_menu_item_new_with_mnemonic (_("5"));
--  gtk_widget_show (mru5);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru5);
--
--  mru6 = gtk_menu_item_new_with_mnemonic (_("6"));
--  gtk_widget_show (mru6);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru6);
--
--  mru7 = gtk_menu_item_new_with_mnemonic (_("7"));
--  gtk_widget_show (mru7);
--  gtk_container_add (GTK_CONTAINER (fileRecentFiles_menu), mru7);
--
-+    
-   separator22 = gtk_separator_menu_item_new ();
-   gtk_widget_show (separator22);
-   gtk_container_add (GTK_CONTAINER (menuFile_menu), separator22);
-@@ -1967,28 +1927,7 @@
-   g_signal_connect ((gpointer) fileSaveAs, "activate",
-                     G_CALLBACK (on_fileSaveAs_activate),
-                     NULL);
--  g_signal_connect ((gpointer) mru0, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru1, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru2, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru3, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru4, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru5, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru6, "activate",
--                    G_CALLBACK (on_mru_activate),
--                    NULL);
--  g_signal_connect ((gpointer) mru7, "activate",
-+  g_signal_connect ((gpointer) fileRecentFiles_menu, "item-activated",
-                     G_CALLBACK (on_mru_activate),
-                     NULL);
-   g_signal_connect ((gpointer) filePrintOptions, "activate",
-@@ -2520,14 +2459,6 @@
-   GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1");
-   GLADE_HOOKUP_OBJECT (winMain, fileRecentFiles, "fileRecentFiles");
-   GLADE_HOOKUP_OBJECT (winMain, fileRecentFiles_menu, "fileRecentFiles_menu");
--  GLADE_HOOKUP_OBJECT (winMain, mru0, "mru0");
--  GLADE_HOOKUP_OBJECT (winMain, mru1, "mru1");
--  GLADE_HOOKUP_OBJECT (winMain, mru2, "mru2");
--  GLADE_HOOKUP_OBJECT (winMain, mru3, "mru3");
--  GLADE_HOOKUP_OBJECT (winMain, mru4, "mru4");
--  GLADE_HOOKUP_OBJECT (winMain, mru5, "mru5");
--  GLADE_HOOKUP_OBJECT (winMain, mru6, "mru6");
--  GLADE_HOOKUP_OBJECT (winMain, mru7, "mru7");
-   GLADE_HOOKUP_OBJECT (winMain, separator22, "separator22");
-   GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions");
-   GLADE_HOOKUP_OBJECT (winMain, image624, "image624");
-
-=== modified file 'src/xournal.h'
---- src/xournal.h	2011-03-10 18:14:21 +0000
-+++ src/xournal.h	2011-03-27 16:32:52 +0000
-@@ -257,8 +257,6 @@
-   GdkCursor *cursor;
-   gboolean progressive_bg; // update PDF bg's one at a time
-   char *mrufile, *configfile; // file names for MRU & config
--  char *mru[MRU_SIZE]; // MRU data
--  GtkWidget *mrumenu[MRU_SIZE];
-   gboolean bg_apply_all_pages;
-   int window_default_width, window_default_height, scrollbar_step_increment;
-   gboolean print_ruling; // print the paper ruling ?
-
diff --git a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch b/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch
deleted file mode 100644
index eae370ebf464..000000000000
--- a/app-text/xournal/files/xournal-0.4.5_p20111022-underlinking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 619691e135630c79f45e61a4126804c51ea52d42 Mon Sep 17 00:00:00 2001
-From: Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
-Date: Mon, 28 Nov 2011 23:36:16 +0100
-Subject: [PATCH] Add xournal_0.4.5-3.debian patch 1 (add_ldflags), should fix Gentoo bug 372119
-
----
- src/Makefile.am |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ba52740..3dea178 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -30,6 +30,5 @@ if WIN32
-   xournal_LDFLAGS = -mwindows
-   xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
- else
--  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS)
-+  xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz
- endif
--
--- 
-1.7.3.4
-
diff --git a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild b/app-text/xournal/xournal-0.4.6-r1.ebuild
index dc409588620a..a5371db6d072 100644
--- a/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild
+++ b/app-text/xournal/xournal-0.4.6-r1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.5_p20111022-r1.ebuild,v 1.6 2012/05/04 03:33:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xournal/xournal-0.4.6-r1.ebuild,v 1.1 2012/06/24 11:08:44 dilfridge Exp $
 
 EAPI=4
 
 GCONF_DEBUG=no
 
-inherit base gnome2 autotools
+inherit gnome2 autotools
 
 DESCRIPTION="Xournal is an application for notetaking, sketching, and keeping a journal using a stylus."
 HOMEPAGE="http://xournal.sourceforge.net/"
 
-SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${P}-sjg-image-rev7.patch.gz"
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}-gentoo.patch.xz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+pdf"
 
 COMMONDEPEND="
@@ -38,15 +38,9 @@ DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${DISTDIR}"/${P}-sjg-image-rev7.patch.gz
-	"${FILESDIR}"/${P}-gtk-recent.patch
-	"${FILESDIR}"/${P}-aspectratio.patch
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
 src_prepare() {
-	base_src_prepare
+	epatch "${WORKDIR}"/${PN}-${PVR}-gentoo.patch
+	sed -e "s:n       http:n       Gentoo release ${PVR}\\\\n       http:" -i "${S}"/src/xo-interface.c
 	eautoreconf
 }