net-wireless/lorcon: add ruby21, bug 589418

Package-Manager: portage-2.3.0

diff --git a/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild b/net-wireless/lorcon/lorcon-0.0_p20150109.ebuild
index 1a9622c59bb39ba8d8c1f71fb109dbf13e24e6bd..b507490492c15f67e0604995b342631bfe7381f9 100644 (file)
--- 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 f91f561b6a118c706abe26d36b631b139d2e21d9..356a067576050d3b6d94c44477cf01981147b224 100644 (file)
--- 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() {