version bump

Package-Manager: portage-2.1.3.5

5 files changed, 188 insertions, 5 deletions

diff --git a/dev-python/IcePy/ChangeLog b/dev-python/IcePy/ChangeLog
index 14874d79c4d2..449ad4b581f0 100644
--- a/dev-python/IcePy/ChangeLog
+++ b/dev-python/IcePy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/IcePy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.5 2007/07/24 12:20:12 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.6 2007/08/15 16:48:24 caleb Exp $
+
+*IcePy-3.2.1 (15 Aug 2007)
+
+  15 Aug 2007; Caleb Tennis <caleb@gentoo.org>
+  +files/icepy-3.2.1-makefile.patch, +IcePy-3.2.1.ebuild:
+  version bump
 
   24 Jul 2007; Caleb Tennis <caleb@gentoo.org>
   -files/icepy-3.1.0-makefile.patch, -files/icepy-3.1.1-makefile.patch,
diff --git a/dev-python/IcePy/IcePy-3.2.1.ebuild b/dev-python/IcePy/IcePy-3.2.1.ebuild
new file mode 100644
index 000000000000..ce9aa7982c39
--- /dev/null
+++ b/dev-python/IcePy/IcePy-3.2.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v 1.1 2007/08/15 16:48:24 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.2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="test debug"
+
+DEPEND="~dev-cpp/Ice-3.2.1"
+
+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}
+	make || die "Died during make"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install Failed!"
+}
+
+src_test() {
+	ICE_HOME=/usr/share/Ice make test || die "Test failed"
+}
diff --git a/dev-python/IcePy/Manifest b/dev-python/IcePy/Manifest
index 139620cf876e..901617a6fe1d 100644
--- a/dev-python/IcePy/Manifest
+++ b/dev-python/IcePy/Manifest
@@ -2,15 +2,24 @@ AUX icepy-3.2.0-makefile.patch 3415 RMD160 7d9b91288e683674a2962cd67c2954a3310b0
 MD5 d9118c877307f87b3541ca1d07ff5228 files/icepy-3.2.0-makefile.patch 3415
 RMD160 7d9b91288e683674a2962cd67c2954a3310b08eb files/icepy-3.2.0-makefile.patch 3415
 SHA256 13698cc682fa0e16b6e677fd7145980be108f82b6ef29d87cc7ad222847ad330 files/icepy-3.2.0-makefile.patch 3415
+AUX icepy-3.2.1-makefile.patch 3415 RMD160 7d9b91288e683674a2962cd67c2954a3310b08eb SHA1 5065133e20109bd467fc6fc58721465b9cb66529 SHA256 13698cc682fa0e16b6e677fd7145980be108f82b6ef29d87cc7ad222847ad330
+MD5 d9118c877307f87b3541ca1d07ff5228 files/icepy-3.2.1-makefile.patch 3415
+RMD160 7d9b91288e683674a2962cd67c2954a3310b08eb files/icepy-3.2.1-makefile.patch 3415
+SHA256 13698cc682fa0e16b6e677fd7145980be108f82b6ef29d87cc7ad222847ad330 files/icepy-3.2.1-makefile.patch 3415
 DIST IcePy-3.2.0.tar.gz 169214 RMD160 e61b0c79c019232099263831239dc0e44190c0b6 SHA1 a5bb889028aa00652232ee86777af5f6b87f89e5 SHA256 236cebc50b27552099fc2c1004baf4b908be04ce402c7a4541a17de115a76bf5
+DIST IcePy-3.2.1.tar.gz 166696 RMD160 f3bf071433d9193ff42b54d9b031c712bc55ef86 SHA1 c34a7458e64cf55d7135a8bbb8f3ccce0cff3e60 SHA256 2a9ea57a370b8c0a4f3a880cbea03092f76efb417e27061f465278d95b720701
 EBUILD IcePy-3.2.0.ebuild 1151 RMD160 fe858d36818f6f4020593bf68410243d3314f2d3 SHA1 badbf659f13b0616845ee0db19f1580ee334d86f SHA256 e1aa3713db97462b86f42e39428fdc97b58dcb7fc2b12266c48d7fbda0b27520
 MD5 60df1e225f24c918cb854dca39e00604 IcePy-3.2.0.ebuild 1151
 RMD160 fe858d36818f6f4020593bf68410243d3314f2d3 IcePy-3.2.0.ebuild 1151
 SHA256 e1aa3713db97462b86f42e39428fdc97b58dcb7fc2b12266c48d7fbda0b27520 IcePy-3.2.0.ebuild 1151
