diff options
author | Caleb Tennis <caleb@gentoo.org> | 2007-08-15 11:51:48 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2007-08-15 11:51:48 +0000 |
commit | 805e1a8cd4756880b6e0a99af69cc40fd80a2a16 (patch) | |
tree | 9f33336bf5d7d5b0880314556ff2417006910e9e /dev-cpp/Ice | |
parent | stable x86, bug 187681 (diff) | |
download | historical-805e1a8cd4756880b6e0a99af69cc40fd80a2a16.tar.gz historical-805e1a8cd4756880b6e0a99af69cc40fd80a2a16.tar.bz2 historical-805e1a8cd4756880b6e0a99af69cc40fd80a2a16.zip |
version bump
Package-Manager: portage-2.1.3.5
Diffstat (limited to 'dev-cpp/Ice')
-rw-r--r-- | dev-cpp/Ice/ChangeLog | 8 | ||||
-rw-r--r-- | dev-cpp/Ice/Ice-3.2.1.ebuild | 65 | ||||
-rw-r--r-- | dev-cpp/Ice/Manifest | 20 | ||||
-rw-r--r-- | dev-cpp/Ice/files/Ice-3.2.1-Makefile.patch | 113 | ||||
-rw-r--r-- | dev-cpp/Ice/files/digest-Ice-3.2.1 | 3 |
5 files changed, 204 insertions, 5 deletions
diff --git a/dev-cpp/Ice/ChangeLog b/dev-cpp/Ice/ChangeLog index 4f26dc3fa0ab..477352f994b6 100644 --- a/dev-cpp/Ice/ChangeLog +++ b/dev-cpp/Ice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-cpp/Ice # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/ChangeLog,v 1.9 2007/08/13 09:03:55 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/ChangeLog,v 1.10 2007/08/15 11:51:48 caleb Exp $ + +*Ice-3.2.1 (15 Aug 2007) + + 15 Aug 2007; Caleb Tennis <caleb@gentoo.org> + +files/Ice-3.2.1-Makefile.patch, +Ice-3.2.1.ebuild: + version bump 12 Aug 2007; Caleb Tennis <caleb@gentoo.org> Ice-3.2.0.ebuild: Fix ncurses support from bug #175404 diff --git a/dev-cpp/Ice/Ice-3.2.1.ebuild b/dev-cpp/Ice/Ice-3.2.1.ebuild new file mode 100644 index 000000000000..7483f9b99085 --- /dev/null +++ b/dev-cpp/Ice/Ice-3.2.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/Ice-3.2.1.ebuild,v 1.1 2007/08/15 11:51:48 caleb Exp $ + +inherit eutils + +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="~amd64 ~x86" +IUSE="ncurses test debug" + +RDEPEND=">=dev-libs/expat-2.0 + >=app-arch/bzip2-1.0.3 + >=dev-libs/openssl-0.9.8 + =sys-libs/db-4.5.20*" + +DEPEND="${RDEPEND} + ncurses? ( sys-libs/ncurses sys-libs/readline ) + test? ( >=dev-lang/python-2.4 )" + +pkg_setup() { + if built_with_use sys-libs/db nocxx; then + eerror "sys-libs/db must be compiled with C++ support!" + eerror "Remove the 'nocxx' use flag and try again." + die "Fix use flags and re-emerge" + fi +} + +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 ?= yes#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!" +} + +src_test() { + make test || die "Test failed" +} diff --git a/dev-cpp/Ice/Manifest b/dev-cpp/Ice/Manifest index f1c29955e8e7..7e2f290802f5 100644 --- a/dev-cpp/Ice/Manifest +++ b/dev-cpp/Ice/Manifest @@ -2,15 +2,24 @@ AUX Ice-3.2.0-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1e MD5 c5187160c42469a8508761c1a283f3c7 files/Ice-3.2.0-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1ed files/Ice-3.2.0-Makefile.patch 4072 SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1 files/Ice-3.2.0-Makefile.patch 4072 +AUX Ice-3.2.1-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1ed SHA1 2e63175980d2b1ee420a37a36e9b8c570285967b SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1 +MD5 c5187160c42469a8508761c1a283f3c7 files/Ice-3.2.1-Makefile.patch 4072 +RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1ed files/Ice-3.2.1-Makefile.patch 4072 +SHA256 78b8c20f7491749c7ff3806d6130110c4d7145ed3c17699792910b877783e1d1 files/Ice-3.2.1-Makefile.patch 4072 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 EBUILD Ice-3.2.0.ebuild 1597 RMD160 592d5fad927ded4bbef30b6f6a0ad57d2d430357 SHA1 d02550c064d88063f35fe5d54869c60ae9c06393 SHA256 f2e8c96032a6b39095ef67c9fb82b40ee465b584861dfa307d34c45dc1f853f0 MD5 6a17ddea1805b01a9bc4b32b9016807a Ice-3.2.0.ebuild 1597 RMD160 592d5fad927ded4bbef30b6f6a0ad57d2d430357 Ice-3.2.0.ebuild 1597 SHA256 f2e8c96032a6b39095ef67c9fb82b40ee465b584861dfa307d34c45dc1f853f0 Ice-3.2.0.ebuild 1597 -MISC ChangeLog 3865 RMD160 2a5483bc33f95b0e16ca2295c09ad150b868aa72 SHA1 c931f9f95f9386e2115fa2bddfc0628db0eed5e2 SHA256 613b2dc32492a62d1c30fbab984cf80790b2d3611eed9da9632569848da8fbec -MD5 4243a7cdf97131ed112c2d27ef9262a3 ChangeLog 3865 -RMD160 2a5483bc33f95b0e16ca2295c09ad150b868aa72 ChangeLog 3865 -SHA256 613b2dc32492a62d1c30fbab984cf80790b2d3611eed9da9632569848da8fbec ChangeLog 3865 +EBUILD Ice-3.2.1.ebuild 1597 RMD160 5b513c2c97290fee7e714534184d638afd893988 SHA1 df201752b296bc4f1bfb535ec89c58b6242c2874 SHA256 90c5979d2250f97cfb5178552ce2ca0a7360086f5037309f6dea7829d2697bcd +MD5 7fd8b245ec66ff2408a2aa93a49f58b8 Ice-3.2.1.ebuild 1597 +RMD160 5b513c2c97290fee7e714534184d638afd893988 Ice-3.2.1.ebuild 1597 +SHA256 90c5979d2250f97cfb5178552ce2ca0a7360086f5037309f6dea7829d2697bcd Ice-3.2.1.ebuild 1597 +MISC ChangeLog 4009 RMD160 82ee771f49043f970fc3bf40e81115855d736f00 SHA1 3d8780cc8840109d67475c54d6088c67b0a1daba SHA256 da1253dbf1820379539809212a8bb335c632b6dd483a5890d8cebf598569afd1 +MD5 8355d99f453c8730acfd8cc0c824d1a4 ChangeLog 4009 +RMD160 82ee771f49043f970fc3bf40e81115855d736f00 ChangeLog 4009 +SHA256 da1253dbf1820379539809212a8bb335c632b6dd483a5890d8cebf598569afd1 ChangeLog 4009 MISC metadata.xml 339 RMD160 f92a68fdab5aad40e9c173ebd1ed26b5963acf9f SHA1 3dfd85c450884b0fb534b7d54cfb6837dfa5c764 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 MD5 f6d118e415addf3e9e7743649a761449 metadata.xml 339 RMD160 f92a68fdab5aad40e9c173ebd1ed26b5963acf9f metadata.xml 339 @@ -18,3 +27,6 @@ SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 metadata MD5 b3354fb8be63f4f0ad176fae64f14f33 files/digest-Ice-3.2.0 232 RMD160 93377881765ef73fd7390b1f7d9b5b6199bc52b1 files/digest-Ice-3.2.0 232 SHA256 5eda1640c836c724b4580132d8c803e897ff3863b69e02b172c77278078015e9 files/digest-Ice-3.2.0 232 +MD5 9cd9ef5767f70982293241a1ecd6047d files/digest-Ice-3.2.1 232 +RMD160 bc96758a9e4eed0efa534a5bc6389d6799591dcc files/digest-Ice-3.2.1 232 +SHA256 cac68fcd8fc004182c21453068eeb5e9230f10ad854c5406b0630f6fc9939119 files/digest-Ice-3.2.1 232 diff --git a/dev-cpp/Ice/files/Ice-3.2.1-Makefile.patch b/dev-cpp/Ice/files/Ice-3.2.1-Makefile.patch new file mode 100644 index 000000000000..d7df955c196c --- /dev/null +++ b/dev-cpp/Ice/files/Ice-3.2.1-Makefile.patch @@ -0,0 +1,113 @@ +--- 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 + + # + # 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,9 +125,10 @@ + install_bindir = $(prefix)/bin + + install_includedir = $(prefix)/include +-install_slicedir = $(prefix)/slice +-install_schemadir = $(prefix)/schema +-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} +@@ -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 +- 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 +--- 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_configdir) + + install:: + @if test ! -d $(prefix) ; \ + then \ + echo "Creating $(prefix)..." ; \ +- $(call mkdir,$(prefix)) ; \ ++ mkdir -p $(prefix) ; \ + fi + ifneq ($(embedded_runpath_prefix),) + @if test -h $(embedded_runpath_prefix) ; \ +@@ -55,8 +55,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 ; \ +@@ -65,4 +65,5 @@ + fi + + test:: ++ @( cd test && $(MAKE) ) || exit 1 + @python $(top_srcdir)/allTests.py +--- config/Makefile.orig 2007-03-13 10:05:05.000000000 -0400 ++++ config/Makefile 2007-03-13 10:05:43.000000000 -0400 +@@ -15,14 +15,9 @@ + echo "" + + install:: +- @if test ! -d $(prefix)/config ; \ +- then \ +- 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)) + diff --git a/dev-cpp/Ice/files/digest-Ice-3.2.1 b/dev-cpp/Ice/files/digest-Ice-3.2.1 new file mode 100644 index 000000000000..ec335a19819b --- /dev/null +++ b/dev-cpp/Ice/files/digest-Ice-3.2.1 @@ -0,0 +1,3 @@ +MD5 77bb04788747d0f4f7ef35f7a4c2800f Ice-3.2.1.tar.gz 2090576 +RMD160 c3394486ba13e94c2491b0dc48dc19c3e7565ecd Ice-3.2.1.tar.gz 2090576 +SHA256 bd24cfe0296d81e2b04ea8d97b32a4f13fdd949d0f038f4c7e0922b395075149 Ice-3.2.1.tar.gz 2090576 |