nevermind, don't bump this yet

Package-Manager: portage-2.1.5.2

3 files changed, 5 insertions, 172 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index 4e1c0368107c..cac22aa7a2cb 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.336 2008/06/20 15:06:12 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.337 2008/06/20 15:08:24 caleb Exp $
+
+  20 Jun 2008; Caleb Tennis <caleb@gentoo.org> -ruby-1.8.6_p230.ebuild:
+  nevermind, don't bump this yet
 
 *ruby-1.8.6_p230 (20 Jun 2008)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 4717091335b4..53dea82ed325 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -3,13 +3,11 @@ AUX ruby-1.8.6_p111-r13657.patch 1915 RMD160 9c135a4e779095127bf7e5d47d2ae3b703e
 DIST onigd2_5_9.tar.gz 221355 RMD160 ceeee9a0221d431d6576a566621ba9badab6423d SHA1 41ca5b916ae1d3b1675fcc45181a0ed04e8726b7 SHA256 b24df7c0fa6fc72ce37fd1e203f378359f29f739a3f4c5b6bdd40ca5f7d25db0
 DIST ruby-1.8.6-p111.tar.bz2 3919396 RMD160 8ff9b8592a80062742be61b2b4e1158282b61c4b SHA1 d85d25786e0ce30f8f54f5cfa36968ec0f6b9a5f SHA256 85c694678313818a5083bcfd66ae389fc053b506d93b5ad46f3764981c120fbb
 DIST ruby-1.8.6-p114.tar.bz2 3920921 RMD160 332d6e98ef79ad8175ce699ed5293407763f769f SHA1 9929782935ebb77d040593a010b8d65b03ce6e23 SHA256 4ac0d0271324c54525210f775e5fcc9a37e3d8a10b96d68cdfeeb361c6f64a63
-DIST ruby-1.8.6-p230.tar.bz2 3948498 RMD160 cdf3ea33c3fd2258c685aea634aca7e9624036ec SHA1 c630222fd6b4272db84f54e68879f81e2014cd51 SHA256 603708301fc3fd7ef1c47bb4a24d7799c26e28db08d69cda240adcbdbff514d7
 DIST ruby-1.8.6_p111-to-p113.patch.bz2 5823 RMD160 bee2dedd786450fb8008ced74af95c8e2401fa3b SHA1 0ed730d65593c828b1122c909900402f4d3d8f74 SHA256 cfe2d2e95ad708c5e00c274b9547e20076d31ccf7655860f7661be531dcdacc4
 DIST ruby-1.8.7.tar.bz2 4100024 RMD160 ea8b631de65469cb5496328e4b2dcd5a8e951d51 SHA1 297282d0e4b885176336f5b26f986f9cf5f47133 SHA256 65f2a862ba5e88bac7a78cff15bcb88d7534e741b51a1ffb79a0136c7041359a
 EBUILD ruby-1.8.6_p111-r1.ebuild 5025 RMD160 0b8b8d252ee486386a42b5b4ff239f15c392ec26 SHA1 1051a2cf6185b0162ef87b0e1d8d22ab5e412bfa SHA256 13b7a3e6e74fe37c2e1d8965e85b3c9d23ba3bf06b4b4cf17d828719f2591359
 EBUILD ruby-1.8.6_p111.ebuild 4981 RMD160 a348a5aa534ea01b0a1dd8bba1c9d6b14e07642e SHA1 f7695b286891594eb9e7658e8ba3e1ebb3d6e73f SHA256 b1fc4edaf3001027c3f1a8dfc75ee470687b76db32f233080287c99f9c51be90
 EBUILD ruby-1.8.6_p114.ebuild 4953 RMD160 6d2ad78573307e2cae18468153882ba9cc905de0 SHA1 cdecf63a4da8228558e7814aa7c28ef83033d835 SHA256 30e3fba77636ad3affa17c8b3e9ea4ddef32f7b910187bae6656cfa9e9b57d1c