-MISC ChangeLog 978 RMD160 7a6c4c024e2a45febfcb787443c20608a41ffeff SHA1 a4e54a6a55ad6f650d05a6b04b4aa265aad88c0d SHA256 2d5fff82c29bab96fbabe2ec210e0e78da068a740eb0ccf65f632b44ba75b6c0
-MD5 c974f1c17bf5e6f6e5e270d8dfb26381 ChangeLog 978
-RMD160 7a6c4c024e2a45febfcb787443c20608a41ffeff ChangeLog 978
-SHA256 2d5fff82c29bab96fbabe2ec210e0e78da068a740eb0ccf65f632b44ba75b6c0 ChangeLog 978
+EBUILD IcePy-3.2.1.ebuild 1152 RMD160 5b1c1124b3359c79ff894415ea3ca591bc065ce4 SHA1 a6f7ce6c2fe00c5d1f28c0826c83e81fdd7cb288 SHA256 eb9bbeea97e8d5333d7a9c1786c367c3e149c2a3a40c91931164a8f82a28a090
+MD5 464f6dc84bb4f790434d111bfd34dbfa IcePy-3.2.1.ebuild 1152
+RMD160 5b1c1124b3359c79ff894415ea3ca591bc065ce4 IcePy-3.2.1.ebuild 1152
+SHA256 eb9bbeea97e8d5333d7a9c1786c367c3e149c2a3a40c91931164a8f82a28a090 IcePy-3.2.1.ebuild 1152
+MISC ChangeLog 1127 RMD160 b9558755121864bb24baea77902cb1591e3b9269 SHA1 0e2a1f2a718ea7c584e9e6a22c81b4bb66ca6d8b SHA256 a1fd52c4ae298c8e4ba59e9ec2aeda2137bc6a3e1c472bec882b7faed911f16d
+MD5 be6fd894d1b819c3ed559c49592cb438 ChangeLog 1127
+RMD160 b9558755121864bb24baea77902cb1591e3b9269 ChangeLog 1127
+SHA256 a1fd52c4ae298c8e4ba59e9ec2aeda2137bc6a3e1c472bec882b7faed911f16d ChangeLog 1127
 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 329df734e7b87db85fed0ebb1247cb04 files/digest-IcePy-3.2.0 235
 RMD160 719d75ef1895e5b8684dba7599c7d4cd97ca678a files/digest-IcePy-3.2.0 235
 SHA256 fb7c095df26b5425fff590ffc027db357ac119555cb3915ced8e5db6248f12cc files/digest-IcePy-3.2.0 235
