Do not use deprecated GTK+ constructs, this prepares for migration to GTK+ 3. Move some comments from ebuild to patches. Change EAPI to 5.

(Portage version: 2.1.11.37/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

9 files changed, 361 insertions, 28 deletions

diff --git a/sys-auth/otpcalc/ChangeLog b/sys-auth/otpcalc/ChangeLog
index c7304a8186cf..ac2473b03276 100644
--- a/sys-auth/otpcalc/ChangeLog
+++ b/sys-auth/otpcalc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-auth/otpcalc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/otpcalc/ChangeLog,v 1.18 2012/05/04 18:57:20 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/otpcalc/ChangeLog,v 1.19 2012/12/15 12:33:05 ulm Exp $
+
+*otpcalc-0.97-r6 (15 Dec 2012)
+
+  15 Dec 2012; Ulrich Müller <ulm@gentoo.org> +otpcalc-0.97-r6.ebuild,
+  files/otpcalc-0.97-badindex.diff, +files/otpcalc-0.97-gtk-deprecated.patch,
+  files/otpcalc-0.97-gtk2-gentoo.patch,
+  files/otpcalc-0.97-sha1-byteorder.patch, files/otpcalc-0.97-skey-md5.patch,
+  files/otpcalc-crypto-proto.diff, files/otpcalc-man-table-format.diff:
+  Do not use deprecated GTK+ constructs, this prepares for migration to GTK+ 3.
+  Move some comments from ebuild to patches. Change EAPI to 5.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> otpcalc-0.97-r5.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-badindex.diff b/sys-auth/otpcalc/files/otpcalc-0.97-badindex.diff
index db1db17ba767..53a32c4e1cc8 100644
--- a/sys-auth/otpcalc/files/otpcalc-0.97-badindex.diff
+++ b/sys-auth/otpcalc/files/otpcalc-0.97-badindex.diff
@@ -1,5 +1,7 @@
---- otpCalc-0.97.orig/callbacks.c	2004-11-24 05:57:45.000000000 +0000
-+++ otpCalc-0.97/callbacks.c	2006-02-24 22:36:56.602831704 +0000
+Allocate enough elements for array of func ptrs, bug 123976.
+
+--- otpCalc-0.97.orig/callbacks.c
++++ otpCalc-0.97/callbacks.c
 @@ -81,7 +81,7 @@
  void calculate(void)
  {
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-gtk-deprecated.patch b/sys-auth/otpcalc/files/otpcalc-0.97-gtk-deprecated.patch
new file mode 100644
index 000000000000..83661773193b
--- /dev/null
+++ b/sys-auth/otpcalc/files/otpcalc-0.97-gtk-deprecated.patch
@@ -0,0 +1,261 @@
+Do not use deprecated GTK symbols.
+Use accessor functions for GTK struct members.
+
+--- otpCalc-0.97-orig/callbacks.c
++++ otpCalc-0.97/callbacks.c
+@@ -65,14 +65,16 @@
+ 
+ 	bu_about_close = gtk_button_new_with_label("Close");
+ 
+-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(di_about)->vbox),
++	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(
++						GTK_DIALOG(di_about))),
+ 			  la_about);
+-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(di_about)->action_area),
++	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(
++						GTK_DIALOG(di_about))),
+ 			  bu_about_close);
+ 
+-	gtk_signal_connect_object(GTK_OBJECT(bu_about_close), "clicked",
+-				  GTK_SIGNAL_FUNC(gtk_widget_destroy),
+-				  (gpointer)di_about);
++	g_signal_connect_swapped(G_OBJECT(bu_about_close), "clicked",
++				 G_CALLBACK(gtk_widget_destroy),
++				 (gpointer)di_about);
+ 
+ 	gtk_widget_show_all(di_about);
+ 
+@@ -176,10 +178,11 @@
+ 	);
+ 	gtk_misc_set_padding(GTK_MISC(la_netwarn), 10, 10);
+ 	gtk_label_set_line_wrap(GTK_LABEL(la_netwarn), TRUE);
+-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(di_netwarn)->vbox),
++	gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(
++						GTK_DIALOG(di_netwarn))),
+ 			  la_netwarn);
+ 
+-	aa_netwarn = GTK_DIALOG(di_netwarn)->action_area;
++	aa_netwarn = gtk_dialog_get_action_area(GTK_DIALOG(di_netwarn));
+ 
+ 	bu_netwarn_ok = gtk_button_new_with_label("Yes");
+ 	gtk_container_add(GTK_CONTAINER(aa_netwarn), bu_netwarn_ok);
+@@ -187,12 +190,12 @@
+ 	bu_netwarn_canc = gtk_button_new_with_label("No");
+ 	gtk_container_add(GTK_CONTAINER(aa_netwarn), bu_netwarn_canc);
+ 
+-	gtk_signal_connect_object(GTK_OBJECT(bu_netwarn_ok), "clicked",
+-				  GTK_SIGNAL_FUNC(gtk_widget_destroy),
+-				  (gpointer)di_netwarn);
++	g_signal_connect_swapped(G_OBJECT(bu_netwarn_ok), "clicked",
++				 G_CALLBACK(gtk_widget_destroy),
++				 (gpointer)di_netwarn);
+ 
+-	gtk_signal_connect_object(GTK_OBJECT(bu_netwarn_canc), "clicked",
+-				  GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
++	g_signal_connect_swapped(G_OBJECT(bu_netwarn_canc), "clicked",
++				 G_CALLBACK(gtk_main_quit), NULL);
+ 
+ 	gtk_widget_show_all(di_netwarn);
+ 
+@@ -207,13 +210,13 @@
+ 	unsigned short parsed;
+ 
+ 
+-	if (selection->length < 1) 
++	if (gtk_selection_data_get_length(selection) < 1)
+ 		return;
+ 
+ 	set = g_malloc(sizeof(struct tokens));
+-	set->seed = g_malloc(selection->length);
++	set->seed = g_malloc(gtk_selection_data_get_length(selection));
+ 
+-	parsed = parse(selection->data, set);
++	parsed = parse(gtk_selection_data_get_data(selection), set);
+ 
+ 	g_free(set->seed);
+ 	g_free(set);
+@@ -221,7 +224,8 @@
+ 	if (!parsed)
+ 		return;
+ 
+-	gtk_entry_set_text(GTK_ENTRY(te_challenge), selection->data);
++	gtk_entry_set_text(GTK_ENTRY(te_challenge),
++			   gtk_selection_data_get_data(selection));
+ 
+ }
+ 
+--- otpCalc-0.97-orig/gui.c
++++ otpCalc-0.97/gui.c
+@@ -51,17 +51,17 @@
+ 	/* Setup the main window... */
+ 	wi_top = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ 	gtk_window_set_title(GTK_WINDOW(wi_top), "otpCalc");
+-	gtk_window_set_policy(GTK_WINDOW(wi_top), FALSE, FALSE, TRUE);
++	gtk_window_set_resizable(GTK_WINDOW(wi_top), FALSE);
+ 	gtk_window_set_wmclass(GTK_WINDOW(wi_top), "otpCalc", "Calc");
+ 
+-	gtk_signal_connect(GTK_OBJECT(wi_top), "delete_event",
+-			   GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
++	g_signal_connect(G_OBJECT(wi_top), "delete_event",
++			 G_CALLBACK(gtk_main_quit), NULL);
+ 
+-	gtk_signal_connect(GTK_OBJECT(wi_top), "focus_in_event",
+-			   GTK_SIGNAL_FUNC(focus), NULL);
++	g_signal_connect(G_OBJECT(wi_top), "focus_in_event",
++			 G_CALLBACK(focus), NULL);
+ 
+-	gtk_signal_connect(GTK_OBJECT(wi_top), "selection_received",
+-			   GTK_SIGNAL_FUNC(selector), NULL);
++	g_signal_connect(G_OBJECT(wi_top), "selection_received",
++			 G_CALLBACK(selector), NULL);
+ 	/* Done. */
+ 
+ 
+@@ -82,9 +82,9 @@
+ 	/* Setup the file menu... */
+ 	me_file = gtk_menu_new();
+ 	mi_file_quit = gtk_menu_item_new_with_label("Quit");
+-	gtk_menu_append(GTK_MENU(me_file), mi_file_quit);
+-	gtk_signal_connect_object(GTK_OBJECT(mi_file_quit), "activate",
+-				  GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
++	gtk_menu_shell_append(GTK_MENU_SHELL(me_file), mi_file_quit);
++	g_signal_connect_swapped(G_OBJECT(mi_file_quit), "activate",
++				 G_CALLBACK(gtk_main_quit), NULL);
+ 
+ 	gtk_widget_add_accelerator(mi_file_quit, "activate", accel_group, 0x071,
+ 				   GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+@@ -97,40 +97,45 @@
+ 	me_sett = gtk_menu_new();
+ 
+ 	mi_sett_sha1 = gtk_radio_menu_item_new_with_label(hashes, "sha1");
+-	gtk_menu_append(GTK_MENU(me_sett), mi_sett_sha1);
+-	gtk_signal_connect_object(GTK_OBJECT(mi_sett_sha1), "activate",
+-				  GTK_SIGNAL_FUNC(sethash), (void *)SHA1);
+-	hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_sha1));
++	gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_sha1);
++	g_signal_connect_swapped(G_OBJECT(mi_sett_sha1), "activate",
++				 G_CALLBACK(sethash), (void *)SHA1);
++	hashes = gtk_radio_menu_item_get_group(
++		GTK_RADIO_MENU_ITEM(mi_sett_sha1));
+ 	gtk_widget_show(mi_sett_sha1);
+ 
+ 	mi_sett_rmd160 = gtk_radio_menu_item_new_with_label(hashes, "rmd160");
+-	gtk_menu_append(GTK_MENU(me_sett), mi_sett_rmd160);
+-	gtk_signal_connect_object(GTK_OBJECT(mi_sett_rmd160), "activate",
+-				  GTK_SIGNAL_FUNC(sethash), (void *)RMD160);
+-	hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_rmd160));
++	gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_rmd160);
++	g_signal_connect_swapped(G_OBJECT(mi_sett_rmd160), "activate",
++				 G_CALLBACK(sethash), (void *)RMD160);
++	hashes = gtk_radio_menu_item_get_group(
++		GTK_RADIO_MENU_ITEM(mi_sett_rmd160));
+ 	gtk_widget_show(mi_sett_rmd160);
+ 
+ 	mi_sett_md5 = gtk_radio_menu_item_new_with_label(hashes, "md5");
+-	gtk_menu_append(GTK_MENU(me_sett), mi_sett_md5);
+-	gtk_signal_connect_object(GTK_OBJECT(mi_sett_md5), "activate",
+-				  GTK_SIGNAL_FUNC(sethash), (void *)MD5);
+-	hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_md5));
++	gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_md5);
++	g_signal_connect_swapped(G_OBJECT(mi_sett_md5), "activate",
++				 G_CALLBACK(sethash), (void *)MD5);
++	hashes = gtk_radio_menu_item_get_group(
++		GTK_RADIO_MENU_ITEM(mi_sett_md5));
+ 	gtk_widget_show(mi_sett_md5);
+ 
+ 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_sett_md5), TRUE);
+ 
+ 	mi_sett_md4 = gtk_radio_menu_item_new_with_label(hashes, "md4");
+-	gtk_menu_append(GTK_MENU(me_sett), mi_sett_md4);
+-	gtk_signal_connect_object(GTK_OBJECT(mi_sett_md4), "activate",
+-				  GTK_SIGNAL_FUNC(sethash), (void *)MD4);
+-	hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_md4));
++	gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_md4);
++	g_signal_connect_swapped(G_OBJECT(mi_sett_md4), "activate",
++				 G_CALLBACK(sethash), (void *)MD4);
++	hashes = gtk_radio_menu_item_get_group(
++		GTK_RADIO_MENU_ITEM(mi_sett_md4));
+ 	gtk_widget_show(mi_sett_md4);
+ 
+ 	mi_sett_skey = gtk_radio_menu_item_new_with_label(hashes, "s/key");
+-	gtk_menu_append(GTK_MENU(me_sett), mi_sett_skey);
+-	gtk_signal_connect_object(GTK_OBJECT(mi_sett_skey), "activate",
+-				  GTK_SIGNAL_FUNC(sethash), (void *)SKEY);
+-	hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_skey));
++	gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_skey);
++	g_signal_connect_swapped(G_OBJECT(mi_sett_skey), "activate",
++				 G_CALLBACK(sethash), (void *)SKEY);
++	hashes = gtk_radio_menu_item_get_group(
++		GTK_RADIO_MENU_ITEM(mi_sett_skey));
+ 	gtk_widget_show(mi_sett_skey);
+ 	/* Done. */
+ 
+@@ -138,9 +143,9 @@
+ 	/* Setup the help menu... */
+ 	me_help = gtk_menu_new();
+ 	mi_help_about = gtk_menu_item_new_with_label("About...");
+-	gtk_menu_append(GTK_MENU(me_help), mi_help_about);
+-	gtk_signal_connect_object(GTK_OBJECT(mi_help_about), "activate",
+-				  GTK_SIGNAL_FUNC(about), NULL);
++	gtk_menu_shell_append(GTK_MENU_SHELL(me_help), mi_help_about);
++	g_signal_connect_swapped(G_OBJECT(mi_help_about), "activate",
++				 G_CALLBACK(about), NULL);
+ 	gtk_widget_show(mi_help_about);
+ 	/* Done. */
+ 
+@@ -156,18 +161,18 @@
+ 	mi_file = gtk_menu_item_new_with_label("File");
+ 	gtk_widget_show(mi_file);
+ 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi_file), me_file);
+-	gtk_menu_bar_append(GTK_MENU_BAR(mb_top), mi_file);
++	gtk_menu_shell_append(GTK_MENU_SHELL(mb_top), mi_file);
+ 
+ 	mi_sett = gtk_menu_item_new_with_label("Settings");
+ 	gtk_widget_show(mi_sett);
+ 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi_sett), me_sett);
+-	gtk_menu_bar_append(GTK_MENU_BAR(mb_top), mi_sett);
++	gtk_menu_shell_append(GTK_MENU_SHELL(mb_top), mi_sett);
+ 
+ 	mi_help = gtk_menu_item_new_with_label("Help");
+ 	gtk_widget_show(mi_help);
+ 	gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi_help), me_help);
+-	gtk_menu_bar_append(GTK_MENU_BAR(mb_top), mi_help);
+-	gtk_menu_item_right_justify(GTK_MENU_ITEM(mi_help));
++	gtk_menu_shell_append(GTK_MENU_SHELL(mb_top), mi_help);
++	gtk_menu_item_set_right_justified(GTK_MENU_ITEM(mi_help), TRUE);
+ 	/* Done. */
+ 
+ 
+@@ -208,8 +213,8 @@
+ 			 (GtkAttachOptions)(0), 5, 0);
+ 	gtk_widget_show(bu_calc);
+ 
+-	gtk_signal_connect_object(GTK_OBJECT(bu_calc), "clicked",
+-				  GTK_SIGNAL_FUNC(calculate), NULL);
++	g_signal_connect_swapped(G_OBJECT(bu_calc), "clicked",
++				 G_CALLBACK(calculate), NULL);
+ 	/* Done. */
+ 
+ 
+@@ -221,8 +226,8 @@
+ 	gtk_entry_set_visibility(GTK_ENTRY(te_passwd), FALSE);
+ 	gtk_widget_show(te_passwd);
+ 
+-	gtk_signal_connect(GTK_OBJECT(te_passwd), "activate",
+-			   GTK_SIGNAL_FUNC(click), bu_calc);
++	g_signal_connect(G_OBJECT(te_passwd), "activate",
++			 G_CALLBACK(click), bu_calc);
+ 	/* Done. */
+ 
+ 
+@@ -234,8 +239,8 @@
+ 			 (GtkAttachOptions)(0), 5, 0);
+ 	gtk_widget_show(bu_clear);
+ 
+-	gtk_signal_connect(GTK_OBJECT(bu_clear), "clicked",
+-			   GTK_SIGNAL_FUNC(clear), NULL);
++	g_signal_connect(G_OBJECT(bu_clear), "clicked",
++			 G_CALLBACK(clear), NULL);
+ 	/* Done. */
+ 
+ 
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-gtk2-gentoo.patch b/sys-auth/otpcalc/files/otpcalc-0.97-gtk2-gentoo.patch
index 19abd5d2f34d..f781b7372c43 100644
--- a/sys-auth/otpcalc/files/otpcalc-0.97-gtk2-gentoo.patch
+++ b/sys-auth/otpcalc/files/otpcalc-0.97-gtk2-gentoo.patch
@@ -1,5 +1,7 @@
---- otpCalc-0.97-orig/Makefile.in	2004-11-24 07:44:12.000000000 +0100
-+++ otpCalc-0.97/Makefile.in	2007-12-26 00:38:52.000000000 +0100
+Make it work with GTK+ 2.
+
+--- otpCalc-0.97-orig/Makefile.in
++++ otpCalc-0.97/Makefile.in
 @@ -3,8 +3,8 @@
  
  CC = @CC@
