[gentoo-commits] repo/gentoo:master commit in: net-wireless/lorcon/

[Hans de Graaff]

commit:     7c8761facfff957141d170ffa05159c3218228fa
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  6 14:51:01 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 15:24:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c8761fa

net-wireless/lorcon: add ruby21, bug 589418

Package-Manager: portage-2.3.0

 net-wireless/lorcon/lorcon-0.0_p20150109.ebuild | 7 ++++---
 net-wireless/lorcon/lorcon-9999.ebuild          | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild 
b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index 1a9622c..b507490 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-USE_RUBY="ruby20"
+USE_RUBY="ruby20 ruby21"
 RUBY_OPTIONAL=yes
 
 inherit distutils-r1 ruby-ng
@@ -91,8 +91,9 @@ each_ruby_compile() {
        sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon 
-L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
        "${RUBY}" -C ruby-lorcon extconf.rb || die
        sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
-       sed -i "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" 
ruby-lorcon/Makefile || die
-       emake -C ruby-lorcon
+       sed -i -e "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" \
+               -e "s#-Wl,--no-undefined##" ruby-lorcon/Makefile || die
+       emake V=1 -C ruby-lorcon
 }
 
 each_ruby_install() {

diff --git a/net-wireless/lorcon/lorcon-9999.ebuild 
b/net-wireless/lorcon/lorcon-9999.ebuild
index f91f561..356a067 100644
--- a/net-wireless/lorcon/lorcon-9999.ebuild
+++ b/net-wireless/lorcon/lorcon-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-USE_RUBY="ruby20"
+USE_RUBY="ruby20 ruby21"
 RUBY_OPTIONAL=yes
 
 inherit distutils-r1 ruby-ng
@@ -91,8 +91,9 @@ each_ruby_compile() {
        sed -i "s#-I/usr/include/lorcon2#-I${WORKDIR}/${P}/ruby-lorcon 
-L${WORKDIR}/${P}/.libs#" ruby-lorcon/extconf.rb
        "${RUBY}" -C ruby-lorcon extconf.rb || die
        sed -i 's#<lorcon2/lorcon.h>#"../lorcon.h"#' ruby-lorcon/Lorcon2.h
-       sed -i "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" 
ruby-lorcon/Makefile || die
-       emake -C ruby-lorcon
+       sed -i -e "s#-L\.#-L. -L${WORKDIR}/${P}/.libs -lorcon2 #g" \
+               -e "s#-Wl,--no-undefined##" ruby-lorcon/Makefile || die
+       emake V=1 -C ruby-lorcon
 }
 
 each_ruby_install() {