version bump

Package-Manager: portage-2.1.2_pre2-r9

5 files changed, 155 insertions, 5 deletions

diff --git a/dev-python/IcePy/ChangeLog b/dev-python/IcePy/ChangeLog
index 9d916d90e676..ebad99d26f87 100644
--- a/dev-python/IcePy/ChangeLog
+++ b/dev-python/IcePy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/IcePy
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.1 2006/09/11 12:35:12 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.2 2006/10/16 14:13:40 caleb Exp $
+
+*IcePy-3.1.1 (16 Oct 2006)
+
+  16 Oct 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/icepy-3.1.1-makefile.patch, +IcePy-3.1.1.ebuild:
+  version bump
 
 *IcePy-3.1.0 (11 Sep 2006)
 
diff --git a/dev-python/IcePy/IcePy-3.1.1.ebuild b/dev-python/IcePy/IcePy-3.1.1.ebuild
new file mode 100644
index 000000000000..54f759549492
--- /dev/null
+++ b/dev-python/IcePy/IcePy-3.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.1.1.ebuild,v 1.1 2006/10/16 14:13:40 caleb Exp $
+
+inherit eutils python
+
+DESCRIPTION="ICE middleware C++ bindings"
+HOMEPAGE="http://www.zeroc.com/index.html"
+SRC_URI="http://www.zeroc.com/download/Ice/3.1/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="test debug"
+
+DEPEND="=dev-cpp/ice-3.1*"
+
+ICE_HOME=/usr
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch ${FILESDIR}/icepy-${PV}-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 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-python/IcePy/Manifest b/dev-python/IcePy/Manifest
index 6aa1d4cf66b0..88c3288bb8df 100644
--- a/dev-python/IcePy/Manifest
+++ b/dev-python/IcePy/Manifest
@@ -2,15 +2,24 @@ AUX icepy-3.1.0-makefile.patch 1707 RMD160 c18e595730a6ea0c345c03f2118a1a23c4428
 MD5 1625b51ce946015a0418bd2e509af31c files/icepy-3.1.0-makefile.patch 1707
 RMD160 c18e595730a6ea0c345c03f2118a1a23c4428c8d files/icepy-3.1.0-makefile.patch 1707
 SHA256 853bce8c60826554eb95ec6820782a0b8ca2494b97bd425c71f6bdbe15197565 files/icepy-3.1.0-makefile.patch 1707
+AUX icepy-3.1.1-makefile.patch 2108 RMD160 ac0302f348ed4108c5f325a9ba65d12d23f5a916 SHA1 5a5b46166dc4be8e6907208d2274bc95283da2fc SHA256 f23258fc841a12b464458abc039e423a2db0597f26ce634cbee74b4a0523da14
+MD5 ef39b0d2304a9b1a5710a8d668b3d342 files/icepy-3.1.1-makefile.patch 2108
+RMD160 ac0302f348ed4108c5f325a9ba65d12d23f5a916 files/icepy-3.1.1-makefile.patch 2108
+SHA256 f23258fc841a12b464458abc039e423a2db0597f26ce634cbee74b4a0523da14 files/icepy-3.1.1-makefile.patch 2108
 DIST IcePy-3.1.0.tar.gz 391534 RMD160 d74170a1c002ac407084cdb05e7d7579c300e1e0 SHA1 454f3194ab7de55859621c715a7dd9f3cb3fbd3c SHA256 fe11e1250f6a315fb0ad8c67a533ecab4e9e0b920ee88a3880efd094470194fd
