commit:     6c7101901fae4223f1bed90dbb57e991b9650103
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 06:07:11 2019 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat May 11 06:08:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c710190

dev-lang/ruby: cleanup

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-lang/ruby/Manifest             |   3 -
 dev-lang/ruby/ruby-2.4.5-r1.ebuild | 230 -----------------------------------
 dev-lang/ruby/ruby-2.5.3.ebuild    | 225 -----------------------------------
 dev-lang/ruby/ruby-2.6.0-r1.ebuild | 237 -------------------------------------
 dev-lang/ruby/ruby-2.6.1.ebuild    | 237 -------------------------------------
 5 files changed, 932 deletions(-)

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 5b67b3c3a3d..cca44afaa3e 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,10 +1,7 @@
 DIST ruby-2.3.8.tar.xz 11465792 BLAKE2B 
b9c8ef5c943872e3d1426c30cbd720acc66d17cc7bc926f3294e68f17fbc78edef42f6496295800c3d4efd3ae441730723bfcfbc1111e46239359930622697d9
 SHA512 
06373050e6c1af9cb6a5863aef878b21c8a45fd0e68414e3d546cb73ec3028207d3acc0a9326428f172b9347a30bbe69a16f9dc0bdb739161d677adb2d888095
 DIST ruby-2.4.5.tar.xz 10064712 BLAKE2B 
0846125e617b43ea302b4c5309b20503577937865d445a6fee766323a188aa552d3a13740c3d38c7be812b19bffb2474021cb7b368cc144d51ea771552f62769
 SHA512 
658f676c623109f4c7499615e191c98c3dd72cfcaeeaf121337d0b8a33c5243145edd50ec5e2775f988e3cd19788984f105fa165e3049779066566f67172c1b4
 DIST ruby-2.4.6.tar.xz 10005544 BLAKE2B 
2af984d96dad4d7ef4d467b317bd4bb54b0614d96619377bc46f7588cd1c72bee47202b61d6ec54f00113fd25672d2831221dbf0a4491aa271541a34c634ee84
 SHA512 
eafb2257747f99e2ed262af142e71175b70f7cceaa4d1253b92c8337f075a9a58a2d93b029d75e11a9b124f112a8f0983273b2b30afc147b5cf71a8dbb5fa0ba
-DIST ruby-2.5.3.tar.xz 11453336 BLAKE2B 
66c59448a23c22796b43f04a1f84359386b7bee7163da4255426ea75b1c7af0a7a7142991b870a75a72ded56ac49f47c51bc162ebf2be2af0d1b1608b60c02df
 SHA512 
6dcae0e8d0bacdb2cbde636e2030596308b5af53f2eb85d3adccb67b02e6f8f9751e8117d12f8484829fdd9d995f6e327f701d9b433bcf94f1f59d13a1fd7518
 DIST ruby-2.5.5.tar.xz 11459832 BLAKE2B 
ced1105a87e7df8f82a65ca8d1d329d5a9d110d2f3f88b27a79262c4ac1484dda16d8646c0c03f18c1bb25f8b154075eb03a0614355ec62f677c2fa56ab3c956
 SHA512 
06b1d58536ebfacb7b56c1e6ed4b8ab816fadc4f48c845a452554cd262e7908199a30e5793f3cbaec2db56a8803aa5c6089abf7bf06c8fc47867e97870b7dfec
-DIST ruby-2.6.0.tar.xz 11918536 BLAKE2B 
f51fe57c1ff83d99c834f29d1bcc8e847f7a4cd3a10e202391327373d9d803fcc356d210cc07b9038915039a7462c0263fa7567b63366d1ab6273b9a82e651d1
 SHA512 
c56eaf85ef7b79deb34ee4590b143c07f4fc83eb79775290761aee5a7c63374659613538a41f25706ed6e19e49d5c67a1014c24d17f29948294c7abd0b0fcea8
-DIST ruby-2.6.1.tar.xz 11872964 BLAKE2B 
789d1a174b02538e92a66372814b8be45f30187f99df15922e3dd899222fd5feea196ed0a352a19246d8c822e0eb97e8f4ff8229a6c00ac5c60cb214460b7289
 SHA512 
