Add patch for openssl-1.0.0 compatibility, bug 312023. Thanks to Philip Kovacs.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-cpp/Ice/ChangeLog b/dev-cpp/Ice/ChangeLog
index cb8bd8bcbafe947f1cbd7e459098d132e04a86b4..9b767a6a08b04b1190e739ce4c852c74c2add0b7 100644 (file)
--- a/dev-cpp/Ice/ChangeLog
+++ b/dev-cpp/Ice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/Ice
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/ChangeLog,v 1.21 2009/11/19 14:32:54 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/ChangeLog,v 1.22 2010/06/04 13:09:47 spatz Exp $
+
+*Ice-3.3.1-r1 (04 Jun 2010)
+
+  04 Jun 2010; Dror Levin <spatz@gentoo.org> +Ice-3.3.1-r1.ebuild,
+  +files/Ice-3.3.1-openssl.patch:
+  Add patch for openssl-1.0.0 compatibility, bug 312023. Thanks to Philip
+  Kovacs.
 
   19 Nov 2009; Christian Faulhammer <fauli@gentoo.org> Ice-3.3.1.ebuild:
   stable x86, bug 282359

diff --git a/dev-cpp/Ice/Ice-3.3.1-r1.ebuild b/dev-cpp/Ice/Ice-3.3.1-r1.ebuild
new file mode 100644 (file)
index 0000000..940ece5
--- /dev/null
+++ b/dev-cpp/Ice/Ice-3.3.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/Ice/Ice-3.3.1-r1.ebuild,v 1.1 2010/06/04 13:09:47 spatz Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="ICE middleware C++ bindings"
+HOMEPAGE="http://www.zeroc.com/index.html"
+SRC_URI="http://www.zeroc.com/download/Ice/3.3/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ncurses test debug"
+
+RDEPEND=">=dev-libs/expat-2.0.1
+       >=app-arch/bzip2-1.0.4
+       >=dev-libs/openssl-0.9.8g
+       =sys-libs/db-4.6.21*[-nocxx]
+       =dev-cpp/libmcpp-2.7.2"
+
+DEPEND="${RDEPEND}
+       ncurses? ( sys-libs/ncurses sys-libs/readline )
+       test? ( >=dev-lang/python-2.4 )"
+
+S=${WORKDIR}/${P}/cpp
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${P}-Makefile.patch
+       epatch "${FILESDIR}"/${P}-openssl.patch
+
+       MAKE_RULES="${S}/config/Make.rules"
+
+       #if use amd64; then
+       #       sed -i -e "s:^#LP64:LP64:g" "${MAKE_RULES}" \
+       #       || die "Failed to set lib64 directory"
+       #fi
+
+       if ! use ncurses; then
+               sed -i -e "s#^USE_READLINE.*#USE_READLINE      ?= yes#g" \
+               "${MAKE_RULES}" || die "Failed to set no readline"
+       fi
+
+       if ! use debug; then
+               sed -i -e "s:#OPTIMIZE:OPTIMIZE:" \
+               "${MAKE_RULES}" || die "Failed to remove debug"
+       fi
+
+       sed -i -e \
+       "s:.*CXXFLAGS[^\+]*\=\s:CXXFLAGS = ${CXXFLAGS} :g" \
+       "${MAKE_RULES}.Linux" || die "CXXFLAGS patching failed!"
+}
+
+src_compile() {
+       emake || die "make failed"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "Install failed"
+       cp -dpR "${S}"/../slice "${D}"/usr/share/Ice
+}
+
+src_test() {
+       emake test || die "Test failed"
+}

diff --git a/dev-cpp/Ice/Manifest b/dev-cpp/Ice/Manifest
index 98d0a192c8811ce7150b41c8ca0fccc3ef93496b..63fa3636b9c24b6c7410161958517bbe9b3aaac1 100644 (file)
--- a/dev-cpp/Ice/Manifest
+++ b/dev-cpp/Ice/Manifest
@@ -1,22 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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.2.1-gcc43.patch 10027 RMD160 0f0e44eae6eee673628094c7f924e2128f38814c SHA1 31a60a37e50f4d440589e6278f7f29839df5ecf7 SHA256 b86df9b5fa6bc2c15b1479cbec33040fee67551fbf1086e0e697820d18f9b60c
 AUX Ice-3.3.1-Makefile.patch 2494 RMD160 e9872d64c716d21865ca6282293e95325d5a6363 SHA1 5dda2d42446647aa2b6411acb0213b759f6deaea SHA256 1fa17c02f5d32aa719995d283fc08bfe9b97b5cb4b7628e8463813f367aba525