@@ -11,8 +13,8 @@
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
---- otpCalc-0.97-orig/callbacks.c	2004-11-24 06:57:45.000000000 +0100
-+++ otpCalc-0.97/callbacks.c	2007-12-26 00:38:52.000000000 +0100
+--- otpCalc-0.97-orig/callbacks.c
++++ otpCalc-0.97/callbacks.c
 @@ -236,7 +236,7 @@
  }
  
@@ -37,8 +39,8 @@
 -
 +	return FALSE;
  }
---- otpCalc-0.97-orig/gui.c	2004-11-24 07:46:53.000000000 +0100
-+++ otpCalc-0.97/gui.c	2007-12-26 00:38:52.000000000 +0100
+--- otpCalc-0.97-orig/gui.c
++++ otpCalc-0.97/gui.c
 @@ -29,7 +29,7 @@
  GtkWidget *te_response;
  
@@ -57,8 +59,8 @@
  	gtk_table_attach(GTK_TABLE(ta_top), mb_top, 0, 3, 0, 1,
  			 (GtkAttachOptions)(GTK_FILL),
  			 (GtkAttachOptions)(0), 0, 0);
---- otpCalc-0.97-orig/utility.c	2004-11-24 06:59:09.000000000 +0100
-+++ otpCalc-0.97/utility.c	2007-12-26 00:38:52.000000000 +0100
+--- otpCalc-0.97-orig/utility.c
++++ otpCalc-0.97/utility.c
 @@ -422,7 +422,7 @@
  			words[extract(message, 33, 11)],
  			words[extract(message, 44, 11)],
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch b/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch
index e7e01019f8e0..79f869ad1f7e 100644
--- a/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch
+++ b/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch
@@ -1,5 +1,7 @@
---- otpCalc-0.97-orig/crypto.c	2001-06-26 10:22:52.000000000 +0200
-+++ otpCalc-0.97/crypto.c	2008-09-17 20:55:10.000000000 +0200
+Fix SHA1 byte-order issue for conformance with RFC 2289.
+
+--- otpCalc-0.97-orig/crypto.c
++++ otpCalc-0.97/crypto.c
 @@ -199,6 +199,8 @@
  	for (i = 0; i < 4; i++)
  		digest[i] ^= digest[i+16];