+MD5 f52ee6dbf29973f99044fb572e8ffcf0 files/digest-IcePy-3.2.1 235
+RMD160 d7dfbc96466bd7370a107933b3bedce34de47c9a files/digest-IcePy-3.2.1 235
+SHA256 10d8880f75b21709d7f86fbd860601f737d9d1704d2dc25d501b0a59e6b68fd4 files/digest-IcePy-3.2.1 235
diff --git a/dev-python/IcePy/files/digest-IcePy-3.2.1 b/dev-python/IcePy/files/digest-IcePy-3.2.1
new file mode 100644
index 000000000000..feea81f18fb7
--- /dev/null
+++ b/dev-python/IcePy/files/digest-IcePy-3.2.1
@@ -0,0 +1,3 @@
+MD5 2fdd8add2ea6271894392645f768e147 IcePy-3.2.1.tar.gz 166696
+RMD160 f3bf071433d9193ff42b54d9b031c712bc55ef86 IcePy-3.2.1.tar.gz 166696
+SHA256 2a9ea57a370b8c0a4f3a880cbea03092f76efb417e27061f465278d95b720701 IcePy-3.2.1.tar.gz 166696
diff --git a/dev-python/IcePy/files/icepy-3.2.1-makefile.patch b/dev-python/IcePy/files/icepy-3.2.1-makefile.patch
new file mode 100644
index 000000000000..65827e45505e
--- /dev/null
+++ b/dev-python/IcePy/files/icepy-3.2.1-makefile.patch
@@ -0,0 +1,112 @@
+diff -rU5 IcePy-3.2.0-orig/Makefile IcePy-3.2.0/Makefile
+--- IcePy-3.2.0-orig/Makefile	2007-03-02 08:11:25.000000000 +1300
++++ IcePy-3.2.0/Makefile	2007-07-20 22:54:53.000000000 +1200
+@@ -38,10 +38,11 @@
+ 	    echo "making $@ in $$subdir"; \
+ 	    ( cd $$subdir && $(MAKE) $@ ) || exit 1; \
+ 	done
+ 
+ install::
+-	$(call installdata,ICE_LICENSE,$(prefix))
+-	$(call installdata,LICENSE,$(prefix))
++	mkdir -p $(install_slicedir)
++	$(call installdata,ICE_LICENSE,$(install_slicedir))
++	$(call installdata,LICENSE,$(install_slicedir))
+ 
+ test::
+ 	@python $(top_srcdir)/allTests.py
+diff -rU5 IcePy-3.2.0-orig/config/Make.rules IcePy-3.2.0/config/Make.rules
+--- IcePy-3.2.0-orig/config/Make.rules	2007-03-02 08:11:25.000000000 +1300
++++ IcePy-3.2.0/config/Make.rules	2007-07-20 22:46:28.000000000 +1200
+@@ -16,17 +16,17 @@
+ #
+ # Select an installation base directory. The directory will be created
+ # 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.
+ # Otherwise the Ice extension is built with debug information.
+ #
+@@ -99,12 +99,12 @@
+ VERSION_MINOR           = 2
+ VERSION			= 3.2.0
+ SOVERSION		= 32
+ 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}
+ INSTALL_LIBRARY		= ${INSTALL}
+ INSTALL_DATA		= ${INSTALL}
+@@ -136,22 +136,22 @@
+ endif
+ 
+ ifneq ($(ICE_HOME),)
+     slicedir		= $(ICE_HOME)/slice
+ else
+-    slicedir		= /usr/share/Ice-$(VERSION)/slice
++    slicedir		= /usr/share/Ice/slice
+ endif
+ 
+-install_libdir	        = $(prefix)/python
++install_libdir	        = $(prefix)/lib
+ 
+-ifneq ($(embedded_runpath_prefix),)
+-   ifeq ($(LP64),yes)
+-       runpath_libdir	  := $(embedded_runpath_prefix)/lib$(lp64suffix)
+-   else
+-       runpath_libdir	  := $(embedded_runpath_prefix)/lib
+-   endif
+-endif
++#ifneq ($(embedded_runpath_prefix),)
++#   ifeq ($(LP64),yes)
++#       runpath_libdir	  := $(embedded_runpath_prefix)/lib$(lp64suffix)
++#   else
++#       runpath_libdir	  := $(embedded_runpath_prefix)/lib
++#   endif
++#endif
+ 
+ CPPFLAGS		=
+ ICECPPFLAGS		= -I$(slicedir)
+ SLICE2PYFLAGS		= $(ICECPPFLAGS)
+ 
+@@ -198,11 +198,11 @@
+     installprogram	= $(INSTALL_PROGRAM) $(1) $(2); \
+ 			  chmod a+rx $(2)/$(notdir $(1))
+ endif
+ 
+ ifeq ($(mkdir),)
+-    mkdir		= mkdir $(1) ; \
++    mkdir		= mkdir -p $(1) ; \
+ 			  chmod a+rx $(1)
+ endif
+ 
+ #
+ # A Python extension library cannot have a "lib" prefix, so Python-specific
+diff -rU5 IcePy-3.2.0-orig/modules/IcePy/Makefile IcePy-3.2.0/modules/IcePy/Makefile
+--- IcePy-3.2.0-orig/modules/IcePy/Makefile	2007-01-09 08:25:09.000000000 +1300
++++ IcePy-3.2.0/modules/IcePy/Makefile	2007-07-20 23:03:25.000000000 +1200
+@@ -51,7 +51,8 @@
+ 	rm -f $@
+ 	ln -s $(SONAME) $@
+ 
+ install:: all
+ 	$(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
++	ln -s $(install_libdir)/$(SONAME) $(install_pythondir)/$(LIBNAME)
+ 
+ include .depend