-EBUILD ruby-1.8.6_p230.ebuild 4906 RMD160 d80ea4a18bdcc2ed09d89e7c59d2d6d35541c880 SHA1 8be9f6436d634fb48e0d839b3b210611a3eb7159 SHA256 f7715cc8f967f62196357479ab55c70ce635b7263a4490bc64b6adc3b10fa515
 EBUILD ruby-1.8.7.ebuild 4855 RMD160 4241bb1ecb0a25e6330cd0063f0fa98685de5c75 SHA1 2c9baa022c68814b8020c619c1a0276ed6a7fbd5 SHA256 d3ba4ab01863b6fda4d31b4c6cf904e611c6df239bfe8b9b25babecc69e69f8f
-MISC ChangeLog 49141 RMD160 7ff3dd7f9be3122cdc97a3df6677d8cf264e2ba5 SHA1 df07c0de83acbe0aba7b8d5b643cda2a15659b05 SHA256 1b0808565bda7fcf77cbbf2658d5831bd3cbf54ace789399b4ec0870b3bb0746
+MISC ChangeLog 49247 RMD160 93ccbb29d25ce46ede7ed182f5235c2074c8d4e9 SHA1 fe253a8779a72ab8ca44ee5f2d50c2036573fe0b SHA256 685f6d430d9b62f867b2aaae777750c01969cb14294b4a7c4f51628bdc052b42
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
diff --git a/dev-lang/ruby/ruby-1.8.6_p230.ebuild b/dev-lang/ruby/ruby-1.8.6_p230.ebuild
deleted file mode 100644
index 65c68fb0f5d0..000000000000
--- a/dev-lang/ruby/ruby-1.8.6_p230.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p230.ebuild,v 1.1 2008/06/20 15:06:12 caleb Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-ONIGURUMA="onigd2_5_9"
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(replace_version_separator 3 '-')"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.bz2
-	cjk? ( http://www.geocities.jp/kosako3/oniguruma/archive/${ONIGURUMA}.tar.gz )"
-
-LICENSE="Ruby"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="berkdb cjk debug doc emacs examples gdbm ipv6 rubytests socks5 ssl threads tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk )
-	>=dev-ruby/ruby-config-0.3.1
-	!=dev-lang/ruby-cvs-${SLOT}*
-	!dev-ruby/rdoc
-	!dev-ruby/rexml"
-DEPEND="${RDEPEND}"
-PDEPEND="emacs? ( app-emacs/ruby-mode )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-PROVIDE="virtual/ruby"
-
-src_unpack() {
-	unpack ${A}
-
-	if use cjk ; then
-		einfo "Applying ${ONIGURUMA}"
-		pushd "${WORKDIR}/oniguruma"
-		econf --with-rubydir="${S}" || die "oniguruma econf failed"
-		emake $MY_SUFFIX || die "oniguruma emake failed"
-		popd
-	fi
-
-	cd "${S}/ext/dl"
-	epatch "${FILESDIR}/${PN}-1.8.6-memory-leak.diff"
-	cd "${S}"
-
-	# 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_compile() {
-	# -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
-
-	# 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
-
-	econf --program-suffix=$MY_SUFFIX --enable-shared \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		$(use_enable threads pthread) \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		$(use_with berkdb dbm) \
-		$(use_with gdbm) \
-		$(use_with ssl openssl) \
-		$(use_with tk) \
-		${myconf} \
-		--with-sitedir=/usr/$(get_libdir)/ruby/site_ruby \
-		|| die "econf failed"
-
-	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 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 -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${SLOT}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitelibdir']")
-	keepdir $(${MINIRUBY} -rrbconfig -e "print Config::CONFIG['sitearchdir']")
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		dodir /usr/share/doc/${PF}
-		cp -pPR sample "${D}/usr/share/doc/${PF}"
-	fi
-
-	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%.*})
-	dosym libruby$MY_SUFFIX$(get_libname ${PV%_*}) /usr/$(get_libdir)/libruby$(get_libname ${PV%_*})
-
-	dodoc ChangeLog NEWS README* ToDo
-
-	if use rubytests; then
-		dodir /usr/share/${PN}-${SLOT}
-		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
-	fi
-}
-
-pkg_postinst() {
-
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
-	fi
-	elog
-	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
-	elog
-}
-
-pkg_postrm() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
-	fi
-}