fb36289a955f0596c683cdadf1e4a9a9fd35222b1e1c6160c2e7cd82e5befd40a7aa4361e55f7a8f83c06ee899ec493821c7db34a60c4ac3bca0e874d33ef1a9
 DIST ruby-2.6.2.tar.xz 11889840 BLAKE2B 
817919c078869c2ad8d5c9d8c8b7ee77e8b0e3339c2ef662a94a666a859f762fa63c6f8534027abd368e91fe4e3e1fe68fa984cbf12f76cff8c0c66f0114914f
 SHA512 
13f7d7b483a037378eac4bf4bebddc21d69f4e19e6bbb397dd53e7518037ae9a3aa5b41fc20bf1fe410803c6efc3a6a65a65af47648d3a93713f75cfe885326a
 DIST ruby-2.6.3.tar.xz 11904360 BLAKE2B 
8113e5a19b967cdf995a3c8d3c83aeab3bf89e975d3b039c64259e97f20dbe9ebd96ada093f9d330516d16ef78bb0ecbbac8f3facd467aa13f1f70b23b992f82
 SHA512 
959a613f5cf5b3185a1d7a7ba0e1921166b3930f30461b391b1c9fcfe396f56dc3c736123dfc7b4e72c32a97dc5a1eb1fd7f09bcc3793a3c5526f6644ba421c8
 DIST ruby-patches-2.3.8-r1.tar.bz2 3030 BLAKE2B 
7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42
 SHA512 
54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1

diff --git a/dev-lang/ruby/ruby-2.4.5-r1.ebuild 
b/dev-lang/ruby/ruby-2.4.5-r1.ebuild
deleted file mode 100644
index 04e38de79d9..00000000000
--- a/dev-lang/ruby/ruby-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/";
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests 
socks5 +ssl static-libs tk xemacs"
-
-RDEPEND="
-       berkdb? ( sys-libs/db:= )
-       gdbm? ( sys-libs/gdbm:= )
-       jemalloc? ( dev-libs/jemalloc )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl )
-       )
-       socks5? ( >=net-proxy/dante-1.1.13 )
-       tk? (
-               dev-lang/tcl:0=[threads]
-               dev-lang/tk:0=[threads]
-       )
-       dev-libs/libyaml
-       virtual/libffi:=
-       sys-libs/readline:0=
-       sys-libs/zlib
-       >=app-eselect/eselect-ruby-20161226
-       !<dev-ruby/rdoc-3.9.4
-       !<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-       >=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
-       >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
-       >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
-       >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
-       >=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
-       >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
-       >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
-"
-
-PDEPEND="
-       ${BUNDLED_GEMS}
-       virtual/rubygems[ruby_targets_ruby24]
-       >=dev-ruby/json-2.0.2[ruby_targets_ruby24]
-       rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
-       xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-       eapply "${FILESDIR}"/${SLOT}/{002,005,009,012}*.patch
-
-       einfo "Unbundling gems..."
-       cd "$S"
-       # Remove bundled gems that we will install via PDEPEND, bug
-       # 539700. Use explicit version numbers to ensure rm fails when they
-       # change so we can update dependencies accordingly.
-       rm -f 
gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem
 || die
