reinit the tree, so we can have metadata

7 files changed, 204 insertions, 0 deletions

diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
new file mode 100644
index 000000000000..3d1efb5e0d9f
--- /dev/null
+++ b/x11-misc/trayer/Manifest
@@ -0,0 +1,9 @@
+AUX trayer-1.0-as-needed-and-pre-stripped.patch 681 SHA256 8d5d4f8507a420e686a4783789a4f154f36a49958c9cef58e7344997ed9f65c4 SHA512 15712e3bc1973f649d5906d42f40825d9f972baf5fcbdf77d751e29da84ae3b539c1fd1807ba0211f36f25876e9475977472d16389d6e1d95426c6b789c650e6 WHIRLPOOL 1af1149a9790e88a3df7c90f3cb42784dacd4b7a7e540a13ffaf7cd7a6915010d0642c508f887a952d13f718b24a208c577405c2dfaf2bc183e08c0e5ef83edf
+AUX trayer-1.0-dont-include-gdk-pixbuf-xlib.patch 1300 SHA256 a2b5fae3de36359c0ee4ff4f573b4c7683ea0d4d0b7bace2999871cd7fcdc385 SHA512 76455b1cbe29979b14ea22a9978d1dff9fdee0ec08027464fd0e93d41ddd4fb5149e3936ff63fa0682e30c6ffe58bf11f7a78ce305fc5aac1d5fa4ebaa29a1e9 WHIRLPOOL 886de88eb6b44e01994de9bb050357404e91b7962bd6b4027a2a2a9209fb86423dfdb68604abc9677be323c1921bdb424db4a02ead1a13909ba62ab69980cca1
+AUX trayer-1.0-dont-include-libXmu.patch 524 SHA256 77bfb5ab37a716427196de6fbba1936f692069dca60fcad61cabdc64c9d2817e SHA512 6dba64b746f655db3c7666f8504a4a3cff06bf91cd475d576a4e50839b3a2fb63c190f62082dec694559fc1d0cf7272d93f629b7ef6e49bf3599d6f36bc22dd0 WHIRLPOOL 5c5e029600b9c00adc27008bef620dabcd15f9f2aeee84d4fb8e6c505e0031c7e07c4fca305fe6d1f5c3954ad65e5e1085ebb410494b58bb46730815ca81a910
+DIST trayer-1.0.tar.gz 30445 SHA256 896647e972a0b189b8368a7de30480e90eede0078ebdbdb62051f18a58070fbd SHA512 c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7 WHIRLPOOL baf2186cf3aace8520d3d6bd757a98d1cfa3f79563a5cd3751e9f911afd255ed5b57f6608f43e1a9a8e2895e45ed2dd761381e38d3ff1584c51365c80fcde366
+EBUILD trayer-1.0-r2.ebuild 1064 SHA256 8c5f010c0145be5675f9ec78ef08b3acf5c313aa1c72c6f2cf427e281642c5b0 SHA512 50a814f3e734a2674db2f2611f6689d1ca8f508e5295589090ccded2daeeecc8306532ddae3145e97ef9d3e499aa89ce715d6f353a6b240b20bffc8e893352c6 WHIRLPOOL 6f545caa3c256a4f2b742a653662f56109e41639ae8b1d9c938358900abc5beb313642dacd3e867037eed5442e57ebcab64c6440fb5cb7e1d6eb50f6e5ef9f03
+EBUILD trayer-1.0-r3.ebuild 828 SHA256 23487d5fb82b0b073efaee27db11a33884657123c718bdec9b3b16416132dc53 SHA512 5775da5668b487c38fae0012faa0fde6499d37aa6e6901bdfd55bc0280fb6d5b225625ec2bce2b20eb613e84f79851c27e5171a74120dd87d6154a0636c87be7 WHIRLPOOL f75bb4d0631ad40fc351f5ae04838e86e690a5f11ee91b4039116be6d2435d48900bcd42295d8694a6d96a0f325167febedd3561c8d9c89cf36c6aff6a9d5ae1
+MISC ChangeLog 2455 SHA256 4df964f1cf3f217e6d5cda8bc342f6270c8a77bc924dd7d122fec039aeb19d62 SHA512 7f8ce80c81f3b0c237040829a3aafe65c5d7c7d77ee41d3555dde0a4e1b10a1f2c11182ae9bddc77542af9374d0376a5e7ea4414c82bc9117a961fd65b40ccb5 WHIRLPOOL 0a587e727a8b3b22eedb95772eab3589c05daf480ef8a9ec63f0d55359d82a6474c8f87b16783786f85b1787c8c7ecb2634b86c79a0c9ee1834f58973917696f
+MISC ChangeLog-2015 3569 SHA256 2a8d210297b849617ba239793b7f5868a74e5b1540ee15c405f8047d05518122 SHA512 e88018e4f6737fc5d7554b7cf10af50b251ed6981a853cb085a7777ac4b33c900716d691ad93644fb6dd3c5eb0e34a4b8bc87f59427bc8e84d618f9db0caf402 WHIRLPOOL 4f2b7239e46fe76272a9c19e5c00e5f2b9c529b9ab583ed207f56482c232ca6b17903052e54b6330e18a6b00ded8b86af3491e6b29b88bf810e47a57cc52ca90
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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
new file mode 100644
index 000000000000..9db338424220
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch
@@ -0,0 +1,29 @@
+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
+ 
+ TARGET = trayer
+ $(TARGET): $(OBJ) $(SYSTRAYOBJ)
+-	$(CC) $(LDFLAGS) $(LIBS) $(OBJ) $(SYSTRAYOBJ) -o $@
++	$(CC) $(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
new file mode 100644
index 000000000000..ccb1e12869b8
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch
@@ -0,0 +1,44 @@
+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
+ endif
+ 
+ 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)
+ 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 @@
+ #include "plugin.h"
+ 
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#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
new file mode 100644
index 000000000000..8b9fd291d15f
--- /dev/null
+++ b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
@@ -0,0 +1,24 @@
+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 @@
+ #include <unistd.h>
+ #include <string.h>
+ 
+-#include <X11/Xmu/WinUtil.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ 
+ #include "panel.h"
+-- 
+2.12.1
+
diff --git a/x11-misc/trayer/metadata.xml b/x11-misc/trayer/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/x11-misc/trayer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/x11-misc/trayer/trayer-1.0-r2.ebuild b/x11-misc/trayer/trayer-1.0-r2.ebuild
new file mode 100644
index 000000000000..9876527f2e6f
--- /dev/null
+++ b/x11-misc/trayer/trayer-1.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
+HOMEPAGE="http://home.gna.org/fvwm-crystal/"
+SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf[X]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/${P}-dont-include-libXmu.patch )
+
+src_prepare() {
+	default
+	# fix for as-needed, bug #141707
+	# fix pre-stripped files, bug #252098
+	sed -i Makefile \
+		-e 's:$(LIBS) $(OBJ) $(SYSTRAYOBJ):$(OBJ) $(SYSTRAYOBJ) $(LIBS):' \
+		-e 's:strip:true:g' \
+		|| die
+	# fix underlinking, bug #369591
+	sed -i Makefile.common \
+		-e '/^LIBS/s:).*: x11):' \
+		-e '/^INC/s:).*: x11):' \
+		|| die
+}
+
+src_compile() {
+	emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+}
+
+src_install() {
+	dobin trayer
+	doman trayer.1
+	einstalldocs
+}
diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild
new file mode 100644
index 000000000000..ad5fb8df846f
--- /dev/null
+++ b/x11-misc/trayer/trayer-1.0-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
+HOMEPAGE="http://home.gna.org/fvwm-crystal/"
+SRC_URI="http://download.gna.org/fvwm-crystal/trayer/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
+	"${FILESDIR}"/${P}-dont-include-libXmu.patch
+	"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
+)
+
+src_compile() {
+	emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+}
+
+src_install() {
+	dobin trayer
+	doman trayer.1
+	einstalldocs
+}