public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: David Seifert <soap@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: David Seifert <soap@gentoo.org>
Subject: [gentoo-dev] [PATCH 32/50] ruby-fakegem.eclass: drop support for EAPI 5 and 6
Date: Tue, 27 Aug 2024 17:15:17 +0200	[thread overview]
Message-ID: <20240827151553.210835-32-soap@gentoo.org> (raw)
In-Reply-To: <20240827151553.210835-1-soap@gentoo.org>

Signed-off-by: David Seifert <soap@gentoo.org>
---
 eclass/ruby-fakegem.eclass | 50 ++++++++++++--------------------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 40ff76ce900e..0a99406954b0 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-fakegem.eclass
@@ -8,7 +8,7 @@
 # Author: Diego E. Pettenò <flameeyes@gentoo.org>
 # Author: Alex Legler <a3li@gentoo.org>
 # Author: Hans de Graaff <graaff@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 7 8
 # @PROVIDES: ruby-ng
 # @BLURB: An eclass for installing Ruby packages to behave like RubyGems.
 # @DESCRIPTION:
@@ -17,6 +17,11 @@
 
 inherit ruby-ng
 
+case ${EAPI} in
+	7|8) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
 # @ECLASS_VARIABLE: RUBY_FAKEGEM_NAME
 # @PRE_INHERIT
 # @DESCRIPTION:
@@ -61,14 +66,7 @@ RUBY_FAKEGEM_TASK_TEST="${RUBY_FAKEGEM_TASK_TEST-test}"
 #  - rdoc (calls `rdoc-2`, adds dev-ruby/rdoc to the dependencies);
 #  - yard (calls `yard`, adds dev-ruby/yard to the dependencies);
 #  - none
-case ${EAPI} in
-	5|6)
-		RUBY_FAKEGEM_RECIPE_DOC="${RUBY_FAKEGEM_RECIPE_DOC-rake}"
-		;;
-	*)
-		RUBY_FAKEGEM_RECIPE_DOC="${RUBY_FAKEGEM_RECIPE_DOC-rdoc}"
-		;;
-esac
+: "${RUBY_FAKEGEM_RECIPE_DOC=rdoc}"
 
 # @ECLASS_VARIABLE: RUBY_FAKEGEM_DOCDIR
 # @DEFAULT_UNSET
@@ -138,11 +136,6 @@ 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} in
-	5|6|7|8) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 RUBY_FAKEGEM_SUFFIX="${RUBY_FAKEGEM_SUFFIX:-}"
 
 
@@ -211,13 +204,7 @@ SRC_URI="https://rubygems.org/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}$
 
 ruby_add_bdepend "virtual/rubygems"
 ruby_add_rdepend virtual/rubygems
-case ${EAPI} in
-	5|6)
-		;;
-	*)
-		ruby_add_depend virtual/rubygems
-		;;
-esac
+ruby_add_depend virtual/rubygems
 
 # Many (but not all) extensions use pkgconfig in src_configure.
 if [[ ${#RUBY_FAKEGEM_EXTENSIONS[@]} -gt 0 ]]; then
@@ -254,7 +241,7 @@ ruby_fakegem_doins() {
 	(
 		insinto $(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}
 		doins "$@"
-	) || die "failed $0 $@"
+	)
 }
 
 # @FUNCTION: ruby_fakegem_newins
@@ -274,7 +261,7 @@ ruby_fakegem_newins() {
 
 		insinto $(ruby_fakegem_gemsdir)/gems/${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}${newdirname}
 		newins "$1" ${newbasename}
-	) || die "failed $0 $@"
+	)
 }
 
 # @FUNCTION: ruby_fakegem_install_gemspec
@@ -299,7 +286,7 @@ ruby_fakegem_install_gemspec() {
 				ruby_fakegem_genspec ${gemspec}
 			fi
 		fi
-	) || die "Unable to generate gemspec file."
+	)
 
 	insinto $(ruby_fakegem_gemsdir)/specifications
 	newins ${gemspec} ${RUBY_FAKEGEM_NAME}-${RUBY_FAKEGEM_VERSION}.gemspec || die "Unable to install gemspec file."
