gentoo resync : 15.12.2019

4 files changed, 189 insertions, 54 deletions

diff --git a/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch b/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch
index 9db338424220..84f54a4bfdfa 100644
--- a/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch
+++ b/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch
@@ -1,15 +1,3 @@
-From 6d0c1123441633660c2ec4f336e1e800b4dfebb5 Mon Sep 17 00:00:00 2001
-From: Harri Nieminen <moikkis@gmail.com>
-Date: Sat, 25 Mar 2017 12:18:13 +0200
-Subject: [PATCH 2/2] Fix for as-needed and pre-stripped files
-
-Gentoo bugs: #141707, #252098
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9d7c4fb..faaa85d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -36,9 +36,9 @@ endif
@@ -17,13 +5,10 @@ index 9d7c4fb..faaa85d 100644
  TARGET = trayer
  $(TARGET): $(OBJ) $(SYSTRAYOBJ)
 -	$(CC) $(LDFLAGS) $(LIBS) $(OBJ) $(SYSTRAYOBJ) -o $@
-+	$(CC) $(LDFLAGS) $(OBJ) $(SYSTRAYOBJ) $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(SYSTRAYOBJ) $(LIBS) -o $@
  ifeq (,$(DEVEL))
 -	strip $@
 +	true $@
  endif
  
  TARGETMAN = $(TARGET).1.gz
--- 
-2.12.1
-
diff --git a/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch b/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch
index ccb1e12869b8..ecb013a37ad4 100644
--- a/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch
+++ b/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch
@@ -1,19 +1,3 @@
-From 1aa5f4164b86fd0c5cf174c8403442060cad497d Mon Sep 17 00:00:00 2001
-From: Harri Nieminen <moikkis@gmail.com>
-Date: Sat, 25 Mar 2017 12:17:09 +0200
-Subject: [PATCH 1/2] Remove useless include on
- gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
-
-Also fix underlinking, bug #369591
-
-Thanks for leio@g.o for reporting
----
- Makefile.common | 4 ++--
- plugin.c        | 1 -
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.common b/Makefile.common
-index 0d50340..ec2bc3c 100644
 --- a/Makefile.common
 +++ b/Makefile.common
 @@ -16,8 +16,8 @@ endif
@@ -22,13 +6,11 @@ index 0d50340..ec2bc3c 100644
  CC = gcc
 -LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib  -lXmu
 -INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
-+LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11)
-+INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11)
++LIBS = $(shell ${PKG_CONFIG} --libs gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11)
++INCS = $(shell ${PKG_CONFIG} --cflags gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11)
  CFLAGS = -O2    # overwriten by command line or env. variable
  CFLAGS += -Wall # always nice to have 
  ifneq (,$(DEVEL))
-diff --git a/plugin.c b/plugin.c
-index 7fd5398..a6f8fbb 100644
 --- a/plugin.c
 +++ b/plugin.c
 @@ -2,7 +2,6 @@
@@ -38,7 +20,3 @@ index 7fd5398..a6f8fbb 100644
 -#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
  #include <gdk/gdk.h>
  #include <string.h>
- 
--- 
-2.12.1
-
diff --git a/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
index 8b9fd291d15f..56f3000ff69c 100644
--- a/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
+++ b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
@@ -1,14 +1,3 @@
-From 710efb0c8192e704a83fd3d4b8b3c0d6be984246 Mon Sep 17 00:00:00 2001
-From: Harri Nieminen <moikkis@gmail.com>
-Date: Sun, 26 Mar 2017 10:08:05 +0300
-Subject: [PATCH] Don't include libXmu
-
----
- systray/main.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/systray/main.c b/systray/main.c
-index dff5455..79cbe34 100644
 --- a/systray/main.c
 +++ b/systray/main.c
 @@ -2,7 +2,6 @@
@@ -19,6 +8,3 @@ index dff5455..79cbe34 100644
  #include <gdk-pixbuf/gdk-pixbuf.h>
  
  #include "panel.h"
