Added metadata.xml, fixed headers in old ebuilds, bumped to -r7 (added patches from bugs #30958 and #30298).

4 files changed, 316 insertions, 0 deletions

diff --git a/x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch b/x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch
new file mode 100644
index 000000000000..f655a241fac0
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch
@@ -0,0 +1,120 @@
+diff -Naur aterm-0.4.2-orig/configure aterm-0.4.2/configure
+--- aterm-0.4.2-orig/configure	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/configure	2004-01-17 01:59:10.457046704 +0100
+@@ -2609,7 +2609,7 @@
+     ; \
+ do
+   ac_save_LIBS=$LIBS
+-  LIBS="-L$ac_dir -lXpm $LIBS -lX11"
++  LIBS="-L$ac_dir -lXpm $LIBS -lX11 -lXmu"
+   cat > conftest.$ac_ext <<EOF
+ #line 2615 "configure"
+ #include "confdefs.h"
+diff -Naur aterm-0.4.2-orig/src/command.c aterm-0.4.2/src/command.c
+--- aterm-0.4.2-orig/src/command.c	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/src/command.c	2004-01-17 01:59:10.481043056 +0100
+@@ -2653,7 +2653,7 @@
+ 		switch (ev->xbutton.button) {
+ 		case Button1:
+ 		case Button3:
+-		    selection_make(ev->xbutton.time);
++		    selection_make(ev->xbutton.time, ev->xbutton.state);
+ 		    break;
+ 
+ 		case Button2:
+diff -Naur aterm-0.4.2-orig/src/screen.c aterm-0.4.2/src/screen.c
+--- aterm-0.4.2-orig/src/screen.c	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/src/screen.c	2004-01-17 01:59:36.316115528 +0100
+@@ -44,7 +44,7 @@
+ 
+ #include <X11/Xatom.h>
+ #include <X11/Xmd.h>		/* get the typedef for CARD32 */
+-
++#include <X11/Xmu/Atoms.h>
+ 
+ static screen_t    screen;
+ 
+@@ -2759,21 +2759,34 @@
+     long            nread;
+     unsigned long   bytes_after, nitems;
+     unsigned char  *data;
++    XTextProperty   ct;
+     Atom            actual_type;
+     int             actual_fmt;
++    int             dummy_count;
++    char          **cl;
+ 
+     if (prop == None)
+ 	return;
++
+     for (nread = 0, bytes_after = 1; bytes_after > 0; nread += nitems) {
+ 	if ((XGetWindowProperty(Xdisplay, win, prop, (nread / 4), PROP_SIZE,
+-				Delete, AnyPropertyType, &actual_type,
+-				&actual_fmt, &nitems, &bytes_after,
+-				&data) != Success)) {
+-	    XFree(data);
++				Delete, AnyPropertyType, &ct.encoding, &ct.format,
++				&ct.nitems, &bytes_after, &ct.value) != Success)) {
++	    XFree(ct.value);
+ 	    return;
+ 	}
+-	PasteIt(data, nitems);
+-	XFree(data);
++	
++	if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl, &dummy_count) == Success && cl) {
++            PasteIt(cl[0], strlen(cl[0]));
++	    XFreeStringList(cl);
++	} else {
++	    PasteIt(ct.value, (unsigned int)ct.nitems);
++	}
++
++	nread += ct.nitems;
++
++	if (ct.value)
++	    XFree(ct.value);
+     }
+ }
+ 
+@@ -2787,6 +2800,9 @@
+ selection_request(Time tm, int x, int y)
+ {
+     Atom            prop;
++    Atom            xa;
++
++    xa = XInternAtom(Xdisplay, "COMPOUND_TEXT", False);
+ 
+     if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
+ 	return;			/* outside window */
+@@ -2797,7 +2813,7 @@
+ 	selection_paste(Xroot, XA_CUT_BUFFER0, False);
+     } else {
+ 	prop = XInternAtom(Xdisplay, "VT_SELECTION", False);
+-	XConvertSelection(Xdisplay, XA_PRIMARY, XA_STRING, prop, TermWin.vt,
++	XConvertSelection(Xdisplay, XA_PRIMARY, xa, prop, TermWin.vt,
+ 			  tm);
+     }
+ }
+@@ -2827,7 +2843,7 @@
+  */
+ /* PROTO */
+ void
+-selection_make(Time tm)
++selection_make(Time tm, unsigned int key_state)
+ {
+     int             i, col, end_col, row, end_row;
+     unsigned char  *new_selection_text;
+@@ -2894,7 +2910,13 @@
+ 	FREE(selection.text);
+     selection.text = new_selection_text;
+ 
+-    XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm);
++    // selecting with ALT will put the text to clipboard
++    if (key_state & Mod1Mask) {
++        XSetSelectionOwner(Xdisplay, XA_CLIPBOARD(Xdisplay), TermWin.vt, tm);
++    } else {
++        XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm);
++    }
++	
+     if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt)
+ 	print_error("can't get primary selection");
+     XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
diff --git a/x11-terms/aterm/files/aterm-0.4.2-paste.patch b/x11-terms/aterm/files/aterm-0.4.2-paste.patch
new file mode 100644
index 000000000000..8d887b9acc59
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-0.4.2-paste.patch
@@ -0,0 +1,59 @@
+--- aterm-0.4.2-orig/src/screen.c	2001-09-06 12:38:07.000000000 -0400
++++ aterm-0.4.2/src/screen.c	2003-09-11 02:45:54.000000000 -0400
+@@ -3328,10 +3330,21 @@
+ void
+ selection_send(XSelectionRequestEvent * rq)
+ {
++    /* Changes are from rxvt. This fixes #205040. */
+     XEvent          ev;
+-    Atom32          target_list[2];
++    Atom32          target_list[4];
++    Atom            target;
+     static Atom     xa_targets = None;
+-
++    static Atom     xa_compound_text = None;
++    static Atom     xa_text = None;
++    XTextProperty   ct;
++    XICCEncodingStyle style;
++    char           *cl[4];
++
++    if (xa_text == None)
++	xa_text = XInternAtom(Xdisplay, "TEXT", False);
++    if (xa_compound_text == None)
++	xa_compound_text = XInternAtom(Xdisplay, "COMPOUND_TEXT", False);
+     if (xa_targets == None)
+ 	xa_targets = XInternAtom(Xdisplay, "TARGETS", False);
+ 
+@@ -3346,14 +3359,29 @@
+     if (rq->target == xa_targets) {
+ 	target_list[0] = (Atom32) xa_targets;
+ 	target_list[1] = (Atom32) XA_STRING;
++	target_list[2] = (Atom32) xa_text;
++	target_list[3] = (Atom32) xa_compound_text;
+ 	XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
+ 			(8 * sizeof(target_list[0])), PropModeReplace,
+ 			(unsigned char *)target_list,
+ 			(sizeof(target_list) / sizeof(target_list[0])));
+ 	ev.xselection.property = rq->property;
+-    } else if (rq->target == XA_STRING) {
+-	XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target,
+-			8, PropModeReplace, selection.text, selection.len);
++    } else if (rq->target == XA_STRING
++	       || rq->target == xa_compound_text
++	       || rq->target == xa_text) {
++	if (rq->target == XA_STRING) {
++	    style = XStringStyle;
++	    target = XA_STRING;
++	} else {
++	    target = xa_compound_text;
++	    style = (rq->target == xa_compound_text) ? XCompoundTextStyle
++		: XStdICCTextStyle;
++	}
++	cl[0] = selection.text;
++	XmbTextListToTextProperty(Xdisplay, cl, 1, style, &ct);
++	XChangeProperty(Xdisplay, rq->requestor, rq->property,
++			target, 8, PropModeReplace,
++			ct.value, ct.nitems);
+ 	ev.xselection.property = rq->property;
+     }
+     XSendEvent(Xdisplay, rq->requestor, False, 0, &ev);
diff --git a/x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch b/x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch
new file mode 100644
index 000000000000..ae31a0e8730a
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch
@@ -0,0 +1,135 @@
+diff -Naur aterm-0.4.2-orig/doc/aterm.1 aterm-0.4.2/doc/aterm.1
+--- aterm-0.4.2-orig/doc/aterm.1	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/doc/aterm.1	2004-01-17 01:52:18.792629208 +0100
+@@ -227,6 +227,9 @@
+ .IP "\fB-st\fP|\fB+st\fP" 
+ Display scrollbar without/with a trough;
+ resource \fBscrollBar_floating\fP\&.
++.IP "\fB-pmo\fP|\fB+pmo\fP" 
++Enable pasting when mouse pointer is outside the aterm window;
++resource \fBpasteMouseOutside\fP\&.
+ .IP "\fB-iconic\fP" 
+ Start iconified, if the window manager supports that option\&.
+ .IP "\fB-sl\fP \fInumber\fP" 
+@@ -708,6 +711,8 @@
+ option \fB-vb\fP\&.
+ \fBFalse\fP: no visual bell [default];
+ option \fB+vb\fP\&.
++.IP "\fBpasteMouseOutside:\fP \fIboolean\fP" 
++\fBTrue\fP: enable text pasting when mouse pointer is outside the window;
+ .IP "\fBloginShell:\fP \fIboolean\fP" 
+ \fBTrue\fP: start as a login shell by prepending a `-\' to \fBargv[0]\fP
+ of the shell;
+diff -Naur aterm-0.4.2-orig/doc/aterm.html aterm-0.4.2/doc/aterm.html
+--- aterm-0.4.2-orig/doc/aterm.html	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/doc/aterm.html	2004-01-17 01:52:18.828623736 +0100
+@@ -284,6 +284,9 @@
+     <li><strong><strong>-st</strong>|<strong>+st</strong></strong> 
+ 	Display scrollbar without/with a trough;
+ 	resource <strong>scrollBar_floating</strong>.
++    <li><strong><strong>-pmo</strong>|<strong>+pmo</strong></strong> 
++	Enable pasting when mouse pointer is outside the aterm window;
++	resource <strong>pasteMouseOutside</strong>.
+     <li><strong><strong>-iconic</strong></strong> 
+ 	Start iconified, if the window manager supports that option.
+     <li><strong><strong>-sl</strong> <em>number</em></strong>
+@@ -544,6 +547,8 @@
+ 	option <strong>-vb</strong>.
+ 	<strong>False</strong>: no visual bell [default];
+ 	option <strong>+vb</strong>.
++    <li><strong><strong>pasteMouseOutside:</strong> <em>boolean</em></strong>
++	<strong>True</strong>: enable text pasting when mouse pointer is outside the window.
+     <li><strong><strong>loginShell:</strong> <em>boolean</em></strong>
+ 	<strong>True</strong>: start as a login shell by prepending a `-' to <strong>argv[0]</strong>
+ 	of the shell;
+diff -Naur aterm-0.4.2-orig/doc/aterm.html.in aterm-0.4.2/doc/aterm.html.in
+--- aterm-0.4.2-orig/doc/aterm.html.in	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/doc/aterm.html.in	2004-01-17 01:52:18.831623280 +0100
+@@ -284,6 +284,9 @@
+     <li><strong><strong>-st</strong>|<strong>+st</strong></strong> 
+ 	Display scrollbar without/with a trough;
+ 	resource <strong>scrollBar_floating</strong>.
++    <li><strong><strong>-pmo</strong>|<strong>+pmo</strong></strong>
++	Enable pasting when mouse pointer is outside the aterm window;
++	resource <strong>pasteMouseOutside</strong>.
+     <li><strong><strong>-iconic</strong></strong> 
+ 	Start iconified, if the window manager supports that option.
+     <li><strong><strong>-sl</strong> <em>number</em></strong>
+@@ -544,6 +547,8 @@
+ 	option <strong>-vb</strong>.
+ 	<strong>False</strong>: no visual bell [default];
+ 	option <strong>+vb</strong>.
++    <li><strong><strong>pasteMouseOutside:</strong> <em>boolean</em></strong>
++	<strong>True</strong>: enable text pasting when mouse pointer is outside the window.
+     <li><strong><strong>loginShell:</strong> <em>boolean</em></strong>
+ 	<strong>True</strong>: start as a login shell by prepending a `-' to <strong>argv[0]</strong>
+ 	of the shell;
+diff -Naur aterm-0.4.2-orig/doc/aterm.pretbl aterm-0.4.2/doc/aterm.pretbl
+--- aterm-0.4.2-orig/doc/aterm.pretbl	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/doc/aterm.pretbl	2004-01-17 01:52:18.846621000 +0100
+@@ -223,6 +223,9 @@
+ .IP "\fB-st\fP|\fB+st\fP" 
+ Display scrollbar without/with a trough;
+ resource \fBscrollBar_floating\fP\&.
++.IP "\fB-pmo\fP|\fB+pmo\fP" 
++Enable pasting when mouse pointer is outside the aterm window;
++resource \fBpasteMouseOutside\fP\&.
+ .IP "\fB-iconic\fP" 
+ Start iconified, if the window manager supports that option\&.
+ .IP "\fB-sl\fP \fInumber\fP" 
+@@ -472,6 +475,8 @@
+ option \fB-vb\fP\&.
+ \fBFalse\fP: no visual bell [default];
+ option \fB+vb\fP\&.
++.IP "\fBpasteMouseOutside:\fP \fIboolean\fP" 
++\fBTrue\fP: enable text pasting when mouse pointer is outside the window;
+ .IP "\fBloginShell:\fP \fIboolean\fP" 
+ \fBTrue\fP: start as a login shell by prepending a `-\' to \fBargv[0]\fP
+ of the shell;
+diff -Naur aterm-0.4.2-orig/src/rxvt.h aterm-0.4.2/src/rxvt.h
+--- aterm-0.4.2-orig/src/rxvt.h	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/src/rxvt.h	2004-01-17 01:52:28.755114680 +0100
+@@ -689,6 +689,7 @@
+ #define Opt_scrollTtyOutputInh	(1LU<<11)
+ #define Opt_scrollKeypress	(1LU<<12)
+ #define Opt_transparent		(1LU<<13)
++#define Opt_pasteMouseOutside   (1LU<<15)
+ #define Opt_transparent_sb	(1LU<<14)
+ 
+ /* place holder used for parsing command-line options */
+diff -Naur aterm-0.4.2-orig/src/screen.c aterm-0.4.2/src/screen.c
+--- aterm-0.4.2-orig/src/screen.c	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/src/screen.c	2004-01-17 01:52:18.866617960 +0100
+@@ -2788,8 +2788,9 @@
+ {
+     Atom            prop;
+ 
+-    if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
+-	return;			/* outside window */
++    if (!(Options & Opt_pasteMouseOutside))
++        if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
++	    return;			/* outside window */
+ 
+     if (selection.text != NULL) {
+ 	PasteIt(selection.text, selection.len);		/* internal selection */
+diff -Naur aterm-0.4.2-orig/src/xdefaults.c aterm-0.4.2/src/xdefaults.c
+--- aterm-0.4.2-orig/src/xdefaults.c	2001-09-06 18:38:07.000000000 +0200
++++ aterm-0.4.2/src/xdefaults.c	2004-01-17 01:52:18.868617656 +0100
+@@ -57,6 +57,8 @@
+ static const char *rs_transparent_sb = NULL;
+ #endif
+ 
++static const char *rs_paste_mouse_outside = NULL;
++
+ #ifdef DONT_TILE_PIXMAP_OPTION
+ static const char *rs_dontTilePixmap = NULL;
+ static const char *rs_dontTilePixmapH = NULL;
+@@ -215,6 +217,8 @@
+     BOOL(rs_transparent_sb, "transpscrollbar", "trsb", Opt_transparent_sb,
+          "transparent scrollbar"),
+ #endif
++    BOOL(rs_paste_mouse_outside, "pasteMouseOutside", "pmo", Opt_pasteMouseOutside,
++         "paste with mouse when pointer is outside the window"),	
+ #endif
+ #if (MENUBAR_MAX)
+     RSTRG(rs_menu, "menu", "name[;tag]"),
diff --git a/x11-terms/aterm/files/digest-aterm-0.4.2-r7 b/x11-terms/aterm/files/digest-aterm-0.4.2-r7
new file mode 100644
index 000000000000..a1aafd5e085e
--- /dev/null
+++ b/x11-terms/aterm/files/digest-aterm-0.4.2-r7
@@ -0,0 +1,2 @@
+MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419
+MD5 2bd8629ea2a1926bca13841b0aca6604 aterm-0.4.2-ja.patch 84282