From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ED0A21382C5 for ; Thu, 4 Jan 2018 09:17:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7F66E089C; Thu, 4 Jan 2018 09:17:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 821C2E089C for ; Thu, 4 Jan 2018 09:17:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8793335C36 for ; Thu, 4 Jan 2018 09:17:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B5791BF for ; Thu, 4 Jan 2018 09:17:07 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1515057371.a573eb974e9204b58c7d2395e957de76a2f525ba.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellkam/, x11-plugins/gkrellkam/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild X-VCS-Directories: x11-plugins/gkrellkam/files/ x11-plugins/gkrellkam/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: a573eb974e9204b58c7d2395e957de76a2f525ba X-VCS-Branch: master Date: Thu, 4 Jan 2018 09:17:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c4382266-6cec-4b0e-b5e8-32302367c66b X-Archives-Hash: 10f3bd7441c4a9a574cd63f6d04c6609 commit: a573eb974e9204b58c7d2395e957de76a2f525ba Author: David Seifert gentoo org> AuthorDate: Wed Jan 3 22:34:33 2018 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Jan 4 09:16:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a573eb97 x11-plugins/gkrellkam: Eclass update Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../gkrellkam/files/gkrellkam-2.0.0-makefile.patch | 4 ++-- x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild | 27 +++++++++++----------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch index 83178b4b0ff..f897f4102b6 100644 --- a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch +++ b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile 2002-10-23 18:36:20.000000000 +0200 -+++ Makefile_new 2013-03-16 14:02:42.979029588 +0100 +--- a/Makefile ++++ b/Makefile @@ -12,10 +12,10 @@ # This should point to the GKrellM headers GKRELLM_HDRS = /usr/include diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild index ae3ad974d5d..bbb98a01715 100644 --- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild +++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild @@ -1,35 +1,36 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" -inherit eutils gkrellm-plugin toolchain-funcs +EAPI=6 + +inherit gkrellm-plugin toolchain-funcs MY_P=${P/-/_} DESCRIPTION="an Image-Watcher-Plugin for GKrellM2" SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz" HOMEPAGE="http://gkrellkam.sourceforge.net" + LICENSE="GPL-2" SLOT="0" -IUSE="" KEYWORDS="x86 ppc sparc alpha amd64" +IUSE="" -RDEPEND="net-misc/wget - app-admin/gkrellm[X]" +RDEPEND=" + app-admin/gkrellm:2[X] + net-misc/wget" DEPEND="${RDEPEND}" -PLUGIN_SO=gkrellkam2.so -PLUGIN_DOCS="example.list" - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch -} +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) src_compile() { emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" } -src_install () { +src_install() { + local PLUGIN_SO=( ${PN}2$(get_modname) ) + local PLUGIN_DOCS=( example.list ) + gkrellm-plugin_src_install doman gkrellkam-list.5 }