Fri Aug 21 21:17:48 UTC 2015

a/aaa_elflibs-14.2-x86_64-1.txz:  Upgraded.
a/dosfstools-3.0.28-x86_64-1.txz:  Upgraded.
a/etc-14.2-x86_64-2.txz:  Rebuilt.
a/glibc-solibs-2.22-x86_64-1.txz:  Upgraded.
a/glibc-zoneinfo-2015f-noarch-1.txz:  Upgraded.
a/kernel-firmware-20150820git-noarch-1.txz:  Upgraded.
a/kernel-generic-4.1.6-x86_64-1.txz:  Upgraded.
a/kernel-huge-4.1.6-x86_64-1.txz:  Upgraded.
a/kernel-modules-4.1.6-x86_64-1.txz:  Upgraded.
a/procps-ng-3.3.10-x86_64-3.txz:  Rebuilt.
  Fix "fuser -s $FILE" with patch from upstream git.
  Thanks to Dan Church.
ap/cups-2.0.4-x86_64-2.txz:  Rebuilt.
ap/cups-filters-1.0.73-x86_64-1.txz:  Upgraded.
ap/hplip-3.15.7-x86_64-2.txz:  Rebuilt.
  Patched a bug.  Thanks to gmgf.
ap/linuxdoc-tools-0.9.69-x86_64-4.txz:  Rebuilt.
  Upgraded to asciidoc-8.6.9 and gtk-doc-1.24.
  Thanks to Stuart Winter.
d/gcc-4.9.3-x86_64-1.txz:  Upgraded.
d/gcc-g++-4.9.3-x86_64-1.txz:  Upgraded.
d/gcc-gfortran-4.9.3-x86_64-1.txz:  Upgraded.
d/gcc-gnat-4.9.3-x86_64-1.txz:  Upgraded.
d/gcc-go-4.9.3-x86_64-1.txz:  Upgraded.
d/gcc-java-4.9.3-x86_64-1.txz:  Upgraded.
d/gcc-objc-4.9.3-x86_64-1.txz:  Upgraded.
d/kernel-headers-4.1.6-x86-1.txz:  Upgraded.
d/pkg-config-0.28-x86_64-2.txz:  Rebuilt.
d/ruby-2.2.3-x86_64-1.txz:  Upgraded.
  Thanks to Vincent Batts.
e/emacs-24.5-x86_64-2.txz:  Rebuilt.
k/kernel-source-4.1.6-noarch-1.txz:  Upgraded.
kde/korundum-4.14.3-x86_64-2.txz:  Rebuilt.
kde/qtruby-4.14.3-x86_64-3.txz:  Rebuilt.
l/elfutils-0.163-x86_64-1.txz:  Added.
l/glib-networking-2.44.0-x86_64-2.txz:  Rebuilt.
l/glibc-2.22-x86_64-1.txz:  Upgraded.
l/glibc-i18n-2.22-x86_64-1.txz:  Upgraded.
l/glibc-profile-2.22-x86_64-1.txz:  Upgraded.
l/gtk+2-2.24.28-x86_64-2.txz:  Rebuilt.
l/gtk+3-3.16.6-x86_64-1.txz:  Upgraded.
l/gvfs-1.24.2-x86_64-1.txz:  Upgraded.
l/libarchive-3.1.2-x86_64-2.txz:  Rebuilt.
l/libelf-0.8.13-x86_64-5.txz:  Removed.
l/libmng-2.0.3-x86_64-1.txz:  Upgraded.
l/librsvg-2.40.10-x86_64-1.txz:  Upgraded.
l/libvncserver-0.9.10-x86_64-2.txz:  Rebuilt.
l/loudmouth-1.5.0_20121201-x86_64-2.txz:  Rebuilt.
l/pango-1.36.8-x86_64-2.txz:  Rebuilt.
l/urwid-1.3.0-x86_64-1.txz:  Upgraded.
n/gnutls-3.4.4.1-x86_64-1.txz:  Upgraded.
  This update fixes some bugs and security issues.
  For more information, see:
    http://www.gnutls.org/security.html#GNUTLS-SA-2015-2
    http://www.gnutls.org/security.html#GNUTLS-SA-2015-3
    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-6251
  (* Security fix *)