-
-       einfo "Removing bundled libraries..."
-       rm -fr ext/fiddle/libffi-3.2.1 || die
-
-       # Fix a hardcoded lib path in configure script
-       sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-               configure.in || die "sed failed"
-
-       eapply_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local modules= myconf=
-
-       # -fomit-frame-pointer makes ruby segfault, see bug #150413.
-       filter-flags -fomit-frame-pointer
-       # In many places aliasing rules are broken; play it safe
-       # as it's risky with newer compilers to leave it as it is.
-       append-flags -fno-strict-aliasing
-       # SuperH needs this
-       use sh && append-flags -mieee
-
-       # Socks support via dante
-       if use socks5 ; then
-               # Socks support can't be disabled as long as SOCKS_SERVER is
-               # set and socks library is present, so need to unset
-               # SOCKS_SERVER in that case.
-               unset SOCKS_SERVER
-       fi
-
-       # Increase GC_MALLOC_LIMIT if set (default is 8000000)
-       if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-               append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-       fi
-
-       # ipv6 hack, bug 168939. Needs --enable-ipv6.
-       use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-       # Determine which modules *not* to build depending in the USE flags.
-       if ! use berkdb ; then
-               modules="${modules},dbm"
-       fi
-       if ! use gdbm ; then
-               modules="${modules},gdbm"
-       fi
-       if ! use ssl ; then
-               modules="${modules},openssl"
-       fi
-       if ! use tk ; then
-               modules="${modules},tk"
-       fi
-
-       # Provide an empty LIBPATHENV because we disable rpath but we do not
-       # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-       # #564272
-       INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-               --program-suffix=${MY_SUFFIX} \
-               --with-soname=ruby${MY_SUFFIX} \
-               --docdir=${EPREFIX}/usr/share/doc/${P} \
-               --enable-shared \
-               --enable-pthread \
-               --disable-rpath \
-               --with-out-ext="${modules}" \
-               $(use_with jemalloc jemalloc) \
-               $(use_enable socks5 socks) \
-               $(use_enable doc install-doc) \
-               --enable-ipv6 \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs install-static-library) \
-               $(use_with static-libs static-linked-ext) \
-               $(use_enable debug) \
-               ${myconf} \
-               --enable-option-checking=no \
-               || die "econf failed"
-}
-
-src_compile() {
-       emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-       emake -j1 V=1 test || die "make test failed"
-
-       elog "Ruby's make test has been run. Ruby also ships with a make check"
-       elog "that cannot be run until after ruby has been installed."
-       elog
-       if use rubytests; then
-               elog "You have enabled rubytests, so they will be installed to"
-               elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a 
user other"
-               elog "than root, and you must place them into a writeable 
directory."
-               elog "Then call: "
-               elog
-               elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-       else
-               elog "Enable the rubytests USE flag to install the make check 
tests"
-       fi
-}
-
-src_install() {
-       # Remove the remaining bundled gems. We do this late in the process
-       # since they are used during the build to e.g. create the
-       # documentation.
-       rm -rf ext/json || die
-
-       # Ruby is involved in the install process, we don't want interference 
here.
-       unset RUBYOPT
-
-       local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo 
$(MINIRUBY)'|make -f - getminiruby)
-
-       
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-       RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-       for d in $(find "${S}/ext" -type d) ; do
-               RUBYLIB="${RUBYLIB}:$d"
-       done
-       export LD_LIBRARY_PATH RUBYLIB
-
-       emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-       # Remove installed rubygems and rdoc copy
-       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die 
"rm rubygems failed"
-       rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins 
failed"
-
-       if use doc; then
-               make DESTDIR="${D}" install-doc || die "make install-doc failed"
-       fi
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}
-               doins -r sample
-       fi
-
-       dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-       if use rubytests; then
-               pushd test
-               insinto /usr/share/${PN}-${SLOT}/test
-               doins -r .
-               popd
-       fi
-}
-
-pkg_postinst() {
-       if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
-               eselect ruby set ruby${MY_SUFFIX}
-       fi
-
-       elog
-       elog "To switch between available Ruby profiles, execute as root:"
-       elog "\teselect ruby set ruby(23|24|...)"
-       elog
-}
-
-pkg_postrm() {
-       eselect ruby cleanup
-}

diff --git a/dev-lang/ruby/ruby-2.5.3.ebuild b/dev-lang/ruby/ruby-2.5.3.ebuild
deleted file mode 100644
index 7c56ce9dff6..00000000000
--- a/dev-lang/ruby/ruby-2.5.3.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/";
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests 
socks5 +ssl static-libs tk xemacs"
-
-RDEPEND="
-       berkdb? ( sys-libs/db:= )
-       gdbm? ( sys-libs/gdbm:= )
-       jemalloc? ( dev-libs/jemalloc )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl )
-       )
-       socks5? ( >=net-proxy/dante-1.1.13 )
-       tk? (
-               dev-lang/tcl:0=[threads]
-               dev-lang/tk:0=[threads]
-       )
-       dev-libs/libyaml
-       virtual/libffi:=
-       sys-libs/readline:0=
-       sys-libs/zlib
-       >=app-eselect/eselect-ruby-20171225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-       >=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
-       >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
-       >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
-       >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
-       >=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
-       >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
-       >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
-"
-
-PDEPEND="
-       ${BUNDLED_GEMS}
-       virtual/rubygems[ruby_targets_ruby25]
-       >=dev-ruby/json-2.0.2[ruby_targets_ruby25]
-       rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby25] )
-       xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-       eapply "${FILESDIR}"/${SLOT}/{001,005,009}*.patch
-
-       einfo "Unbundling gems..."
-       cd "$S"
-       # Remove bundled gems that we will install via PDEPEND, bug
-       # 539700. Use explicit version numbers to ensure rm fails when they
-       # change so we can update dependencies accordingly.
-       rm -f 
gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem
 || die
