From: Caleb Tennis Date: Thu, 8 Mar 2007 21:12:22 +0000 (+0000) Subject: version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6321c562e59c52d3831c1877bfa65a14d91af0b4;p=gentoo.git version bump Package-Manager: portage-2.1.2.1 --- diff --git a/dev-ruby/IceRuby/ChangeLog b/dev-ruby/IceRuby/ChangeLog index 35dd8f7da376..1811b283fda9 100644 --- a/dev-ruby/IceRuby/ChangeLog +++ b/dev-ruby/IceRuby/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-ruby/IceRuby # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.2 2007/02/02 14:10:48 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/ChangeLog,v 1.3 2007/03/08 21:12:22 caleb Exp $ + +*IceRuby-3.2.0_beta1 (08 Mar 2007) + + 08 Mar 2007; Caleb Tennis + +files/IceRuby-3.2.0_beta1-Makefile.patch, +IceRuby-3.2.0_beta1.ebuild: + version bump *IceRuby-3.1.1-r1 (02 Feb 2007) diff --git a/dev-ruby/IceRuby/IceRuby-3.2.0_beta1.ebuild b/dev-ruby/IceRuby/IceRuby-3.2.0_beta1.ebuild new file mode 100644 index 000000000000..4ae002834418 --- /dev/null +++ b/dev-ruby/IceRuby/IceRuby-3.2.0_beta1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-ruby/IceRuby/IceRuby-3.2.0_beta1.ebuild,v 1.1 2007/03/08 21:12:22 caleb Exp $ + +inherit eutils + +MY_P=${P/.0_beta1/b} + +DESCRIPTION="ICE middleware C++ bindings" +HOMEPAGE="http://www.zeroc.com/index.html" +SRC_URI="http://www.zeroc.com/download/Ice/3.2/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="test debug" + +S=${WORKDIR}/${MY_P} + +DEPEND="=dev-cpp/Ice-3.2* + >=dev-lang/ruby-1.8.4 + test? ( >=dev-lang/python-2.4 )" + +ICE_HOME=/usr + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch ${FILESDIR}/${P}-Makefile.patch + + mkdir -p ${S}/bin + mkdir -p ${S}/lib + + if use amd64; then + sed -i -e "s:^#LP64:LP64:g" ${S}/config/Make.rules \ + || die "Failed to set lib64 directory" + fi + + if ! use debug; then + sed -i -e "s:#OPTIMIZE:OPTIMIZE:" \ + ${S}/config/Make.rules || die "Failed to remove debug" + fi + + sed -i -e \ + "s:.*CXXFLAGS[^\+]*\=\s:CXXFLAGS = ${CXXFLAGS} :g" \ + ${S}/config/Make.rules.Linux || die "CXXFLAGS patching failed!" +} + +src_compile() { + cd ${S} + export ICE_HOME=/usr + make || die "Died during make" +} + +src_install() { + export ICE_HOME=/usr + make DESTDIR="${D}" install || die "Install Failed!" +} + +src_test() { + export ICE_HOME=/usr + make test || die "Test failed" +} diff --git a/dev-ruby/IceRuby/Manifest b/dev-ruby/IceRuby/Manifest index 1e58f5c6d3a2..450f2ede7672 100644 --- a/dev-ruby/IceRuby/Manifest +++ b/dev-ruby/IceRuby/Manifest @@ -2,11 +2,16 @@ AUX IceRuby-3.1.1-Makefile.patch 3216 RMD160 f6c2f7666ae944684d542e8b7e170d501d0 MD5 34db10d7fe3c89360215a6362b49661b files/IceRuby-3.1.1-Makefile.patch 3216 RMD160 f6c2f7666ae944684d542e8b7e170d501d0486a7 files/IceRuby-3.1.1-Makefile.patch 3216 SHA256 c00a9dc0bc8e62a9562a339d4e889ea39b6922f4b239800ab3a9e9d33fa85119 files/IceRuby-3.1.1-Makefile.patch 3216 +AUX IceRuby-3.2.0_beta1-Makefile.patch 3602 RMD160 338f4366fa8ad57125eff56760924596f03d3c62 SHA1 dfb8980dc52458709bc99cff18d5be36121c7f2d SHA256 5d69235ce67a97bedae0e535d871bbfa552ffed7fce2067f6afbac2b4e04983c +MD5 922e94e40a6d8d8eff4cb9786c591d86 files/IceRuby-3.2.0_beta1-Makefile.patch 3602 +RMD160 338f4366fa8ad57125eff56760924596f03d3c62 files/IceRuby-3.2.0_beta1-Makefile.patch 3602 +SHA256 5d69235ce67a97bedae0e535d871bbfa552ffed7fce2067f6afbac2b4e04983c files/IceRuby-3.2.0_beta1-Makefile.patch 3602 AUX array_fix-3.1.1.patch 1596 RMD160 444e6d86c7250f7af5c46ac0c09f0043fc696b55 SHA1 b283b84840c94401380220214d19b0ccd0d43ae2 SHA256 9e71d44a83e8c71627c053d19bef50bdba772b26c848039825728e9bf7f3efb4 MD5 e3012f59a7988c4a949bed6de1f8c4b2 files/array_fix-3.1.1.patch 1596 RMD160 444e6d86c7250f7af5c46ac0c09f0043fc696b55 files/array_fix-3.1.1.patch 1596 SHA256 9e71d44a83e8c71627c053d19bef50bdba772b26c848039825728e9bf7f3efb4 files/array_fix-3.1.1.patch 1596 DIST IceRuby-3.1.1.tar.gz 337998 RMD160 7c8fdd43469432bbfabc9ca49018349a4418c928 SHA1 7bf2b3d5f3f17b6284d81d0d0dc38de81db16786 SHA256 1dee046bab93e4320a2b69a6b6b4beb16bd7a2e8b45553299c468773f9e57f8e +DIST IceRuby-3.2b.tar.gz 264922 RMD160 ea99a68e1935e90d7fa4c001635a972aa9c3c9a0 SHA1 4f12a51aed3c54c24a1a40f0278424e19157bbfb SHA256 705669368631194ec26978975a4e9891b0db7ccc86eab2e20184767123aa01fd EBUILD IceRuby-3.1.1-r1.ebuild 1341 RMD160 0da6c067479466fee6887999732615600b3d9098 SHA1 37ba6ce13c6b433c0f797b3d9e932e69283e0f99 SHA256 e7897db3215fd80e461d6cc9ce2d3e863debb315cce4dc5d9a905e6996bd9d03 MD5 fe57883c6c412670ae1a074936b2cbd9 IceRuby-3.1.1-r1.ebuild 1341 RMD160 0da6c067479466fee6887999732615600b3d9098 IceRuby-3.1.1-r1.ebuild 1341 @@ -15,10 +20,14 @@ EBUILD IceRuby-3.1.1.ebuild 1296 RMD160 f410bf5075946425402e2cc9aac62c9a6f65e1bb MD5 616f0b74b769ef9d945926f4136ebf22 IceRuby-3.1.1.ebuild 1296 RMD160 f410bf5075946425402e2cc9aac62c9a6f65e1bb IceRuby-3.1.1.ebuild 1296 SHA256 77d31d722f85e7a10d1a558d65ee5d11ab4cabdaa85f2a96b635629a222fa54e IceRuby-3.1.1.ebuild 1296 -MISC ChangeLog 549 RMD160 5fdf0df785be423c5da1325cc643e723a041e0da SHA1 1bcafa5ad9aba84fba6eeccc53b08057134fe627 SHA256 be437d21a0dcfcac16efcad078a19872b103dbdcd2cbe2919dd74ef6cc1385f7 -MD5 c91efa502cc3f11bfab00abfdc7447e4 ChangeLog 549 -RMD160 5fdf0df785be423c5da1325cc643e723a041e0da ChangeLog 549 -SHA256 be437d21a0dcfcac16efcad078a19872b103dbdcd2cbe2919dd74ef6cc1385f7 ChangeLog 549 +EBUILD IceRuby-3.2.0_beta1.ebuild 1337 RMD160 b8a4851505dea65cabf71ff9445f47761a4d3495 SHA1 61264e00c744186bc1d3b9853aa58421a4fbfb42 SHA256 96a5bc1fe2e07667cfdc65dc89676908d7ea10b34c96de2300c827eaaa3c51e7 +MD5 ff2119f6d1516861f51ea195e03cd1ef IceRuby-3.2.0_beta1.ebuild 1337 +RMD160 b8a4851505dea65cabf71ff9445f47761a4d3495 IceRuby-3.2.0_beta1.ebuild 1337 +SHA256 96a5bc1fe2e07667cfdc65dc89676908d7ea10b34c96de2300c827eaaa3c51e7 IceRuby-3.2.0_beta1.ebuild 1337 +MISC ChangeLog 722 RMD160 35f3f649d922cbfb44b00b1f813c8f6d9de66bf8 SHA1 71be94488d88c35a92e74859a45a56c1ec8fa8de SHA256 ee2c39c8712ccb17df67856d09fba0bda3f717760bd842a4baeb7fc910a9dc69 +MD5 dd6ca149f22c010dd86f96fbeb4a94a7 ChangeLog 722 +RMD160 35f3f649d922cbfb44b00b1f813c8f6d9de66bf8 ChangeLog 722 +SHA256 ee2c39c8712ccb17df67856d09fba0bda3f717760bd842a4baeb7fc910a9dc69 ChangeLog 722 MISC metadata.xml 395 RMD160 824fce41b363dcf8701aefea3b030852c290416c SHA1 c193aaf6a87cc88495597c67ad8f913cabd9adcc SHA256 6ca761b49f13da5280c535c04facd4919a991b24fc033fa7c151e45c8acc51ee MD5 f5e750cc0394d806839049a1b1b9e64e metadata.xml 395 RMD160 824fce41b363dcf8701aefea3b030852c290416c metadata.xml 395 @@ -29,3 +38,6 @@ SHA256 8f3523efe5403131d8a7dd99c4fe1479236f699698a9aa0459c5300ed04953f9 files/di MD5 551237dd41500ee49c3b673cbb98d358 files/digest-IceRuby-3.1.1-r1 241 RMD160 db515c18310404d18edabda92af469beeae64804 files/digest-IceRuby-3.1.1-r1 241 SHA256 8f3523efe5403131d8a7dd99c4fe1479236f699698a9aa0459c5300ed04953f9 files/digest-IceRuby-3.1.1-r1 241 +MD5 38faf47832e3b838b5b9b11470a6c1e6 files/digest-IceRuby-3.2.0_beta1 238 +RMD160 1ab083cd8c0e47ff9aba38ea228507599060b3f1 files/digest-IceRuby-3.2.0_beta1 238 +SHA256 2867519a93b65340ef8e35c219590148439e4e43e4e76a7cd87659d8435e4636 files/digest-IceRuby-3.2.0_beta1 238 diff --git a/dev-ruby/IceRuby/files/IceRuby-3.2.0_beta1-Makefile.patch b/dev-ruby/IceRuby/files/IceRuby-3.2.0_beta1-Makefile.patch new file mode 100644 index 000000000000..c1925eb23e2f --- /dev/null +++ b/dev-ruby/IceRuby/files/IceRuby-3.2.0_beta1-Makefile.patch @@ -0,0 +1,105 @@ +--- Makefile.orig 2007-03-08 15:55:09.000000000 -0500 ++++ Makefile 2007-03-08 15:56:04.000000000 -0500 +@@ -13,13 +13,13 @@ + + SUBDIRS = src ruby + +-INSTALL_SUBDIRS = $(install_libdir) $(install_rubydir) $(install_slicedir) ++INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_rubylibdir) $(install_slicedir) $(install_rubyarchdir) + + install:: + @if test ! -d $(prefix) ; \ + then \ + echo "Creating $(prefix)..." ; \ +- $(call mkdir,$(prefix)) ; \ ++ mkdir -p $(prefix) ; \ + fi + @for subdir in $(INSTALL_SUBDIRS); \ + do \ +@@ -61,9 +61,5 @@ + done \ + fi + +-install:: +- $(call installdata,ICE_LICENSE,$(prefix)) +- $(call installdata,LICENSE,$(prefix)) +- + test:: + @python $(top_srcdir)/allTests.py +--- ruby/Makefile.orig 2007-03-08 15:56:11.000000000 -0500 ++++ ruby/Makefile 2007-03-08 15:56:30.000000000 -0500 +@@ -127,8 +127,8 @@ + @echo "Installing generated code" + @for i in $(MODULES) ; \ + do \ +- $(INSTALL_DATA) $${i}.rb $(install_rubydir) ; \ +- $(INSTALL_DATA) -r $$i $(install_rubydir) ; \ ++ $(INSTALL_DATA) $${i}.rb $(install_rubylibdir) ; \ ++ $(INSTALL_DATA) -r $$i $(install_rubylibdir) ; \ + done + + clean:: +--- src/IceRuby/Makefile.orig 2007-03-08 15:56:40.000000000 -0500 ++++ src/IceRuby/Makefile 2007-03-08 15:56:55.000000000 -0500 +@@ -39,6 +39,6 @@ + $(call mkshlib,$@,$(SONAME),$(OBJS),$(LINKWITH)) + + install:: all +- $(call installrubylib,$(rubydir)/$(LIBNAME),$(install_rubydir)) ++ $(call installrubylib,$(rubydir)/$(LIBNAME),$(install_rubyarchdir)) + + include .depend +--- config/Make.rules.orig 2007-03-08 15:57:05.000000000 -0500 ++++ config/Make.rules 2007-03-08 15:59:29.000000000 -0500 +@@ -18,13 +18,13 @@ + # if it does not exist. + # + +-prefix = /opt/IceRuby-$(VERSION) ++prefix = $(DESTDIR)/usr + + # + # The "root directory" for runpath embedded in executables. Can be unset + # to avoid adding a runpath to Ice executables. + # +-embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) ++#embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) + + # + # Define OPTIMIZE as yes if you want to build with optimization. +@@ -51,10 +51,10 @@ + RUBY = ruby + endif + +-RUBY_INCLUDE_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(archdir)")') +-RUBY_LIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(libdir)")') +- +-RUBY_SHARED = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::MAKEFILE_CONFIG["ENABLE_SHARED"]') ++RUBY_ARCH_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(archdir)")') ++RUBY_LIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(rubylibdir)")') ++RUBY_SITEARCH_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(sitearchdir)")') ++RUBY_SITELIB_DIR = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("$$(sitelibdir)")') + + ifeq ("$(RUBY_SHARED)","yes") + RUBY_LIB = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("-l$$(RUBY_SO_NAME)")') +@@ -62,7 +62,7 @@ + RUBY_LIB = $(shell $(RUBY) -e 'require "rbconfig"; puts Config::expand("-l$$(RUBY_SO_NAME)-static")') + endif + +-RUBY_FLAGS = -I$(RUBY_INCLUDE_DIR) ++RUBY_FLAGS = -I$(RUBY_ARCH_DIR) + RUBY_LIBS = -L$(RUBY_LIB_DIR) $(RUBY_LIB) + + ifneq ($(ICE_HOME),) +@@ -110,8 +110,9 @@ + endif + + install_bindir = $(prefix)/bin +-install_slicedir = $(prefix)/slice +-install_rubydir = $(prefix)/ruby ++install_slicedir = $(prefix)/share/IceRuby/slice ++install_rubylibdir = $(DESTDIR)/$(RUBY_SITELIB_DIR) ++install_rubyarchdir = $(DESTDIR)/$(RUBY_SITEARCH_DIR) + + INSTALL = cp -fp + INSTALL_PROGRAM = ${INSTALL} diff --git a/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0_beta1 b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0_beta1 new file mode 100644 index 000000000000..d4a854a48ecd --- /dev/null +++ b/dev-ruby/IceRuby/files/digest-IceRuby-3.2.0_beta1 @@ -0,0 +1,3 @@ +MD5 5e21e439cf463025809fcb8fc1bb7f42 IceRuby-3.2b.tar.gz 264922 +RMD160 ea99a68e1935e90d7fa4c001635a972aa9c3c9a0 IceRuby-3.2b.tar.gz 264922 +SHA256 705669368631194ec26978975a4e9891b0db7ccc86eab2e20184767123aa01fd IceRuby-3.2b.tar.gz 264922