--- 
-2.12.1
-
diff --git a/x11-misc/trayer/files/trayer.1 b/x11-misc/trayer/files/trayer.1
new file mode 100644
index 000000000000..a00cdbadecd1
--- /dev/null
+++ b/x11-misc/trayer/files/trayer.1
@@ -0,0 +1,186 @@
+.TH TRAYER 1 "Feb 14, 2005" "FVWM\-Crystal"
+.SH NAME
+trayer \- a lightweight GTK2\-based systray for UNIX desktop
+.SH SYNOPSIS
+.B trayer \-h
+.br
+.B trayer \-v
+.br
+.B trayer
+.\"
+.RB [\| \-\-edge
+.RI \| left \||\| right \||\| top \||\| bottom \||\| none \|]
+.\"
+.RB [\| \-\-align
+.RI \| left \||\| right \||\| center \|]
+.\"
+.RB [\| \-\-margin
+.RI \| <size> \|]
+.\"
+.RB [\| \-\-widthtype
+.RI \| request \||\| pixel \||\| percent
+.RI \|]
+.\"
+.RB [\| \-\-width
+.RI \| <size> \|]
+.\"
+.RB [\| \-\-heighttype
+.RI \| <pixel> \|]
+.\"
+.RB [\| \-\-height
+.RI \| <size> \|]
+.\"
+.RB [\| \-\-SetDockType
+.RI \| true \||\| false \|]
+.\"
+.RB [\| \-\-SetPartialStrut
+.RI \| true \||\| false \|]
+.\"
+.RB [\| \-\-transparent
+.RI \| true \||\| false \|]
+.\"
+.RB [\| \-\-alpha
+.RI \| <value> \|]
+.\"
+.RB [\| \-\-tint
+.RI \| <color> \|]
+.\"
+.RB [\| \-\-distance
+.RI \| <length> \|]
+.\"
+.RB [\| \-\-expand
+.RI \| true \||\| false \|]
+.\"
+.RB [\| \-\-padding
+.RI \| <size> \|]
+.\"
+.SH DESCRIPTION
+.B trayer
+is small program designed to provide system tray similar to these in
+.B GNOME
+/
+.B KDE
+desktop environments for window managers which does not
+support that function. It is similar to other applications such as
+.B peksystray
+and \fBdocker\fP.
+.PP
+System tray is a place, where many applications put their icons, so they are
+always visible. Such icons may present status of an application and allow user
+to control the program.
+.PP
+\fBtrayer\fP code was extracted from \fBfbpanel\fP application, you can find more
+about it on its homepage: http://fbpanel.sourceforge.net/.
+.SH OPTIONS
+This programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h
+Show summary of options and exit.
+
+.TP
+.B \-v
+Show version of program and exit.
+
+.TP
+\fB\-\-edge\fP \fIleft\fP\||\|\fIright\fP\||\|\fItop\fP\||\|\fIbottom\fP\||\|\fInone\fP
+Specifies a screen edge to use.
+
+.TP
+\fB\-\-align\fP \fIleft\fP\||\|\fIcenter\fP\||\|\fIright\fP
+Specifies an align of the icons.
+
+.TP
+\fB\-\-margin\fP \fI<size>\fP
+Specifies length of margin (in pixels)
+
+.TP
+\fB\-\-widthtype\fB \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP
+Specifies method of calculating trayer's window width:
+.RS
+.TP
+\fIrequest\fP
+Follow application icons' size, so trayer may shrink or expand dynamically.
+
+.TP
+\fIpixel\fP
+Set a fixed size, given with \fB\-\-width\fP option in pixels.
+
+.TP
+\fIpercent\fP
+Set a fixed size, given with \fB\-\-width\fP option in percentage of a lenght of screen edge.
+.RE
+
+.TP
+\fB\-\-width\fP \fI<size>\fP
+Width of trayer's window. Ignored when \fB\-\-widthtype\fP is set to \fIrequest\fP.
+
+.TP
+\fB\-\-heighttype\fP \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP
+Specifies method of calculating trayer's window height:
+.RS
+.TP
+\fIrequest\fP
+Follow application icons' size, so trayer may shrink or expand dynamically.
+
+.TP
+\fIpixel\fP
+Set a fixed size, given with \fB\-\-height\fP option in pixels.
+
+.TP
+\fIpercent\fP
+Set a fixed size, given with \fB\-\-height\fP option in percentage of a lenght of screen edge.
+.RE
+
+.TP
+\fB\-\-height\fP \fI<size>\fP
+Height of trayer's window. Ignored when \fB\-\-heighttype\fP is set to \fIrequest\fP.
+
+.TP
+\fB\-\-SetDockType\fP \fItrue\fP\||\|\fIfalse\fP
+Identify panel window type as dock.
+
+.TP
+\fB\-\-SetPartialStrut\fP \fItrue\fP\||\|\fIfalse\fP
+Reserve panel space so that it will not be covered by maximized windows.
+
+.TP
+\fB\-\-transparent\fP \fItrue\fP\||\|\fIfalse\fP
+Use transparency.
+
+.TP
+\fB\-\-alpha\fP \fI<value>\fP
+Percentage of transparency (0 \- nontransparent, 256 \- fully transparent)
+
+.TP
+\fB\-\-tint\fP \fI<color>\fP
+Color used to tint transparent background. Color is given as a 24-bit C hexadecimal integer, for example: 0xff0000 is red, 0xff8800 is orange and 0x00ff00 is green.
+
+.TP
+\fB\-\-distance\fP \fI<length>\fP
+Specifies distance between trayer's window and screen edge (in pixels)
+
+.TP
+\fB\-\-expand\fP \fItrue\fP\||\|\fIfalse\fP
+Specifies whether trayer may accomodate extra space when there is too much
+icons.
+
+.TP
+\fB\-\-padding\fP \fI<size>\fP
+Extra space between icons and trayer window's border.
+
+.SH SEE ALSO
+.BR fbpanel (1)
+.SH AUTHORS
+Anatoly Asviyan <aanatoly@users.sf.net> \- fbpanel
+.br
+Rafal Bisingier <ravbc@man.poznan.pl>
+.br
+Maciej Delmanowski <harnir@users.berlios.de>
+.br
+Grzegorz Nieweglowski <hoppke@dobremiasto.net>
+.br
+Thomas Rydzynski
+.PP
+This manual page was written by Tomasz Melcer <liori@interia.pl>.