diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/ice/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-cpp/ice/Manifest | 27 | ||||
| -rw-r--r-- | dev-cpp/ice/files/digest-ice-3.1.0-r1 | 3 | ||||
| -rw-r--r-- | dev-cpp/ice/files/ice-3.1-patches/GCCountMap.h | 24 | ||||
| -rwxr-xr-x | dev-cpp/ice/files/ice-3.1-patches/GCShared.h | 71 | ||||
| -rw-r--r-- | dev-cpp/ice/files/ice-3.1-patches/ObjectF.h | 40 | ||||
| -rw-r--r-- | dev-cpp/ice/ice-3.1.0-r1.ebuild | 61 |
7 files changed, 230 insertions, 5 deletions
diff --git a/dev-cpp/ice/ChangeLog b/dev-cpp/ice/ChangeLog index 6def47eed49e..2109cf34d54b 100644 --- a/dev-cpp/ice/ChangeLog +++ b/dev-cpp/ice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-cpp/ice # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ice/ChangeLog,v 1.7 2006/07/13 01:13:39 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/ice/ChangeLog,v 1.8 2006/07/14 12:04:39 caleb Exp $ + +*ice-3.1.0-r1 (14 Jul 2006) + + 14 Jul 2006; Caleb Tennis <caleb@gentoo.org> + +files/ice-3.1-patches/GCCountMap.h, +files/ice-3.1-patches/GCShared.h, + +files/ice-3.1-patches/ObjectF.h, +ice-3.1.0-r1.ebuild: + Revbump to include the first patch release *ice-3.1.0 (13 Jul 2006) diff --git a/dev-cpp/ice/Manifest b/dev-cpp/ice/Manifest index c02c244a67f1..d9575053fec6 100644 --- a/dev-cpp/ice/Manifest +++ b/dev-cpp/ice/Manifest @@ -6,6 +6,18 @@ AUX ice-3.0.1-makefile.patch 1436 RMD160 6957ee3d88b7208b8d23da2c2d00e6643c9ab23 MD5 175aea2fc46c6c8180771013e363b11e files/ice-3.0.1-makefile.patch 1436 RMD160 6957ee3d88b7208b8d23da2c2d00e6643c9ab233 files/ice-3.0.1-makefile.patch 1436 SHA256 bc1a2251ddefd09ac4b4d5f543a613b76ae1ece79d046811a3da122310d8017a files/ice-3.0.1-makefile.patch 1436 +AUX ice-3.1-patches/GCCountMap.h 508 RMD160 6164b53f1207b26e473f1b328080b26ab55f6774 SHA1 6d67cb3b87834cc65c7c4e89a4f01b080dacce78 SHA256 e7dd563a96a55d949a182ba07d1b1ef664567060af5197b01023921cf883268f +MD5 2e6f76c99c3ea655214e17dcdb95e2c0 files/ice-3.1-patches/GCCountMap.h 508 +RMD160 6164b53f1207b26e473f1b328080b26ab55f6774 files/ice-3.1-patches/GCCountMap.h 508 +SHA256 e7dd563a96a55d949a182ba07d1b1ef664567060af5197b01023921cf883268f files/ice-3.1-patches/GCCountMap.h 508 +AUX ice-3.1-patches/GCShared.h 1536 RMD160 d44a37f6cd4d72ff277f913e9c622dcf279f0197 SHA1 d51b1a4e17881548e54d966e7d9690414275da27 SHA256 63b0a8dd9f889072ba88f63b5deeb806b7ec2f9b6cc81dbc50e79ae8e406cb6b +MD5 ebe01b259618ca1dcee012290c6598ab files/ice-3.1-patches/GCShared.h 1536 +RMD160 d44a37f6cd4d72ff277f913e9c622dcf279f0197 files/ice-3.1-patches/GCShared.h 1536 +SHA256 63b0a8dd9f889072ba88f63b5deeb806b7ec2f9b6cc81dbc50e79ae8e406cb6b files/ice-3.1-patches/GCShared.h 1536 +AUX ice-3.1-patches/ObjectF.h 709 RMD160 b08faa2601198705301fc2ca45748a118c89cd0a SHA1 1154ea3d821fb2ac491f24571ee3d7cd7d611240 SHA256 89676a27181e3fef304e2f857ac28c8f0806ebac0701794a89d7838be3d3c055 +MD5 5fabc8e1f4461fe0d3261cd61905f74f files/ice-3.1-patches/ObjectF.h 709 +RMD160 b08faa2601198705301fc2ca45748a118c89cd0a files/ice-3.1-patches/ObjectF.h 709 +SHA256 89676a27181e3fef304e2f857ac28c8f0806ebac0701794a89d7838be3d3c055 files/ice-3.1-patches/ObjectF.h 709 AUX ice-3.1.0-makefile.patch 1929 RMD160 5bc1a9fcd28c9f3d6e659d64e787969abf295d04 SHA1 ace104097f9665b65656bc5c5f4dc1efb2ebe552 SHA256 aa590e9e5799cc2bf57bc2ecb758c44c6ef88494c38e6922cc4a983b56706fe2 MD5 20ee8eef1a7f9dbc7974193a0e55e09e files/ice-3.1.0-makefile.patch 1929 RMD160 5bc1a9fcd28c9f3d6e659d64e787969abf295d04 files/ice-3.1.0-makefile.patch 1929 @@ -21,14 +33,18 @@ EBUILD ice-3.0.1.ebuild 1474 RMD160 4cfd6cdc519b44b3ffee86a28ed8344ff52b5c35 SHA MD5 1ea2a9cdba6ae5afaab08c211388c0dd ice-3.0.1.ebuild 1474 RMD160 4cfd6cdc519b44b3ffee86a28ed8344ff52b5c35 ice-3.0.1.ebuild 1474 SHA256 ec192d04c62c3b4e355d202dda0882b6b490321854097d9a84abed2e5e61c3cf ice-3.0.1.ebuild 1474 +EBUILD ice-3.1.0-r1.ebuild 1525 RMD160 89f84bd1f96b45ceca908015657792d512b1e7d4 SHA1 28474fdf48e01a21eb92d4bfc778406b96a3f258 SHA256 24b38ff1179f44b400ea0c4730786db0af6a2e50c8cd82a2b89fd11aaf4022ed +MD5 c828fe8ea52a35ada41c12d36f6715a0 ice-3.1.0-r1.ebuild 1525 +RMD160 89f84bd1f96b45ceca908015657792d512b1e7d4 ice-3.1.0-r1.ebuild 1525 +SHA256 24b38ff1179f44b400ea0c4730786db0af6a2e50c8cd82a2b89fd11aaf4022ed ice-3.1.0-r1.ebuild 1525 EBUILD ice-3.1.0.ebuild 1491 RMD160 5e9a98e80a4bcf0371b10ae5288edaf2868c828b SHA1 3e8af5e094e1c137820d7404f73065602baf8e03 SHA256 93fff81428d860e44e0d450c02c72ae3a1fcc67fdafda0682974f41382588f56 MD5 d675f046409d0bb1469855b53e6a5b78 ice-3.1.0.ebuild 1491 RMD160 5e9a98e80a4bcf0371b10ae5288edaf2868c828b ice-3.1.0.ebuild 1491 SHA256 93fff81428d860e44e0d450c02c72ae3a1fcc67fdafda0682974f41382588f56 ice-3.1.0.ebuild 1491 -MISC ChangeLog 1471 RMD160 055579f015cbfc7174bfd6479615d5f8cf98d80d SHA1 a24cac06daf4718197e767ddab0dcc1088443ee2 SHA256 46b4d89321e3e66a3c62961616b2f0cb42c2758a78e75ba0e057e8116f59030d -MD5 12b9fbf28cbc7d58a21297355a2949b5 ChangeLog 1471 -RMD160 055579f015cbfc7174bfd6479615d5f8cf98d80d ChangeLog 1471 -SHA256 46b4d89321e3e66a3c62961616b2f0cb42c2758a78e75ba0e057e8116f59030d ChangeLog 1471 +MISC ChangeLog 1725 RMD160 3fec4816b9d2766e590cb1af66a618287da24b22 SHA1 9b3772eeb3defebfc79c46bd1da0b3b97f759ff0 SHA256 cf51bee38ce71d5e68aa66a13c1e086b82ccf9041524a2cd8771bc08f5c26e5f +MD5 88018474baabd81eedc89f99c7883151 ChangeLog 1725 +RMD160 3fec4816b9d2766e590cb1af66a618287da24b22 ChangeLog 1725 +SHA256 cf51bee38ce71d5e68aa66a13c1e086b82ccf9041524a2cd8771bc08f5c26e5f ChangeLog 1725 MISC metadata.xml 367 RMD160 b6a6be891c7d6a93019b478754aaa304cbd03165 SHA1 ae4be8377a9dad6d14e92860ddb7a8468473b014 SHA256 3de23948faba6aa2f0ba1a51921ecf0258c7c3b8992998668c18957e9698893e MD5 3ec88d1ac2be997dc111b3eaa1da573e metadata.xml 367 RMD160 b6a6be891c7d6a93019b478754aaa304cbd03165 metadata.xml 367 @@ -42,3 +58,6 @@ SHA256 0941402cf1886bb1955f0f2671c856a428f5a2186fbbd1aa6ab62d4f00b95cef files/di MD5 b61727d9dce2aedd8c0af23bc86ead46 files/digest-ice-3.1.0 232 RMD160 6d7af01d8c7b4ec6df1225147ff36305299b2bc2 files/digest-ice-3.1.0 232 SHA256 41be52994af43b70c2c700afff9a328fe96dc3430c1870e19dc083e858c027b6 files/digest-ice-3.1.0 232 +MD5 b61727d9dce2aedd8c0af23bc86ead46 files/digest-ice-3.1.0-r1 232 +RMD160 6d7af01d8c7b4ec6df1225147ff36305299b2bc2 files/digest-ice-3.1.0-r1 232 +SHA256 41be52994af43b70c2c700afff9a328fe96dc3430c1870e19dc083e858c027b6 files/digest-ice-3.1.0-r1 232 diff --git a/dev-cpp/ice/files/digest-ice-3.1.0-r1 b/dev-cpp/ice/files/digest-ice-3.1.0-r1 new file mode 100644 index 000000000000..ba729b9d94a3 --- /dev/null +++ b/dev-cpp/ice/files/digest-ice-3.1.0-r1 @@ -0,0 +1,3 @@ +MD5 f37f7c6c1de570a5782f61430557ef4e Ice-3.1.0.tar.gz 2110940 +RMD160 e65fd990a77938d8e35b425cf9e6cc59a912a3ee Ice-3.1.0.tar.gz 2110940 +SHA256 c2de63f99d881ce0229f5cc10e0936f2bb4e7257a74220f5eec74712425f7ac4 Ice-3.1.0.tar.gz 2110940 diff --git a/dev-cpp/ice/files/ice-3.1-patches/GCCountMap.h b/dev-cpp/ice/files/ice-3.1-patches/GCCountMap.h new file mode 100644 index 000000000000..8d14f43c3815 --- /dev/null +++ b/dev-cpp/ice/files/ice-3.1-patches/GCCountMap.h @@ -0,0 +1,24 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_GCCOUNTMAP_H +#define ICE_GCCOUNTMAP_H + +#include <map> + +namespace IceInternal +{ + +class GCShared; + +typedef ::std::map<GCShared*, int> GCCountMap; + +} + +#endif diff --git a/dev-cpp/ice/files/ice-3.1-patches/GCShared.h b/dev-cpp/ice/files/ice-3.1-patches/GCShared.h new file mode 100755 index 000000000000..863084267d63 --- /dev/null +++ b/dev-cpp/ice/files/ice-3.1-patches/GCShared.h @@ -0,0 +1,71 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_GC_SHARED_H +#define ICE_GC_SHARED_H + +#include <IceUtil/Config.h> +#include <Ice/GCRecMutex.h> +#include <Ice/GCCountMap.h> +#include <set> + +namespace IceInternal +{ + +class GC; +class GCShared; + +typedef std::set<GCShared*> GCObjectSet; +extern ICE_API GCObjectSet gcObjects; // Set of pointers to all existing classes with class data members. + +class ICE_API GCShared +{ +public: + + GCShared(); + GCShared(const GCShared&); + virtual ~GCShared() {} + + GCShared& operator=(const GCShared&) + { + return *this; + } + + virtual void __incRef(); // First derived class with class data members overrides this. + virtual void __decRef(); // Ditto. + virtual void __addObject(GCCountMap&) {} // Ditto. + virtual bool __usesClasses() { return false; } // Ditto. + + virtual int __getRef() const; + virtual void __setNoDelete(bool); + + virtual void __gcReachable(GCCountMap&) const = 0; + virtual void __gcClear() = 0; + + int __getRefUnsafe() const + { + return _ref; + } + + void __decRefUnsafe() + { + --_ref; + } + +protected: + + int _ref; + bool _noDelete; + + friend class IceInternal::GC; // Allows IceInternal::GC to read value of _ref. +}; + +} + +#endif diff --git a/dev-cpp/ice/files/ice-3.1-patches/ObjectF.h b/dev-cpp/ice/files/ice-3.1-patches/ObjectF.h new file mode 100644 index 000000000000..c6b40780fa30 --- /dev/null +++ b/dev-cpp/ice/files/ice-3.1-patches/ObjectF.h @@ -0,0 +1,40 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_OBJECT_F_H +#define ICE_OBJECT_F_H + +#include <Ice/Handle.h> +#include <Ice/GCCountMap.h> + +namespace Ice +{ + +class Object; + +} + +namespace IceInternal +{ + +ICE_API void incRef(::Ice::Object*); +ICE_API void decRef(::Ice::Object*); + +} + +namespace Ice +{ + +typedef IceInternal::Handle< Object > ObjectPtr; + +void ICE_API __patch__ObjectPtr(void*, ObjectPtr&); + +} + +#endif diff --git a/dev-cpp/ice/ice-3.1.0-r1.ebuild b/dev-cpp/ice/ice-3.1.0-r1.ebuild new file mode 100644 index 000000000000..1b6a111e5d1d --- /dev/null +++ b/dev-cpp/ice/ice-3.1.0-r1.ebuild @@ -0,0 +1,61 @@ +# 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.1.0-r1.ebuild,v 1.1 2006/07/14 12:04:39 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.1/${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 sys-libs/db nocxx && die "DB must be compiled with C++ support!" +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-makefile.patch + cp ${FILESDIR}/ice-3.1-patches/*.h ${S}/include/Ice + + 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!" +} |