Version bump. Drop cjk until a new version of oniguruma appears.

Package-Manager: portage-2.1.4.4

3 files changed, 181 insertions, 2 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index fea687e5f719..5edd77d1259d 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,11 @@
 # 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.332 2008/03/06 13:45:06 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.333 2008/04/16 06:44:24 rbrown Exp $
+
+*ruby-1.8.7_pre1 (16 Apr 2008)
+
+  16 Apr 2008; Richard Brown <rbrown@gentoo.org> +ruby-1.8.7_pre1.ebuild:
+  Version bump. Drop cjk until a new version of oniguruma appears.
 
   06 Mar 2008; Steve Dibb <beandog@gentoo.org> ruby-1.8.6_p114.ebuild:
   amd64 stable, bug 212264
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d1aa6956fc49..97dd63f2545f 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -4,8 +4,10 @@ DIST onigd2_5_9.tar.gz 221355 RMD160 ceeee9a0221d431d6576a566621ba9badab6423d SH
 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_p111-to-p113.patch.bz2 5823 RMD160 bee2dedd786450fb8008ced74af95c8e2401fa3b SHA1 0ed730d65593c828b1122c909900402f4d3d8f74 SHA256 cfe2d2e95ad708c5e00c274b9547e20076d31ccf7655860f7661be531dcdacc4
+DIST ruby-1.8.7-preview1.tar.bz2 4007006 RMD160 6e2907bbe8615e078eb50b3e46694a5caeddf0ba SHA1 aeee8958d11309a6b0400a11a429920ac8ea82ab SHA256 e432ab1ab9b4570c0b7fe5c0c2730de0fda4c49a47811ea3a9170a311cf110b9
 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
-MISC ChangeLog 48556 RMD160 94c46a34604d8e5d2e298710d6fdd3664367fc1f SHA1 ef884ba26c1c74baefb17d5d59b28722e165da9d SHA256 824b046e8d9d1e92dbcf34e509108969169d5f60edc1af990ccad88b08d09d06
+EBUILD ruby-1.8.7_pre1.ebuild 4981 RMD160 c368b5f9e390acd6f78ad58cfe62f23c1057492e SHA1 38ec602a03df52c6132777cb09a22d00409a055f SHA256 aecd95b639c40fdd66e5c3b5def9456d9ca5418e63212f842bd37ee2aba93148
+MISC ChangeLog 48729 RMD160 5aba4593fa45f37274f89af5efd510e4895fc577 SHA1 c07ef99493e6855253a09adad6f59764516f4a88 SHA256 770baa43a166082ef609b4c1cdfe0f9bb1ff5d5700eaec0a782c7cf019bf9ab2
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
diff --git a/dev-lang/ruby/ruby-1.8.7_pre1.ebuild b/dev-lang/ruby/ruby-1.8.7_pre1.ebuild
new file mode 100644
index 000000000000..ad5564c2a333
--- /dev/null
+++ b/dev-lang/ruby/ruby-1.8.7_pre1.ebuild
@@ -0,0 +1,172 @@
+# 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.7_pre1.ebuild,v 1.1 2008/04/16 06:44:24 rbrown Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+#PATCHES APPLY, DOESN'T COMPILE THOUGH
+#ONIGURUMA="onigd2_5_9"
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_PV="$(replace_version_separator 3 '-')"
+MY_PV="${MY_PV/pre/preview}"
+MY_P="${PN}-${MY_PV}"
+
+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="mirror://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 debug doc emacs examples gdbm ipv6 rubytests socks5 ssl threads tk xemacs" #cjk
+
+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}:${LD_LIBRARY_PATH}/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
+}