-
-       einfo "Removing bundled libraries..."
-       rm -fr ext/fiddle/libffi-3.2.1 || die
-
-       eapply_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local modules= myconf=
-
-       # -fomit-frame-pointer makes ruby segfault, see bug #150413.
-       filter-flags -fomit-frame-pointer
-       # In many places aliasing rules are broken; play it safe
-       # as it's risky with newer compilers to leave it as it is.
-       append-flags -fno-strict-aliasing
-       # SuperH needs this
-       use sh && append-flags -mieee
-
-       # Socks support via dante
-       if use socks5 ; then
-               # Socks support can't be disabled as long as SOCKS_SERVER is
-               # set and socks library is present, so need to unset
-               # SOCKS_SERVER in that case.
-               unset SOCKS_SERVER
-       fi
-
-       # Increase GC_MALLOC_LIMIT if set (default is 8000000)
-       if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-               append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-       fi
-
-       # ipv6 hack, bug 168939. Needs --enable-ipv6.
-       use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-       # Determine which modules *not* to build depending in the USE flags.
-       if ! use berkdb ; then
-               modules="${modules},dbm"
-       fi
-       if ! use gdbm ; then
-               modules="${modules},gdbm"
-       fi
-       if ! use ssl ; then
-               modules="${modules},openssl"
-       fi
-       if ! use tk ; then
-               modules="${modules},tk"
-       fi
-
-       # Provide an empty LIBPATHENV because we disable rpath but we do not
-       # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-       # #564272
-       INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-               --program-suffix=${MY_SUFFIX} \
-               --with-soname=ruby${MY_SUFFIX} \
-               --docdir=${EPREFIX}/usr/share/doc/${P} \
-               --enable-shared \
-               --enable-pthread \
-               --disable-rpath \
-               --with-out-ext="${modules}" \
-               $(use_with jemalloc jemalloc) \
-               $(use_enable socks5 socks) \
-               $(use_enable doc install-doc) \
-               --enable-ipv6 \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs install-static-library) \
-               $(use_with static-libs static-linked-ext) \
-               $(use_enable debug) \
-               ${myconf} \
-               --enable-option-checking=no \
-               || die "econf failed"
-}
-
-src_compile() {
-       emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-       emake -j1 V=1 test || die "make test failed"
-
-       elog "Ruby's make test has been run. Ruby also ships with a make check"
-       elog "that cannot be run until after ruby has been installed."
-       elog
-       if use rubytests; then
-               elog "You have enabled rubytests, so they will be installed to"
-               elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a 
user other"
-               elog "than root, and you must place them into a writeable 
directory."
-               elog "Then call: "
-               elog
-               elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-       else
-               elog "Enable the rubytests USE flag to install the make check 
tests"
-       fi
-}
-
-src_install() {
-       # Remove the remaining bundled gems. We do this late in the process
-       # since they are used during the build to e.g. create the
-       # documentation.
-       rm -rf ext/json || die
-
-       # Ruby is involved in the install process, we don't want interference 
here.
-       unset RUBYOPT
-
-       local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo 
$(MINIRUBY)'|make -f - getminiruby)
-
-       
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-       RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-       for d in $(find "${S}/ext" -type d) ; do
-               RUBYLIB="${RUBYLIB}:$d"
-       done
-       export LD_LIBRARY_PATH RUBYLIB
-
-       emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-       # Remove installed rubygems and rdoc copy
-       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die 
"rm rubygems failed"
-       rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins 
failed"
-
-       if use doc; then
-               make DESTDIR="${D}" install-doc || die "make install-doc failed"
-       fi
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}
-               doins -r sample
-       fi
-
-       dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-       if use rubytests; then
-               pushd test
-               insinto /usr/share/${PN}-${SLOT}/test
-               doins -r .
-               popd
-       fi
-}
-
-pkg_postinst() {
-       if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
-               eselect ruby set ruby${MY_SUFFIX}
-       fi
-
-       elog
-       elog "To switch between available Ruby profiles, execute as root:"
-       elog "\teselect ruby set ruby(23|24|...)"
-       elog
-}
-
-pkg_postrm() {
-       eselect ruby cleanup
-}