@@ -345,14 +332,9 @@ ruby_fakegem_metadata_gemspec() {
 ruby_fakegem_genspec() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	case ${EAPI} in
-		5|6) ;;
-		*)
-			eqawarn "Generating generic fallback gemspec *without* dependencies"
-			eqawarn "This will only work when there are no runtime dependencies"
-			eqawarn "Set RUBY_FAKEGEM_GEMSPEC to generate a proper specifications file"
-			;;
-	esac
+	eqawarn "Generating generic fallback gemspec *without* dependencies"
+	eqawarn "This will only work when there are no runtime dependencies"
+	eqawarn "Set RUBY_FAKEGEM_GEMSPEC to generate a proper specifications file"
 
 	local required_paths="'lib'"
 	for path in ${RUBY_FAKEGEM_REQUIRE_PATHS}; do
@@ -430,7 +412,7 @@ EOF
 
 		exeinto ${binpath:-/usr/bin}
 		newexe "${T}"/gembin-wrapper-${gembinary} $(basename $newbinary)
-	) || die "Unable to create fakegem wrapper"
+	)
 }
 
 # @FUNCTION: each_fakegem_configure
-- 
2.46.0



  parent reply	other threads:[~2024-08-27 15:24 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-27 15:14 [gentoo-dev] [PATCH 01/50] apache-module.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 02/50] autotools.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 03/50] bash-completion-r1.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 04/50] cdrom.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 05/50] check-reqs.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 06/50] depend.apache.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 07/50] desktop.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 08/50] distutils-r1.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 09/50] flag-o-matic.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 10/50] fortran-2.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 11/50] gap-pkg.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 12/50] gnuconfig.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 13/50] java-pkg-2.eclass: " David Seifert
2024-08-27 15:14 ` [gentoo-dev] [PATCH 14/50] java-utils-2.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 15/50] libtool.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 16/50] mono-env.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 17/50] multibuild.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 18/50] multilib-build.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 19/50] multilib-minimal.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 20/50] multilib.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 21/50] multiprocessing.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 22/50] out-of-source-utils.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 23/50] pax-utils.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 24/50] perl-functions.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 25/50] php-pear-r2.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 26/50] portability.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 27/50] prefix.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 28/50] preserve-libs.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 29/50] python-r1.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 30/50] python-utils-r1.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 31/50] readme.gentoo-r1.eclass: " David Seifert
2024-08-27 15:15 ` David Seifert [this message]
2024-08-27 15:15 ` [gentoo-dev] [PATCH 33/50] ruby-ng.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 34/50] ruby-utils.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 35/50] strip-linguas.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 36/50] systemd.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 37/50] tmpfiles.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 38/50] toolchain-funcs.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 39/50] toolchain.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 40/50] udev.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 41/50] vcs-clean.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 42/50] vdr-plugin-2.eclass: drop support for EAPI 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 43/50] vim-doc.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 44/50] vim-plugin.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 45/50] vim-spell.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 46/50] virtualx.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 47/50] webapp.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 48/50] wrapper.eclass: drop support for EAPI 5 and 6 David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 49/50] xdg-utils.eclass: " David Seifert
2024-08-27 15:15 ` [gentoo-dev] [PATCH 50/50] xdg.eclass: drop support for EAPI 6 David Seifert
2024-08-27 21:03 ` [gentoo-dev] [PATCH 00/50] XXXXXX.eclass: drop support for EAPI6 Robin H. Johnson
2024-08-27 21:16   ` Eli Schwartz
2024-08-27 21:36     ` Sam James
2024-08-28  9:45   ` Ulrich Mueller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240827151553.210835-32-soap@gentoo.org \
    --to=soap@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox