commit:     500765d83e9879dfa854ff4d661a6216fe538adf
Author:     layman <layman <AT> localhost>
AuthorDate: Mon Mar 14 01:25:20 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 01:39:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=500765d8

dev-lang/ruby: in tree versions works

 dev-lang/ruby/Manifest                         |   5 -
 dev-lang/ruby/files/ruby-add-asm_ioctl_h.patch |  11 --
 dev-lang/ruby/metadata.xml                     |  28 ---
 dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild        | 231 -------------------------
 4 files changed, 275 deletions(-)

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
deleted file mode 100644
index 8565f6a..0000000
--- a/dev-lang/ruby/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ruby-add-asm_ioctl_h.patch 338 SHA256 
82fa2b35c1a1ae05aaf7e849bd7b6068951f65609a35de1f88fcf83f254666f2 SHA512 
eba8f362cda01fed4d38515a1ce03e4c462ddb6adf686de76b3d91bc5d5484661b7be5a9080624a9fa87fffff27b65c746d7ec94d4e27dbef2f9b321fc286be1
 WHIRLPOOL 
9c1ac98344cd44a3f9523e7dc723ab6dceab3c1c569d2656d03fdbe7677207bbe52ed5436dcd405c33c16d623333219aa6492dcb76d94b0cf833305589312ae2
-DIST ruby-2.0.0-p647.tar.xz 8301008 SHA256 
9f793880df1209ea4e5c10ee9d8ef79caa0e73ee769f745f1c191505255e2847 SHA512 
38fd2ad631588a0e8adf9a7ae01cb5274eca4fd794c5ed7030e5fae9e53cd8920eaac9d388c73b844a154c7eb56fa6fed8e2ee5df5617efd624b6a568ea4953b
 WHIRLPOOL 
c8ec19ed900e6578f1f6e08d1e2a5c015cfa6e81379fb0437a1167ffb8bc56561d02b4b5b35a674039f7adcd2c43b222b89e139cb0ea702e8bfec886872c8e6a
-DIST ruby-patches-2.0.0_p647-r1.tar.bz2 3341 SHA256 
7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 
40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6
 WHIRLPOOL 
ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
-EBUILD ruby-2.0.0_p647-r1.ebuild 6412 SHA256 
793e794ac8333125eba8bace90d0dae825ba66f64088ae07f8aa019079668ff1 SHA512 
3052910cd789ec498bfc9312944d18b69517313ebb18e193094503c8d510c132da3225895fa52bffc1c5320c5e21d27199052ad88df74b521d9ef1a41c56ceb9
 WHIRLPOOL 
d9aa2192d62c7cd29857c10fedb8f0750503d6b9b6ea4d61a162721155b3552cc56f9090a40f16b41f58389102d3bc28b1e0ca13cfd5a1530fcef4ffe426807a
-MISC metadata.xml 977 SHA256 
fc9d7cc6e682821e89141cdfcb007bc889c6cc522f662631e28dc280935a6624 SHA512 
274ff4d66139d0e4fb91f339b834e77938e51508e712a5005fbb67e6b16fa04879cbb30ad6ee61cd60b16f01b6e311deee461dbb15ffcd1d9b45119484295750
 WHIRLPOOL 
44dbd829673c75af5459d1e440aa53be46e8ebc95d91faf0af31b9ad8608dac920d9dc13c11ca24af1646a31d0c5fa6800669fa7ba34c709814dffde226b4418

diff --git a/dev-lang/ruby/files/ruby-add-asm_ioctl_h.patch 
b/dev-lang/ruby/files/ruby-add-asm_ioctl_h.patch
deleted file mode 100644
index 9fef9e8..0000000
--- a/dev-lang/ruby/files/ruby-add-asm_ioctl_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar ruby-2.0.0-p353.orig/io.c ruby-2.0.0-p353/io.c
---- ruby-2.0.0-p353.orig/io.c  2013-10-04 17:30:50.000000000 +0000
-+++ ruby-2.0.0-p353/io.c       2014-02-23 13:22:06.038406133 +0000
-@@ -19,6 +19,7 @@
- #include "id.h"
- #include <ctype.h>
- #include <errno.h>
-+#include <asm/ioctl.h>
- #include "ruby_atomic.h"
- 
- #define free(x) xfree(x)

diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
deleted file mode 100644
index 249178b..0000000
--- a/dev-lang/ruby/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-  <maintainer type="project">
-    <email>r...@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <use>
-    <flag name="rubytests">
-      Install ruby tests that can only be run after ruby is installed
-    </flag>
-    <flag name="readline">
-      Use the <pkg>sys-libs/readline</pkg> library to provide the
-      readline extension, used for instance by the irb tool. This flag
-      is meaningful only if the libedit USE flag is disabled.
-
-      If neither libedit nor readline USE flags are enabled, the
-      readline extension will not be built (and irb will lose line
-      editing functionality).
-    </flag>
-    <flag name="rdoc">
-      Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
-    </flag>
-    <flag name="jemalloc">
-         Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.
-       </flag>
-  </use>
-</pkgmetadata>

diff --git a/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild 
b/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
deleted file mode 100644
index 5908fd1..0000000
--- a/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.0.0
-
-if [[ -n ${PATCHSET} ]]; then
-       if [[ ${PVR} == ${PV} ]]; then
-               PATCHSET="${PV}-r0.${PATCHSET}"
-       else
-               PATCHSET="${PVR}.${PATCHSET}"
-       fi
-else
-       PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/";
-SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
-                
https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2";
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs 
ncurses +readline cpu_flags_x86_sse2"
-
-RDEPEND="
-       berkdb? ( sys-libs/db:= )
-       gdbm? ( sys-libs/gdbm )
-       ssl? ( dev-libs/openssl:0 )
-       socks5? ( >=net-proxy/dante-1.1.13 )
-       ncurses? ( sys-libs/ncurses:0= )
-       readline?  ( sys-libs/readline:0 )
-       dev-libs/libyaml
-       virtual/libffi
-       sys-libs/zlib
-       >=app-eselect/eselect-ruby-20100402
-       !<dev-ruby/rdoc-3.9.4
-       !<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-PDEPEND="
-       virtual/rubygems[ruby_targets_ruby20]
-       >=dev-ruby/json-1.7.7[ruby_targets_ruby20]
-       >=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
-       rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
-       xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-       if use cpu_flags_x86_sse2 ; then
-               excluded_patches="012_no_forced_sse2.patch"
-       fi
-
-       EPATCH_EXCLUDE="${excluded_patches}" EPATCH_FORCE="yes" 
EPATCH_SUFFIX="patch" \
-               epatch "${WORKDIR}/patches"
-
-       epatch "${FILESDIR}"/${PN}-add-asm_ioctl_h.patch
-       # We can no longer unbundle all of rake because rubygems now depends
-       # on this. We leave the actual rake code around to bootstrap
-       # rubygems, but remove the bits that would cause a file collision.
-       einfo "Unbundling gems..."
-       cd "$S"
-       rm -r \
-               {bin,lib}/rake lib/rake.rb man/rake.1 \
-               bin/gem || die "removal failed"
-
-       # 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"
-
-       eautoreconf
-}
-
-src_configure() {
-       local myconf=
-
-       # The Tk module can no longer be built because the module code is no
-       # longer compatible with newer stable versions.
-       # https://bugs.gentoo.org/show_bug.cgi?id=500894
-       local modules="tk"
-
-       # -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 readline ; then
-               modules="${modules},readline"
-       fi
-       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 ncurses ; then
-               modules="${modules},curses"
-       fi
-
-       INSTALL="${EPREFIX}/usr/bin/install -c" 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_enable socks5 socks) \
-               $(use_enable doc install-doc) \
-               --enable-ipv6 \
-               $(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="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-       RUBYLIB="${S}:${D}/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 copy
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems failed"
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -r "${D}/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 "${ROOT}"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(19|20|...)"
-       elog
-}
-
-pkg_postrm() {
-       eselect ruby cleanup
-}

Reply via email to