From bacd60e8e7e7b49a1372828963d6ddb145936cc2 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Mon, 4 Jun 2012 18:14:14 +0000 Subject: QA: Remove ebuilds that define EAPI more than once, bug 410999. Package-Manager: portage-2.1.10.64/cvs/Linux x86_64 --- dev-libs/Ice/ChangeLog | 8 +- dev-libs/Ice/Ice-3.3.1-r2.ebuild | 236 ---------------------- dev-libs/Ice/Ice-3.4.0.ebuild | 242 ----------------------- dev-libs/Ice/Manifest | 37 ++-- dev-libs/Ice/files/Ice-3.3.1-cross-compile.patch | 103 ---------- dev-libs/Ice/files/Ice-3.4.0-openssl.patch | 11 -- dev-libs/Ice/files/Ice-3.4.0-stream1.patch | 47 ----- dev-libs/Ice/files/Ice-3.4.0-stream2.patch | 13 -- 8 files changed, 21 insertions(+), 676 deletions(-) delete mode 100644 dev-libs/Ice/Ice-3.3.1-r2.ebuild delete mode 100644 dev-libs/Ice/Ice-3.4.0.ebuild delete mode 100644 dev-libs/Ice/files/Ice-3.3.1-cross-compile.patch delete mode 100644 dev-libs/Ice/files/Ice-3.4.0-openssl.patch delete mode 100644 dev-libs/Ice/files/Ice-3.4.0-stream1.patch delete mode 100644 dev-libs/Ice/files/Ice-3.4.0-stream2.patch (limited to 'dev-libs/Ice') diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog index 432bca43a385..c9f4b4baf78f 100644 --- a/dev-libs/Ice/ChangeLog +++ b/dev-libs/Ice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/Ice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.11 2012/04/14 19:39:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.12 2012/06/04 18:14:14 ulm Exp $ + + 04 Jun 2012; Ulrich Müller -Ice-3.3.1-r2.ebuild, + -files/Ice-3.3.1-cross-compile.patch, -Ice-3.4.0.ebuild, + -files/Ice-3.4.0-openssl.patch, -files/Ice-3.4.0-stream1.patch, + -files/Ice-3.4.0-stream2.patch: + QA: Remove ebuilds that define EAPI more than once, bug 410999. 14 Apr 2012; Mike Frysinger Ice-3.4.2.ebuild: Add ia64 love #282954 by Dennis Schridde. diff --git a/dev-libs/Ice/Ice-3.3.1-r2.ebuild b/dev-libs/Ice/Ice-3.3.1-r2.ebuild deleted file mode 100644 index f402ef51c201..000000000000 --- a/dev-libs/Ice/Ice-3.3.1-r2.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.3.1-r2.ebuild,v 1.3 2011/11/14 11:22:34 flameeyes Exp $ - -EAPI="2" - -PYTHON_DEPEND="python? 2" -RESTRICT_PYTHON_ABIS="3.*" -RUBY_OPTIONAL="yes" -USE_RUBY="ruby18" - -inherit eutils toolchain-funcs versionator python mono ruby-ng - -DESCRIPTION="ICE middleware C++ library and generator tools" -HOMEPAGE="http://www.zeroc.com/" -SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.tar.gz - doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf.gz )" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc examples +ncurses mono python ruby 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:4.6[cxx] - =dev-cpp/libmcpp-2.7.2 - ruby? ( $(ruby_implementation_depend ruby18) ) - mono? ( dev-lang/mono ) - !dev-python/IcePy - !dev-ruby/IceRuby" -DEPEND="${RDEPEND} - ncurses? ( sys-libs/ncurses sys-libs/readline ) - test? ( >=dev-lang/python-2.4 )" - -pkg_setup() { - use python && python_pkg_setup -} - -src_unpack() { - # prevent ruby-ng.eclass from messing with src_unpack - default -} - -src_prepare() { - epatch "${FILESDIR}/${P}-openssl.patch" - - if tc-is-cross-compiler ; then - export CROSS_COMPILE=yes - epatch "${FILESDIR}/${P}-cross-compile.patch" - fi - - sed -i \ - -e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \ - -e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \ - cpp/config/Make.rules || die "sed failed" - - sed -i \ - -e 's|\(install_pythondir[[:space:]]*\):=|\1?=|' \ - -e 's|\(install_rubydir[[:space:]]*\):=|\1?=|' \ - -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \ - {py,rb}/config/Make.rules || die "sed failed" - - sed -i \ - -e 's|-O2 ||g' \ - cpp/config/Make.rules.Linux || die "sed failed" - - sed -i \ - -e 's|install-common||' \ - -e 's|demo||' \ - {cpp,cs,php,py,rb}/Makefile || die "sed failed" - - sed -i \ - -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \ - cs/config/Make.rules.cs || die "sed failed" - - if ! use test ; then - sed -i \ - -e 's|^\(SUBDIRS.*\)test|\1|' \ - {cpp,cs,php,py,rb}/Makefile || die "sed failed" - fi -} - -src_configure() { - MAKE_RULES="prefix=\"${D}/usr\" - install_docdir=\"${D}/usr/share/doc/${PF}\" - install_configdir=\"${D}/usr/share/Ice-${PV}/config\" - embedded_runpath_prefix=\"\" - LP64=yes" - - use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no" - use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes" - - MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.6" - sed -i \ - -e "s|c++|$(tc-getCXX)|" \ - -e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \ - -e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \ - -e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \ - -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.6|" \ - cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed" - - if use python ; then - MAKE_RULES_PY="install_pythondir=\"${D}/$(python_get_sitedir)\" - install_libdir=\"${D}/$(python_get_sitedir)\"" - fi - - if use ruby ; then - SITERUBY="$(ruby -r rbconfig -e 'print Config::CONFIG["sitedir"]')" - MAKE_RULES_RB="install_rubydir=\"${D}/${SITERUBY}\" - install_libdir=\"${D}/${SITERUBY}\"" - - # make it use ruby18 only - sed -i \ - -e 's|RUBY = ruby|\018|' \ - rb/config/Make.rules || die "sed failed" - fi - - MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${D}/usr/$(get_libdir)\" GAC_DIR=/usr/$(get_libdir)" - -} - -src_compile() { - if tc-is-cross-compiler ; then - export CXX="${CHOST}-g++" - fi - - emake -C cpp ${MAKE_RULES} || die "emake failed" - - if use doc ; then - emake -C cpp/doc || die "building docs failed" - fi - - if use python ; then - emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} || die "emake py failed" - fi - - if use ruby ; then - emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed" - fi - - if use mono ; then - emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake cs failed" - fi -} - -src_install() { - dodoc CHANGES README - - insinto /usr/share/${P} - doins -r slice - - emake -C cpp ${MAKE_RULES} install || die "emake install failed" - - docinto cpp - dodoc CHANGES README - - if use examples ; then - insinto /usr/share/doc/${PF}/examples-cpp - doins cpp/config/*.cfg - doins -r cpp/demo/* - fi - - if use doc ; then - dohtml -r cpp/doc/reference/* - dodoc "${WORKDIR}/${P}.pdf" - fi - - if use python ; then - dodir $(python_get_sitedir) - emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} install || die "emake py install failed" - - docinto py - dodoc py/CHANGES py/README - - if use examples ; then - insinto /usr/share/doc/${PF}/examples-py - doins -r py/demo/* - fi - - cd "${D}/$(python_get_sitedir)" - PYTHON_MODULES=(*.py) - PYTHON_MODULES+=(Glacier2 IceBox IceGrid IcePatch2 IceStorm) - cd "${S}" - fi - - if use ruby ; then - dodir "${SITERUBY}" - emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake rb install failed" - - docinto rb - dodoc rb/CHANGES rb/README - - if use examples ; then - insinto /usr/share/doc/${PF}/examples-rb - doins -r rb/demo/* - fi - fi - - if use mono ; then - emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake cs install failed" - - docinto cs - dodoc cs/CHANGES cs/README - - if use examples ; then - insinto /usr/share/doc/${PF}/examples-cs - doins -r cs/demo/* - fi - fi -} - -src_test() { - emake -C cpp ${MAKE_RULES} test || die "emake test failed" - - if use python ; then - emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} test || die "emake py test failed" - fi - - if use ruby ; then - emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake rb test failed" - fi - - if use mono ; then - ewarn "Tests for C# are currently disabled." -# emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake cs test failed" - fi -} - -pkg_postinst() { - use python && EAPI="3" python_mod_optimize "${PYTHON_MODULES[@]}" -} - -pkg_postrm() { - use python && EAPI="3" python_mod_cleanup "${PYTHON_MODULES[@]}" -} diff --git a/dev-libs/Ice/Ice-3.4.0.ebuild b/dev-libs/Ice/Ice-3.4.0.ebuild deleted file mode 100644 index 2f5967f17fcc..000000000000 --- a/dev-libs/Ice/Ice-3.4.0.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.0.ebuild,v 1.4 2011/11/14 11:22:34 flameeyes Exp $ - -EAPI="2" - -PYTHON_DEPEND="python? 2" -RESTRICT_PYTHON_ABIS="3.*" -RUBY_OPTIONAL="yes" -USE_RUBY="ruby18" - -inherit eutils toolchain-funcs versionator python mono ruby-ng - -DESCRIPTION="ICE middleware C++ library and generator tools" -HOMEPAGE="http://www.zeroc.com/" -SRC_URI="http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.tar.gz - doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf.gz )" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc examples +ncurses mono python ruby test debug" - -RDEPEND=">=dev-libs/expat-2.0.1 - >=app-arch/bzip2-1.0.4 - >=dev-libs/openssl-0.9.8o - >=sys-libs/db-4.8.30:4.8[cxx] - =dev-cpp/libmcpp-2.7.2 - ruby? ( $(ruby_implementation_depend ruby18) ) - mono? ( dev-lang/mono ) - !dev-python/IcePy - !dev-ruby/IceRuby" -DEPEND="${RDEPEND} - ncurses? ( sys-libs/ncurses sys-libs/readline ) - test? ( >=dev-lang/python-2.4 )" - -pkg_setup() { - use python && python_pkg_setup -} - -src_unpack() { - # prevent ruby-ng.eclass from messing with src_unpack - default -} - -src_prepare() { - epatch \ - "${FILESDIR}/${P}-openssl.patch" \ - "${FILESDIR}/${P}-stream1.patch" \ - "${FILESDIR}/${P}-stream2.patch" - - if tc-is-cross-compiler ; then - export CROSS_COMPILE=yes - epatch "${FILESDIR}/${P}-cross-compile.patch" - fi - - sed -i \ - -e 's|\(install_docdir[[:space:]]*\):=|\1?=|' \ - -e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \ - cpp/config/Make.rules || die "sed failed" - - sed -i \ - -e 's|\(install_pythondir[[:space:]]*\):=|\1?=|' \ - -e 's|\(install_rubydir[[:space:]]*\):=|\1?=|' \ - -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \ - {py,rb}/config/Make.rules || die "sed failed" - - sed -i \ - -e 's|-O2 ||g' \ - cpp/config/Make.rules.Linux || die "sed failed" - - sed -i \ - -e 's|install-common||' \ - -e 's|demo||' \ - {cpp,cs,php,py,rb}/Makefile || die "sed failed" - - sed -i \ - -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \ - cs/config/Make.rules.cs || die "sed failed" - - if ! use test ; then - sed -i \ - -e 's|^\(SUBDIRS.*\)test|\1|' \ - {cpp,cs,php,py,rb}/Makefile || die "sed failed" - fi -} - -src_configure() { - MAKE_RULES="prefix=\"${D}/usr\" - install_docdir=\"${D}/usr/share/doc/${PF}\" - install_configdir=\"${D}/usr/share/Ice-${PV}/config\" - embedded_runpath_prefix=\"\" - LP64=yes" - - use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no" - use debug && OPTIONS"${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes" - - MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I/usr/include/db4.8" - sed -i \ - -e "s|c++|$(tc-getCXX)|" \ - -e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \ - -e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \ - -e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \ - -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-4.8|" \ - cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed" - - if use python ; then - MAKE_RULES_PY="install_pythondir=\"${D}/$(python_get_sitedir)\" - install_libdir=\"${D}/$(python_get_sitedir)\"" - fi - - if use ruby ; then - SITERUBY="$(ruby -r rbconfig -e 'print Config::CONFIG["sitedir"]')" - MAKE_RULES_RB="install_rubydir=\"${D}/${SITERUBY}\" - install_libdir=\"${D}/${SITERUBY}\"" - - # make it use ruby18 only - sed -i \ - -e 's|RUBY = ruby|\018|' \ - rb/config/Make.rules || die "sed failed" - fi - - MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${D}/usr/$(get_libdir)\" GAC_DIR=/usr/$(get_libdir)" - -} - -src_compile() { - if tc-is-cross-compiler ; then - export CXX="${CHOST}-g++" - fi - - emake -C cpp ${MAKE_RULES} || die "emake failed" - - if use doc ; then - emake -C cpp/doc || die "building docs failed" - fi - - if use python ; then - emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} || die "emake py failed" - fi - - if use ruby ; then - emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed" - fi - - if use mono ; then - emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake cs failed" - fi -} - -src_install() { - dodoc CHANGES README - - insinto /usr/share/${P} - doins -r slice - - emake -C cpp ${MAKE_RULES} install || die "emake install failed" - - docinto cpp - dodoc CHANGES README - - if use examples ; then - insinto /usr/share/doc/${PF}/examples-cpp - doins cpp/config/*.cfg - doins -r cpp/demo/* - fi - - if use doc ; then - dohtml -r cpp/doc/reference/* - dodoc "${WORKDIR}/${P}.pdf" - fi - - if use python ; then - dodir $(python_get_sitedir) - emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} install || die "emake py install failed" - - docinto py - dodoc py/CHANGES py/README - - if use examples ; then - insinto /usr/share/doc/${PF}/examples-py - doins -r py/demo/* - fi - - cd "${D}/$(python_get_sitedir)" - PYTHON_MODULES=(*.py) - PYTHON_MODULES+=(Glacier2 IceBox IceGrid IcePatch2 IceStorm) - cd "${S}" - fi - - if use ruby ; then - dodir "${SITERUBY}" - emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake rb install failed" - - docinto rb - dodoc rb/CHANGES rb/README - - if use examples ; then - insinto /usr/share/doc/${PF}/examples-rb - doins -r rb/demo/* - fi - fi - - if use mono ; then - emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake cs install failed" - - # TODO: anyone has an idea what those are for? - rm "${D}"/usr/bin/*.xml - - docinto cs - dodoc cs/CHANGES cs/README - - if use examples ; then - insinto /usr/share/doc/${PF}/examples-cs - doins -r cs/demo/* - fi - fi -} - -src_test() { - emake -C cpp ${MAKE_RULES} test || die "emake test failed" - - if use python ; then - emake -C py ${MAKE_RULES} ${MAKE_RULES_PY} test || die "emake py test failed" - fi - - if use ruby ; then - emake -C rb ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake rb test failed" - fi - - if use mono ; then - ewarn "Tests for C# are currently disabled." -# emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake cs test failed" - fi -} - -pkg_postinst() { - use python && EAPI="3" python_mod_optimize "${PYTHON_MODULES[@]}" -} - -pkg_postrm() { - use python && EAPI="3" python_mod_cleanup "${PYTHON_MODULES[@]}" -} diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest index e50238f875d3..7c0b01d4c9df 100644 --- a/dev-libs/Ice/Manifest +++ b/dev-libs/Ice/Manifest @@ -5,19 +5,12 @@ AUX Ice-3.2.0-Makefile.patch 4072 RMD160 40098fa6142aba0f08b72d1ab2f50426d3c0e1e 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-cross-compile.patch 3460 RMD160 09d91b8c02c1d69d7106bae9b4d546cba71072d3 SHA1 2fbcea245ce16709ee1fa5943f48da7d3535b3e0 SHA256 664c28aba32f2f03a9c6fc16348439d456e5d16df14689f6180fcf247aff348d AUX Ice-3.3.1-openssl.patch 590 RMD160 655eabb89994bf8a9baf02386e415a674a67318b SHA1 a050423f4b6ad3bf46d0037772c0d3aa79b98c86 SHA256 0c010f9ea91d8feefbc101b1a2017930a5db0fd1fa50d5827a61a6d33da077b3 -AUX Ice-3.4.0-openssl.patch 486 RMD160 2011b7520dc29da8660afff46f3a10a845c574d9 SHA1 31e9e460a5a6040a6f3311c77eac75e07b3a36fc SHA256 33e04b94420ff4f8c06dc6c94c53041a8251b2ed80a3f61d4e21855b001df5b6 -AUX Ice-3.4.0-stream1.patch 1300 RMD160 2cc981de643a92e618f1619ba9eee79bcf72c7f5 SHA1 1e856b5ff62185693e7cb123e304a7fa0879edb9 SHA256 b7fd0231b1dce875c007ae5c86cbdf822f83f8b554f011d87a1ac8479bf775f8 -AUX Ice-3.4.0-stream2.patch 305 RMD160 13da0516405da5560383cba5d10f2fcd5341bc8e SHA1 31a5c4298d9ee503072e9ed9ad2ff3aa75e72d8d SHA256 091d93c5ea5e4e35ecae95175a0c1158fb33988fe2a34c3da790b2b7f401b53a AUX Ice-3.4.1-db5.patch 468 RMD160 b1b7e93c30233b8b2356ad70d3d0fdf45445fbef SHA1 141478dd9dd73bc40dc23e1c1521859d177c1e97 SHA256 53d5c688e6ec716c33f427b0efdca0a9da4c5d5e5b2f260e72127a0543875a87 AUX Ice-3.4.2-gcc46.patch 275 RMD160 5d753d052298e821dd799d2ad9ab9ce78f1d9a21 SHA1 ecc4347aaeb6c4f0b12ef3bf5cfa8d94e2045986 SHA256 eb1d14656f19ee919441586682308210ec9877fc814a642a84ab56a818b5c737 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.pdf.gz 5798120 RMD160 1b162529bc35a716c3713242fad2ccc6b3d639f1 SHA1 1136ec0d1634c34aa7a7c0afba6f871c5b9e5ccb SHA256 816b1cb1fcb675abe33ada3dd2a0bb174a8cc6130f9f5c03b5c623c4956efc5b DIST Ice-3.3.1.tar.gz 4455154 RMD160 d64d52c35640cebe1145e62f57618473d17cbeb5 SHA1 08d0f32bdb7d909b4a531d45cccfa97bdde649aa SHA256 7b90477303ea2668e8f2cc7bb4506e3a596699e092c4e622746ea42d8286abd0 -DIST Ice-3.4.0.pdf.gz 5899146 RMD160 b7f3f867a55d09e28522a8c752985e19e05c8282 SHA1 f1215e3cf09a413a884ed3a264ffd5fc5079f88b SHA256 4b0abfd3ac68cf728bfbfe23b591aa6982c170996a9d0232e06d2330a1e46399 -DIST Ice-3.4.0.tar.gz 5233156 RMD160 e874749f8d7d1916c1e3b19c006a7f2216e10f53 SHA1 1c8fe296af8d65d16cddac39a8bc24b71e069f75 SHA256 8af7f278722998d2c9e7a2a60b56e230c3a47434d645d6de258aa1f18080b708 DIST Ice-3.4.1.pdf.gz 5916874 RMD160 7bd0e94c634acf2ae68c91c00ffb3e23cf9bc5ec SHA1 76b86221ce6196a54d09ae1b98fbc801dff25687 SHA256 ce7b41769e22ec718d41a3e9eebbe92bee189e9bcab424c3551d2b765bde2e0f DIST Ice-3.4.1.tar.gz 5263510 RMD160 aa756a14421e084336dcecdcbb977aa98c5e1283 SHA1 f3ae394146a36fa6453dc69e80d2ab6ab30f4d9a SHA256 83c76687ac2b1c16a7e51799668531ec794dc8bd81f0daec14765ad3c671b0e6 DIST Ice-3.4.2.pdf.gz 4232836 RMD160 06319749bc50419ef6ab23d336fee89526e88e0c SHA1 c4469565e7e7074c33e384f7b2d4b19cf76f70c3 SHA256 6400efa65f879f964590759222dd46010bfeb3e430787a4d53e826a54cbc4067 @@ -25,27 +18,25 @@ DIST Ice-3.4.2.tar.gz 5485106 RMD160 7ce680a4eb5fa9d0bb6f8b8910e267dfc2373d75 SH EBUILD Ice-3.2.0.ebuild 1601 RMD160 0565fdf7fcbea5fa165e10dd3eabd53c3fe078b8 SHA1 b3175229e32ee81712c75536650cc98eaa9cbeb9 SHA256 268e0043adff185dff04252df8a01415b4a7bb59c1347edd7782de16246efab2 EBUILD Ice-3.2.1.ebuild 1650 RMD160 c75d19140759039b3d70199030dd438beb8a6ec2 SHA1 cd1813bcde751763fa33098e364b5b3470d8a697 SHA256 a96acbf9ef1778dac2ebf0730cbd31809ad0c2a8da32f1ebcbb9e04bdc45e6ab EBUILD Ice-3.3.1-r1.ebuild 1581 RMD160 1be58ab653767becc4ceb37329b66a5fdb1a079c SHA1 b55ad96257d016917e85055ea6fec90976a234cd SHA256 bd6f330ad086a2836647649db25aaef7227fd95ddde7af07d7eb6606210326d9 -EBUILD Ice-3.3.1-r2.ebuild 5979 RMD160 fc6e89a72e1f82aa4970b139b032d03c2bff055d SHA1 c514e43a399ed93d9a92c1f063334376b8499e60 SHA256 1fd1030de648dd0c7da60f13fee9c9211502e5a8e96ff92bc88bec1c3dcc4685 EBUILD Ice-3.3.1.ebuild 1560 RMD160 06002685a79a72a21c50950af69cd70ff43f7b2d SHA1 1d9c75936cf2f95d83938b542194a90ff329bd68 SHA256 6288b9b4ce08b89ef08c634c02c9bfa5fe3740e9fa0df016846fdc4d0b70cb6b -EBUILD Ice-3.4.0.ebuild 6130 RMD160 ac19d91a42e9e85e16044d10cb29fd1d2a700589 SHA1 63942bcf2b5410536ddd51a1a08ae86fcc4f22dd SHA256 1e940cffaee645a2dfa82d05cca94e8bc3b49ae50f58d34b24735da76675561d EBUILD Ice-3.4.1.ebuild 6841 RMD160 aa40e9130b518a44bfc09334feaee9be490d43c6 SHA1 e15313161c7e2147f40852302b9135ac7548081d SHA256 cd7b720b77d980c681aa51176847a6c4d89c40c6852015c521735725938db2bd EBUILD Ice-3.4.2.ebuild 6844 RMD160 bf10765deeb58b02763627dbbe5e331a45ea4fca SHA1 0588e8c3d164be32da89ed03a5ed649f62fe9947 SHA256 49993bac9ed4f29c73e687cf78365d9595b72ebb9b194650dd955d6eab1cdeb2 -MISC ChangeLog 8831 RMD160 8944a8f4c27d069184d611902343ff685dab7bd9 SHA1 11ed06c7c4011dea525bf60e16be8e4336e6f03b SHA256 057c023ef179ef18dcecefb314e594e7e5b063def6f1ed3b5cb4d5d7a5bdf3b7 +MISC ChangeLog 9123 RMD160 8640a240262f2ac8ad997e7dd9daeabeb2532eed SHA1 2628cbda7ffecfc66bdb18d46f9907e67fd40c5b SHA256 516ccffe2475be3a340c7913b6e336a287dfee9189fc520ca881b77db7028f09 MISC metadata.xml 339 RMD160 f92a68fdab5aad40e9c173ebd1ed26b5963acf9f SHA1 3dfd85c450884b0fb534b7d54cfb6837dfa5c764 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBAgAGBQJPidKFAAoJELEHsLL7fEFWkCsQAK7+anNhsFor46AwjNI9gKB5 -e/Xocs/XEZY5URUfuqewAaVh9ou+Vtc8rej6KNvuII7Y4n99bJKG6PArkc8WBywd -J5mFGl+5kI4OXTm/LZg8hPW7jouyfY/Vc6Agr8Jeg4cXUmoKWnRSyt0PTXqIztMr -d1QD6F6Eyuxyf/luQbhbHAmk70n8tvULaDpnJE+3wXrOrzUefvcyxepcEl6tfBbt -Wi0OwEXyTWWmeC/RSrok4cjWZ9U5H17gKspBH5VszDJwTBfwd316G298//UfxsNv -pLr2BeITrca92lAjig/yzoeahMvUn/VlD9V11hjzfWNhdIOW+7Q9L+nki+YIDGNZ -U1k3129izhSTNgyKPEuJn/+WndqrRImwd+LtpM4cUSHoofeEtWteUfHmh/rrgHTe -CYvAfqmoOjwJc8FH+LfxbR7LcVOCHB3MmhSC9rukPXjndoAPQ0JYkcdCZvFQouAA -dAgFtwRFiibW96T9mWs0hrpAjSsVG8wKBMlEWpCjDLLVMttwlPu2LDiQ0xaSNiL7 -qwn3hRfNT2ebmnFKW00pwpA3tvBHMejVopLr/fqL56kDTpSJAMQSeDBATLxKbxaZ -iA0zIXrr00ZvGB0jm7FyR76Hw9E8F5zpltRNswixPkeTCDdj/wr5sbU3w8cef8zM -2fcTF/ICIadgzDrZ9q2s -=8lj1 +iQIcBAEBAgAGBQJPzPwcAAoJEDxpGckxwJCB0zEP/31TlXs1DeHwI5hSMmdejjy9 +k9QdRIsqcfeZ6ilaCdtf/2ZzfwPIB0erpHCIcOP3O2hS1hChbG0aM9126RhDtIdN +X9RyH+ekT92FejbLBBfh6Pe6kMt9CFrUuDHMWnNQS9XKdnsP+O/fUm5R8ERhl4j5 +DCy/cdnnhroLNo6gwqy37ZhGAEfZb02Sxb0UtmGrjwD698maedGClip0buMkByn1 +07Ra6PZbePVVdiFbyfeEwRVe0Oil1MR7FMC1966wP9XJIiFNvtKjWm00zzs1E+N6 +bCy6ADaAXcxMmdsQDAhgvV6Qa060z7vQ/uIflAIjF+QdM47YWL8Fk9sRYBiKNDsO +hWA5fSejkc6dsMcnVVgs9bDzfx5D2grvBBbI8jry2L/TLghwDeLmgFrE9SOoSDOg +UKN6+vUeMwTbE0uty+o/ZcglTouzJoTve3AzZ2B0MqDZ7K1kzLnHqdhkOS+u8Wwo +WbNXp4V6Hk1Al67WU4rTBy/HxPTRvyD2BqOKM+AdY/ATm3zHRYU2O5YYNx9CI0d3 +CdCM3foUymp6QhK01pu3y1FpOl8FTBOPKi2YA/oHy+VUBPRyAv2WdIFLbueqIEC0 +a4U1AB8hhxlBoATpxAz+tj9FrfBohQ6mjUlgvBWg4AtQr1lpvXZo4UGZ0lDXzTIS +L1Uopzu2L9wb05TlrjwT +=zBXo -----END PGP SIGNATURE----- diff --git a/dev-libs/Ice/files/Ice-3.3.1-cross-compile.patch b/dev-libs/Ice/files/Ice-3.3.1-cross-compile.patch deleted file mode 100644 index 059965df97f5..000000000000 --- a/dev-libs/Ice/files/Ice-3.3.1-cross-compile.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- ./Ice-3.3.1/cpp/config/Make.rules.orig 2009-07-28 12:35:31.000000000 +0300 -+++ ./Ice-3.3.1/cpp/config/Make.rules 2009-07-28 12:39:50.000000000 +0300 -@@ -214,18 +214,26 @@ - $(error You need to define mkshlib in Make.rules.$(UNAME)) - endif - --ifdef ice_src_dist -+ifndef ice_cross_compile -+ ifdef ice_src_dist - SLICEPARSERLIB = $(libdir)/$(call mklibfilename,Slice,$(VERSION)) - SLICE2CPP = $(bindir)/slice2cpp - SLICE2XSD = $(bindir)/slice2xsd - SLICE2FREEZE = $(bindir)/slice2freeze - SLICE2DOCBOOK = $(bindir)/slice2docbook --else -+ else - SLICEPARSERLIB = $(ice_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - SLICE2CPP = $(ice_dir)/$(binsubdir)/slice2cpp - SLICE2XSD = $(ice_dir)/$(binsubdir)/slice2xsd - SLICE2FREEZE = $(ice_dir)/$(binsubdir)/slice2freeze - SLICE2DOCBOOK = $(ice_dir)/$(binsubdir)/slice2docbook -+ endif -+else -+ SLICEPARSERLIB = /usr/lib/$(call mklibfilename,Slice,$(VERSION)) -+ SLICE2CPP = /usr/bin/slice2cpp -+ SLICE2XSD = /usr/bin/slice2xsd -+ SLICE2FREEZE = /usr/bin/slice2freeze -+ SLICE2DOCBOOK = /usr/bin/slice2docbook - endif - - EVERYTHING = all depend clean install ---- ./Ice-3.3.1/cpp/config/Make.rules.Linux.orig 2009-07-28 12:03:52.000000000 +0300 -+++ ./Ice-3.3.1/cpp/config/Make.rules.Linux 2009-07-28 12:25:15.000000000 +0300 -@@ -78,7 +78,7 @@ - endif - endif - -- CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT -I/usr/include/nptl -+ CXXFLAGS = $(CXXARCHFLAGS) -ftemplate-depth-128 -Wall -D_REENTRANT - - ifneq ($(GENPIC),no) - CXXFLAGS += -fPIC -@@ -154,9 +154,7 @@ - - endif - --NPTL_LIB = /usr/$(libsubdir)/nptl -- --BASELIBS = -lIceUtil -L$(NPTL_LIB) -lpthread -lrt -+BASELIBS = -lIceUtil -lpthread -lrt - LIBS = $(BZIP2_RPATH_LINK) -lIce $(BASELIBS) - - ICEUTIL_OS_LIBS = ---- ./Ice-3.3.1/cpp/include/IceUtil/Config.h.orig 2009-07-28 12:17:41.000000000 +0300 -+++ ./Ice-3.3.1/cpp/include/IceUtil/Config.h 2009-07-28 12:26:02.000000000 +0300 -@@ -16,16 +16,8 @@ - // Most CPUs support only one endianness, with the notable exceptions - // of Itanium (IA64) and MIPS. - // --#if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || \ -- defined(_M_X64) || defined(_M_IA64) || defined(__alpha__) || \ -- defined(__MIPSEL__) --# define ICE_LITTLE_ENDIAN --#elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || \ -- defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \ -- defined(__MIPSEB__) --# define ICE_BIG_ENDIAN --#else --# error "Unknown architecture" -+#ifdef __GLIBC__ -+ #include - #endif - - // ---- ./Ice-3.3.1/cpp/Makefile.orig 2009-07-28 12:02:58.000000000 +0300 -+++ ./Ice-3.3.1/cpp/Makefile 2009-07-28 12:17:05.000000000 +0300 -@@ -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 ; \ ---- ./Ice-3.3.1/config/Make.common.rules.orig 2009-07-28 12:12:17.000000000 +0300 -+++ ./Ice-3.3.1/config/Make.common.rules 2009-07-28 12:25:41.000000000 +0300 -@@ -40,6 +40,10 @@ - ice_bin_dist = 1 - endif - -+ifeq ($(CROSS_COMPILE),yes) -+ice_cross_compile = 1 -+endif -+ - ifeq ($(UNAME),SunOS) - ifeq ($(MACHINE_TYPE),sun4u) - lp64suffix = /sparcv9 diff --git a/dev-libs/Ice/files/Ice-3.4.0-openssl.patch b/dev-libs/Ice/files/Ice-3.4.0-openssl.patch deleted file mode 100644 index 1440cedfe438..000000000000 --- a/dev-libs/Ice/files/Ice-3.4.0-openssl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./cpp/src/IceSSL/Instance.cpp.orig 2010-04-03 16:00:51.000000000 -0400 -+++ ./cpp/src/IceSSL/Instance.cpp 2010-04-03 16:03:45.000000000 -0400 -@@ -1058,7 +1058,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"; diff --git a/dev-libs/Ice/files/Ice-3.4.0-stream1.patch b/dev-libs/Ice/files/Ice-3.4.0-stream1.patch deleted file mode 100644 index 2e49abbce3f1..000000000000 --- a/dev-libs/Ice/files/Ice-3.4.0-stream1.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- ./cpp/src/slice2cpp/Gen.cpp -+++ ./cpp/src/slice2cpp/Gen.cpp -@@ -6629,21 +6629,34 @@ Slice::Gen::StreamVisitor::visitModuleStart(const ModulePtr& m) - { - return false; - } -- H.zeroIndent(); -- H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX -- H << nl << "#else"; -- H.restoreIndent(); -- H << nl << "namespace Ice" << nl << '{'; -+ if(UnitPtr::dynamicCast(m->container())) -+ { -+ // -+ // Only emit this for the top-level module. -+ // -+ H << sp; -+ H.zeroIndent(); -+ H << nl << "#if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug"; // COMPILERFIX -+ H << nl << "#else"; -+ H.restoreIndent(); -+ H << nl << "namespace Ice" << nl << '{'; -+ } - return true; - } - - void --Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr&) -+Slice::Gen::StreamVisitor::visitModuleEnd(const ModulePtr& m) - { -- H << nl << '}'; -- H.zeroIndent(); -- H << nl << "#endif"; -- H.restoreIndent(); -+ if(UnitPtr::dynamicCast(m->container())) -+ { -+ // -+ // Only emit this for the top-level module. -+ // -+ H << nl << '}'; -+ H.zeroIndent(); -+ H << nl << "#endif"; -+ H.restoreIndent(); -+ } - } - - bool diff --git a/dev-libs/Ice/files/Ice-3.4.0-stream2.patch b/dev-libs/Ice/files/Ice-3.4.0-stream2.patch deleted file mode 100644 index cced0b8dd67d..000000000000 --- a/dev-libs/Ice/files/Ice-3.4.0-stream2.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./cpp/src/slice2cpp/Gen.cpp -+++ ./cpp/src/slice2cpp/Gen.cpp -@@ -354,6 +354,10 @@ Slice::Gen::generate(const UnitPtr& p) - { - H << "\n#include "; - } -+ else -+ { -+ H << "\n#include "; -+ } - } - - if(_checksum) -- cgit v1.2.3-65-gdbad