n/iputils-s20140519-x86_64-1.txz:  Upgraded.
n/nettle-3.1.1-x86_64-1.txz:  Upgraded.
n/obexftp-0.23-x86_64-10.txz:  Rebuilt.
n/samba-4.2.3-x86_64-1.txz:  Upgraded.
  Modified wscript files to install talloc, tevent, and tdb directly.
  Thanks to Christoph Willing.
x/appres-1.0.4-x86_64-2.txz:  Rebuilt.
x/bdftopcf-1.0.5-x86_64-2.txz:  Rebuilt.
x/beforelight-1.0.5-x86_64-2.txz:  Rebuilt.
x/bitmap-1.0.8-x86_64-2.txz:  Rebuilt.
x/compiz-0.8.8-x86_64-3.txz:  Rebuilt.
x/dri2proto-2.8-x86_64-2.txz:  Rebuilt.
x/dri3proto-1.0-x86_64-2.txz:  Rebuilt.
x/editres-1.0.6-x86_64-2.txz:  Rebuilt.
x/fixesproto-5.0-x86_64-2.txz:  Rebuilt.
x/font-util-1.3.1-x86_64-2.txz:  Rebuilt.
x/fonttosfnt-1.0.4-x86_64-2.txz:  Rebuilt.
x/fslsfonts-1.0.5-x86_64-2.txz:  Rebuilt.
x/fstobdf-1.0.6-x86_64-2.txz:  Rebuilt.
x/glamor-egl-0.6.0-x86_64-1.txz:  Removed.
x/iceauth-1.0.7-x86_64-2.txz:  Rebuilt.
x/ico-1.0.4-x86_64-2.txz:  Rebuilt.
x/imake-1.0.7-x86_64-2.txz:  Rebuilt.
x/intel-gpu-tools-1.3-x86_64-2.txz:  Rebuilt.
x/kbproto-1.0.7-noarch-1.txz:  Upgraded.
x/libFS-1.0.7-x86_64-1.txz:  Upgraded.
x/libICE-1.0.9-x86_64-2.txz:  Rebuilt.
x/libSM-1.2.2-x86_64-2.txz:  Rebuilt.
x/libX11-1.6.3-x86_64-2.txz:  Rebuilt.
x/libXScrnSaver-1.2.2-x86_64-2.txz:  Rebuilt.
x/libXau-1.0.8-x86_64-2.txz:  Rebuilt.
x/libXaw-1.0.13-x86_64-1.txz:  Upgraded.
x/libXaw3d-1.6.2-x86_64-3.txz:  Rebuilt.
x/libXcm-0.5.2-x86_64-2.txz:  Rebuilt.
x/libXcomposite-0.4.4-x86_64-2.txz:  Rebuilt.
x/libXcursor-1.1.14-x86_64-2.txz:  Rebuilt.
x/libXdamage-1.1.4-x86_64-2.txz:  Rebuilt.
x/libXdmcp-1.1.2-x86_64-2.txz:  Rebuilt.
x/libXevie-1.0.3-x86_64-2.txz:  Rebuilt.
x/libXext-1.3.3-x86_64-2.txz:  Rebuilt.
x/libXfixes-5.0.1-x86_64-2.txz:  Rebuilt.
x/libXfont-1.5.1-x86_64-2.txz:  Rebuilt.
x/libXfontcache-1.0.5-x86_64-2.txz:  Rebuilt.
x/libXft-2.3.2-x86_64-3.txz:  Rebuilt.
x/libXi-1.7.4-x86_64-2.txz:  Rebuilt.
x/libXinerama-1.1.3-x86_64-2.txz:  Rebuilt.
x/libXmu-1.1.2-x86_64-2.txz:  Rebuilt.
x/libXp-1.0.3-x86_64-2.txz:  Rebuilt.
x/libXpm-3.5.11-x86_64-2.txz:  Rebuilt.
x/libXpresent-1.0.0-x86_64-1.txz:  Added.
x/libXrandr-1.5.0-x86_64-1.txz:  Upgraded.
x/libXrender-0.9.9-x86_64-1.txz:  Upgraded.
x/libXres-1.0.7-x86_64-2.txz:  Rebuilt.
x/libXt-1.1.5-x86_64-1.txz:  Upgraded.
x/libXtst-1.2.2-x86_64-2.txz:  Rebuilt.
x/libXv-1.0.10-x86_64-2.txz:  Rebuilt.
x/libXvMC-1.0.9-x86_64-2.txz:  Rebuilt.
x/libXxf86dga-1.1.4-x86_64-2.txz:  Rebuilt.
x/libXxf86misc-1.0.3-x86_64-2.txz:  Rebuilt.
x/libXxf86vm-1.1.4-x86_64-2.txz:  Rebuilt.
x/libdmx-1.1.3-x86_64-2.txz:  Rebuilt.
x/libdrm-2.4.64-x86_64-1.txz:  Upgraded.
x/libepoxy-1.3.1-x86_64-1.txz:  Added.
x/libfontenc-1.1.3-x86_64-1.txz:  Upgraded.
x/libpciaccess-0.13.4-x86_64-1.txz:  Upgraded.
x/libxcb-1.11-x86_64-2.txz:  Rebuilt.
x/libxkbfile-1.0.9-x86_64-1.txz:  Upgraded.
x/libxshmfence-1.2-x86_64-2.txz:  Rebuilt.
x/listres-1.0.3-x86_64-2.txz:  Rebuilt.
x/lndir-1.0.3-x86_64-2.txz:  Rebuilt.
x/luit-1.1.1-x86_64-2.txz:  Rebuilt.
x/makedepend-1.0.5-x86_64-2.txz:  Rebuilt.
x/mesa-10.6.4-x86_64-1.txz:  Upgraded.
x/mkcomposecache-1.2.1-x86_64-2.txz:  Rebuilt.
x/mkfontscale-1.1.2-x86_64-2.txz:  Rebuilt.
x/oclock-1.0.3-x86_64-2.txz:  Rebuilt.
x/pixman-0.33.2-x86_64-1.txz:  Upgraded.
x/presentproto-1.0-x86_64-2.txz:  Rebuilt.
x/randrproto-1.5.0-noarch-1.txz:  Upgraded.
x/rendercheck-1.5-x86_64-1.txz:  Upgraded.
x/rgb-1.0.6-x86_64-2.txz:  Rebuilt.
x/sessreg-1.1.0-x86_64-2.txz:  Rebuilt.
x/setxkbmap-1.3.1-x86_64-1.txz:  Upgraded.
x/showfont-1.0.5-x86_64-2.txz:  Rebuilt.
x/smproxy-1.0.6-x86_64-1.txz:  Upgraded.
x/transset-1.0.1-x86_64-2.txz:  Rebuilt.
x/twm-1.0.9-x86_64-1.txz:  Upgraded.
x/viewres-1.0.4-x86_64-2.txz:  Rebuilt.
x/x11perf-1.6.0-x86_64-1.txz:  Upgraded.
x/xauth-1.0.9-x86_64-2.txz:  Rebuilt.
x/xbacklight-1.2.1-x86_64-2.txz:  Rebuilt.
x/xbiff-1.0.3-x86_64-2.txz:  Rebuilt.
x/xbitmaps-1.1.1-x86_64-2.txz:  Rebuilt.
x/xcalc-1.0.6-x86_64-2.txz:  Rebuilt.
x/xcb-proto-1.11-x86_64-2.txz:  Rebuilt.
x/xcb-util-0.4.0-x86_64-2.txz:  Rebuilt.
x/xcb-util-cursor-0.1.2-x86_64-2.txz:  Rebuilt.
x/xcb-util-errors-1.0-x86_64-1.txz:  Added.
x/xcb-util-image-0.4.0-x86_64-2.txz:  Rebuilt.
x/xcb-util-keysyms-0.4.0-x86_64-2.txz:  Rebuilt.
x/xcb-util-renderutil-0.3.9-x86_64-2.txz:  Rebuilt.
x/xcb-util-wm-0.4.1-x86_64-2.txz:  Rebuilt.
x/xclipboard-1.1.3-x86_64-2.txz:  Rebuilt.
x/xclock-1.0.7-x86_64-2.txz:  Rebuilt.
x/xcm-0.5.2-x86_64-2.txz:  Rebuilt.
x/xcmsdb-1.0.5-x86_64-1.txz:  Upgraded.
x/xcompmgr-1.1.7-x86_64-1.txz:  Upgraded.
x/xconsole-1.0.6-x86_64-2.txz:  Rebuilt.
x/xcursorgen-1.0.6-x86_64-3.txz:  Rebuilt.
x/xdbedizzy-1.1.0-x86_64-2.txz:  Rebuilt.
x/xditview-1.0.4-x86_64-1.txz:  Upgraded.
x/xdm-1.1.11-x86_64-6.txz:  Rebuilt.
x/xdpyinfo-1.3.2-x86_64-1.txz:  Upgraded.
x/xdriinfo-1.0.5-x86_64-1.txz:  Upgraded.
x/xedit-1.2.2-x86_64-2.txz:  Rebuilt.
x/xev-1.2.2-x86_64-1.txz:  Upgraded.
x/xextproto-7.3.0-x86_64-2.txz:  Rebuilt.
x/xeyes-1.1.1-x86_64-2.txz:  Rebuilt.
x/xf86-input-acecad-1.5.0-x86_64-8.txz:  Rebuilt.
x/xf86-input-aiptek-1.4.1-x86_64-8.txz:  Rebuilt.
x/xf86-input-evdev-2.9.2-x86_64-2.txz:  Rebuilt.
x/xf86-input-joystick-1.6.1-x86_64-8.txz:  Rebuilt.
x/xf86-input-keyboard-1.8.1-x86_64-1.txz:  Upgraded.
x/xf86-input-mouse-1.9.1-x86_64-3.txz:  Rebuilt.
x/xf86-input-penmount-1.5.0-x86_64-8.txz:  Rebuilt.
x/xf86-input-synaptics-1.8.2-x86_64-2.txz:  Rebuilt.
x/xf86-input-vmmouse-13.1.0-x86_64-1.txz:  Upgraded.
x/xf86-input-void-1.4.0-x86_64-8.txz:  Rebuilt.
x/xf86-input-wacom-0.19.0-x86_64-7.txz:  Rebuilt.
x/xf86-video-apm-1.2.5-x86_64-7.txz:  Rebuilt.
x/xf86-video-ark-0.7.5-x86_64-7.txz:  Rebuilt.
x/xf86-video-ast-1.1.5-x86_64-1.txz:  Upgraded.
x/xf86-video-ati-7.5.0-x86_64-2.txz:  Rebuilt.
x/xf86-video-chips-1.2.5-x86_64-7.txz:  Rebuilt.
x/xf86-video-cirrus-1.5.3-x86_64-1.txz:  Upgraded.
x/xf86-video-dummy-0.3.7-x86_64-4.txz:  Rebuilt.
x/xf86-video-glint-1.2.8-x86_64-7.txz:  Rebuilt.
x/xf86-video-i128-1.3.6-x86_64-7.txz:  Rebuilt.
x/xf86-video-i740-1.3.5-x86_64-2.txz:  Rebuilt.
x/xf86-video-intel-2.99.917-x86_64-2.txz:  Rebuilt.
x/xf86-video-mach64-6.9.5-x86_64-1.txz:  Upgraded.
x/xf86-video-mga-1.6.4-x86_64-2.txz:  Rebuilt.
x/xf86-video-modesetting-0.9.0-x86_64-3.txz:  Rebuilt.
x/xf86-video-neomagic-1.2.9-x86_64-1.txz:  Upgraded.
x/xf86-video-nouveau-1.0.11-x86_64-2.txz:  Rebuilt.
x/xf86-video-nv-2.1.20-x86_64-8.txz:  Rebuilt.
x/xf86-video-openchrome-0.3.3-x86_64-5.txz:  Rebuilt.
x/xf86-video-r128-6.10.0-x86_64-1.txz:  Upgraded.
x/xf86-video-rendition-4.2.5-x86_64-7.txz:  Rebuilt.
x/xf86-video-s3-0.6.5-x86_64-7.txz:  Rebuilt.
x/xf86-video-s3virge-1.10.6-x86_64-8.txz:  Rebuilt.
x/xf86-video-savage-2.3.8-x86_64-1.txz:  Upgraded.
x/xf86-video-siliconmotion-1.7.8-x86_64-1.txz:  Upgraded.
x/xf86-video-sis-0.10.7-x86_64-8.txz:  Rebuilt.
x/xf86-video-sisusb-0.9.6-x86_64-7.txz:  Rebuilt.
x/xf86-video-tdfx-1.4.6-x86_64-2.txz:  Rebuilt.
x/xf86-video-tga-1.2.2-x86_64-7.txz:  Rebuilt.
x/xf86-video-trident-1.3.7-x86_64-2.txz:  Rebuilt.
x/xf86-video-tseng-1.2.5-x86_64-7.txz:  Rebuilt.
x/xf86-video-v4l-0.2.0-x86_64-12.txz:  Rebuilt.
x/xf86-video-vesa-2.3.4-x86_64-1.txz:  Upgraded.
x/xf86-video-vmware-13.1.0-x86_64-2.txz:  Rebuilt.
x/xf86-video-voodoo-1.2.5-x86_64-8.txz:  Rebuilt.
x/xf86-video-xgi-git_5a3e0de677b7-x86_64-2.txz:  Rebuilt.
x/xf86-video-xgixp-1.8.1-x86_64-7.txz:  Rebuilt.
x/xf86dga-1.0.3-x86_64-2.txz:  Rebuilt.
x/xfd-1.1.2-x86_64-2.txz:  Rebuilt.
x/xfontsel-1.0.5-x86_64-2.txz:  Rebuilt.
x/xfs-1.1.4-x86_64-2.txz:  Rebuilt.
x/xfsinfo-1.0.5-x86_64-2.txz:  Rebuilt.
x/xgamma-1.0.6-x86_64-1.txz:  Upgraded.
x/xgc-1.0.5-x86_64-1.txz:  Upgraded.
x/xhost-1.0.7-x86_64-1.txz:  Upgraded.
x/xinit-1.3.4-x86_64-2.txz:  Rebuilt.
x/xinput-1.6.1-x86_64-2.txz:  Rebuilt.
x/xkbcomp-1.3.0-x86_64-2.txz:  Rebuilt.
x/xkbevd-1.1.4-x86_64-1.txz:  Upgraded.
x/xkbprint-1.0.4-x86_64-1.txz:  Upgraded.
x/xkbutils-1.0.4-x86_64-2.txz:  Rebuilt.
x/xkill-1.0.4-x86_64-2.txz:  Rebuilt.
x/xload-1.1.2-x86_64-2.txz:  Rebuilt.
x/xlogo-1.0.4-x86_64-2.txz:  Rebuilt.
x/xlsatoms-1.1.2-x86_64-1.txz:  Upgraded.
x/xlsclients-1.1.3-x86_64-2.txz:  Rebuilt.
x/xlsfonts-1.0.5-x86_64-1.txz:  Upgraded.
x/xmag-1.0.6-x86_64-1.txz:  Upgraded.
x/xman-1.1.4-x86_64-2.txz:  Rebuilt.
x/xmessage-1.0.4-x86_64-2.txz:  Rebuilt.
x/xmh-1.0.3-x86_64-1.txz:  Upgraded.
x/xmodmap-1.0.9-x86_64-1.txz:  Upgraded.
x/xmore-1.0.2-x86_64-2.txz:  Rebuilt.
x/xorg-docs-1.7.1-noarch-1.txz:  Upgraded.
x/xorg-server-1.17.2-x86_64-1.txz:  Upgraded.
x/xorg-server-xephyr-1.17.2-x86_64-1.txz:  Upgraded.
x/xorg-server-xnest-1.17.2-x86_64-1.txz:  Upgraded.
x/xorg-server-xvfb-1.17.2-x86_64-1.txz:  Upgraded.
x/xorg-sgml-doctools-1.11-x86_64-2.txz:  Rebuilt.
x/xpr-1.0.4-x86_64-2.txz:  Rebuilt.
x/xprop-1.2.2-x86_64-2.txz:  Rebuilt.
x/xproto-7.0.28-noarch-1.txz:  Upgraded.
x/xpyb-1.3.1-x86_64-3.txz:  Rebuilt.
x/xrandr-1.4.3-x86_64-2.txz:  Rebuilt.
x/xrdb-1.1.0-x86_64-2.txz:  Rebuilt.
x/xrefresh-1.0.5-x86_64-2.txz:  Rebuilt.
x/xscope-1.4.1-x86_64-2.txz:  Rebuilt.
x/xset-1.2.3-x86_64-2.txz:  Rebuilt.
x/xsetroot-1.1.1-x86_64-2.txz:  Rebuilt.
x/xsm-1.0.3-x86_64-2.txz:  Rebuilt.
x/xstdcmap-1.0.3-x86_64-2.txz:  Rebuilt.
x/xvidtune-1.0.3-x86_64-2.txz:  Rebuilt.
x/xvinfo-1.1.3-x86_64-1.txz:  Upgraded.
x/xwd-1.0.6-x86_64-2.txz:  Rebuilt.
x/xwininfo-1.1.3-x86_64-2.txz:  Rebuilt.
x/xwud-1.0.4-x86_64-2.txz:  Rebuilt.
xap/MPlayer-20150721-x86_64-1.txz:  Upgraded.
  Thanks to Heinz Wiesinger.
