Some fixes

Package-Manager: portage-2.1.2.1

2 files changed, 50 insertions, 23 deletions

diff --git a/dev-cpp/Ice/Manifest b/dev-cpp/Ice/Manifest
index 83fa743bc511..907d906a7e63 100644
--- a/dev-cpp/Ice/Manifest
+++ b/dev-cpp/Ice/Manifest
@@ -2,10 +2,10 @@ 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-Makefile.patch 2702 RMD160 854d3313007141e95935e692eaa69cae368a2425 SHA1 0d0d03d2d3c9800ba79d3ff12e440c136da9cdd1 SHA256 a23bc8dd3c1e4a97a117451190ff867a8eb4fdb69d60d6fa0ab52e3dfd2ebf6b
-MD5 4be3232c262218719c9f73fc11ff56f2 files/Ice-3.2.0-Makefile.patch 2702
-RMD160 854d3313007141e95935e692eaa69cae368a2425 files/Ice-3.2.0-Makefile.patch 2702
-SHA256 a23bc8dd3c1e4a97a117451190ff867a8eb4fdb69d60d6fa0ab52e3dfd2ebf6b files/Ice-3.2.0-Makefile.patch 2702
+AUX Ice-3.2.0-Makefile.patch 4002 RMD160 687d6073f98d17e3e5284de6c0cfdb48f7145a16 SHA1 eabb95b5cb83225776363b86e03d53be647f7891 SHA256 9dbd6a6fd4cb801fd6ca9b8d364edb96bd2d5002f33a624dc77ab624e026cdc4
+MD5 d45cb4561bb173877263b8b7a5b91092 files/Ice-3.2.0-Makefile.patch 4002
+RMD160 687d6073f98d17e3e5284de6c0cfdb48f7145a16 files/Ice-3.2.0-Makefile.patch 4002
+SHA256 9dbd6a6fd4cb801fd6ca9b8d364edb96bd2d5002f33a624dc77ab624e026cdc4 files/Ice-3.2.0-Makefile.patch 4002
 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
diff --git a/dev-cpp/Ice/files/Ice-3.2.0-Makefile.patch b/dev-cpp/Ice/files/Ice-3.2.0-Makefile.patch
index 93fc3770cc88..92cfd5162f79 100644
--- a/dev-cpp/Ice/files/Ice-3.2.0-Makefile.patch
+++ b/dev-cpp/Ice/files/Ice-3.2.0-Makefile.patch
@@ -1,11 +1,11 @@
---- config/Make.rules.orig	2007-02-27 15:49:03.000000000 -0500
-+++ config/Make.rules	2007-02-27 15:51:08.000000000 -0500
+--- config/Make.rules.orig	2007-03-13 09:07:05.000000000 -0400
++++ config/Make.rules	2007-03-13 09:07:13.000000000 -0400
 @@ -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
++prefix			 ?= /$(DESTDIR)/usr
  
  #
  # The "root directory" for runpath embedded in executables. Can be unset
@@ -16,7 +16,7 @@
  
  #
  # Define OPTIMIZE as yes if you want to build with
-@@ -125,9 +125,9 @@
+@@ -125,9 +125,10 @@
  install_bindir		= $(prefix)/bin
  
  install_includedir	= $(prefix)/include
@@ -25,35 +25,62 @@
 -install_docdir		= $(prefix)/doc
 +install_slicedir	= $(prefix)/share/Ice/slice
 +install_schemadir	= $(prefix)/share/Ice/schema
++install_configdir	= $(prefix)/share/Ice/config
 +install_docdir		= $(prefix)/share/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
+@@ -179,18 +180,8 @@
+ BZIP2_LIBS              = $(if $(BZIP2_HOME),-L$(BZIP2_HOME)/$(libsubdir)) -lbz2
+ BZIP2_RPATH_LINK        = $(if $(BZIP2_HOME),$(call rpathlink,$(BZIP2_HOME)/$(libsubdir)))
+ 
+-ifneq ($(DB_HOME),)
+-   DB_FLAGS             = -I$(DB_HOME)/include
+-   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 @@
+-   else
+-      DB_LIBS           = -ldb_cxx
+-   endif
+-endif
++DB_FLAGS          = -I/usr/include/db4.5
++DB_LIBS           = -L/usr/$(libsubdir) -ldb_cxx-4.5
+ 
+ EXPAT_FLAGS             = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
+ EXPAT_LIBS              = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
+--- config/Makefile.orig	2007-03-13 09:08:50.000000000 -0400
++++ config/Makefile	2007-03-13 09:09:22.000000000 -0400
+@@ -20,9 +20,9 @@
+ 	    echo "Creating $(prefix)/config..." ; \
+ 	    $(call mkdir,$(prefix)/config) ; \
+ 	fi
+-	$(call installdata,templates.xml,$(prefix)/config)
+-	$(call installdata,convertssl.py,$(prefix)/config)
+-	$(call installdata,upgradeicegrid.py,$(prefix)/config)
+-	$(call installdata,upgradeicestorm.py,$(prefix)/config)
+-	$(call installdata,icegrid-slice.3.1.ice.gz,$(prefix)/config)
++	$(call installdata,templates.xml,$(install_configdir))
++	$(call installdata,convertssl.py,$(install_configdir))
++	$(call installdata,upgradeicegrid.py,$(install_configdir))
++	$(call installdata,upgradeicestorm.py,$(install_configdir))
++	$(call installdata,icegrid-slice.3.1.ice.gz,$(install_configdir))
+ 
+--- Makefile.orig	2007-03-13 09:07:20.000000000 -0400
++++ Makefile	2007-03-13 09:08:44.000000000 -0400
+@@ -11,15 +11,15 @@
  
  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)
+-INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir)
++INSTALL_SUBDIRS	= $(install_bindir) $(install_libdir) $(install_includedir) $(install_slicedir) $(install_docdir) $(install_configdir)
  
-@@ -19,7 +19,7 @@
+ install::
  	@if test ! -d $(prefix) ; \
  	then \
  	    echo "Creating $(prefix)..." ; \