fix makefile patch

(Portage version: 2.1_pre3-r1)

5 files changed, 129 insertions, 2 deletions

diff --git a/dev-cpp/ice/ChangeLog b/dev-cpp/ice/ChangeLog
index 8c28588b47d3..3fb4d31febcb 100644
--- a/dev-cpp/ice/ChangeLog
+++ b/dev-cpp/ice/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/ice
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ice/ChangeLog,v 1.3 2006/01/19 18:03:34 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ice/ChangeLog,v 1.4 2006/01/25 21:32:03 caleb Exp $
+
+  25 Jan 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/ice-3.0.1-makefile.patch, +ice-3.0.1.ebuild:
+  fix makefile patch
+
+*ice-3.0.1 (25 Jan 2006)
+
+  25 Jan 2006; Caleb Tennis <caleb@gentoo.org> +ice-3.0.1.ebuild:
+  version bump
 
   19 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org> ice-3.0.0-r1.ebuild:
   Fixed readline->ncurses USE flag move.
diff --git a/dev-cpp/ice/Manifest b/dev-cpp/ice/Manifest
index 23dfbfd355d4..7c8fec004d37 100644
--- a/dev-cpp/ice/Manifest
+++ b/dev-cpp/ice/Manifest
@@ -1,5 +1,8 @@
-MD5 816cb9fab7d1ab5475c134bc2713ea77 ChangeLog 957
+MD5 974b83577ec5c58d72e67e3bbfdc682e ChangeLog 1065
 MD5 5643b69002aaa0bd00051022b1b087aa files/digest-ice-3.0.0-r1 62
+MD5 76a7d7075d2cc7073fbf13ff1d80f334 files/digest-ice-3.0.1 62
 MD5 a0be36f640bd61300ef8d1a538ed0145 files/ice-3.0.0-makefile.patch 1666
+MD5 175aea2fc46c6c8180771013e363b11e files/ice-3.0.1-makefile.patch 1436
 MD5 2e582f2fff0e920a43fcc2365b9225fd ice-3.0.0-r1.ebuild 1467
+MD5 2e582f2fff0e920a43fcc2365b9225fd ice-3.0.1.ebuild 1467
 MD5 89c7fbb98eae7d62ddd1c72e6d4e2ca5 metadata.xml 360
diff --git a/dev-cpp/ice/files/digest-ice-3.0.1 b/dev-cpp/ice/files/digest-ice-3.0.1
new file mode 100644
index 000000000000..42b5d625238b
--- /dev/null
+++ b/dev-cpp/ice/files/digest-ice-3.0.1
@@ -0,0 +1 @@
+MD5 4e10daada8e5f66379ab968af247cad7 Ice-3.0.1.tar.gz 1844952
diff --git a/dev-cpp/ice/files/ice-3.0.1-makefile.patch b/dev-cpp/ice/files/ice-3.0.1-makefile.patch
new file mode 100644
index 000000000000..997a062e7b89
--- /dev/null
+++ b/dev-cpp/ice/files/ice-3.0.1-makefile.patch
@@ -0,0 +1,54 @@
+--- Makefile.orig	2006-01-25 16:25:45.000000000 -0500
++++ Makefile	2006-01-25 16:28:04.000000000 -0500
+@@ -19,7 +19,7 @@
+ 	@if test ! -d $(prefix) ; \
+ 	then \
+ 	    echo "Creating $(prefix)..." ; \
+-	    $(call mkdir,$(prefix)) ; \
++		 mkdir -p $(prefix) ; \
+ 	fi
+ 
+ 	@for subdir in $(INSTALL_SUBDIRS); \
+@@ -47,8 +47,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 ; \
+--- config/Make.rules.orig	2006-01-25 16:28:18.000000000 -0500
++++ config/Make.rules	2006-01-25 16:29:11.000000000 -0500
+@@ -12,7 +12,7 @@
+ # if it does not exist.
+ #
+ 
+-prefix			?= /opt/Ice-$(VERSION)
++prefix			?= $(DESTDIR)/usr
+ 
+ #
+ # Define OPTIMIZE as yes if you want to build with
+@@ -154,9 +154,9 @@
+ endif
+ 
+ install_includedir	= $(prefix)/include
+-install_slicedir	= $(prefix)/slice
++install_slicedir	= $(prefix)/share/ice-$(VERSION)/slice
+ install_schemadir	= $(prefix)/schema
+-install_docdir		= $(prefix)/doc
++install_docdir		= $(prefix)/share/doc/ice-$(VERSION)
+ 
+ INSTALL			= cp -fp
+ INSTALL_PROGRAM		= ${INSTALL}
+@@ -212,7 +212,7 @@
+     DB_FLAGS		= -I$(DB_HOME)/include
+     DB_LIBS		= -L$(DB_HOME)/$(libsubdir) -ldb_cxx
+ else
+-    DB_FLAGS		=
++    DB_FLAGS		= -I/usr/include/db4.3
+     DB_LIBS		= -ldb_cxx
+ endif
+ 
diff --git a/dev-cpp/ice/ice-3.0.1.ebuild b/dev-cpp/ice/ice-3.0.1.ebuild
new file mode 100644
index 000000000000..adb8e03163ba
--- /dev/null
+++ b/dev-cpp/ice/ice-3.0.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ice/ice-3.0.1.ebuild,v 1.1 2006/01/25 21:32:03 caleb Exp $
+
+inherit eutils
+
+MY_P=${PN/i/I}-${PV}
+
+DESCRIPTION="ICE middleware C++ bindings"
+HOMEPAGE="http://www.zeroc.com/index.html"
+SRC_URI="http://www.zeroc.com/download/Ice/3.0/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="ncurses test debug"
+
+DEPEND="ncurses? ( sys-libs/ncurses
+				   sys-libs/readline )
+		test? ( >=dev-lang/python-2.2 )
+		>=sys-libs/db-4.3.29
+		>=dev-libs/openssl-0.9.7"
+RDEPEND=">=dev-libs/expat-1.9
+		>=app-arch/bzip2-1.0"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	built_with_use db nocxx && die "DB must be compiled with C++ support!"
+}
+
+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!"
+}