Modernize ebuild; drop old, respect CC and CFLAGS, bug #428598

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 22 insertions, 91 deletions

diff --git a/x11-plugins/gkrellweather/ChangeLog b/x11-plugins/gkrellweather/ChangeLog
index e2edfa5369b6..fa6bf12398a8 100644
--- a/x11-plugins/gkrellweather/ChangeLog
+++ b/x11-plugins/gkrellweather/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/gkrellweather
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/ChangeLog,v 1.34 2013/06/01 11:38:58 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/ChangeLog,v 1.35 2015/03/20 16:05:47 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -gkrellweather-2.0.7-r1.ebuild,
+  -gkrellweather-2.0.7-r2.ebuild, gkrellweather-2.0.8.ebuild, metadata.xml:
+  Modernize ebuild; drop old, respect CC and CFLAGS, bug #428598
 
   01 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #144305
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.7-r1.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.7-r1.ebuild
deleted file mode 100644
index 47264c96c241..000000000000
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.7-r1.ebuild,v 1.2 2010/08/25 00:44:14 lack Exp $
-
-EAPI=3
-inherit gkrellm-plugin
-
-IUSE=""
-DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weather
-info"
-SRC_URI="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/${P}.tgz"
-HOMEPAGE="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/index.html"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-	>=net-misc/wget-1.5.3
-	!x11-misc/bbweather"
-DEPEND=">=sys-apps/sed-4.0.5"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Respect-LDFLAGS.patch"
-	sed -i \
-		-e "s:/usr/share/gkrellm:/usr/bin:g" \
-		gkrellweather.c || die
-}
-
-src_compile() {
-	emake PREFIX=/usr || die
-}
-
-src_install () {
-	gkrellm-plugin_src_install
-
-	exeinto /usr/bin
-	doexe GrabWeather
-}
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.7-r2.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.7-r2.ebuild
deleted file mode 100644
index f63333f25812..000000000000
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.7-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.7-r2.ebuild,v 1.1 2010/08/25 00:44:14 lack Exp $
-
-EAPI=3
-inherit gkrellm-plugin
-
-IUSE=""
-DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weather
-info"
-SRC_URI="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/${P}.tgz"
-HOMEPAGE="http://kmlinux.fjfi.cvut.cz/~makovick/gkrellm/index.html"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-	>=net-misc/wget-1.5.3"
-DEPEND=">=sys-apps/sed-4.0.5"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-Respect-LDFLAGS.patch"
-	epatch "${FILESDIR}/${P}-Move-GrabWeather.patch"
-}
-
-src_compile() {
-	emake PREFIX=/usr || die
-}
-
-src_install () {
-	gkrellm-plugin_src_install
-
-	exeinto /usr/libexec/gkrellweather
-	doexe GrabWeather
-}
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild
index 31b8fe7f5593..9a700e500170 100644
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild,v 1.1 2011/05/10 18:20:14 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellweather/gkrellweather-2.0.8.ebuild,v 1.2 2015/03/20 16:05:47 jlec Exp $
 
-EAPI=3
-inherit gkrellm-plugin
+EAPI=5
 
-IUSE=""
-DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weather
-info"
-SRC_URI="http://sites.google.com/site/makovick/projects/${P}.tgz"
+inherit gkrellm-plugin toolchain-funcs
+
+DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weatherinfo"
 HOMEPAGE="http://sites.google.com/site/makovick/gkrellm-plugins"
+SRC_URI="http://sites.google.com/site/makovick/projects/${P}.tgz"
 
 SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.6.1
+RDEPEND="
+	>=dev-lang/perl-5.6.1
 	>=net-misc/wget-1.5.3"
 DEPEND=">=sys-apps/sed-4.0.5"
-
+pkg_setup() { :; }
 src_prepare() {
-	epatch "${FILESDIR}/${P}-Respect-LDFLAGS.patch"
-	epatch "${FILESDIR}/${P}-Move-GrabWeather.patch"
+	epatch \
+		"${FILESDIR}"/${P}-Respect-LDFLAGS.patch \
+		"${FILESDIR}"/${P}-Move-GrabWeather.patch
 }
 
 src_compile() {
-	emake PREFIX=/usr || die
+	emake PREFIX=/usr CC=$(tc-getCC) CFLAGS="${CFLAGS}"
 }
 
 src_install () {
diff --git a/x11-plugins/gkrellweather/metadata.xml b/x11-plugins/gkrellweather/metadata.xml
index a03f5d8b381b..ca551894a934 100644
--- a/x11-plugins/gkrellweather/metadata.xml
+++ b/x11-plugins/gkrellweather/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-dock</herd>
+  <herd>desktop-dock</herd>
 </pkgmetadata>