+AUX Ice-3.3.1-openssl.patch 590 RMD160 655eabb89994bf8a9baf02386e415a674a67318b SHA1 a050423f4b6ad3bf46d0037772c0d3aa79b98c86 SHA256 0c010f9ea91d8feefbc101b1a2017930a5db0fd1fa50d5827a61a6d33da077b3
 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.3.1.tar.gz 4455154 RMD160 d64d52c35640cebe1145e62f57618473d17cbeb5 SHA1 08d0f32bdb7d909b4a531d45cccfa97bdde649aa SHA256 7b90477303ea2668e8f2cc7bb4506e3a596699e092c4e622746ea42d8286abd0
 EBUILD Ice-3.2.0.ebuild 1597 RMD160 592d5fad927ded4bbef30b6f6a0ad57d2d430357 SHA1 d02550c064d88063f35fe5d54869c60ae9c06393 SHA256 f2e8c96032a6b39095ef67c9fb82b40ee465b584861dfa307d34c45dc1f853f0
 EBUILD Ice-3.2.1.ebuild 1649 RMD160 bbc3e8ff9eed455dffb0b9a0280e56062b289f29 SHA1 551f237707c0f331b306c8341a047365d6fb882c SHA256 246fe46cce54d0e6ed91b2143ffa1a5507b01781fef6411beb9346e81c6fdef7
+EBUILD Ice-3.3.1-r1.ebuild 1603 RMD160 7a5cbd73860f2ae7b0beb297aaac6bbe8eca344b SHA1 943e288daa2684be51fcfe1bd2cc25025b9fd53f SHA256 86b91dfca90964e2dc775fe71e19ba42f7c7d69aaf78c2864fc417769d9f57da
 EBUILD Ice-3.3.1.ebuild 1558 RMD160 4f901b790c935c6bda67c93fd9eaedabe8f3cc66 SHA1 c25068ab07a4976b00434b20cf545e610562661a SHA256 ea923ce6a0d97347b63c9bf4b134b2a65840641ce8359fd1706007ee18b05a44
-MISC ChangeLog 5969 RMD160 4a2991c3b0b4f6b8e0e8646317fea63abb217a7d SHA1 01dfd4efdc6f3cbe7a6887e1e9b898680015a721 SHA256 c30e68e276b00de0fb8505d0c0faec512e602b6e33cc8317238788a20a67db29
+MISC ChangeLog 6184 RMD160 217ccd83347fdc36837c8f000f5c27d3fdd3e16e SHA1 4602bbd8ab4201575f62d6eea678e8d22e390ba5 SHA256 e5bb807040e47796bb1dd6acf3fe2e8c6568d9cfec0034b97a76afb05deaa07f
 MISC metadata.xml 339 RMD160 f92a68fdab5aad40e9c173ebd1ed26b5963acf9f SHA1 3dfd85c450884b0fb534b7d54cfb6837dfa5c764 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAksFVxsACgkQNQqtfCuFnePJgQCgiiqH9YKNpUepQkXCrGbwIK0w
-wjQAmgJjugCWbT5KulET0NPqWgOexxhI
-=goYA
+iQEcBAEBCgAGBQJMCPsjAAoJEAWF714uGAc66wcH/3K6qK0WGZMAbkvfyy4zH/Ea
+rxfnBEiZYEnR2MtNDgO+9dXftg/Cklvkcujq5hXPL8RrZjnE6rh8Ege3iSFx3vOu
+wpC7s3bQCIVVUkyQ7HMqmsebVu3Wsede9zDWYkwJi+zE5tNyXRrJC/DA3x8mEBT3
+FicsCK35lVYwy+H3uKBXcuD0G0FafR8lYDsAnQGPo7l9GhEl+eh934Elf3+nhpC9
+cJfl0l+1pbFGbRYj78qmEsuUQjVhK6fq33Cngt6GWXSkMoVNlv3U5BcBTR33hlV9
+UNwKvDjDu+5p4q3DtDKBC4ZYIgpZY07GX1IVd3UcaI6OPxhnSTdTY10lugP6qlc=
+=3NOK
 -----END PGP SIGNATURE-----

diff --git a/dev-cpp/Ice/files/Ice-3.3.1-openssl.patch b/dev-cpp/Ice/files/Ice-3.3.1-openssl.patch
new file mode 100644 (file)
index 0000000..28ba3ba
--- /dev/null
+++ b/dev-cpp/Ice/files/Ice-3.3.1-openssl.patch
@@ -0,0 +1,12 @@
+diff -ur Ice-3.3.1-orig/cpp/src/IceSSL/Instance.cpp Ice-3.3.1/cpp/src/IceSSL/Instance.cpp
+--- Ice-3.3.1-orig/cpp/src/IceSSL/Instance.cpp 2009-03-20 19:52:14.000000000 +0200
++++ Ice-3.3.1/cpp/src/IceSSL/Instance.cpp      2010-06-04 16:02:16.779755389 +0300
+@@ -989,7 +989,7 @@
+ {
+     Trace out(_logger, _securityTraceCategory);
+     out << "SSL summary for " << (incoming ? "incoming" : "outgoing") << " connection\n";
+-    SSL_CIPHER* cipher = SSL_get_current_cipher(ssl);
++    const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl);
+     if(!cipher)
+     {
+         out << "unknown cipher\n";