Merge updates from master

10 files changed, 189 insertions, 67 deletions

diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch
new file mode 100644
index 000000000000..a5fcabfea07b
--- /dev/null
+++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile	2003-09-20 13:02:15.000000000 +0200
++++ b/Makefile_new	2013-03-16 14:38:19.122375762 +0100
+@@ -9,8 +9,8 @@
+ 
+ DISTFILES=gkrellm_radio.c radio.c radio.h videodev.h README Makefile CHANGES
+ 
+-CC=gcc
+-LDFLAGS=
++CC=$(CC)
++LDFLAGS=$(LDFLAGS)
+ OBJS=gkrellm_radio.o radio.o
+ PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
+ INSTALL = install -c
+@@ -35,7 +35,7 @@
+ export PACKAGE LOCALEDIR
+ 
+ radio.so: $(OBJS)
+-	$(CC) -shared -Wl -o radio.so $(OBJS) $(LDFLAGS) 
++	$(CC) -shared -o radio.so $(OBJS) $(LDFLAGS) 
+ 	(cd po && ${MAKE} all )
+ 
+ %.o: %.c
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
index b1e09da0c03d..f3a86c9d01bf 100644
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
@@ -1,25 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit gkrellm-plugin
+EAPI=6
+inherit gkrellm-plugin toolchain-funcs
 
-IUSE="lirc"
-
-S=${WORKDIR}/${PN}
 DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php"
 
 DEPEND="lirc? ( app-misc/lirc )"
+RDEPEND="${DEPEND}
+	app-admin/gkrellm[X]
+"
 
+IUSE="lirc"
 SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="ppc sparc x86"
+KEYWORDS="~amd64 ppc sparc x86"
+
+PLUGIN_SO="radio.so"
+S="${WORKDIR}/${PN}"
 
-PLUGIN_SO=radio.so
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
 	use lirc && myconf="${myconf} WITH_LIRC=1"
-	emake ${myconf} || die
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
 }
