bump to new beta version, package masked because it relies on db-4.5

Package-Manager: portage-2.1.2-r12

5 files changed, 174 insertions, 5 deletions

diff --git a/dev-cpp/Ice/ChangeLog b/dev-cpp/Ice/ChangeLog
index 2582c3af4306..eb5cd4d1872b 100644
--- a/dev-cpp/Ice/ChangeLog
+++ b/dev-cpp/Ice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/Ice
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/ChangeLog,v 1.3 2007/02/03 03:14:53 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/ChangeLog,v 1.4 2007/02/28 12:50:18 caleb Exp $
+
+*Ice-3.2.0_beta1 (28 Feb 2007)
+
+  28 Feb 2007; Caleb Tennis <caleb@gentoo.org>
+  +files/Ice-3.2.0_beta1-Makefile.patch, +Ice-3.2.0_beta1.ebuild:
+  Bump to new beta version, package masked because it relies on db-4.5
 
   03 Feb 2007; Steve Dibb <beandog@gentoo.org> Ice-3.1.1.ebuild:
   Add ~amd64, bug 142045
diff --git a/dev-cpp/Ice/Ice-3.2.0_beta1.ebuild b/dev-cpp/Ice/Ice-3.2.0_beta1.ebuild
new file mode 100644
index 000000000000..95e275bcf620
--- /dev/null
+++ b/dev-cpp/Ice/Ice-3.2.0_beta1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/Ice-3.2.0_beta1.ebuild,v 1.1 2007/02/28 12:50:18 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="~amd64 ~x86"
+IUSE="ncurses test debug"
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="ncurses? ( sys-libs/ncurses sys-libs/readline )
+	test? ( >=dev-lang/python-2.2 )
+	~sys-libs/db-4.5.20
+	>=dev-libs/openssl-0.9.7"
+RDEPEND=">=dev-libs/expat-1.9
+	>=app-arch/bzip2-1.0"
+
+pkg_setup() {
+	if built_with_use sys-libs/db nocxx; then
+		eerror "sys-libs/db must be compiled with C++ support!"
+		eerror "Remove the 'nocxx' use flag and try again."
+		die "Fix use flags and re-emerge"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+
+	if use amd64; then
+		sed -i -e "s:^#LP64:LP64:g" ${S}/config/Make.rules \
+		|| die "Failed to set lib64 directory"
+	fi
+
+	if ! use ncurses; then
+		sed -i -e "s#   USE_READLINE.*#   USE_READLINE := no#g" \
+		${S}/config/Make.rules || die "Failed to set no readline"
+	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_install() {
+	make DESTDIR="${D}" install || die "Install Failed!"
+}
+
+src_test() {
+	make test || die "Test failed"
+}
diff --git a/dev-cpp/Ice/Manifest b/dev-cpp/Ice/Manifest
index e1343c7a2e9b..27f152289f71 100644
--- a/dev-cpp/Ice/Manifest
+++ b/dev-cpp/Ice/Manifest
@@ -2,19 +2,28 @@ AUX Ice-3.1.1-Makefile.patch 2464 RMD160 2777dd9711a88a9427db2397aba9c25fbd3f56d
 MD5 346974d12ba19b0cd915709dbd813684 files/Ice-3.1.1-Makefile.patch 2464
 RMD160 2777dd9711a88a9427db2397aba9c25fbd3f56da files/Ice-3.1.1-Makefile.patch 2464
 SHA256 39c49b2c8afa29ce6085ffc62ba01b166582ed12a1e7737b9745d127ed19a42b files/Ice-3.1.1-Makefile.patch 2464
+AUX Ice-3.2.0_beta1-Makefile.patch 2696 RMD160 e2db8c7b2ee806a41666ee62ed82954170e1bac3 SHA1 0418268df769718baae3a43b73fc56a076d8bd25 SHA256 e0a0d88c9d470084018442a3a82c4260d9e3c53a478e39ca2547f3cd066f3d3d
+MD5 e21b3c74677b67f057eabedd2a19a004 files/Ice-3.2.0_beta1-Makefile.patch 2696
+RMD160 e2db8c7b2ee806a41666ee62ed82954170e1bac3 files/Ice-3.2.0_beta1-Makefile.patch 2696
+SHA256 e0a0d88c9d470084018442a3a82c4260d9e3c53a478e39ca2547f3cd066f3d3d files/Ice-3.2.0_beta1-Makefile.patch 2696
 AUX ice-makefile-speedup.patch 474 RMD160 db480e394adb2721027e5b14b6e194a0b2e72f57 SHA1 c58d91bd19086e365a54886a10d29c467057782d SHA256 b6aeecc1f95ee58656515e5466cb1853cf2be2b12cff9243d57d2d70a61eaa89
 MD5 b0c56cee008c862ef7521bcf865df180 files/ice-makefile-speedup.patch 474
 RMD160 db480e394adb2721027e5b14b6e194a0b2e72f57 files/ice-makefile-speedup.patch 474
 SHA256 b6aeecc1f95ee58656515e5466cb1853cf2be2b12cff9243d57d2d70a61eaa89 files/ice-makefile-speedup.patch 474
 DIST Ice-3.1.1.tar.gz 2183969 RMD160 737f453d8d3b44fecbbee10f13d84658675c8e91 SHA1 6ca97f243d4c84cf1f8522c511cba58f6b328ea3 SHA256 b20286bbdb4100d5120e27b6bf3d8babab39a75b1b4bf4c8e743ed6789df0a80
+DIST Ice-3.2b.tar.gz 2168682 RMD160 eb24d040850471d66daafaee089f0525bc267b4e SHA1 1e2ac5e9afaed65c88e484df49f3b953db209613 SHA256 44e1bec31175cfd0ae7d645e482eadc4f3cf839e2a4b4dca30091049ec1faf53
 EBUILD Ice-3.1.1.ebuild 1631 RMD160 4d35c0ac6272a819d8850a337dd5d8c887176738 SHA1 6c72912aafc0621c01cd7aa6ae7919d5243626fd SHA256 c24a3bef989d3bbbbb71668b973dcb6aabe763af6a5747872f1573100bdcd648
 MD5 a28b02504b0e25856e1384e668d52d97 Ice-3.1.1.ebuild 1631
 RMD160 4d35c0ac6272a819d8850a337dd5d8c887176738 Ice-3.1.1.ebuild 1631
 SHA256 c24a3bef989d3bbbbb71668b973dcb6aabe763af6a5747872f1573100bdcd648 Ice-3.1.1.ebuild 1631
-MISC ChangeLog 2942 RMD160 1faaa2e08b7d42b40b6e5466471b6e5cca21bb6b SHA1 238a7149d34434919e1ba5ce0bc3a3c68ac84855 SHA256 6e2ee8e0d9de124fdfc5d223740d5ebab25c54cb6a2dd1b52ee6f9dfbb64d95b
-MD5 cec4f14805f45a8f24e6aad531f9e254 ChangeLog 2942
-RMD160 1faaa2e08b7d42b40b6e5466471b6e5cca21bb6b ChangeLog 2942
-SHA256 6e2ee8e0d9de124fdfc5d223740d5ebab25c54cb6a2dd1b52ee6f9dfbb64d95b ChangeLog 2942
+EBUILD Ice-3.2.0_beta1.ebuild 1633 RMD160 173d8c7ba35b2f0d5b2e41a665035b17094bc180 SHA1 361b7ca95a3d990f79508e5616252d9558562b5c SHA256 7dccabce94322ad9acb7022a4905e0e2618d10faac0590403ba7ea4b1cc36532
+MD5 a7412c22ae5bf616c5568ca0e41932a2 Ice-3.2.0_beta1.ebuild 1633
+RMD160 173d8c7ba35b2f0d5b2e41a665035b17094bc180 Ice-3.2.0_beta1.ebuild 1633
+SHA256 7dccabce94322ad9acb7022a4905e0e2618d10faac0590403ba7ea4b1cc36532 Ice-3.2.0_beta1.ebuild 1633
+MISC ChangeLog 3157 RMD160 ec4af9485811b1d54b89be7f0a56eece9bf552f6 SHA1 f1bc0337c03018478dce0cde08dfef42fddd53d8 SHA256 a4419123825996e578f4991abcd7be046b088ba13e7679c332d46ce0ab3351d4
+MD5 0f4ed52bb3b015e07f060c13af53d706 ChangeLog 3157
+RMD160 ec4af9485811b1d54b89be7f0a56eece9bf552f6 ChangeLog 3157
+SHA256 a4419123825996e578f4991abcd7be046b088ba13e7679c332d46ce0ab3351d4 ChangeLog 3157
 MISC metadata.xml 367 RMD160 b6a6be891c7d6a93019b478754aaa304cbd03165 SHA1 ae4be8377a9dad6d14e92860ddb7a8468473b014 SHA256 3de23948faba6aa2f0ba1a51921ecf0258c7c3b8992998668c18957e9698893e
 MD5 3ec88d1ac2be997dc111b3eaa1da573e metadata.xml 367
 RMD160 b6a6be891c7d6a93019b478754aaa304cbd03165 metadata.xml 367
@@ -22,3 +31,6 @@ SHA256 3de23948faba6aa2f0ba1a51921ecf0258c7c3b8992998668c18957e9698893e metadata
 MD5 89ba1e9c2eff08e02ab5a1293083e69d files/digest-Ice-3.1.1 232
 RMD160 664c3e9b2841bae6b05ad35428510eb6bd21d35a files/digest-Ice-3.1.1 232
 SHA256 590b665cd5e6a6baceb3a589cb64c39ebfa0c91d303ccefb8c68219ff3f87dfc files/digest-Ice-3.1.1 232
+MD5 4eef114722b7538dc9375af0dea1ab6d files/digest-Ice-3.2.0_beta1 229
+RMD160 1a94628b70c27c9b2ba0f68584301a86c00f30e6 files/digest-Ice-3.2.0_beta1 229
+SHA256 011dbecffc9eb3d5a6d50546268d1fe0153c3c60a08d11477ed03c28a8a7cd23 files/digest-Ice-3.2.0_beta1 229
diff --git a/dev-cpp/Ice/files/Ice-3.2.0_beta1-Makefile.patch b/dev-cpp/Ice/files/Ice-3.2.0_beta1-Makefile.patch
new file mode 100644
index 000000000000..4fe2e06695f9
--- /dev/null
+++ b/dev-cpp/Ice/files/Ice-3.2.0_beta1-Makefile.patch
@@ -0,0 +1,81 @@
+--- config/Make.rules.orig	2007-02-27 15:49:03.000000000 -0500
++++ config/Make.rules	2007-02-27 15:51:08.000000000 -0500
+@@ -11,13 +11,13 @@
+ # Select an installation base directory. The directory will be created
+ # if it does not exist.
+ #
+-prefix			 ?= /opt/Ice-$(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
+@@ -125,9 +125,9 @@
+ install_bindir		= $(prefix)/bin
+ 
+ install_includedir	= $(prefix)/include
+-install_slicedir	= $(prefix)/slice
+-install_schemadir	= $(prefix)/schema
+-install_docdir		= $(prefix)/doc
++install_slicedir	= $(prefix)/share/Ice/slice
++install_schemadir	= $(prefix)/share/Ice/schema
++install_docdir		= $(prefix)/doc/Ice-$(VERSION)
+ 
+ INSTALL			= cp -fp
+ INSTALL_PROGRAM		= ${INSTALL}
+@@ -184,9 +184,9 @@
+    DB_LIBS              = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
+    DB_RPATH_LINK        = $(call rpathlink,$(DB_HOME)/$(libsubdir))
+ else
+-   ifeq ($(shell if [ -d /usr/include/db45 -a -d /usr/$(libsubdir)/db45 ] ; then echo yes; fi), yes)
+-      DB_FLAGS          = -I/usr/include/db45
+-      DB_LIBS           = -L/usr/$(libsubdir)/db45 -ldb_cxx
++   ifeq ($(shell if [ -d /usr/include/db4.5 -a -d /usr/$(libsubdir) ] ; then echo yes; fi), yes)
++      DB_FLAGS          = -I/usr/include/db4.5
++      DB_LIBS           = -L/usr/$(libsubdir) -ldb_cxx-4.5
+    else
+       DB_LIBS           = -ldb_cxx
+    endif
+--- Makefile.orig	2007-02-27 15:53:01.000000000 -0500
++++ Makefile	2007-02-27 15:54:20.000000000 -0500
+@@ -11,7 +11,7 @@
+ 
+ include $(top_srcdir)/config/Make.rules
+ 
+-SUBDIRS		= config src include test demo slice doc
++SUBDIRS		= config src include slice doc
+ 
+ INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir)
+ 
+@@ -19,7 +19,7 @@
+ 	@if test ! -d $(prefix) ; \
+ 	then \
+ 	    echo "Creating $(prefix)..." ; \
+-	    $(call mkdir,$(prefix)) ; \
++            mkdir -p $(prefix) ; \
+ 	fi
+ ifneq ($(embedded_runpath_prefix),)
+ 	@if test -h $(embedded_runpath_prefix) ; \
+@@ -55,8 +55,8 @@
+ 	then \
+ 	    ( cd doc && $(MAKE) install ) || exit 1 ; \
+ 	fi
+-	$(call installdata,ICE_LICENSE,$(prefix))
+-	$(call installdata,LICENSE,$(prefix))
++	$(call installdata,ICE_LICENSE,$(install_docdir))
++	$(call installdata,LICENSE,$(install_docdir))
+ 
+ clean::
+ 	@if test -d doc ; \
+@@ -65,4 +65,5 @@
+ 	fi
+ 
+ test::
++	@( cd test && $(MAKE) ) || exit 1
+ 	@python $(top_srcdir)/allTests.py
diff --git a/dev-cpp/Ice/files/digest-Ice-3.2.0_beta1 b/dev-cpp/Ice/files/digest-Ice-3.2.0_beta1
new file mode 100644
index 000000000000..36ecfe3e3be2
--- /dev/null
+++ b/dev-cpp/Ice/files/digest-Ice-3.2.0_beta1
@@ -0,0 +1,3 @@
+MD5 778f585c690edeca1d8c5e818cc75f09 Ice-3.2b.tar.gz 2168682
+RMD160 eb24d040850471d66daafaee089f0525bc267b4e Ice-3.2b.tar.gz 2168682
+SHA256 44e1bec31175cfd0ae7d645e482eadc4f3cf839e2a4b4dca30091049ec1faf53 Ice-3.2b.tar.gz 2168682