xap/ddd-3.3.12-x86_64-4.txz:  Rebuilt.
xap/pan-0.139-x86_64-3.txz:  Rebuilt.
xap/xine-lib-1.2.6-x86_64-2.txz:  Rebuilt.
extra/wicd/wicd-1.7.3-x86_64-1.txz:  Upgraded.
  Probably better to use NetworkManager, but this seems to work for now.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

3 files changed, 14 insertions, 6 deletions

diff --git a/slackware64-current/source/d/ruby/ruby-1.9.3-p551.tar.xz b/slackware64-current/source/d/ruby/ruby-1.9.3-p551.tar.xz
deleted file mode 100644
index f29895562..000000000
--- a/slackware64-current/source/d/ruby/ruby-1.9.3-p551.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-55c15fc0217bb35ed5d6b33068f845690fe8dd58
diff --git a/slackware64-current/source/d/ruby/ruby-2.2.3.tar.xz b/slackware64-current/source/d/ruby/ruby-2.2.3.tar.xz
new file mode 100644
index 000000000..4df2f9634
--- /dev/null
+++ b/slackware64-current/source/d/ruby/ruby-2.2.3.tar.xz
@@ -0,0 +1 @@
+74b0699912fd21a2c6dac08e38f9d3edcc52e708
diff --git a/slackware64-current/source/d/ruby/ruby.SlackBuild b/slackware64-current/source/d/ruby/ruby.SlackBuild
index 9a70d9627..51e9edaf6 100755
--- a/slackware64-current/source/d/ruby/ruby.SlackBuild
+++ b/slackware64-current/source/d/ruby/ruby.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,13 +22,21 @@
 
 
 PKGNAM=ruby
-VERSION=$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)
+
+if echo $PKGNAM-*.tar.?z* | grep -q p ; then
+  # With patchlevel in tarball name:
+  VERSION=$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)
+else
+  # Without patchlevel in tarball name:
+  VERSION=$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
+fi
+
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -41,12 +49,12 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-ruby
 
-if [ "$ARCH" = "i486" ]; then
+if [ "$ARCH" = "i586" ]; then
   # -O3 works around a compile failure due to a miniruby segfault
   # when trying to build ruby with gcc-4.4 or newer.  Evidently
   # -O0 also works, but...
   # other distributions also use -fno-strict-aliasing which helps stability
-  SLKCFLAGS="-march=i486 -mtune=i686 -O3 -fno-strict-aliasing"
+  SLKCFLAGS="-march=i586 -mtune=i686 -O3 -fno-strict-aliasing"
   OPTFLAGS=-O3
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then