[gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods
www-servers/apache-2.2 has been removed in 2019.
---
eclass/depend.apache.eclass | 30 ++
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 4dc3f68daabc..4d1ca573611b 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -109,7 +109,7 @@ APACHE2_DEPEND="=www-servers/apache-2*"
# @ECLASS_VARIABLE: APACHE2_2_DEPEND
# @DESCRIPTION:
-# Dependencies for Apache 2.2.x
+# Dependencies for Apache 2.2.x. Deprecated and removed in EAPI 8.
APACHE2_2_DEPEND="=www-servers/apache-2.2*"
# @ECLASS_VARIABLE: APACHE2_4_DEPEND
@@ -215,10 +215,17 @@ want_apache2() {
want_apache2_2() {
debug-print-function $FUNCNAME $*
- local myiuse=${1:-apache2}
- IUSE="${IUSE} ${myiuse}"
- DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
- RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ case ${EAPI:-0} in
+ 6|7)
+ local myiuse=${1:-apache2}
+ IUSE="${IUSE} ${myiuse}"
+ DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ ;;
+ *)
+ errror "want-apache2_2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: want_apache2_4
@@ -263,9 +270,16 @@ need_apache2() {
need_apache2_2() {
debug-print-function $FUNCNAME $*
- DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
- RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
- _init_apache2
+ case ${EAPI:-0} in
+ 6|7)
+ DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
+ RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
+ _init_apache2
+ ;;
+ *)
+ error "need_apache2-2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: need_apache2_4
--
2.41.0
[gentoo-dev] [PATCH 4/4] www-apache/mod_xsendfile: update EAPI 7 -> 8
Signed-off-by: Hans de Graaff
---
.../mod_xsendfile-1.0_beta1-r3.ebuild | 28 +++
1 file changed, 28 insertions(+)
create mode 100644 www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
diff --git a/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
new file mode 100644
index ..b70dfc8ac59d
--- /dev/null
+++ b/www-apache/mod_xsendfile/mod_xsendfile-1.0_beta1-r3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit apache-module
+
+MY_PV="1.0b1"
+DESCRIPTION="Apache module that processes X-SENDFILE headers registered by the
output handler"
+HOMEPAGE="https://tn123.org/mod_xsendfile/;
+SRC_URI="https://tn123.org/mod_xsendfile/beta/${PN}-${MY_PV}.tar.gz;
+S="${WORKDIR}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux"
+
+need_apache2
+
+src_install() {
+ APACHE2_MOD_CONF="50_${PN}"
+ APACHE2_MOD_DEFINE="XSENDFILE"
+ APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+
+ apache-module_src_install
+
+ dodoc docs/Readme.html
+}
--
2.41.0
[gentoo-dev] [PATCH 3/4] eclass/apache-module.eclass: enable EAPI 8
Closes: https://bugs.gentoo.org/914200
---
eclass/apache-module.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index 8074aff5ddcb..5a84ffedf71a 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -4,7 +4,7 @@
# @ECLASS: apache-module.eclass
# @MAINTAINER:
# apache-b...@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: Provides a common set of functions for apache modules
# @DESCRIPTION:
# This eclass handles apache modules in a sane way.
@@ -45,7 +45,7 @@
# @CODE
case ${EAPI} in
- 6|7) ;;
+ 6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
--
2.41.0
[gentoo-dev] [PATCH 2/4] eclass/depend.apache: enable EAPI 8
Bug: https://bugs.gentoo.org/914200
---
eclass/depend.apache.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 4d1ca573611b..8f0469931d2c 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -4,7 +4,7 @@
# @ECLASS: depend.apache.eclass
# @MAINTAINER:
# apache-b...@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: Functions to allow ebuilds to depend on apache
# @DESCRIPTION:
# This eclass handles depending on apache in a sane way and provides
information
@@ -41,7 +41,7 @@
# @CODE
case ${EAPI:-0} in
- 6|7)
+ 6|7|8)
;;
*)
die "EAPI=${EAPI} is not supported by depend.apache.eclass"
--
2.41.0
[gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods
www-servers/apache-2.2 has been removed in 2019.
---
eclass/depend.apache.eclass | 30 ++
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 4dc3f68daabc..4d1ca573611b 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -109,7 +109,7 @@ APACHE2_DEPEND="=www-servers/apache-2*"
# @ECLASS_VARIABLE: APACHE2_2_DEPEND
# @DESCRIPTION:
-# Dependencies for Apache 2.2.x
+# Dependencies for Apache 2.2.x. Deprecated and removed in EAPI 8.
APACHE2_2_DEPEND="=www-servers/apache-2.2*"
# @ECLASS_VARIABLE: APACHE2_4_DEPEND
@@ -215,10 +215,17 @@ want_apache2() {
want_apache2_2() {
debug-print-function $FUNCNAME $*
- local myiuse=${1:-apache2}
- IUSE="${IUSE} ${myiuse}"
- DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
- RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ case ${EAPI:-0} in
+ 6|7)
+ local myiuse=${1:-apache2}
+ IUSE="${IUSE} ${myiuse}"
+ DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )"
+ ;;
+ *)
+ errror "want-apache2_2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: want_apache2_4
@@ -263,9 +270,16 @@ need_apache2() {
need_apache2_2() {
debug-print-function $FUNCNAME $*
- DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
- RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
- _init_apache2
+ case ${EAPI:-0} in
+ 6|7)
+ DEPEND="${DEPEND} ${APACHE2_2_DEPEND}"
+ RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}"
+ _init_apache2
+ ;;
+ *)
+ error "need_apache2-2 is no longer supported in EAPI 8"
+ ;;
+ esac
}
# @FUNCTION: need_apache2_4
--
2.41.0
[gentoo-dev] [PATCH] eclass/depend.apache: drop support for EAPI 0-5
Signed-off-by: Hans de Graaff
---
eclass/depend.apache.eclass | 60 -
1 file changed, 12 insertions(+), 48 deletions(-)
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 51410265bbc5..4dc3f68daabc 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: depend.apache.eclass
# @MAINTAINER:
# apache-b...@gentoo.org
-# @SUPPORTED_EAPIS: 0 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 6 7
# @BLURB: Functions to allow ebuilds to depend on apache
# @DESCRIPTION:
# This eclass handles depending on apache in a sane way and provides
information
@@ -41,9 +41,6 @@
# @CODE
case ${EAPI:-0} in
- 0|2|3|4|5)
- inherit multilib
- ;;
6|7)
;;
*)
@@ -78,8 +75,7 @@ esac
# @ECLASS_VARIABLE: APACHE_BASEDIR
# @DESCRIPTION:
# Path to the server root directory.
-# This variable is set by the want/need_apache functions (EAPI=0 through 5)
-# or depend.apache_pkg_setup (EAPI=6 and later).
+# This variable is set by depend.apache_pkg_setup.
# @ECLASS_VARIABLE: APACHE_CONFDIR
# @DESCRIPTION:
@@ -99,8 +95,7 @@ esac
# @ECLASS_VARIABLE: APACHE_MODULESDIR
# @DESCRIPTION:
# Path where we install modules.
-# This variable is set by the want/need_apache functions (EAPI=0 through 5)
-# or depend.apache_pkg_setup (EAPI=6 and later).
+# This variable is set by depend.apache_pkg_setup.
# @ECLASS_VARIABLE: APACHE_DEPEND
# @DESCRIPTION:
@@ -140,12 +135,6 @@ _init_apache2() {
APACHE_CONFDIR="/etc/apache2"
APACHE_MODULES_CONFDIR="${APACHE_CONFDIR}/modules.d"
APACHE_VHOSTS_CONFDIR="${APACHE_CONFDIR}/vhosts.d"
-
- case ${EAPI:-0} in
- 0|2|3|4|5)
- _init_apache2_late
- ;;
- esac
}
_init_apache2_late() {
@@ -177,27 +166,14 @@ depend.apache_pkg_setup() {
local myiuse=${1:-apache2}
- case ${EAPI:-0} in
- 0|2|3|4|5)
- if has ${myiuse} ${IUSE}; then
- if use ${myiuse}; then
- _init_apache2
- else
- _init_no_apache
- fi
- fi
- ;;
- *)
- if in_iuse ${myiuse}; then
- if use ${myiuse}; then
- _init_apache2
- _init_apache2_late
- else
- _init_no_apache
- fi
- fi
- ;;
- esac
+ if in_iuse ${myiuse}; then
+ if use ${myiuse}; then
+ _init_apache2
+ _init_apache2_late
+ else
+ _init_no_apache
+ fi
+ fi
}
# @FUNCTION: want_apache
@@ -327,12 +303,6 @@ has_apache() {
has_apache_threads() {
debug-print-function $FUNCNAME $*
- case ${EAPI:-0} in
- 0|1)
- die "depend.apache.eclass: has_apache_threads is not
supported for EAPI=${EAPI:-0}"
- ;;
- esac
-
if ! has_version 'www-servers/apache[threads]'; then
return
fi
@@ -356,12 +326,6 @@ has_apache_threads() {
has_apache_threads_in() {
debug-print-function $FUNCNAME $*
- case ${EAPI:-0} in
- 0|1)
- die "depend.apache.eclass: has_apache_threads_in is not
supported for EAPI=${EAPI:-0}"
- ;;
- esac
-
if ! has_version 'www-servers/apache[threads]'; then
return
fi
--
2.41.0
[gentoo-dev] Last rites: dev-ruby/kirbybase
# Hans de Graaff (2023-09-23) # ruby31-only package. No reverse dependencies. Archived by # upstream. Last release in 2012. Removal on 2023-10-23. dev-ruby/kirbybase signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/amqp
# Hans de Graaff (2023-09-23) # ruby31-only packages. No reverse dependencies. Discontinued by # upstream who recommends using dev-ruby/bunny instead. Removal on # 2023-10-23. dev-ruby/amqp signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: app-dicts/prime-dict
# Hans de Graaff (2023-09-23) # ruby30-only package. Upstream HOMEPAGE and SRC_URI are gone. Last # release at least 8 years ago. Bug #909023. Removal on 2024-10-23. app-dicts/prime-dict signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/ruby-elf
# Hans de Graaff (2023-09-15) # Not compatible with ruby31, no reverse dependencies. Last release in # 2013. Masked for removal on 2023-10-15. dev-ruby/ruby-elf signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/state_machine
# Hans de Graaff (2023-08-26) # Does not compile with Ruby 3.2. Last release 10 years ago. No activity # upstream since. No reverse dependencies. Masked for removal on # 2023-09-26. dev-ruby/state_machine signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/totoridipjp
# Hans de Graaff (2023-08-26) # The totori.dip.jp website is no longer available. Last release in # 2015. No reverse dependencies. Masked for removal on 2023-09-26. dev-ruby/totoridipjp signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/safe_yaml
# Hans de Graaff (2023-08-19) # ruby30-only package without any reverse dependencies. Use # dev-ruby/psych if you want to safely load YAML files. # Masked for removal on 2023-09-19 dev-ruby/safe_yaml signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: ruby 3.0
# Hans de Graaff (2023-08-19) # Ruby 3.0 is not compatible with OpenSSL 3 and consequently will be # masked earlier than its upstream EOL date. Please use a newer Ruby # version instead. Masked for removal on 2023-09-19. dev-lang/ruby:3.0 signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: app-emacs/ruby-mode
# Hans de Graaff (2023-08-17) # The ruby project no longer maintains the elisp ruby-mode with the last # changed upstream 5 years ago. ruby-mode is also included in Emacs # itself, and this version is still maintained. # Masked for removal on 2023-09-17. app-emacs/ruby-mode signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/fast_xs
# Hans de Graaff (2023-07-22) # Does not compile with modern compilers. Last upstream release in # 2011. No activity upstream. No reverse dependencies. Masked for # removal on 2023-08-22. dev-ruby/fast_xs signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/hamster
# Hans de Graaff (2023-07-18) # Obsolete rubu30-only package, previously a dependency of nanoc. No # longer maintained upstream. Masked for removal on 2023-08-18. dev-ruby/hamster signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Re: [PATCH] ruby-utils.eclass: Simplify _ruby_implementation_depend
On Thu, 1970-01-01 at 00:00 +, Sam James wrote: > > Sam James writes: > > > From: konsolebox > > > > Closes: https://bugs.gentoo.org/909529 > > Signed-off-by: Sam James > > ftr, while I find the case really repetitive, I'm not sure if this > crosses the line into unreadable bash or not, so I feel on the fence. I don't have a strong preference either way. We only need to change this once a year anyway. Perhaps not having the large case statement makes the whole file a bit more readable at the expense of a more difficult expression. Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-util/cucumber-wire
# Hans de Graaff (2023-07-08) # Obsolete component for dev-util/cucumber. Discontinued upstream. # No reverse dependencies. Masked for removal on 2023-08-08. dev-util/cucumber-wire signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/annoy
# Hans de Graaff (2023-07-08) # Last release in 2010. Upstream is gone. No reverse dependencies. # Masked for removal on 2023-08-08 dev-ruby/annoy signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/c21e
# Hans de Graaff (2023-07-08) # Obsolete component for dev-util/cucumber. Discontinued upstream. # No reverse dependencies. Masked for removal on 2023-08-08. dev-ruby/c21e signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/deprecated
# Hans de Graaff (2023-07-06) # Last release in 2012. Upstream is gone. No reverse dependencies. # Masked for removal on 2023-08-06. dev-ruby/deprecated signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/inflecto
# Hans de Graaff (2023-07-04) # Discontinued by upstream. No reverse dependencies. Upstream recommends # using dry-inflector. Please file a but if you would like us to package # this. Masked for removal on 2023-08-04. dev-ruby/inflecto signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/instantiator
# Hans de Graaff (2023-07-04) # Archived by upstream. No reverse dependencies. Does not work with # ruby32. Masked for removal on 2023-08-04. dev-ruby/instantiator signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/memoize
# Hans de Graaff (2023-07-02) # Unmaintained and obsolete package. Last release 10 years ago. Upstream # advises to use dev-ruby/memoizable or dev-ruby/memoist instead. # Masked for removal on 2023-08-02. dev-ruby/memoize signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/subexec
# Hans de Graaff (2023-06-23) # Deprecated upstream, who recommends to use the Open3 method instead. # No reverse dependencies. Masked for removal on 2023-07-23. dev-ruby/subexec signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Packages up for grabs: x11-misc/lightdm-mini-greeter and x11-misc/xautolock
On Thu, 1970-01-01 at 00:00 +, Jaco Kroon wrote: > referenced bug report it looks like there isn't much "care" > for the package any more? I think it is very unlikely that new versions will be released, so the only maintenance would be fixing compilation issues or incompatibilities that may appear in the future. There was never a trigger for me to really investigate that package further, so I can't tell you much about its details. Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/trollop
# Hans de Graaff (2023-06-23) # Deprecated package. Renamed to dev-ruby/optimist by upstream. No # reverse dependencies. Masked for removal on 2023-07-23. dev-ruby/trollop signature.asc Description: This is a digitally signed message part
[gentoo-dev] Package up for grabs: app-office/unoconv
Hi, I no longer have a need for app-office/unoconv, so it is up for grabs. I've already dropped myself as maintainer. There is one open bug for it for python 3.11 compatibility. Note that upstream has deprecated unoconv and recommends using (currently unpackaged) unoserver instead: https://github.com/unoconv/unoserver/ Kind regards, Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Package up for grabs: dev-libs/gumbo
Hi, I originally added dev-libs/gumbo because it was a dependency for dev- ruby/nokogiri, but in the mean time nokogiri has bundled this package and modified it to fix various issues and better integrate it with nokogiri. Google's upstream version appears to be no longer maintained, it has been archived since 2023-02-15. This package still has some reverse dependencies: app-text/mupdf dev-perl/Alien-LibGumbo dev-qt/qt-creator mail-client/claws-mail There are no open bugs for it in Gentoo. Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Packages up for grabs: x11-misc/lightdm-mini-greeter and x11-misc/xautolock
Hi, After migrating to Wayland I no longer have a need for these X packages. I have already removed myself as maintainer. x11-misc/lightdm-mini-greeter Has no open bugs. Up-to-date with upstream. x11-misc/xautolock Has one open bug that should be addressed upstream, but upstream is pretty much dead: https://bugs.gentoo.org/634766 Kind regards, Hans signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH 01/11] ruby-ng.eclass: optimize: use pattern for old ruby impls
On Thu, 1970-01-01 at 00:00 +, Sam James wrote: > Not much improvement on a grand scale, but for dev-ruby/sinatra at > least, we get: Reviewed all patches and they look good to me. Thanks! Hans
Re: [gentoo-dev] [PATCH 10/11] ruby-ng.eclass: use shopt directly, not via estack.eclass
On Thu, 1970-01-01 at 00:00 +, Sam James wrote: > ulm points out that estack.eclass is particularly inefficient > (although > it'll get slightly better once > https://github.com/gentoo/gentoo/pull/31437 > is fixed). > > Let's just manually roll it like llvm.eclass does. It looks like that was the only use for inhering estack? If so that inherit can go too, right? Hans
Re: [gentoo-dev] [PATCH 1/2] ruby-ng.eclass: error out earlier if RUBY is unset
On Fri, 2023-04-07 at 11:14 +0100, Sam James wrote: > This might prevent an ebuild installing no files, but the main aim > here is > to give a better error message earlier on rather than the classic > "Unable to generate gemspec file". Looks good to me. Better to error out as fast as possible with a clear message. Hans signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH] ruby-single.eclass: depend on virtual/rubygems[ruby_targets_rubyNN(-)] for each impl
On Tue, 2023-04-04 at 01:02 +0100, Sam James wrote: > > - app-misc/foo (with only USE_RUBY="ruby30") using ruby-single.eclass > is queued > and fails because the installed Ruby isn't fully usable yet, > because > the eclass only guarantees dev-lang/ruby:3.0 and virtual/rubygems > is installed, > not necessarily rubygems for that interpreter. lgtm, we do the same thing for ruby-fakegem.eclass. There could still be issues with other PDEPENDs from dev-lang/ruby, perhaps we need to make a virtual/ruby that includes all the PDEPENDs as well as dev- lang/ruby and virtual/rubygems, and depend on that in cases where we need "a working ruby implementation" ? Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/allison
# Hans de Graaff (2023-04-08) # Last release in 2008. Upstream is gone. No reverse dependencies. No tests. # Removal on 2023-05-08 dev-ruby/allison signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/turbolinks, dev-ruby/turbolinks-source
# Hans de Graaff (2023-04-02) # Archived upstream since two years, meant to be used with Rails # 5.2. Continued as Turbo as part of the hotwire project in Rails. # Masked for removal on 2023-05-02 dev-ruby/turbolinks dev-ruby/turbolinks-source signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH 1/3] ruby-ng.eclass: improve error when no valid Ruby in USE_RUBY
On Wed, 2023-03-29 at 16:39 +0100, Sam James wrote: > This means we don't get confusing *DEPEND/REQUIRED_USE errors about > it being > unparseable and instead just get a straightforward die message > indicating > the problem. All three patches look good to me. Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/elasticsearch-extensions
# Hans de Graaff (2023-03-30) # Deprecated upstream and ruby27-only. Masked for removal on 2023-04- 30. dev-ruby/elasticsearch-extensions signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/certified
# Hans de Graaff (2023-03-30) # Ships a Certificate Authority bundle from 2014. Not needed on Gentoo # since we use ca-certificates. Masked for removal on 2023-04-30. dev-ruby/certified signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: www-apps/jekyll, dev-ruby/safe_yaml, dev-ruby/pathutil, dev-ruby/rb-gsl, dev-ruby/classifier-reborn
# ruby27-only package. Last release 5 years ago. Does not build with # modern C compilers. classifier-reborn depends on this package, and is # itself a dependency for the now-masked jekyll. Masked for removal on # 2023-04-30. dev-ruby/rb-gsl dev-ruby/classifier-reborn # Hans de Graaff (2023-03-30) # ruby27-only package for securily loading YAML files. No longer # maintained. Broken with newer versions of Psych which is shipped by # default in Ruby and now supports secure loading by default. Migrate to # Psych. All packages depending directly or indirectly on safe_yaml have # also been included. Masked for removal on 2023-04-30. dev-ruby/safe_yaml dev-ruby/pathutil www-apps/jekyll www-apps/jekyll-coffeescript www-apps/jekyll-sass-converter www-apps/jekyll-sitemap www-apps/jekyll-watch signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: app-text/ronn
# Hans de Graaff (2023-03-29) # ruby27-only package. app-text/ronn-ng is a drop-in replacement. # Masked for removal on 2023-04-29. app-text/ronn signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: app-admin/ec2-ami-tools
# Hans de Graaff (2023-03-29) # ruby27-only package without tests and without maintainer. Upstream # releases new versions in an unversioned zip file. This needs a # dedicated maintainer that can test this package. # Masked for removal on 2023-04-29. app-admin/ec2-ami-tools signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Last rites: dev-ruby/hiera-eyaml and dev-ruby/hiera-eyaml-gpg
On Sun, 2023-03-26 at 22:37 +, Robin H. Johnson wrote: > > So you're implying that we are now responsible to fix the tests of > every > package in our dependency tree, and you'll just remove all dependent > packages if we don't do that. My answer would be yes, especially for packages maintained by a project team and in an interpreted language. We have no compiler or other checks to fall back on other than tests. Obviously a dedicated maintainer who is using a package could determine if a package is compatible (at least for their use case) in other ways, but in this case the only other maintainer is also a project team. > And if that's the case why didn't graaff mask dev-util/aruba:0 in > addition to hiera-eyaml & hiera-eyaml-gpg? Simply because I did not get to that yet and leaf dependencies have to go first. > The fix for Aruba:0 is just tweaking the cucumber tag syntax: > "~@foo" -> "not @foo" This comment prompted me to have another look at aruba-0.6.2 because I was sure there was more work involved when I looked at this in the past, but you are right and it turns out that the dependency on rspec:2 was (no longer) correct. I have now updated the aruba-0.6.2 ebuilds and consequently unmasked hiera-eyaml again. > I'll do the better fix anyway, making hiera-eyaml use aruba:2 > instead, I > really just want better communication that we're now responsible for > the > entire deptree's tests. Using aruba:2 would be helpful here but I already looked at that a bit and the change was not trivial. It would still be the better fix. Kind regards, Hans signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Last rites: dev-ruby/hiera-eyaml and dev-ruby/hiera-eyaml-gpg
On Sun, 2023-03-26 at 21:39 +, Robin H. Johnson wrote: To start with your last question since that is the most fundamental one for me: > So do we really remove packages because a 2nd-order test-only > dependency > fails it's own tests? (aruba:0 failing tests on Ruby 3 being the only > reason I can see to remove stuff right now). Yes, if you want packages to maintained by the Ruby team then they must have working tests, and consequently the dependencies, including test dependencies, must also have them. The test suites are the only thing that makes it feasible to maintain a large number of ruby packages without actually using them. > Looking deeper, I think the CI > tests on Ruby 3.1 + Puppet7 already successfully. The Gemfile doesn't > lock in old Puppet either. > https://github.com/voxpupuli/hiera-eyaml/actions/runs/4280324437/jobs/7451960271 Yes, it looks like any working "puppet" command is fine. I've updated this to depend on either puppet-agent or puppet. Kind regards, Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/hiera-eyaml and dev-ruby/hiera-eyaml-gpg
# Hans de Graaff (2023-03-26) # Mask ruby27-only packages related to hiera-eyaml. These require a now # masked version of puppet and other obsolete ruby27-only test # dependencies. Masked for removal on 2023-04-26. dev-ruby/hiera-eyaml dev-ruby/hiera-eyaml-gpg signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH 2/2] eclass/ruby-fakegem.eclass: add support for sus test runner
On Sat, 2023-03-25 at 17:20 +0500, Anna (cybertailor) Vyalkova wrote:
>
> > +# @FUNCTION: ruby-ng_sus
> > +# @DESCRIPTION:
> > +# This is simply a wrapper around the sus-parallel command
> > (executed by $RUBY})
> > +# which also respects TEST_VERBOSE and NOCOLOR environment
> > variables.
> > +ruby-ng_sus() {
> > + debug-print-function ${FUNCNAME} "${@}"
> > +
> > + if [[ "${DEPEND}${BDEPEND}" != *"dev-ruby/sus"* ]]; then
> > + ewarn "Missing test dependency dev-ruby/sus"
> > + fi
> > +
> > + local sus_params=
>
> How about making it a bash array?
At this point I'd like to keep it consistent with the other test
runners, but converting this to a bash array could be done later for
all test runners.
Hans
signature.asc
Description: This is a digitally signed message part
[gentoo-dev] [PATCH 2/2] eclass/ruby-fakegem.eclass: add support for sus test runner
Signed-off-by: Hans de Graaff
---
eclass/ruby-fakegem.eclass | 9 +
eclass/ruby-ng.eclass | 25 +
2 files changed, 34 insertions(+)
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 08e3ccf588ac..4ad1d8eca683 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -44,6 +44,7 @@ RUBY_FAKEGEM_TASK_DOC="${RUBY_FAKEGEM_TASK_DOC-rdoc}"
# - rspec3 (calls ruby-ng_rspec, adds dev-ruby/rspec:3 to the dependencies)
# - cucumber (calls ruby-ng_cucumber, adds dev-util/cucumber to the
#dependencies)
+# - sus (calls ruby-ng_sus, adds dev-ruby/sus to the dependencies)
# - none
RUBY_FAKEGEM_RECIPE_TEST="${RUBY_FAKEGEM_RECIPE_TEST-rake}"
@@ -193,6 +194,11 @@ case ${RUBY_FAKEGEM_RECIPE_TEST} in
RESTRICT+=" !test? ( test )"
ruby_add_bdepend "test? ( dev-util/cucumber )"
;;
+ sus)
+ IUSE+=" test"
+ RESTRICT+=" !test? ( test )"
+ ruby_add_bdepend "test? ( dev-ruby/sus )"
+ ;;
none)
;;
*)
@@ -566,6 +572,9 @@ each_fakegem_test() {
cucumber)
ruby-ng_cucumber
;;
+ sus)
+ ruby-ng_sus
+ ;;
none)
ewarn "each_fakegem_test called, but
\${RUBY_FAKEGEM_RECIPE_TEST} is 'none'"
;;
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index f85a933f81d9..c273a431c5b1 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -757,6 +757,31 @@ ruby-ng_cucumber() {
CUCUMBER_PUBLISH_QUIET=true ${RUBY} -S cucumber ${cucumber_params} "$@"
|| die -n "cucumber failed"
}
+# @FUNCTION: ruby-ng_sus
+# @DESCRIPTION:
+# This is simply a wrapper around the sus-parallel command (executed by $RUBY})
+# which also respects TEST_VERBOSE and NOCOLOR environment variables.
+ruby-ng_sus() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ if [[ "${DEPEND}${BDEPEND}" != *"dev-ruby/sus"* ]]; then
+ ewarn "Missing test dependency dev-ruby/sus"
+ fi
+
+ local sus_params=
+
+ # sus has a --verbose argument but it does not seem to impact the
output (yet?)
+ case ${TEST_VERBOSE} in
+ 1|yes|true)
+ sus_params+=" --verbose"
+ ;;
+ *)
+ ;;
+ esac
+
+ ${RUBY} -S sus-parallel ${sus_params} "$@" || die -n "sus failed"
+}
+
# @FUNCTION: ruby-ng_testrb-2
# @DESCRIPTION:
# This is simply a replacement for the testrb command that load the test
--
2.39.2
[gentoo-dev] [PATCH 1/2] eclass/ruby-fakegem.eclass: warn when using an unknown test recipe
Signed-off-by: Hans de Graaff
---
eclass/ruby-fakegem.eclass | 3 +++
1 file changed, 3 insertions(+)
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 9ef5e1f098d1..08e3ccf588ac 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -193,7 +193,10 @@ case ${RUBY_FAKEGEM_RECIPE_TEST} in
RESTRICT+=" !test? ( test )"
ruby_add_bdepend "test? ( dev-util/cucumber )"
;;
+ none)
+ ;;
*)
+ eqawarn "Unknown test recipe '${RUBY_FAKEGEM_RECIPE_TEST}'
specified, using 'none'"
RUBY_FAKEGEM_RECIPE_TEST="none"
;;
esac
--
2.39.2
[gentoo-dev] Last rites: dev-ruby/bit-struct
# Hans de Graaff (2023-03-19) # ruby27-only package without reverse dependencies. No recent activity # upstream and last supported ruby version is 2.5. Masked for removal # on 2023-04-19. dev-ruby/bit-struct signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/fivemat
# Hans de Graaff (2023-03-19) # Last upstream activity 5 years ago, no longer works with modern # Cucumber. Masked for removal on 2023-04-19. dev-ruby/fivemat signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/six
# Hans de Graaff (2023-03-18) # Ancient out-of-date package. No proper upstream release since 2011. # No reverse dependencies. Masked for removal on 2023-04-18. dev-ruby/six signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/ruby_gntp
# Hans de Graaff (2023-01-28) # No upstream releases since 2010. No longer maintained # upstream. ruby27-only package. Masked for removal on 2023-02-27. dev-ruby/ruby_gntp signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/rails:5.2, dev-ruby/arel
# Hans de Graaff (2023-01-21) # No longer maintained upstream and missing recent security fixes. # Use a newer Rails version instead. # This mask also includes several supporting or rails 5.2-only packages. # Masked for removal after 2023-02-21. dev-ruby/actioncable:5.2 dev-ruby/actionmailer:5.2 dev-ruby/actionpack:5.2 dev-ruby/actionview:5.2 dev-ruby/activejob:5.2 dev-ruby/activemodel:5.2 dev-ruby/activerecord:5.2 dev-ruby/activestorage:5.2 dev-ruby/activesupport:5.2 dev-ruby/rails:5.2 dev-ruby/railties:5.2 dev-ruby/arel =www-apps/redmine-4.2.9 signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH 04/41] apache-2.eclass: drop EAPI 6 support
On Sun, 2022-12-25 at 23:15 +0100, David Seifert wrote: > Signed-off-by: David Seifert > --- > eclass/apache-2.eclass | 29 ++--- > 1 file changed, 14 insertions(+), 15 deletions(-) > > diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass > index 71fcb542869..5e1f4a0be4a 100644 > --- a/eclass/apache-2.eclass > +++ b/eclass/apache-2.eclass > @@ -3,8 +3,8 @@ > > # @ECLASS: apache-2.eclass > # @MAINTAINER: > -# polynomia...@gentoo.org > -# @SUPPORTED_EAPIS: 6 7 > +# maintainer-nee...@gentoo.org > +# @SUPPORTED_EAPIS: 7 > I have already updated these based on your "up for grabs" mail. The other changes look good to me, please feel free to commit them. Hans signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Packages up for grabs: apache-2.eclass
On Sun, 2022-12-25 at 10:40 -0500, Michael Orlitzky wrote: > > If anyone is interested, I posted updates/replacements for the other > two apache eclasses on https://bugs.gentoo.org/616612. Merging those > should ideally be accompanied by an update to apache-2.eclass, making > it use the paths from the new apache-paths.eclass, so that everyone > is > getting the paths from the same place. It would be great if you could dust these off and post them here so we can get these improvements merged. You mention in the bug that you'd rather wait for a dedicated maintainer to review them, but I'm (in name) that maintainer and I think you probably know these eclasses better than I do. With some joint effort we may get things moving here. Hans signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Packages up for grabs: apache-2.eclass
On Sun, 2022-12-25 at 13:09 +0100, David Seifert wrote: > Back when polynomial-c was retired, we forgot to send up for grabs > for > eclasses he maintained: > > apache-2.eclass > > is up for grabs, and is in general need of a revamp, it hasn't aged > well. Given that this eclass is only used by the www-servers/apache ebuilds I'd think it would be obvious who maintains it. I've updated the MAINTAINER and AUTHOR in the eclass to reflect that. Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/hiredis
# Hans de Graaff (2022-12-25) # Last release in 2018. Poor quality C extension code. Package # consistently segfaults on it tests with the latest ruby versions. # No reverse dependencies. Removal in 30 days. dev-ruby/hiredis signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/daemon_controller
# Hans de Graaff (2022-12-16) # ruby27-only package. No longer maintained upstream. # No reverse dependencies. Masked for removal in 30 days. dev-ruby/daemon_controller signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/ferret
# Hans de Graaff (2022-12-16) # ruby27-only package. No longer maintained upstream. # No reverse dependencies. Masked for removal in 30 days. dev-ruby/ferret signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/log_buddy
# Hans de Graaff (2022-12-11) # ruby27-only package. No reverse dependencies. # Last release in 2012. Removal in 30 days. dev-ruby/log_buddy signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/nagios_analyzer
# Hans de Graaff (2022-12-11) # ruby27-only package. No reverse dependencies. # Last release in 2013. Removal in 30 days. dev-ruby/nagios_analyzer signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/ntlm-http
# Hans de Graaff (2022-12-11) # ruby27-only package. No reverse dependencies. # Last release in 2009. Removal in 30 days. dev-ruby/ntlm-http signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/posix-spawn
# Hans de Graaff (2022-12-11) # ruby27-only package. No reverse dependencies. # Removal in 30 days. dev-ruby/posix-spawn signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/iobuffer
# Hans de Graaff (2022-12-05) # This package has been subsumed into its only consumer: # dev-ruby/nio4r. It is no longer developed, and its last standalone # release was 11 years ago. Removal in 30 days. dev-ruby/iobuffer signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/logue
# Hans de Graaff (2022-12-03) # ruby27-only package with no reverse dependencies. # Last release in 2019. Removal in 30 days. dev-ruby/logue signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/textpow and dev-ruby/ultraviolet
# Hans de Graaff (2022-12-03) # ruby27-only packages with no other reverse dependencies. # Last releases in 2013 and 2015. Removal in 30 days. dev-ruby/textpow dev-ruby/ultraviolet signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/rspec-retry
# Hans de Graaff (2022-12-03) # ruby27-only packages. No recent releases. No reverse dependencies # anymore. Maksed for removal in 30 days. dev-ruby/rspec-retry signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/ruby-sdl
# Hans de Graaff (2022-10-22) # Last release upstream 10 years ago. No longer compiles with latest # clang (bug #875254) and doubtful that this actually works with recent # ruby versions. # Masked for removal in 30 days. dev-ruby/ruby-sdl signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/async_sinatra
# Hans de Graaff signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Packages up for grabs: app-eselect/eselect-wine, gui-libs/gtk-layer-shell ...
On Sun, 2022-07-24 at 11:34 +0300, Joonas Niilola wrote: > Hey, > > these packages are up for grabs: > > app-crypt/acme-tiny I'm using this and this looks low maintenance, so I'll take this. Hans signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH 4/8] ruby-ng.eclass: Drop support for EAPI 5
On Sat, 2022-07-23 at 21:19 +0200, Ulrich Müller wrote: > Signed-off-by: Ulrich Müller > --- > eclass/ruby-ng.eclass | 38 +- > 1 file changed, 9 insertions(+), 29 deletions(-) Looks good to me. Hans signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Packages up for grabs: x11-misc/xautolock
On Thu, 2022-02-10 at 19:09 +0100, Jonas Stein wrote: > Dear all > > the following packages are up for grabs after dropping > desktop-misc: > > x11-misc/xautolock > https://packages.gentoo.org/packages/x11-misc/xautolock > I'm still using this and I don't see any obvious replacements for it, so I'll take it. Hans signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH] eclass/ruby-fakegem.eclass: guard against broken rdoc
On Fri, 2022-07-15 at 13:04 +0100, Sam James wrote: > > I worry a bit about silently skipping given it can go further > and lead to e.g. unpredictably broken binpkgs. Yes, not really happy with that either, even though this only affects documentation files. > I'd probably prefer not doing +doc but I assume it's there > for a reason. Your question prompted me to investigate this again. +doc was added initially to ensure that the built-in documentation was generated which people expect to work as part of normal operations. Starting with bundler 2.2.0 this documentation is now bundled as part of the gem and does not need to be generated anymore, so for the 2.2 and 2.3 series the +doc can be dropped. I'll drop the patch since I expect that this is no longer needed (or at least, the drawbacks now outweight the benefits. Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] [PATCH] eclass/ruby-fakegem.eclass: guard against broken rdoc
Skip building documentation rather than generating an error when rdoc is
missing but documentation is requested. rdoc should not be missing
normally, but this is a common problem when updating from one ruby
target straight to another one. There can be a gap when eselect has not
been triggered again yet for rdoc and another core ruby package may
require rdoc. This is commonly bundler since it has a +doc USE flag.
Signed-off-by: Hans de Graaff
---
eclass/ruby-fakegem.eclass | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 6f561f4f6a2f..64c285d70559 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -458,8 +458,13 @@ all_fakegem_compile() {
rake ${RUBY_FAKEGEM_TASK_DOC} || die "failed to
(re)build documentation"
;;
rdoc)
- rdoc ${RUBY_FAKEGEM_DOC_SOURCES} || die "failed
to (re)build documentation"
- rm -f doc/js/*.gz || die "failed to remove
duplicated compressed javascript files"
+ rdoc=$(type -p rdoc)
+ if [[ -x ${rdoc} ]]; then
+ ${rdoc} ${RUBY_FAKEGEM_DOC_SOURCES} ||
die "failed to (re)build documentation"
+ rm -f doc/js/*.gz || die "failed to
remove duplicated compressed javascript files"
+ else
+ ewarn "No executable rdoc found,
skipping documentation"
+ fi
;;
yard)
yard doc ${RUBY_FAKEGEM_DOC_SOURCES} || die
"failed to (re)build documentation"
--
2.35.1
Re: [gentoo-dev] [PATCH] ruby-ng.eclass: replace ebegin with einfo in _ruby_invoke_environment
On Sun, 2022-07-03 at 15:45 -0400, Mike Gilbert wrote: > Calling ebegin here makes no sense because it is likely that the > called > function will also generate output. This will lead to the "[ ok ]" > potentially appearing many lines later. > > It also leads to nested ebegin calls, which make no sense for the > same > reason. I looked at this earlier and left this in because it makes sense to me to do it this way conceptually. That implies that our tools should supported nested ebegin calls and deal with multiline output, so for me the real issue to fix is there. Right now that support isn't there, though, and if that isn't forthcoming soonish I have no objections to this patch if people feel that is the better approach (for now). Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Re: [gentoo-dev-announce] Packages up for grabs: x11-misc/lightdm, sys-apps/fwupd, net-im/pidgin, media-sound/mumble, app-emulation/virtualbox, app-editors/nano, app-shells/zsh and more
On Wed, 2022-06-29 at 10:15 +0300, Joonas Niilola wrote: > > dev-libs/apr > dev-libs/apr-util These can be maintained as part of the Apache project. Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Re: [gentoo-dev-announce] Project:Apache is now without a member!
On Thu, 2022-06-30 at 10:21 +0200, Michał Górny wrote: > Hello, > > Due to the last member retiring, the Apache project [1] does not have > any members left. I was already on the apache-bugs alias, but I'll add myself to the project as well. Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: ruby26-only dev-ruby/{best_in_place,cinch,dotenv,origin,packagefu}
# Hans de Graaff (2022-06-19) # ruby26-only, fails tests, no longer maintained upstream, # no reverse dependencies. Removal in 30 days. dev-ruby/best_in_place # Hans de Graaff (2022-06-19) # ruby26-only, no tests, no reverse dependencies # Removal in 30 days. dev-ruby/cinch # Hans de Graaff (2022-06-19) # ruby26-only, fails tests, last upstream release in 2020, # no reverse dependencies. Removal in 30 days. dev-ruby/dotenv # Hans de Graaff (2022-06-19) # ruby26-only, no longer maintained upstream, # no reverse dependencies. Removal in 30 days. dev-ruby/origin # Hans de Graaff (2022-06-19) # ruby26-only, fails tests, no longer maintained upstream, # no reverse dependencies. Removal in 30 days. dev-ruby/packetfu signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Upstream remote-id types in package metadata
On Sun, 2022-05-22 at 09:09 +0200, Ulrich Mueller wrote: > > rubyforge > > Some of them seem to be obsolete. Presumably freshmeat, gitorious, > and > google-code should be removed? Any other removal candidates? rubyforge has been shut down since 2015 so it can be removed as well. Hans signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH] eclass/ruby-fakegem.eclass: depend on virtual/pkgconfig
On Fri, 2022-05-20 at 11:09 +0200, Ulrich Mueller wrote:
> > > > > > On Fri, 20 May 2022, Florian Schmaus wrote:
> > > +if [ ${#RUBY_FAKEGEM_EXTENSIONS[@]} -ge 1 ]; then
> > > + BDEPEND+=" virtual/pkgconfig "
> > > +fi
>
> > Not sure if we have a policy on this,
>
> We do. :)
Policy followed in the committed version.
Hans
signature.asc
Description: This is a digitally signed message part
Re: [gentoo-dev] [PATCH] eclass/ruby-fakegem.eclass: depend on virtual/pkgconfig
On Fri, 2022-05-20 at 09:28 +0200, Thomas Bracht Laumann Jespersen
wrote:
> > this is easy to mis in the ebuild. Handle this in the eclass
> > instead
>
> small typo: mis -> miss
Fixed.
> > +if [ ${#RUBY_FAKEGEM_EXTENSIONS[@]} -ge 1 ]; then
>
> shouldn't it be [[ ]] and not [ ] ? Also, just a suggestion, do "-gt
> 0" instead
> of "-ge 1"
Yes, that probably indicates the intention a bit better (array not
empty). Changed.
Thanks!
Hans
signature.asc
Description: This is a digitally signed message part
[gentoo-dev] [PATCH] eclass/ruby-fakegem.eclass: depend on virtual/pkgconfig
Many C extensions depend on pkgconfig during their configure phase and
this is easy to mis in the ebuild. Handle this in the eclass instead
even though the dependency will not be needed for all extensions.
Closes: https://bugs.gentoo.org/845393
Signed-off-by: Hans de Graaff
---
eclass/ruby-fakegem.eclass | 5 +
1 file changed, 5 insertions(+)
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 358fff1be753..754b48f82fa9 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -210,6 +210,11 @@ case ${EAPI} in
;;
esac
+# Many (but not all) extensions use pkgconfig in src_configure.
+if [ ${#RUBY_FAKEGEM_EXTENSIONS[@]} -ge 1 ]; then
+ BDEPEND+=" virtual/pkgconfig "
+fi
+
# @FUNCTION: ruby_fakegem_gemsdir
# @RETURN: Returns the gem data directory
# @DESCRIPTION:
--
2.35.1
[gentoo-dev] Last rites: dev-ruby/nokogumbo
# Hans de Graaff (2022-04-12) # dev-ruby/nokogumbo is now part of dev-ruby/nokogiri and nokogiri # versions still supporting a separate nokogumbo have known security # issues. nokogumbo's only reverse dependency is dev-ruby/sanitize:5, # but a newer slot is available. dev-ruby/nokogumbo dev-ruby/sanitize:5 signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/aws-s3
# Hans de Graaff (2021-11-25) # Last upstream release in 2012 and upstream itself is no longer # available. Unlikely to still work correctly. No reverse dependencies. # Masked for removal in 30 days. dev-ruby/aws-s3 signature.asc Description: This is a digitally signed message part
[gentoo-dev] [PATCH 2/2] dev-ruby/mimemagic: mark extension as installed
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Hans de Graaff
---
dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild | 41 +
dev-ruby/mimemagic/mimemagic-0.4.3-r1.ebuild | 45 +++
2 files changed, 86 insertions(+)
create mode 100644 dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild
create mode 100644 dev-ruby/mimemagic/mimemagic-0.4.3-r1.ebuild
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild
b/dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild
new file mode 100644
index ..14cda3064dd1
--- /dev/null
+++ b/dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC=mimemagic.gemspec
+
+inherit prefix ruby-fakegem
+
+DESCRIPTION="Fast mime detection by extension or content"
+HOMEPAGE="https://github.com/mimemagicrb/mimemagic;
+SRC_URI="https://github.com/mimemagicrb/mimemagic/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" x11-misc/shared-mime-info"
+
+ruby_add_rdepend "
+ dev-ruby/nokogiri
+ dev-ruby/rake
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+ cp "${FILESDIR}/${PN}-0.3.9-path.rb" lib/mimemagic/path.rb || die
+ eprefixify lib/mimemagic/path.rb
+
+ sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+ ruby_fakegem_extensions_installed
+}
diff --git a/dev-ruby/mimemagic/mimemagic-0.4.3-r1.ebuild
b/dev-ruby/mimemagic/mimemagic-0.4.3-r1.ebuild
new file mode 100644
index ..8b8fb492af14
--- /dev/null
+++ b/dev-ruby/mimemagic/mimemagic-0.4.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC=mimemagic.gemspec
+
+inherit prefix ruby-fakegem
+
+DESCRIPTION="Fast mime detection by extension or content"
+HOMEPAGE="https://github.com/mimemagicrb/mimemagic;
+SRC_URI="https://github.com/mimemagicrb/mimemagic/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND+=" x11-misc/shared-mime-info"
+
+ruby_add_rdepend "
+ dev-ruby/nokogiri
+ dev-ruby/rake
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+ cp "${FILESDIR}/${PN}-0.3.9-path.rb" lib/mimemagic/path.rb || die
+ eprefixify lib/mimemagic/path.rb
+
+ sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+ ${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each {|f| require f}'
|| die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+ ruby_fakegem_extensions_installed
+}
--
2.32.0
[gentoo-dev] [PATCH 1/2] eclass/ruby-fakegem.eclass: add method to indicate extensions are installed
Add a public method ruby_fakegem_extensions_installed to add the
marker that rubygems uses to determine if extensions have been
installed. We were already adding this as part of the extensions code,
but rubygems also expects this to be present for extensions that we
either ignore or handle differently. Without this marker rubygems
3.2.22 and newer will ignore this gem.
Signed-off-by: Hans de Graaff
---
eclass/ruby-fakegem.eclass | 24
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 1ef40aa2fad9..3832165761c9 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -546,6 +546,24 @@ if [[ ${RUBY_FAKEGEM_RECIPE_TEST} != none ]]; then
}
fi
+# @FUNCTION: ruby_fakegem_extensions_installed
+# @DESCRIPTION:
+# Install the marker indicating that extensions have been
+# installed. This is normally done as part of the extension
+# installation, but may be useful when we handle extensions manually.
+ruby_fakegem_extensions_installed() {
+ mkdir -p "${ED}$(ruby_fakegem_extensionsdir)" || die
+ touch "${ED}$(ruby_fakegem_extensionsdir)/gem.build_complete" || die
+}
+
+# @FUNCTION: ruby_fakegem_extensionsdir
+# @DESCRIPTION:
+# The directory where rubygems expects extensions for this package
+# version.
+ruby_fakegem_extensionsdir() {
+ echo "$(ruby_fakegem_gemsdir)/extensions/$(ruby_rbconfig_value
'arch')/$(ruby_rbconfig_value
'ruby_version')/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}"
+}
+
# @FUNCTION: each_fakegem_install
# @DESCRIPTION:
# Install the package for each ruby target.
@@ -562,14 +580,12 @@ each_fakegem_install() {
if [[ -n ${RUBY_FAKEGEM_EXTENSIONS} ]] && [
${#RUBY_FAKEGEM_EXTENSIONS[@]} -ge 0 ]; then
einfo "installing extensions"
- local
_extensionsdir="$(ruby_fakegem_gemsdir)/extensions/$(ruby_rbconfig_value
'arch')/$(ruby_rbconfig_value
'ruby_version')/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}"
for extension in ${RUBY_FAKEGEM_EXTENSIONS[@]} ; do
- emake V=1 sitearchdir="${ED}${_extensionsdir}"
sitelibdir="${ED}$(ruby_rbconfig_value 'sitelibdir')" -C ${extension%/*} install
+ emake V=1
sitearchdir="${ED}$(ruby_fakegem_extensionsdir)"
sitelibdir="${ED}$(ruby_rbconfig_value 'sitelibdir')" -C ${extension%/*} install
done
- # Add the marker to indicate that the extensions are installed
- touch "${ED}${_extensionsdir}/gem.build_complete" || die
+ ruby_fakegem_extensions_installed
fi
}
--
2.32.0
[gentoo-dev] Last rites: dev-ruby/rack-ssl
# Hans de Graaff (2021-11-20) # Obsolete package. Last upstream release in 2014, upstream itself is # gone. No reverse dependencies in Gentoo. # Masked for removal in 30 days. dev-ruby/rack-ssl signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/d3_rails
# Hans de Graaff (2021-11-13) # No longer maintained upstream. Stuck on an old version 4.x of d3 # while d3 upstream is now on 7.x. Probably best to use directly via # npm or yarn. # Masked for removal on 2021-12-13. dev-ruby/d3_rails signature.asc Description: This is a digitally signed message part
[gentoo-dev] [PATCH 2/2] dev-ruby/ruby-ldap: EAPI 8; add ruby30; fix extension install
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Hans de Graaff
---
dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r1.ebuild | 34 +++
1 file changed, 34 insertions(+)
create mode 100644 dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r1.ebuild
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r1.ebuild
b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r1.ebuild
new file mode 100644
index ..a195fa0f2b51
--- /dev/null
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.20-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
+
+DESCRIPTION="A Ruby interface to some LDAP libraries"
+HOMEPAGE="https://github.com/bearded/ruby-ldap;
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ssl"
+DEPEND=">=net-nds/openldap-2
+ dev-libs/cyrus-sasl
+ ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+# Current test set is interactive due to certificate generation and requires
+# running LDAP daemon
+RESTRICT="test"
+
+each_ruby_configure() {
+ local myconf="--with-openldap2"
+ if ! use ssl ; then
+ myconf="${myconf} --without-libcrypto --without-libssl"
+ fi
+ RUBY_FAKEGEM_EXTENSION_OPTIONS=${myconf} each_fakegem_configure
+}
--
2.32.0
[gentoo-dev] [PATCH 1/2] eclass/ruby-fakegem.eclass: add options support for extensions
Introduce RUBY_FAKEGEM_EXTENSION_OPTIONS to allow setting options for
extensions.
Signed-off-by: Hans de Graaff
---
eclass/ruby-fakegem.eclass | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 4b954615cac9..a907a12831b5 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -123,6 +123,13 @@ RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}"
# the configuration script that needs to be run to generate the
# extension.
+# @ECLASS-VARIABLE: RUBY_FAKEGEM_EXTENSION_OPTIONS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Additional options that are passed when configuring the
+# extension. Some extensions use this to locate paths or turn specific
+# parts of the extionsion on or off.
+
# @ECLASS-VARIABLE: RUBY_FAKEGEM_EXTENSION_LIBDIR
# @DESCRIPTION:
# The lib directory where extensions are copied directly after they have
@@ -404,7 +411,7 @@ EOF
each_fakegem_configure() {
tc-export PKG_CONFIG
for extension in "${RUBY_FAKEGEM_EXTENSIONS[@]}" ; do
- CC=$(tc-getCC) ${RUBY} --disable=did_you_mean -C
${extension%/*} ${extension##*/} || die
+ CC=$(tc-getCC) ${RUBY} --disable=did_you_mean -C
${extension%/*} ${extension##*/} ${RUBY_FAKEGM_EXTENSION_OPTIONS} || die
done
}
--
2.32.0
[gentoo-dev] [PATCH] eclass/ruby-fakegem.eclass: set flags for compilation
Explicitly pass CC, CFLAGS and LDFLAGS when compiling ruby
extensions. By default ruby re-uses the stored flags used when
compiling ruby itself. This is intended to create a better chance of
compatibility between extensions and ruby itself, and extensions do
not need to bother with this themselves, but it does not match the
expectations of a Gentoo system where each compile action should use
the currently defined flags.
We also cannot guarantee this compatibility in any case since
toolchain packages may have been updated in the meantime.
This change uses the current CC, CFLAGS and LDFLAGS, and adds -fPIC
which ruby extensions need and which would otherwise be added by
ruby. This combination is already used in some ebuilds without any
reported issues.
Signed-off-by: Hans de Graaff
---
eclass/ruby-fakegem.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 573e3511daf7..858fe04e082f 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -404,7 +404,7 @@ EOF
each_fakegem_configure() {
tc-export PKG_CONFIG
for extension in "${RUBY_FAKEGEM_EXTENSIONS[@]}" ; do
- ${RUBY} --disable=did_you_mean -C ${extension%/*}
${extension##*/} || die
+ CC=$(tc-getCC) ${RUBY} --disable=did_you_mean -C
${extension%/*} ${extension##*/} || die
done
}
@@ -441,7 +441,7 @@ all_fakegem_compile() {
# Compile extensions defined in RUBY_FAKEGEM_EXTENSIONS, if any.
each_fakegem_compile() {
for extension in "${RUBY_FAKEGEM_EXTENSIONS[@]}" ; do
- emake V=1 -C ${extension%/*}
+ emake V=1 -C ${extension%/*} CFLAGS="${CFLAGS} -fPIC"
archflag="${LDFLAGS}"
mkdir -p "${RUBY_FAKEGEM_EXTENSION_LIBDIR%/}"
cp "${extension%/*}"/*$(get_modname)
"${RUBY_FAKEGEM_EXTENSION_LIBDIR%/}/" || die "Copy of extension into
${RUBY_FAKEGEM_EXTENSION_LIBDIR} failed"
done
--
2.32.0
[gentoo-dev] Last rites: dev-ruby/archive-tar-minitar
# Hans de Graaff (2021-10-17) # Obsolete package, replaced by dev-ruby/minitar. # No reverse dependencies left. Masked for removal in 30 days. dev-ruby/archive-tar-minitar signature.asc Description: This is a digitally signed message part
[gentoo-dev] Re: [gentoo-dev-announce] Packages up for grabs per ikelos's retirement
On Tue, 2021-08-10 at 08:57 +0300, Joonas Niilola wrote: > > app-crypt/xca I'll take this. Hans signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/sfl
# Hans de Graaff (2021-07-18) # Compatibility package for ruby 1.8. No longer maintained upstream. # Last release in 2016, but current release in gentoo is from 2012. # No reverse dependencies. # Masked for removal in 30 days. dev-ruby/sfl signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/factory_girl and dev-ruby/bourne
# Hans de Graaff (2021-07-17) # Deprecated upstream, replaced with factory_bot. # Last release in 2017, no dependencies. # Masked for removal in 30 days. dev-ruby/factory_girl # Hans de Graaff (2021-07-17) # Deprecated upstream, no longer needed with rspec 2+ # Last release in 2016, factory_girl was last dependency. # Masked for removal in 30 days. dev-ruby/bourne signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-ruby/spork
# Hans de Graaff (2021-07-15) # Dead upstream, no longer maintained, last release in # 2013. No dependencies. # Masked for removal in 30 days. dev-ruby/spork signature.asc Description: This is a digitally signed message part
[gentoo-dev] [PATCH 4/4] eclass/ruby-fakegem.eclass: remove EAPI 4 support
Signed-off-by: Hans de Graaff
---
eclass/ruby-fakegem.eclass | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 34eeff2fad96..76a80f6b9be2 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -60,7 +60,7 @@ RUBY_FAKEGEM_TASK_TEST="${RUBY_FAKEGEM_TASK_TEST-test}"
# - yard (calls `yard`, adds dev-ruby/yard to the dependencies);
# - none
case ${EAPI} in
- 4|5|6)
+ 5|6)
RUBY_FAKEGEM_RECIPE_DOC="${RUBY_FAKEGEM_RECIPE_DOC-rake}"
;;
*)
@@ -130,7 +130,7 @@ RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}"
RUBY_FAKEGEM_EXTENSION_LIBDIR="${RUBY_FAKEGEM_EXTENSION_LIBDIR-lib}"
case ${EAPI} in
- 4|5|6|7|8) ;;
+ 5|6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -197,7 +197,7 @@
SRC_URI="https://rubygems.org/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}$
ruby_add_bdepend "virtual/rubygems !!dev-ruby/psych"
ruby_add_rdepend virtual/rubygems
case ${EAPI} in
- 4|5|6)
+ 5|6)
;;
*)
ruby_add_depend virtual/rubygems
@@ -312,7 +312,7 @@ ruby_fakegem_metadata_gemspec() {
# See RUBY_FAKEGEM_REQUIRE_PATHS for setting extra require paths.
ruby_fakegem_genspec() {
case ${EAPI} in
- 4|5|6) ;;
+ 5|6) ;;
*)
eqawarn "Generating generic fallback gemspec *without*
dependencies"
eqawarn "This will only work when there are no runtime
dependencies"
--
2.31.1
[gentoo-dev] [PATCH 3/4] eclass/ruby-ng.eclass: remove EAPI 4 support
Signed-off-by: Hans de Graaff
---
eclass/ruby-ng.eclass | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index d8afa207661f..ac9c117c0c02 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -8,7 +8,7 @@
# Author: Diego E. Pettenò
# Author: Alex Legler
# Author: Hans de Graaff
-# @SUPPORTED_EAPIS: 4 5 6 7 8
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: An eclass for installing Ruby packages with proper support for
multiple Ruby slots.
# @DESCRIPTION:
# The Ruby eclass is designed to allow an easier installation of Ruby packages
@@ -68,7 +68,7 @@
local inherits=""
case ${EAPI} in
- 4|5)
+ 5)
inherits="eutils toolchain-funcs"
;;
6)
@@ -87,7 +87,7 @@ EXPORT_FUNCTIONS src_unpack src_prepare src_configure
src_compile src_test src_i
S="${WORKDIR}"
case ${EAPI} in
- 4|5|6|7|8) ;;
+ 5|6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -207,7 +207,7 @@ ruby_add_rdepend() {
1) ;;
2)
case ${EAPI} in
- 4|5|6)
+ 5|6)
[[ "${GENTOO_DEV}" == "yes" ]] &&
eqawarn "You can now use the usual syntax in ruby_add_rdepend for $CATEGORY/$PF"
ruby_add_rdepend
"$(_ruby_wrap_conditions "$1" "$2")"
return
@@ -229,7 +229,7 @@ ruby_add_rdepend() {
# Add the dependency as a test-dependency since we're going to
# execute the code during test phase.
case ${EAPI} in
- 4|5|6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
+ 5|6) DEPEND="${DEPEND} test? ( ${dependency} )" ;;
*) BDEPEND="${BDEPEND} test? ( ${dependency} )" ;;
esac
if ! has test "$IUSE"; then
@@ -252,7 +252,7 @@ ruby_add_bdepend() {
1) ;;
2)
case ${EAPI} in
- 4|5|6)
+ 5|6)
[[ "${GENTOO_DEV}" == "yes" ]] &&
eqawarn "You can now use the usual syntax in ruby_add_bdepend for $CATEGORY/$PF"
ruby_add_bdepend
"$(_ruby_wrap_conditions "$1" "$2")"
return
@@ -270,7 +270,7 @@ ruby_add_bdepend() {
local dependency=$(_ruby_atoms_samelib "$1")
case ${EAPI} in
- 4|5|6) DEPEND="${DEPEND} $dependency" ;;
+ 5|6) DEPEND="${DEPEND} $dependency" ;;
*) BDEPEND="${BDEPEND} $dependency" ;;
esac
RDEPEND="${RDEPEND}"
@@ -283,7 +283,7 @@ ruby_add_bdepend() {
# ruby_add_bdepend.
ruby_add_depend() {
case ${EAPI} in
- 4|5|6) die "only available in EAPI 7 and newer" ;;
+ 5|6) die "only available in EAPI 7 and newer" ;;
*) ;;
esac
@@ -351,7 +351,7 @@ if [[ ${RUBY_OPTIONAL} != yes ]]; then
RDEPEND="${RDEPEND} $(ruby_implementations_depend)"
REQUIRED_USE+=" || ( $(ruby_get_use_targets) )"
case ${EAPI} in
- 4|5|6) ;;
+ 5|6) ;;
*) BDEPEND="${BDEPEND} $(ruby_implementations_depend)" ;;
esac
fi
@@ -455,7 +455,7 @@ ruby-ng_src_unpack() {
_ruby_apply_patches() {
case ${EAPI} in
- 4|5)
+ 5)
for patch in "${RUBY_PATCHES[@]}"; do
if [ -f "${patch}" ]; then
epatch "${patch}"
@@ -503,7 +503,7 @@ ruby-ng_src_prepare() {
# Handle PATCHES and user supplied patches via the default phase
case ${EAPI} in
- 4|5)
+ 5)
;;
*)
_ruby_invoke_environment all default
--
2.31.1
[gentoo-dev] [PATCH 2/4] eclass/ruby-fakegem.eclass: add EAPI 8 support
Signed-off-by: Hans de Graaff
---
eclass/ruby-fakegem.eclass | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 9b2fd39ccf14..34eeff2fad96 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -8,7 +8,7 @@
# Author: Diego E. Pettenò
# Author: Alex Legler
# Author: Hans de Graaff
-# @SUPPORTED_EAPIS: 4 5 6 7
+# @SUPPORTED_EAPIS: 4 5 6 7 8
# @BLURB: An eclass for installing Ruby packages to behave like RubyGems.
# @DESCRIPTION:
# This eclass allows to install arbitrary Ruby libraries (including Gems),
@@ -129,17 +129,11 @@ RUBY_FAKEGEM_BINDIR="${RUBY_FAKEGEM_BINDIR-bin}"
# legacy way to install extensions for a long time.
RUBY_FAKEGEM_EXTENSION_LIBDIR="${RUBY_FAKEGEM_EXTENSION_LIBDIR-lib}"
-case "${EAPI:-0}" in
- 0|1|2|3)
- die "Unsupported EAPI=${EAPI} (too old) for
ruby-fakegem.eclass" ;;
- 4|5|6|7)
- ;;
- *)
- die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
- ;;
+case ${EAPI} in
+ 4|5|6|7|8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
-
RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}"
--
2.31.1