+DIST IcePy-3.1.1.tar.gz 399743 RMD160 d0bf996b20bacc563e60766047224e2f55c42b05 SHA1 466de7e1379c5e9fa3bd481d88799ee9c4fced67 SHA256 e0e104f4bfc19d97ed9ab11e34a7365055a6cb9a7f8aa0d95b60bd469285c20b
 EBUILD IcePy-3.1.0.ebuild 1214 RMD160 c1de353d6915e55b2aae45f0a96a4087ccc78779 SHA1 6fa266ecf8f3ec05f87a35118c2c18fba892c91c SHA256 34af4b42917962491ad1170fd313cb7d8be9e1c2db1e767f6598898e68b2fbd8
 MD5 e2741dfeb3f50e04ea4d12e04566652d IcePy-3.1.0.ebuild 1214
 RMD160 c1de353d6915e55b2aae45f0a96a4087ccc78779 IcePy-3.1.0.ebuild 1214
 SHA256 34af4b42917962491ad1170fd313cb7d8be9e1c2db1e767f6598898e68b2fbd8 IcePy-3.1.0.ebuild 1214
-MISC ChangeLog 355 RMD160 eae19bbe889dc3c7a99f1bed7763ed7af5ae7bf9 SHA1 4528b03b8045b55babb05e38284fd520d181f464 SHA256 2cee9b44d53e974d04b83746be4daca80a4ff68303db75c07149c80ce2cb8fee
-MD5 089188646c39d1288a4643af87ef31bb ChangeLog 355
-RMD160 eae19bbe889dc3c7a99f1bed7763ed7af5ae7bf9 ChangeLog 355
-SHA256 2cee9b44d53e974d04b83746be4daca80a4ff68303db75c07149c80ce2cb8fee ChangeLog 355
+EBUILD IcePy-3.1.1.ebuild 1201 RMD160 f72f11f198c1181dc6925bd44490df9275fabbf0 SHA1 12bba4351338c57f3648de7c95520f1c744f5d50 SHA256 bb55ece27c3161c41307247ddecff41879e81b896cd9eab490242b9e9e6e7c54
+MD5 7e7cc443d1cafd20b984b1b4ea4b7be5 IcePy-3.1.1.ebuild 1201
+RMD160 f72f11f198c1181dc6925bd44490df9275fabbf0 IcePy-3.1.1.ebuild 1201
+SHA256 bb55ece27c3161c41307247ddecff41879e81b896cd9eab490242b9e9e6e7c54 IcePy-3.1.1.ebuild 1201
+MISC ChangeLog 504 RMD160 0febe75e5f0900b3397326e42e498e07303efdbb SHA1 c8c72f3d33fe2b554a912a24259d280ba0683f0b SHA256 2dfbc14bb6df036fe6a43b7a90dfd1f0e63ee745804a81e8036815f64e193638
+MD5 d64e3930492122ba2b4e5814b62afad8 ChangeLog 504
+RMD160 0febe75e5f0900b3397326e42e498e07303efdbb ChangeLog 504
+SHA256 2dfbc14bb6df036fe6a43b7a90dfd1f0e63ee745804a81e8036815f64e193638 ChangeLog 504
 MISC metadata.xml 392 RMD160 ffd09293bbbb76e88cfb4754677479a4d89ce9d4 SHA1 4150acf383b5db8b739e18674c0fa82e9be32091 SHA256 5f3b5405e94149e750f7912de7a4924b4ab4fe5745d12603006684cc1b33cf23
 MD5 18c99f8118456d8c3a89e1bd1726e4eb metadata.xml 392
 RMD160 ffd09293bbbb76e88cfb4754677479a4d89ce9d4 metadata.xml 392
@@ -18,3 +27,6 @@ SHA256 5f3b5405e94149e750f7912de7a4924b4ab4fe5745d12603006684cc1b33cf23 metadata
 MD5 04588dd118d191eeaa9350f1b93f1ed2 files/digest-IcePy-3.1.0 235
 RMD160 70ca34449bdbf9cf40a823b4e5d60ca07000df2f files/digest-IcePy-3.1.0 235
 SHA256 8ddcd73b5f479e3abf425707c4d5ea973a8895aa3432c792fb2e8a1d639f1438 files/digest-IcePy-3.1.0 235
