From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7698659CA3 for ; Mon, 14 Mar 2016 16:16:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC89A21C003; Mon, 14 Mar 2016 16:16:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7DEDB21C003 for ; Mon, 14 Mar 2016 16:16:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 62346340C69 for ; Mon, 14 Mar 2016 16:16:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1010C1F2 for ; Mon, 14 Mar 2016 16:16:35 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1457972191.28357a789bbe994addd26906770a5ecc4067c53a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libsmbios/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild sys-libs/libsmbios/libsmbios-2.3.0.ebuild X-VCS-Directories: sys-libs/libsmbios/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 28357a789bbe994addd26906770a5ecc4067c53a X-VCS-Branch: master Date: Mon, 14 Mar 2016 16:16:35 +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: 011febdd-8d1d-4c98-93b7-da6897b7a802 X-Archives-Hash: 437f06a503b2744c478a33692dcacd5d commit: 28357a789bbe994addd26906770a5ecc4067c53a Author: Lars Wendler gentoo org> AuthorDate: Mon Mar 14 16:15:46 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Mar 14 16:16:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28357a78 sys-libs/libsmbios: Don't build yum-plugin ever (fixes bug #577402). Use some more python scripts via python-exec wrapper. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> .../{libsmbios-2.3.0.ebuild => libsmbios-2.3.0-r1.ebuild} | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys-libs/libsmbios/libsmbios-2.3.0.ebuild b/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild similarity index 83% rename from sys-libs/libsmbios/libsmbios-2.3.0.ebuild rename to sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild index 8cceca9..495b64e 100644 --- a/sys-libs/libsmbios/libsmbios-2.3.0.ebuild +++ b/sys-libs/libsmbios/libsmbios-2.3.0-r1.ebuild @@ -43,6 +43,9 @@ src_prepare() { >pkg/py-compile + # Don't build yum-plugin - we don't need it + sed '/yum-plugin/d' -i Makefile.am || die + eautoreconf } @@ -61,14 +64,12 @@ src_configure() { src_install() { emake install DESTDIR="${D}" - rm -r "${D}etc/yum" || die - rm -r "${D}usr/lib/yum-plugins" || die if ! use python ; then - rmdir "${D}libsmbios_c" "${D}usr/share/smbios-utils" || die - rm -r "${D}etc" || die + rmdir "${ED%/}/libsmbios_c" "${ED%/}/usr/share/smbios-utils" || die + rm -r "${ED%/}/etc" || die else local python_scriptroot="/usr/sbin" - python_doscript "${D}"/usr/sbin/smbios-{lcd-brightness,passwd,rbu-bios-update,sys-info,token-ctl,wakeup-ctl,wireless-ctl} + python_doscript "${ED%/}"/usr/sbin/smbios-{{keyboard,thermal,token,wakeup,wireless}-ctl,lcd-brightness,passwd,rbu-bios-update,sys-info} fi insinto /usr/include/