diff --git a/dev-lang/ruby/ruby-2.6.0-r1.ebuild 
b/dev-lang/ruby/ruby-2.6.0-r1.ebuild
deleted file mode 100644
index 3d4b93b4185..00000000000
--- a/dev-lang/ruby/ruby-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/";
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc 
rubytests socks5 +ssl static-libs tk xemacs"
-
-RDEPEND="
-       berkdb? ( sys-libs/db:= )
-       gdbm? ( sys-libs/gdbm:= )
-       jemalloc? ( dev-libs/jemalloc )
-       jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl )
-       )
-       socks5? ( >=net-proxy/dante-1.1.13 )
-       tk? (
-               dev-lang/tcl:0=[threads]
-               dev-lang/tk:0=[threads]
-       )
-       dev-libs/libyaml
-       virtual/libffi:=
-       sys-libs/readline:0=
-       sys-libs/zlib
-       >=app-eselect/eselect-ruby-20171225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-       >=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26]
-       >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26]
-       >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26]
-       >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26]
-       >=dev-ruby/rake-12.3.2[ruby_targets_ruby26]
-       >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26]
-       >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26]
-"
-
-PDEPEND="
-       ${BUNDLED_GEMS}
-       virtual/rubygems[ruby_targets_ruby26]
-       >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
-       >=dev-ruby/json-2.0.2[ruby_targets_ruby26]
-       rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby26] )
-       xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-       # 005 does not compile bigdecimal and is questionable because it
-       # compiles ruby in a non-standard way, may be dropped
-       eapply "${FILESDIR}"/2.6/009*.patch
-
-       einfo "Unbundling gems..."
-       cd "$S"
-       # Remove bundled gems that we will install via PDEPEND, bug
-       # 539700.
-       rm -fr gems/* || die
-
-       einfo "Removing bundled libraries..."
-       rm -fr ext/fiddle/libffi-3.2.1 || die
-
-       eapply_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local modules= myconf=
-
-       # -fomit-frame-pointer makes ruby segfault, see bug #150413.
-       filter-flags -fomit-frame-pointer
-       # In many places aliasing rules are broken; play it safe
-       # as it's risky with newer compilers to leave it as it is.
-       append-flags -fno-strict-aliasing
-       # SuperH needs this
-       use sh && append-flags -mieee
-
-       # Socks support via dante
-       if use socks5 ; then
-               # Socks support can't be disabled as long as SOCKS_SERVER is
-               # set and socks library is present, so need to unset
-               # SOCKS_SERVER in that case.
-               unset SOCKS_SERVER
-       fi
-
-       # Increase GC_MALLOC_LIMIT if set (default is 8000000)
-       if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-               append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-       fi
-
-       # ipv6 hack, bug 168939. Needs --enable-ipv6.
-       use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-       # Determine which modules *not* to build depending in the USE flags.
-       if ! use berkdb ; then
-               modules="${modules},dbm"
-       fi
-       if ! use gdbm ; then
-               modules="${modules},gdbm"
-       fi
-       if ! use ssl ; then
-               modules="${modules},openssl"
-       fi
-       if ! use tk ; then
-               modules="${modules},tk"
-       fi
-
-       # Provide an empty LIBPATHENV because we disable rpath but we do not
-       # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-       # #564272
-       INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-               --program-suffix=${MY_SUFFIX} \
-               --with-soname=ruby${MY_SUFFIX} \
-               --docdir=${EPREFIX}/usr/share/doc/${P} \
-               --enable-shared \
-               --enable-pthread \
-               --disable-rpath \
-               --with-out-ext="${modules}" \
-               $(use_with jemalloc jemalloc) \
-               $(use_enable jit jit-support ) \
-               $(use_enable socks5 socks) \
-               $(use_enable doc install-doc) \
-               --enable-ipv6 \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs install-static-library) \
-               $(use_with static-libs static-linked-ext) \
-               $(use_enable debug) \
-               ${myconf} \
-               --enable-option-checking=no \
-               || die "econf failed"
-
-       # Makefile is broken because it lacks -ldl
-       rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-       emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" 
MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || die "emake failed"
-}
-
-src_test() {
-       emake -j1 V=1 test || die "make test failed"
-
-       elog "Ruby's make test has been run. Ruby also ships with a make check"
-       elog "that cannot be run until after ruby has been installed."
-       elog
-       if use rubytests; then
-               elog "You have enabled rubytests, so they will be installed to"
-               elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a 
user other"
-               elog "than root, and you must place them into a writeable 
directory."
-               elog "Then call: "
-               elog
-               elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-       else
-               elog "Enable the rubytests USE flag to install the make check 
tests"
-       fi
-}
-
-src_install() {
-       # Remove the remaining bundled gems. We do this late in the process
-       # since they are used during the build to e.g. create the
-       # documentation.
-       rm -rf ext/json || die
-       rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-       # Ruby is involved in the install process, we don't want interference 
here.
-       unset RUBYOPT
-
-       local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo 
$(MINIRUBY)'|make -f - getminiruby)
-
-       
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-       RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-       for d in $(find "${S}/ext" -type d) ; do
-               RUBYLIB="${RUBYLIB}:$d"
-       done
-       export LD_LIBRARY_PATH RUBYLIB
-
-       # Create directory for the default gems
-       local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-       mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-       emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install || die "make 
install failed"
-
-       # Remove installed rubygems and rdoc copy
-       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die 
"rm rubygems failed"
-       rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die 
"rm rdoc bins failed"
-
-       if use doc; then
-               emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc || die 
"make install-doc failed"
-       fi
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}
-               doins -r sample
-       fi
-
-       dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-       if use rubytests; then
-               pushd test
-               insinto /usr/share/${PN}-${SLOT}/test
-               doins -r .
-               popd
-       fi
-}
-
-pkg_postinst() {
-       if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
-               eselect ruby set ruby${MY_SUFFIX}
-       fi
-
-       elog
-       elog "To switch between available Ruby profiles, execute as root:"
-       elog "\teselect ruby set ruby(23|24|...)"
-       elog
-}
-
-pkg_postrm() {
-       eselect ruby cleanup
-}

diff --git a/dev-lang/ruby/ruby-2.6.1.ebuild b/dev-lang/ruby/ruby-2.6.1.ebuild
deleted file mode 100644
index 9ab0d7c1a5d..00000000000
--- a/dev-lang/ruby/ruby-2.6.1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib
-
-MY_P="${PN}-$(ver_cut 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(ver_cut 1-2)
-MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/";
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc 
rubytests socks5 +ssl static-libs tk xemacs"
-
-RDEPEND="
-       berkdb? ( sys-libs/db:= )
-       gdbm? ( sys-libs/gdbm:= )
-       jemalloc? ( dev-libs/jemalloc )
-       jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl )
-       )
-       socks5? ( >=net-proxy/dante-1.1.13 )
-       tk? (
-               dev-lang/tcl:0=[threads]
-               dev-lang/tk:0=[threads]
-       )
-       dev-libs/libyaml
-       virtual/libffi:=
-       sys-libs/readline:0=
-       sys-libs/zlib
-       >=app-eselect/eselect-ruby-20171225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-       >=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26]
-       >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26]
-       >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26]
-       >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26]
-       >=dev-ruby/rake-12.3.2[ruby_targets_ruby26]
-       >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26]
-       >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26]
-"
-
-PDEPEND="
-       ${BUNDLED_GEMS}
-       virtual/rubygems[ruby_targets_ruby26]
-       >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
-       >=dev-ruby/json-2.0.2[ruby_targets_ruby26]
-       rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby26] )
-       xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-       # 005 does not compile bigdecimal and is questionable because it
-       # compiles ruby in a non-standard way, may be dropped
-       eapply "${FILESDIR}"/2.6/010*.patch
-
-       einfo "Unbundling gems..."
-       cd "$S"
-       # Remove bundled gems that we will install via PDEPEND, bug
-       # 539700.
-       rm -fr gems/* || die
-
-       einfo "Removing bundled libraries..."
-       rm -fr ext/fiddle/libffi-3.2.1 || die
-
-       eapply_user
-
-       eautoreconf
-}
-
-src_configure() {
-       local modules= myconf=
-
-       # -fomit-frame-pointer makes ruby segfault, see bug #150413.
-       filter-flags -fomit-frame-pointer
-       # In many places aliasing rules are broken; play it safe
-       # as it's risky with newer compilers to leave it as it is.
-       append-flags -fno-strict-aliasing
-       # SuperH needs this
-       use sh && append-flags -mieee
-
-       # Socks support via dante
-       if use socks5 ; then
-               # Socks support can't be disabled as long as SOCKS_SERVER is
-               # set and socks library is present, so need to unset
-               # SOCKS_SERVER in that case.
-               unset SOCKS_SERVER
-       fi
-
-       # Increase GC_MALLOC_LIMIT if set (default is 8000000)
-       if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-               append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-       fi
-
-       # ipv6 hack, bug 168939. Needs --enable-ipv6.
-       use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-       # Determine which modules *not* to build depending in the USE flags.
-       if ! use berkdb ; then
-               modules="${modules},dbm"
-       fi
-       if ! use gdbm ; then
-               modules="${modules},gdbm"
-       fi
-       if ! use ssl ; then
-               modules="${modules},openssl"
-       fi
-       if ! use tk ; then
-               modules="${modules},tk"
-       fi
-
-       # Provide an empty LIBPATHENV because we disable rpath but we do not
-       # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-       # #564272
-       INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-               --program-suffix=${MY_SUFFIX} \
-               --with-soname=ruby${MY_SUFFIX} \
-               --docdir=${EPREFIX}/usr/share/doc/${P} \
-               --enable-shared \
-               --enable-pthread \
-               --disable-rpath \
-               --with-out-ext="${modules}" \
-               $(use_with jemalloc jemalloc) \
-               $(use_enable jit jit-support ) \
-               $(use_enable socks5 socks) \
-               $(use_enable doc install-doc) \
-               --enable-ipv6 \
-               $(use_enable static-libs static) \
-               $(use_enable static-libs install-static-library) \
-               $(use_with static-libs static-linked-ext) \
-               $(use_enable debug) \
-               ${myconf} \
-               --enable-option-checking=no \
-               || die "econf failed"
-
-       # Makefile is broken because it lacks -ldl
-       rm -rf ext/-test-/popen_deadlock || die
-}
-
-src_compile() {
-       emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" 
MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || die "emake failed"
-}
-
-src_test() {
-       emake -j1 V=1 test || die "make test failed"
-
-       elog "Ruby's make test has been run. Ruby also ships with a make check"
-       elog "that cannot be run until after ruby has been installed."
-       elog
-       if use rubytests; then
-               elog "You have enabled rubytests, so they will be installed to"
-               elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a 
user other"
-               elog "than root, and you must place them into a writeable 
directory."
-               elog "Then call: "
-               elog
-               elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-       else
-               elog "Enable the rubytests USE flag to install the make check 
tests"
-       fi
-}
-
-src_install() {
-       # Remove the remaining bundled gems. We do this late in the process
-       # since they are used during the build to e.g. create the
-       # documentation.
-       rm -rf ext/json || die
-       rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
-
-       # Ruby is involved in the install process, we don't want interference 
here.
-       unset RUBYOPT
-
-       local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo 
$(MINIRUBY)'|make -f - getminiruby)
-
-       
LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-       RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-       for d in $(find "${S}/ext" -type d) ; do
-               RUBYLIB="${RUBYLIB}:$d"
-       done
-       export LD_LIBRARY_PATH RUBYLIB
-
-       # Create directory for the default gems
-       local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
-       mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
-
-       emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install || die "make 
install failed"
-
-       # Remove installed rubygems and rdoc copy
-       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die 
"rm rubygems failed"
-       rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-       rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die 
"rm rdoc bins failed"
-
-       if use doc; then
-               emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc || die 
"make install-doc failed"
-       fi
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}
-               doins -r sample
-       fi
-
-       dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-       if use rubytests; then
-               pushd test
-               insinto /usr/share/${PN}-${SLOT}/test
-               doins -r .
-               popd
-       fi
-}
-
-pkg_postinst() {
-       if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
-               eselect ruby set ruby${MY_SUFFIX}
-       fi
-
-       elog
-       elog "To switch between available Ruby profiles, execute as root:"
-       elog "\teselect ruby set ruby(23|24|...)"
-       elog
-}
-
-pkg_postrm() {
-       eselect ruby cleanup
-}

Reply via email to