Re: [gentoo-dev] [PATCH 8/9] ruby-ng-gnome2.eclass: fold common all_ruby_prepare

2020-02-15 Thread Michał Górny
On Sat, 2020-02-15 at 21:18 +0900, Naohiro Aota wrote:
> Signed-off-by: Naohiro Aota 
> ---
>  eclass/ruby-ng-gnome2.eclass | 22 ++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass
> index 619a02d0d1d7..4220dc9f2092 100644
> --- a/eclass/ruby-ng-gnome2.eclass
> +++ b/eclass/ruby-ng-gnome2.eclass
> @@ -47,6 +47,28 @@ HOMEPAGE="https://ruby-gnome2.osdn.jp/;
>  LICENSE="LGPL-2.1+"
>  SLOT="0"
>  
> +ruby-ng-gnome2_all_ruby_prepare() {
> + # Avoid compilation of dependencies during test.
> + if [ -e test/run-test.rb ]; then

Don't use [.

> + sed -i -e '/system(/s/which make/true/' test/run-test.rb || die
> + fi
> +
> + # work on top directory
> + pushd .. >/dev/null

|| die

> +
> + # Avoid native installer
> + if [ -e glib2/lib/mkmf-gnome.rb ]; then

Don't use [.

> + sed -i -e '/native-package-installer/ s:^:#:' \
> + -e '/^setup_homebrew/ s:^:#:' glib2/lib/mkmf-gnome.rb 
> || die
> + fi
> +
> + popd >/dev/null

|| die

> +}
> +
> +all_ruby_prepare() {
> + ruby-ng-gnome2_all_ruby_prepare
> +}
> +
>  # @FUNCTION: each_ruby_configure
>  # @DESCRIPTION:
>  # Run the configure script in the subbinding for each specific ruby target.

-- 
Best regards,
Michał Górny



signature.asc
Description: This is a digitally signed message part


[gentoo-dev] [PATCH 8/9] ruby-ng-gnome2.eclass: fold common all_ruby_prepare

2020-02-15 Thread Naohiro Aota
Signed-off-by: Naohiro Aota 
---
 eclass/ruby-ng-gnome2.eclass | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass
index 619a02d0d1d7..4220dc9f2092 100644
--- a/eclass/ruby-ng-gnome2.eclass
+++ b/eclass/ruby-ng-gnome2.eclass
@@ -47,6 +47,28 @@ HOMEPAGE="https://ruby-gnome2.osdn.jp/;
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+ruby-ng-gnome2_all_ruby_prepare() {
+   # Avoid compilation of dependencies during test.
+   if [ -e test/run-test.rb ]; then
+   sed -i -e '/system(/s/which make/true/' test/run-test.rb || die
+   fi
+
+   # work on top directory
+   pushd .. >/dev/null
+
+   # Avoid native installer
+   if [ -e glib2/lib/mkmf-gnome.rb ]; then
+   sed -i -e '/native-package-installer/ s:^:#:' \
+   -e '/^setup_homebrew/ s:^:#:' glib2/lib/mkmf-gnome.rb 
|| die
+   fi
+
+   popd >/dev/null
+}
+
+all_ruby_prepare() {
+   ruby-ng-gnome2_all_ruby_prepare
+}
+
 # @FUNCTION: each_ruby_configure
 # @DESCRIPTION:
 # Run the configure script in the subbinding for each specific ruby target.
-- 
2.25.0