diff --git a/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch
new file mode 100644
index 000000000000..92764a9b32af
--- /dev/null
+++ b/x11-plugins/gkrellm-trayicons/files/gkrellm-trayicons-1.03-ldflags.patch
@@ -0,0 +1,25 @@
+--- a/Makefile	2003-11-26 00:27:29.000000000 +0100
++++ b/Makefile_new	2013-03-15 21:36:05.331857288 +0100
+@@ -6,19 +6,18 @@
+ GKRELLM_INCLUDE = -I$(PREFIX)/include
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+-FLAGS = -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+-CFLAGS ?= -O -g
++FLAGS = -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ CFLAGS += $(FLAGS)
+ CFLAGS += -DVERSION=\"$(VERSION)\"
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+-CC ?= gcc
++CC = $(CC)
+ INSTALL = install -c
+ INSTALL_PROGRAM = $(INSTALL) -s
+ OBJS = trayicons.o
+ 
+ trayicons.so: $(OBJS)
+-	$(CC) $(FLAGS) $(OBJS) -o trayicons.so $(LIBS) $(LFLAGS)
++	$(CC) $(FLAGS) $(LDFLAGS) $(OBJS) -o trayicons.so $(LIBS) $(LFLAGS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03.ebuild b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03.ebuild
index 16dd06672109..2d1437b0734f 100644
--- a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03.ebuild
+++ b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03.ebuild
@@ -1,16 +1,23 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit gkrellm-plugin
+EAPI=6
+inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="Configurable Tray Icons for GKrellM"
-HOMEPAGE="http://tripie.sweb.cz/gkrellm/trayicons/"
-SRC_URI="http://tripie.sweb.cz/gkrellm/trayicons/dist/${P}.tar.gz"
+HOMEPAGE="http://gkrellm.srcbox.net/Plugins.html"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
+
 PLUGIN_SO=trayicons.so
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-Respect-LDFLAGS.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-Respect-LDFLAGS.patch
deleted file mode 100644
index 1d711fb74946..000000000000
--- a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-Respect-LDFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7a9821d..db02cad 100644
---- a/Makefile
-+++ b/Makefile
-@@ -18,6 +18,8 @@ FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
- LIBS = $(GTK_LIB)
- LFLAGS = -shared
- 
-+LFLAGS += $(LDFLAGS)
-+
- OBJS = volume.o mixer.o oss_mixer.o
- 
- ifeq ($(enable_alsa),1)
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch
new file mode 100644
index 000000000000..23d822ca7fc8
--- /dev/null
+++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch
@@ -0,0 +1,57 @@
+--- a/Makefile	2004-08-19 22:07:27.000000000 +0200
++++ b/Makefile_new	2013-03-16 21:16:03.919755685 +0100
+@@ -3,7 +3,7 @@
+ PACKAGE ?= gkrellm-volume
+ LOCALEDIR ?= /usr/local/share/locale
+ 
+-FLAGS += -DPACKAGE="\"$(PACKAGE)\"" 
++CFLAGS += -DPACKAGE="\"$(PACKAGE)\"" 
+ export PACKAGE LOCALEDIR
+ 
+ GTK_CONFIG = pkg-config gtk+-2.0
+@@ -14,31 +14,32 @@
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
++CFLAGS := $(CFLAGS) -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
++LFLAGS += $(LDFLAGS)
+ 
+ OBJS = volume.o mixer.o oss_mixer.o
+ 
+ ifeq ($(enable_alsa),1)
+-  FLAGS += -DALSA
++  CFLAGS += -DALSA
+   LIBS += -lasound
+   OBJS += alsa_mixer.o 
+ endif
+ 
+ ifeq ($(enable_nls),1)
+-    FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
++    CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
+     export enable_nls
+ endif
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ INSTALL = install -c
+ INSTALL_PROGRAM = $(INSTALL) -s
+ 
+ all:	volume.so
+ 	(cd po && ${MAKE} all )
+-
++	
+ volume.so: $(OBJS)
+ 	$(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS)
+ 
+@@ -50,5 +51,4 @@
+ 	(cd po && ${MAKE} install)
+ 	$(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR)
+ 
+-%.c.o: %.c
+-
++%.c.o: %.c
+\ No newline at end of file
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
index a13bd83b9392..e9b82fd19019 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="3"
-inherit gkrellm-plugin eutils
+EAPI=6
+inherit gkrellm-plugin toolchain-funcs
 
-IUSE="alsa"
 DESCRIPTION="A mixer control plugin for gkrellm"
 HOMEPAGE="http://gkrellm.luon.net/volume.php"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
@@ -13,20 +12,24 @@ SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+IUSE="alsa"
 
 DEPEND="alsa? ( media-libs/alsa-lib )"
+RDEPEND="${DEPEND}
+	app-admin/gkrellm[X]
+"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
-PLUGIN_SO=volume.so
+PLUGIN_SO="volume.so"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-reenable.patch"
-	epatch "${FILESDIR}/${P}-Respect-LDFLAGS.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-reenable.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+)
 
 src_compile() {
 	local myconf=""
 	use alsa && myconf="${myconf} enable_alsa=1"
-	make ${myconf} || die "make failed"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" "${myconf}"
 }
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild
deleted file mode 100644
index 615e6f19f52e..000000000000
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit gkrellm-plugin
-
-IUSE="alsa"
-DESCRIPTION="A mixer control plugin for gkrellm"
-HOMEPAGE="http://gkrellm.luon.net/volume.php"
-SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 ppc sparc x86"
-
-DEPEND="alsa? ( media-libs/alsa-lib )"
-
-S=${WORKDIR}/${PN}
-
-PLUGIN_SO=volume.so
-
-src_compile() {
-	local myconf=""
-	use alsa && myconf="${myconf} enable_alsa=1"
-	make ${myconf} || die "make failed"
-}
diff --git a/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
new file mode 100644
index 000000000000..4f4bd0e403f3
--- /dev/null
+++ b/x11-plugins/gkrellmoon/files/gkrellmoon-0.6-makefile.patch
@@ -0,0 +1,34 @@
+--- a/Makefile	2002-12-11 04:36:06.000000000 +0100
++++ b/Makefile_new	2013-03-16 13:04:00.963512605 +0100
+@@ -4,23 +4,26 @@
+ INSTALLDIR = ${DESTDIR}/usr/lib/gkrellm2/plugins
+ 
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE)
++FLAGS = -fPIC $(GTK_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
++CC = $(CC)
+ 
+ OBJS = gkrellmoon.o MoonRise.o CalcEphem.o Moon.o
+ 
++all: gkrellmoon.so
++
++%.o: %.c
++	$(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c -o $@ $<
++
+ gkrellmoon.so: $(OBJS)
+-	$(CC) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(FLAGS) $(LDFLAGS) $(OBJS) -o gkrellmoon.so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+ 
+ gkrellmoon.o: gkrellmoon.c moon_60.xpm
+ 
+-# %.o: %.c
+-
+ install: gkrellmoon.so
+ 	install -c -s -m 644 gkrellmoon.so $(INSTALLDIR)
diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild
index 19646d53e6f2..8333fd6c7846 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit gkrellm-plugin
+EAPI=6
+inherit gkrellm-plugin toolchain-funcs
 
 IUSE=""
 DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
@@ -10,13 +11,20 @@ SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 HOMEPAGE="http://gkrellmoon.sourceforge.net/"
 
 DEPEND="media-libs/imlib2"
+RDEPEND="${DEPEND}"
 
 SLOT="2"
 LICENSE="GPL-2"
+
 KEYWORDS="alpha amd64 ppc sparc x86"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_prepare() {
+	default
 	sed -i -e '/^#include <stdio.h>/a#include <string.h>' CalcEphem.h
 }
+
+src_compile() {
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}