[gentoo-commits] repo/gentoo:master commit in: sys-libs/libsmbios/

[Lars Wendler]

commit:     28357a789bbe994addd26906770a5ecc4067c53a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 16:15:46 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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/