+MD5 ef71165038b237188b44e1b12205b281 files/digest-IcePy-3.1.1 235
+RMD160 c45f6b71efcd3d965dbf4191a3c53630a47186c2 files/digest-IcePy-3.1.1 235
+SHA256 b9e8c9e2c661b9949c396ffd3ad6fa1988bc2dac8a3f452a0415da202a7effbf files/digest-IcePy-3.1.1 235
diff --git a/dev-python/IcePy/files/digest-IcePy-3.1.1 b/dev-python/IcePy/files/digest-IcePy-3.1.1
new file mode 100644
index 000000000000..7a14bdeb7b3a
--- /dev/null
+++ b/dev-python/IcePy/files/digest-IcePy-3.1.1
@@ -0,0 +1,3 @@
+MD5 96023adfb1449fd633d57e4dc1d5a876 IcePy-3.1.1.tar.gz 399743
+RMD160 d0bf996b20bacc563e60766047224e2f55c42b05 IcePy-3.1.1.tar.gz 399743
+SHA256 e0e104f4bfc19d97ed9ab11e34a7365055a6cb9a7f8aa0d95b60bd469285c20b IcePy-3.1.1.tar.gz 399743
diff --git a/dev-python/IcePy/files/icepy-3.1.1-makefile.patch b/dev-python/IcePy/files/icepy-3.1.1-makefile.patch
new file mode 100644
index 000000000000..350470860f8e
--- /dev/null
+++ b/dev-python/IcePy/files/icepy-3.1.1-makefile.patch
@@ -0,0 +1,74 @@
+--- config/Make.rules.orig	2006-10-16 09:46:19.000000000 -0400
++++ config/Make.rules	2006-10-16 09:49:52.000000000 -0400
+@@ -16,13 +16,13 @@
+ # if it does not exist.
+ #
+ 
+-prefix			= /opt/IcePy-$(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.
+@@ -127,7 +127,7 @@
+ ifeq ($(shell test -d $(top_srcdir)/slice && echo 0),0)
+     slicedir		= $(top_srcdir)/slice
+ else
+-    slicedir		= $(ICE_HOME)/slice
++    slicedir		= $(prefix)/share/icepy-$(VERSION)/slice
+ endif
+ 
+ ifeq ($(LP64),yes)
+@@ -135,9 +135,9 @@
+ # TODO: Where should the shared library be installed if it is a 64 bit
+ # build.
+ #
+-    install_libdir	= $(prefix)/python
++    install_libdir	= $(prefix)/lib$(lp64suffix)
+ else
+-    install_libdir	= $(prefix)/python
++    install_libdir	= $(prefix)/lib
+ endif
+ 
+ ifeq ($(LP64),yes)
+@@ -203,7 +203,7 @@
+ endif
+ 
+ ifeq ($(mkdir),)
+-    mkdir		= mkdir $(1) ; \
++    mkdir		= mkdir -p $(1) ; \
+ 			  chmod a+rx $(1)
+ endif
+ 
+--- Makefile.orig	2006-10-16 09:50:17.000000000 -0400
++++ Makefile	2006-10-16 09:50:49.000000000 -0400
+@@ -69,8 +69,8 @@
+ 	fi
+ 
+ install::
+-	$(call installdata,ICE_LICENSE,$(prefix))
+-	$(call installdata,LICENSE,$(prefix))
++	$(call installdata,ICE_LICENSE,$(install_slicedir))
++	$(call installdata,LICENSE,$(install_slicedir))
+ 
+ test::
+ 	@python $(top_srcdir)/allTests.py
+--- config/Make.rules.orig	2006-10-16 10:02:00.000000000 -0400
++++ config/Make.rules	2006-10-16 10:04:04.000000000 -0400
+@@ -96,8 +96,8 @@
+ SOVERSION		= $(VERSION_MAJOR)$(VERSION_MINOR)
+ libdir			= $(top_srcdir)/python
+ 
+-install_slicedir	= $(prefix)/slice
+-install_pythondir	= $(prefix)/python
++install_slicedir	= $(prefix)/share/icepy-$(VERSION)/slice
++install_pythondir	= $(prefix)/lib/$(PYTHON_VERSION)/site-packages
+ 
+ INSTALL			= cp -fp
+ INSTALL_PROGRAM		= ${INSTALL}