diff options
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/ruby/ChangeLog | 4 | ||||
-rw-r--r-- | dev-lang/ruby/Manifest | 8 | ||||
-rw-r--r-- | dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff | 32 | ||||
-rw-r--r-- | dev-lang/ruby/metadata.xml | 6 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild | 219 |
5 files changed, 6 insertions, 263 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog index 2b607693..90e12eea 100644 --- a/dev-lang/ruby/ChangeLog +++ b/dev-lang/ruby/ChangeLog @@ -1,3 +1,7 @@ + 26 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh> + -files/ruby-1.9.3_p551-asm-ilp32+volatile.diff, -ruby-1.9.3_p551-r1.ebuild: + dev-lang/ruby: Drop since ruby 1.9 is being removed + *ruby-2.0.0_p647 (22 Aug 2015) 22 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh> diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 8a62b206..4efe40b7 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -1,11 +1,7 @@ -AUX ruby-1.9.3_p551-asm-ilp32+volatile.diff 1439 SHA256 302b737a014a68be1f7aea3d53fb7bdf6fb74c248d29c15e79ec32581b42cf2a WHIRLPOOL 23658e01a36afd77decc9f0b280b7d0fa04a92f737f5bbc4c38072a966a9e115a7d852db80c859ca21f09ca4287559fb7c12b06409712a2905811ea8a8697ee4 AUX ruby-2.0.0_p647-SVNr39186-asm-volatile.diff 1084 SHA256 018db4d702d43c3020be470f5ae262c6e433023988b7522aef4051c6a10dfb12 WHIRLPOOL d9155e0e3dd688889d70d0484219e0ee4a15fe48f92f191bbabf60b58c846bd563ebe6549b9f6351c71936085af06359f6fed917011edbb821055cf009c1bfe7 AUX ruby-2.0.0_p647-SVNr40636-asm-ilp32.diff 990 SHA256 90739a6c3502f12f2d79d69920676d218776f50816b7d0f107192ff664ad88be WHIRLPOOL 83c9866bade1c90cb0de3b99b86174cc5bddca8b1f1371fe7a59a829c92378734b8af4ade9538743fb3d3f2359f9e4696f2b7b005114e14c34a1fe3469f6df72 -DIST ruby-1.9.3-p551.tar.bz2 10049332 SHA256 b0c5e37e3431d58613a160504b39542ec687d473de1d4da983dabcf3c5de771e WHIRLPOOL a4de6b7300e1f1cb22b01b1fbe0a73928baf6e5b1d083e8eb239e7696703e13774fdcb52bbb7f4253ea75b597663c43a8fbea2df7b77ed95f3fd8b2512ff1f1e DIST ruby-2.0.0-p647.tar.xz 8301008 SHA256 9f793880df1209ea4e5c10ee9d8ef79caa0e73ee769f745f1c191505255e2847 WHIRLPOOL c8ec19ed900e6578f1f6e08d1e2a5c015cfa6e81379fb0437a1167ffb8bc56561d02b4b5b35a674039f7adcd2c43b222b89e139cb0ea702e8bfec886872c8e6a -DIST ruby-patches-1.9.3_p551-r1.tar.bz2 3685 SHA256 362d94b77c3408d200c42855868ebb5ddbee287d66bbed8e269255f9cb63418a WHIRLPOOL 3001b1c6189a882a45125d04b6264e22e0bf2b773c249bf00c2cfc98dec3392ae422913d278aae289767db0aaf8782e1a7dd44e94965aa02893833d5737ad494 DIST ruby-patches-2.0.0_p647.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e -EBUILD ruby-1.9.3_p551-r1.ebuild 6125 SHA256 719bf1f618f087b8736a7ee11a1a87740c7f44b505bd458c0f15e34900927f49 WHIRLPOOL 542726412e801317313a5b24b04790210e17b8d04caab1d8d479614e3cd44607b21f52d044d1aadf855de2eba5ec26682c96a0d04cac3564dd2c9efc1b3583c8 EBUILD ruby-2.0.0_p647.ebuild 6538 SHA256 2e9c9faee892f822a173b1563b7a3e40385deffbaa6bcfc5c4e8dd4055936fe8 WHIRLPOOL 756ec67eb043be263a6846668a140a32560f42981aeaaa5c3ac10a851c3d806205d70ae91c2578c39a511ee36cc5efe01a0eb4aca7575053e877534608beed7f -MISC ChangeLog 4647 SHA256 c39ad30e1d931d7c1fe167191d26f9643feaa62a2b63301e9d62592ba5e511c4 WHIRLPOOL 2d612af26807bb512f14d61ce44c0af82da86ba394ba20987bcfb7801b9cf3123dd993e9029579f7066cd0184b6d9af924d9e4485234cd037884976bfd7a72b0 -MISC metadata.xml 1135 SHA256 4eb2a9282b6a9ec8da39dece1406618a5134adc75bc27bb8b73109ce1bfc4e62 WHIRLPOOL 3aeaa05e3e8f762ba9d6f779165ce9b715e0858cec3b19b73d3c2ecc5236be9f1cd67f6dddfe1fadf9e9bde2b8f1f77e1e9d2400bf8bf8cefdc1dd367ad21342 +MISC ChangeLog 4835 SHA256 6f3aa641c3a506a675e69a39862cf2f8196b5d13c6a6c78abc622f2e6ab2a30b WHIRLPOOL 30b12acc1b8c813f68377510b33077b18a4b40c41186e391d180a25f59850dbfee137ca6fc6505875edd085dbcc13aa0044565ee77e391b3a9dd2f61dfc10926 +MISC metadata.xml 892 SHA256 1e04af7280748397c1156d9ad9eac34d2afcc404b474ed337e0658a0d4a931d9 WHIRLPOOL f7c799e31ee7b2d72cfdfbe3b2f3e3c51e78ed22fc67d7848bfcaa72aff00283db163846cd95f93ac7eaebae5ecca8091d5a1117d9e3637fa6f207361b6c0917 diff --git a/dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff b/dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff deleted file mode 100644 index bd4b32b7..00000000 --- a/dev-lang/ruby/files/ruby-1.9.3_p551-asm-ilp32+volatile.diff +++ /dev/null @@ -1,32 +0,0 @@ ------------------------------------------------------------------------- -r39186 | kosaki | 2013-02-10 06:41:01 +0100 (Sun, 10 Feb 2013) | 1 line - -* gc.h (SET_MACHINE_STACK_END): use __volatile__ instead of volatile. - ------------------------------------------------------------------------- -r40636 | akr | 2013-05-10 17:49:56 +0200 (Fri, 10 May 2013) | 5 lines - -* gc.h (SET_MACHINE_STACK_END): Add !defined(_ILP32) to a defining - condition to avoid compilation error on x32. - https://sites.google.com/site/x32abi/ - -Index: gc.h -=================================================================== ---- gc.h (revision 39185) -+++ gc.h (revision 40636) -@@ -2,10 +2,10 @@ - #ifndef RUBY_GC_H - #define RUBY_GC_H 1 - --#if defined(__x86_64__) && defined(__GNUC__) --#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movq\t%%rsp, %0" : "=r" (*(p))) -+#if defined(__x86_64__) && !defined(_ILP32) && defined(__GNUC__) && !defined(__native_client__) -+#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movq\t%%rsp, %0" : "=r" (*(p))) - #elif defined(__i386) && defined(__GNUC__) --#define SET_MACHINE_STACK_END(p) __asm__ volatile ("movl\t%%esp, %0" : "=r" (*(p))) -+#define SET_MACHINE_STACK_END(p) __asm__ __volatile__ ("movl\t%%esp, %0" : "=r" (*(p))) - #else - NOINLINE(void rb_gc_set_stack_end(VALUE **stack_end_p)); - #define SET_MACHINE_STACK_END(p) rb_gc_set_stack_end(p) - ------------------------------------------------------------------------- diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml index 815b4d7b..7cb8bba6 100644 --- a/dev-lang/ruby/metadata.xml +++ b/dev-lang/ruby/metadata.xml @@ -17,12 +17,6 @@ editing functionality). </flag> - <flag name='yaml'> - Use the <pkg>dev-libs/libyaml</pkg> library to build the psych - extension, available since Ruby 1.9.2_rc2, in alternative to the - bundled syck-based parser. - </flag> - <flag name='rdoc'> Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby. </flag> diff --git a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild b/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild deleted file mode 100644 index f71eda10..00000000 --- a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -#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}) -# 1.9.3 still uses 1.9.1 -RUBYVERSION=1.9.1 - -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/1.9/${MY_P}.tar.bz2 - http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" - -LICENSE="|| ( Ruby-BSD BSD-2 )" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline +yaml" #libedit - -# libedit support is removed everywhere because of this upstream bug: -# http://redmine.ruby-lang.org/issues/show/3698 - -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 ) - readline? ( sys-libs/readline ) - yaml? ( 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" -# libedit? ( dev-libs/libedit ) -# !libedit? ( readline? ( sys-libs/readline ) ) - -DEPEND="${RDEPEND}" -PDEPEND=" - virtual/rubygems[ruby_targets_ruby19] - rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] ) - xemacs? ( app-xemacs/ruby-modes )" - -src_prepare() { - EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ - epatch "${WORKDIR}/patches" - - epatch "${FILESDIR}/${P}-asm-ilp32+volatile.diff" - - einfo "Unbundling gems..." - cd "$S" - rm -r \ - {bin,lib}/rake lib/rake.rb man/rake.1 \ - ext/json \ - 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= - - # -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" - -# if use libedit; then -# einfo "Using libedit to provide readline extension" -# myconf="${myconf} --enable-libedit --with-readline" -# elif use readline; then -# einfo "Using readline to provide readline extension" -# myconf="${myconf} --with-readline" -# else -# myconf="${myconf} --without-readline" -# fi - myconf="${myconf} $(use_with readline)" - - # Always disable tk because the module is no longer compatible with - # stable tcl/tk: https://bugs.gentoo.org/show_bug.cgi?id=500894 - INSTALL="${EPREFIX}/usr/bin/install -c" econf \ - --program-suffix=${MY_SUFFIX} \ - --with-soname=ruby${MY_SUFFIX} \ - --enable-shared \ - --enable-pthread \ - --without-tk \ - $(use_enable socks5 socks) \ - $(use_enable doc install-doc) \ - --enable-ipv6 \ - $(use_enable debug) \ - $(use_with berkdb dbm) \ - $(use_with gdbm) \ - $(use_with ssl openssl) \ - $(use_with ncurses curses) \ - $(use_with yaml psych) \ - ${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() { - # 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* ToDo || 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 -} |