@@ -10,8 +12,8 @@
 +		 message[i] = digest[i^3];
  
  }
---- otpCalc-0.97-orig/sha1.h	2001-06-11 10:13:15.000000000 +0200
-+++ otpCalc-0.97/sha1.h	2008-09-20 14:44:15.000000000 +0200
+--- otpCalc-0.97-orig/sha1.h
++++ otpCalc-0.97/sha1.h
 @@ -1,3 +1,5 @@
 +#include "config.h"
 +
@@ -27,8 +29,8 @@
  #define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
      |(rol(block->l[i],8)&0x00FF00FF))
  #else
---- otpCalc-0.97-orig/otpCalc.man	2008-09-17 22:23:00.000000000 +0200
-+++ otpCalc-0.97/otpCalc.man	2008-09-17 22:23:47.000000000 +0200
+--- otpCalc-0.97-orig/otpCalc.man
++++ otpCalc-0.97/otpCalc.man
 @@ -47,9 +47,6 @@
  RFC 2289, RFC 1740
  .SH "AUTHOR"
@@ -39,8 +41,8 @@
  .SH "COPYRIGHT"
  Copyright \(co 2001 Anthony D. Urso.
  .br
---- otpCalc-0.97-orig/BUGS	2001-05-07 08:23:38.000000000 +0200
-+++ otpCalc-0.97/BUGS	2008-09-17 21:02:36.000000000 +0200
+--- otpCalc-0.97-orig/BUGS
++++ otpCalc-0.97/BUGS
 @@ -16,3 +16,7 @@
  
  Thanks,
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch b/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch
index b6013e572254..39ab2675b210 100644
--- a/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch
+++ b/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch
@@ -1,5 +1,7 @@
---- otpCalc-0.97-orig/callbacks.c	2008-08-21 00:23:04.000000000 +0200
-+++ otpCalc-0.97/callbacks.c	2008-08-21 00:27:47.000000000 +0200
+Change default s/key hash to MD5 (same as sys-auth/skey).
+
+--- otpCalc-0.97-orig/callbacks.c
++++ otpCalc-0.97/callbacks.c
 @@ -90,7 +90,7 @@
  	unsigned char results[9];
  
@@ -9,8 +11,8 @@
  	hashes[MD4] = md4lite;
  	hashes[MD5] = md5lite;
  	hashes[RMD160] = rmd160lite;
---- otpCalc-0.97-orig/otpCalc.man	2008-08-21 00:23:04.000000000 +0200
-+++ otpCalc-0.97/otpCalc.man	2008-08-21 00:26:49.000000000 +0200
+--- otpCalc-0.97-orig/otpCalc.man
++++ otpCalc-0.97/otpCalc.man
 @@ -30,7 +30,7 @@
  cb l
  cb l
diff --git a/sys-auth/otpcalc/files/otpcalc-crypto-proto.diff b/sys-auth/otpcalc/files/otpcalc-crypto-proto.diff
index deb65465f5e6..05ba89fc1fe4 100644
--- a/sys-auth/otpcalc/files/otpcalc-crypto-proto.diff
+++ b/sys-auth/otpcalc/files/otpcalc-crypto-proto.diff
@@ -1,6 +1,7 @@
-diff -urN otpCalc-0.97.orig/crypto.h otpCalc-0.97/crypto.h
---- otpCalc-0.97.orig/crypto.h	2001-05-12 02:04:54.000000000 -0400
-+++ otpCalc-0.97/crypto.h	2006-03-21 17:24:54.000000000 -0500
+Correct crypto prototypes, bug 123993.
+
+--- otpCalc-0.97.orig/crypto.h
++++ otpCalc-0.97/crypto.h
 @@ -1,4 +1,4 @@
 -void md4lite(char *, size_t);
 -void md5lite(char *, size_t);
diff --git a/sys-auth/otpcalc/files/otpcalc-man-table-format.diff b/sys-auth/otpcalc/files/otpcalc-man-table-format.diff
index 062cce7f4b5f..bbd767ef215a 100644
--- a/sys-auth/otpcalc/files/otpcalc-man-table-format.diff
+++ b/sys-auth/otpcalc/files/otpcalc-man-table-format.diff
@@ -1,5 +1,7 @@
---- otpCalc.man.orig	2005-04-29 23:17:06.000000000 +0100
-+++ otpCalc.man	2005-04-29 23:19:03.000000000 +0100
+Make missing list appear in man page, bug 90900.
+
+--- otpCalc.man.orig
++++ otpCalc.man
 @@ -24,18 +24,20 @@
  the Challenge input:
  .IP
diff --git a/sys-auth/otpcalc/otpcalc-0.97-r6.ebuild b/sys-auth/otpcalc/otpcalc-0.97-r6.ebuild
new file mode 100644
index 000000000000..730ecfee2bab
--- /dev/null
+++ b/sys-auth/otpcalc/otpcalc-0.97-r6.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/otpcalc/otpcalc-0.97-r6.ebuild,v 1.1 2012/12/15 12:33:05 ulm Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A One Time Password and S/Key calculator for X"
+HOMEPAGE="http://killa.net/infosec/otpCalc/"
+SRC_URI="http://killa.net/infosec/otpCalc/otpCalc-${PV}.tar.gz"
+
+LICENSE="GPL-2+" # bundled crypto functions are not used
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/otpCalc-${PV}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-man-table-format.diff" \
+		"${FILESDIR}/${P}-badindex.diff" \
+		"${FILESDIR}/${PN}-crypto-proto.diff" \
+		"${FILESDIR}/${P}-gtk2-gentoo.patch" \
+		"${FILESDIR}/${P}-skey-md5.patch" \
+		"${FILESDIR}/${P}-sha1-byteorder.patch" \
+		"${FILESDIR}/${P}-gtk-deprecated.patch"
+
+	# print correct version in manpage
+	sed -i -e "s/VERSION/${PV}/g" otpCalc.man || die
+
+	# override hardcoded FLAGS
+	sed -i \
+		-e 's:$(CC) $(CFLAGS) $^:$(CC) $(LDFLAGS) $(CFLAGS) $^:' \
+		-e "s#-s -O3#${CFLAGS}#g" \
+		Makefile.in || die
+}
+
+src_install() {
+	dobin otpCalc
+	dosym otpCalc /usr/bin/otpcalc
+	newman otpCalc.man otpCalc.1
+	domenu "${FILESDIR}/${PN}.desktop"
+	dodoc BUGS ChangeLog TODO
+}