summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2008-05-21 18:10:19 +0000
committerCaleb Tennis <caleb@gentoo.org>2008-05-21 18:10:19 +0000
commitd72cc4faa2deb47f97337937c8d03406e0211990 (patch)
tree5d9077e37ca4e7b3ddf626dfa3bbe624a3f98187 /dev-cpp
parentUSE=postgres should set --with-pgsql, reported by Krzysztof Tomczyk (#222317) (diff)
downloadhistorical-d72cc4faa2deb47f97337937c8d03406e0211990.tar.gz
historical-d72cc4faa2deb47f97337937c8d03406e0211990.tar.bz2
historical-d72cc4faa2deb47f97337937c8d03406e0211990.zip
version bump
Package-Manager: portage-2.1.5_rc10
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/Ice/ChangeLog9
-rw-r--r--dev-cpp/Ice/Ice-3.3.0.ebuild (renamed from dev-cpp/Ice/Ice-3.3.0_beta1.ebuild)8
-rw-r--r--dev-cpp/Ice/Manifest8
-rw-r--r--dev-cpp/Ice/files/Ice-3.3.0-Makefile.patch68
-rw-r--r--dev-cpp/Ice/files/Ice-3.3.0_beta1-Makefile.patch91
5 files changed, 83 insertions, 101 deletions
diff --git a/dev-cpp/Ice/ChangeLog b/dev-cpp/Ice/ChangeLog
index 490241438c44..b31af723df37 100644
--- a/dev-cpp/Ice/ChangeLog
+++ b/dev-cpp/Ice/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-cpp/Ice
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/ChangeLog,v 1.14 2008/04/23 13:25:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/ChangeLog,v 1.15 2008/05/21 18:10:19 caleb Exp $
+
+*Ice-3.3.0 (21 May 2008)
+
+ 21 May 2008; Caleb Tennis <caleb@gentoo.org>
+ +files/Ice-3.3.0-Makefile.patch, -files/Ice-3.3.0_beta1-Makefile.patch,
+ -Ice-3.3.0_beta1.ebuild, +Ice-3.3.0.ebuild:
+ version bump
*Ice-3.3.0_beta1 (23 Apr 2008)
diff --git a/dev-cpp/Ice/Ice-3.3.0_beta1.ebuild b/dev-cpp/Ice/Ice-3.3.0.ebuild
index 9a148df0f8c7..f208800376fa 100644
--- a/dev-cpp/Ice/Ice-3.3.0_beta1.ebuild
+++ b/dev-cpp/Ice/Ice-3.3.0.ebuild
@@ -1,14 +1,12 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/Ice-3.3.0_beta1.ebuild,v 1.1 2008/04/23 13:25:21 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/Ice-3.3.0.ebuild,v 1.1 2008/05/21 18:10:19 caleb Exp $
inherit eutils
-MY_P=Ice-3.3b
-
DESCRIPTION="ICE middleware C++ bindings"
HOMEPAGE="http://www.zeroc.com/index.html"
-SRC_URI="http://www.zeroc.com/download/Ice/3.3/${MY_P}.tar.gz"
+SRC_URI="http://www.zeroc.com/download/Ice/3.3/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
@@ -25,7 +23,7 @@ DEPEND="${RDEPEND}
ncurses? ( sys-libs/ncurses sys-libs/readline )
test? ( >=dev-lang/python-2.4 )"
-S=${WORKDIR}/${MY_P}/cpp
+S=${WORKDIR}/${P}/cpp
pkg_setup() {
if built_with_use sys-libs/db nocxx; then
diff --git a/dev-cpp/Ice/Manifest b/dev-cpp/Ice/Manifest
index 505fedcc6533..ae526fad40b3 100644
--- a/dev-cpp/Ice/Manifest
+++ b/dev-cpp/Ice/Manifest
@@ -1,11 +1,11 @@
AUX Ice-3.2.0-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1ed SHA1 2e63175980d2b1ee420a37a36e9b8c570285967b SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1
AUX Ice-3.2.1-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1ed SHA1 2e63175980d2b1ee420a37a36e9b8c570285967b SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1
-AUX Ice-3.3.0_beta1-Makefile.patch 3421 RMD160 6b43f9b9e6fdb1a38f6cbaadd7eb08b892b88220 SHA1 ed13b9cbc97a449033cda2825dcb2cafb4548888 SHA256 f6e34e5e0c843f75a57cb9df7ec5058245f1d1dd0eee68627b1e56b1cdd94969
+AUX Ice-3.3.0-Makefile.patch 2494 RMD160 e9872d64c716d21865ca6282293e95325d5a6363 SHA1 5dda2d42446647aa2b6411acb0213b759f6deaea SHA256 1fa17c02f5d32aa719995d283fc08bfe9b97b5cb4b7628e8463813f367aba525
DIST Ice-3.2.0.tar.gz 2060037 RMD160 b11fc5718f4c86b349bf0ddc15d7cf402720a013 SHA1 e3b91f14f280a2df78ec5bfed2d9c7e97890ea51 SHA256 4698326e39342d2526c8780db996e47d35a09cdc6080be4329980ec5766ce81d
DIST Ice-3.2.1.tar.gz 2090576 RMD160 c3394486ba13e94c2491b0dc48dc19c3e7565ecd SHA1 69fc7dbdff81d7d9300b57f6e495914f3c9e5c19 SHA256 bd24cfe0296d81e2b04ea8d97b32a4f13fdd949d0f038f4c7e0922b395075149
-DIST Ice-3.3b.tar.gz 4238359 RMD160 bd027ac2b23a38bbe157b254a49d5e9e67ed8cfb SHA1 510cb32e023938feacad26619fecaef847beb222 SHA256 a59cc21c28fcf8c0296a3186d7989e7f98cd9f0159b0df42421cf8f799c8f209
+DIST Ice-3.3.0.tar.gz 4260675 RMD160 e85b37c93f12d9ae97c6b7b2f64f506fa051e4f8 SHA1 b599c3a4d1d3006b868bf2cbcd8e2a2d4575fb22 SHA256 73330e29799d08605d51b9fc148fdc11eb01b6c55b7e4bf4dcb8fafd98ba7749
EBUILD Ice-3.2.0.ebuild 1597 RMD160 592d5fad927ded4bbef30b6f6a0ad57d2d430357 SHA1 d02550c064d88063f35fe5d54869c60ae9c06393 SHA256 f2e8c96032a6b39095ef67c9fb82b40ee465b584861dfa307d34c45dc1f853f0
EBUILD Ice-3.2.1.ebuild 1609 RMD160 b258a9d434fec08faaea2c357a1625eba76f737d SHA1 d25b901dc258aa2a3af071b9e8a8c68760f043b2 SHA256 46d997436e8c456f5f62b8d76024de51d25e0761ff841fee531ccd352cdcc7eb
-EBUILD Ice-3.3.0_beta1.ebuild 1775 RMD160 22183724eaf42f25ab89daeb07cb6e4e953982bc SHA1 0b4ae3646f1af2d543742ba706cdfe95b7c3bbc7 SHA256 e4c17dda4b6649c7cc3a77927216cf3d0b8a48121624e429c33b63a9329b839d
-MISC ChangeLog 4472 RMD160 6a3a16c5710773eda0338c684557686e71c0353d SHA1 2dfbcd948008620795a7c2892cf1ba4badf1a587 SHA256 d18af2d07ae6d316cb925041c5b88ec0302dfafb21c70ed4882c6104e2dc8d96
+EBUILD Ice-3.3.0.ebuild 1748 RMD160 812ec574b17ad3da216f9ac68d498a4cb36c280a SHA1 8a00dca1ba779c25508ea5f5593f154eb8cf58c2 SHA256 630af554c38c5a9f5d29ac0e3299da24c04711c4a2ce9962ff325740a152f578
+MISC ChangeLog 4681 RMD160 e9dfe46a6822f2d6ec9980fab9ff5e650e11dc0d SHA1 d629da64e0fea24bba568102ed0569f876423af1 SHA256 5a6684dfa69dcaf243206b6962a880c248624062113e0adf8111005077446e3e
MISC metadata.xml 339 RMD160 f92a68fdab5aad40e9c173ebd1ed26b5963acf9f SHA1 3dfd85c450884b0fb534b7d54cfb6837dfa5c764 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3
diff --git a/dev-cpp/Ice/files/Ice-3.3.0-Makefile.patch b/dev-cpp/Ice/files/Ice-3.3.0-Makefile.patch
new file mode 100644
index 000000000000..ceeaab4fd48e
--- /dev/null
+++ b/dev-cpp/Ice/files/Ice-3.3.0-Makefile.patch
@@ -0,0 +1,68 @@
+--- config/Make.rules.orig 2008-05-21 13:39:46.000000000 -0400
++++ config/Make.rules 2008-05-21 13:43:35.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
+
+ #
+ # 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
+@@ -144,10 +144,10 @@
+ include $(top_srcdir)/config/Make.rules.$(UNAME)
+
+ install_includedir := $(prefix)/include
+-install_docdir := $(prefix)/doc
++install_docdir := $(prefix)/share/doc/Ice-$(VERSION)
+ install_bindir := $(prefix)/$(binsubdir)
+ install_libdir := $(prefix)/$(libsubdir)
+-install_configdir := $(prefix)/config
++install_configdir := $(prefix)/share/Ice/config
+
+ ifneq ($(embedded_runpath_prefix),)
+ runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir)
+@@ -162,18 +162,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/db46 -a -d /usr/$(libsubdir)/db46 ] ; then echo yes; fi), yes)
+- DB_FLAGS = -I/usr/include/db46
+- DB_LIBS = -L/usr/$(libsubdir)/db46 -ldb_cxx
+- else
+- DB_LIBS = -ldb_cxx
+- endif
+-endif
++DB_FLAGS = -I/usr/include/db4.6
++DB_LIBS = -L/usr/$(libsubdir) -ldb_cxx-4.6
+
+ EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
+ EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
+--- Makefile.orig 2008-05-21 13:42:32.000000000 -0400
++++ Makefile 2008-05-21 13:42:50.000000000 -0400
+@@ -11,11 +11,11 @@
+
+ include $(top_srcdir)/config/Make.rules
+
+-SUBDIRS = config src include test demo
++SUBDIRS = config src include
+
+ INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
+
+-install:: install-common
++install::
+ @for subdir in $(INSTALL_SUBDIRS); \
+ do \
+ if test ! -d $$subdir ; \
diff --git a/dev-cpp/Ice/files/Ice-3.3.0_beta1-Makefile.patch b/dev-cpp/Ice/files/Ice-3.3.0_beta1-Makefile.patch
deleted file mode 100644
index c76f4ee12c71..000000000000
--- a/dev-cpp/Ice/files/Ice-3.3.0_beta1-Makefile.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- config/Make.rules.orig 2008-04-02 07:40:44.000000000 -0400
-+++ config/Make.rules 2008-04-02 07:45:56.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
-
- #
- # 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,7 +125,7 @@
- endif
-
- install_includedir = $(prefix)/include
--install_docdir = $(prefix)/doc
-+install_docdir = $(prefix)/share/doc/Ice-$(VERSION)
-
- bindir = $(top_srcdir)/bin
- libdir = $(top_srcdir)/lib
-@@ -161,18 +161,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/db46 -a -d /usr/$(libsubdir)/db46 ] ; then echo yes; fi), yes)
-- DB_FLAGS = -I/usr/include/db46
-- DB_LIBS = -L/usr/$(libsubdir)/db46 -ldb_cxx
-- else
-- DB_LIBS = -ldb_cxx
-- endif
--endif
-+DB_FLAGS = -I/usr/include/db4.6
-+DB_LIBS = -L/usr/$(libsubdir) -ldb_cxx-4.6
-
- EXPAT_FLAGS = $(if $(EXPAT_HOME),-I$(EXPAT_HOME)/include)
- EXPAT_LIBS = $(if $(EXPAT_HOME),-L$(EXPAT_HOME)/$(libsubdir)) -lexpat
---- Makefile.orig 2008-04-02 09:51:02.000000000 -0400
-+++ Makefile 2008-04-02 09:51:18.000000000 -0400
-@@ -11,11 +11,11 @@
-
- include $(top_srcdir)/config/Make.rules
-
--SUBDIRS = config src include test demo
-+SUBDIRS = config src include
-
- INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir)
-
--install:: install-common
-+install::
- @for subdir in $(INSTALL_SUBDIRS); \
- do \
- if test ! -d $$subdir ; \
---- config/Makefile.orig 2008-04-02 10:33:40.000000000 -0400
-+++ config/Makefile 2008-04-02 10:34:26.000000000 -0400
-@@ -15,15 +15,15 @@
- echo ""
-
- install::
-- @if test ! -d $(prefix)/config ; \
-+ @if test ! -d $(prefix)/share/Ice/config ; \
- then \
-- echo "Creating $(prefix)/config..." ; \
-- $(call mkdir,$(prefix)/config) ; \
-+ echo "Creating $(prefix)/share/Ice/config..." ; \
-+ mkdir -p $(prefix)/share/Ice/config ; \
- fi
-- $(call installdata,templates.xml,$(prefix)/config)
-- $(call installdata,convertssl.py,$(prefix)/config)
-- $(call installdata,upgradeicegrid.py,$(prefix)/config)
-- $(call installdata,icegrid-slice.3.1.ice.gz,$(prefix)/config)
-- $(call installdata,icegrid-slice.3.2.ice.gz,$(prefix)/config)
-- $(call installdata,icegrid-slice.3.3.ice.gz,$(prefix)/config)
-+ $(call installdata,templates.xml,$(prefix)/share/Ice/config)
-+ $(call installdata,convertssl.py,$(prefix)/share/Ice/config)
-+ $(call installdata,upgradeicegrid.py,$(prefix)/share/Ice/config)
-+ $(call installdata,icegrid-slice.3.1.ice.gz,$(prefix)/share/Ice/config)
-+ $(call installdata,icegrid-slice.3.2.ice.gz,$(prefix)/share/Ice/config)
-+ $(call installdata,icegrid-slice.3.3.ice.gz,$(prefix)/share/Ice/config)
-