summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-libs/Ice/Ice-3.6.0-r1.ebuild278
-rw-r--r--dev-libs/Ice/Ice-3.6.1.ebuild (renamed from dev-libs/Ice/Ice-3.6.0-r2.ebuild)5
-rw-r--r--dev-libs/Ice/Manifest10
-rw-r--r--dev-libs/Ice/files/dont-append-c++11-to-libs.patch4
-rw-r--r--dev-libs/Ice/files/dont-separate-c++11-libs.patch4
5 files changed, 12 insertions, 289 deletions
diff --git a/dev-libs/Ice/Ice-3.6.0-r1.ebuild b/dev-libs/Ice/Ice-3.6.0-r1.ebuild
deleted file mode 100644
index 22d5485..0000000
--- a/dev-libs/Ice/Ice-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.5.1.ebuild,v 1.11 2015/04/08 17:51:56 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby19"
-
-inherit toolchain-funcs versionator python-r1 mono-env ruby-ng db-use
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="http://www.zeroc.com/"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
-IUSE="doc examples +ncurses mono python ruby test debug c++0x"
-
-RDEPEND=">=dev-libs/expat-2.0.1
- >=app-arch/bzip2-1.0.5
- >=dev-libs/openssl-0.9.8o:0
- || (
- sys-libs/db:5.3[cxx]
- sys-libs/db:5.1[cxx]
- sys-libs/db:4.8[cxx]
- )
- ~dev-cpp/libmcpp-2.7.2
- python? ( ${PYTHON_DEPS} )
- ruby? ( $(ruby_implementation_depend ruby19) )
- mono? ( dev-lang/mono )
- !dev-python/IcePy
- !dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
- ncurses? ( sys-libs/ncurses sys-libs/readline )
- test? ( ${PYTHON_DEPS} )"
-
-# Maintainer notes:
-# - yes, we have to do the trickery with the move for the python functions
-# since the build and test frameworks deduce various settings from the path
-# and they can't be tricked by a symlink. And we also need
-# SUPPORT_PYTHON_ABIS=1 otherwise we can't get pyc/pyo anymore the sane way.
-# TODO: php bindings
-# TODO: java bindings
-
-#overwrite ruby-ng.eclass default
-S="${WORKDIR}/${P,,}"
-
-pkg_setup() {
- # prevent ruby-ng.eclass from messing with src_unpack
- :;
-}
-
-src_unpack() {
- # prevent ruby-ng.eclass from messing with src_unpack
- default
- epatch ${FILESDIR}/dont-separate-c++11-libs.patch
-}
-
-src_prepare() {
- 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?=|' \
- {python,ruby}/config/Make.rules || die "sed failed"
-
- sed -i \
- -e 's|-O2 ||g' \
- -e 's|-Werror ||g' \
- cpp/config/Make.rules.Linux || die "sed failed"
-
- sed -i \
- -e 's|install-common||' \
- -e 's|demo||' \
- {cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
-
- sed -i \
- -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
- csharp/config/Make.rules.cs || die "sed failed"
-
- # skip mono tests, bug #498484
- sed -i \
- -e 's|^\(SUBDIRS.*\)test|\1|' \
- csharp/Makefile || die "sed failed"
-
- if ! use test ; then
- sed -i \
- -e 's|^\(SUBDIRS.*\)test|\1|' \
- {cpp,php,python,ruby}/Makefile || die "sed failed"
- fi
-}
-
-suitable_db_version() {
- local tested_slots="5.3 5.1 4.8"
- for ver in ${tested_slots}; do
- if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
- echo ${ver}
- return 0
- fi
- done
- die "No suitable BerkDB versions found, aborting"
-}
-
-src_configure() {
- MAKE_RULES="prefix=\"${ED}/usr\"
- install_docdir=\"${ED}/usr/share/doc/${PF}\"
- install_configdir=\"${ED}/usr/share/Ice-${PV}/config\"
- install_mandir=\"${ED}/usr/share/man\"
- embedded_runpath_prefix=\"${EPREFIX}/usr\"
- LP64=yes"
-
- use ncurses && MAKE_RULES="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
- use debug && MAKE_RULES="${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
- use c++0x && MAKE_RULES="${MAKE_RULES} CPP11=yes" || MAKE_RULES="${MAKE_RULES} CPP11=no"
-
- local BERKDB_VERSION="$(suitable_db_version)"
- MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})"
- sed -i \
- -e "s|g++|$(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-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
- cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
-
- if use python ; then
- S=${S}/python python_copy_sources
-
- # make a place for the symlink
- rm -r python/python || die
- fi
-
- if use ruby ; then
- SITERUBY="$(ruby19 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
- MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
- install_libdir=\"${ED}/${SITERUBY}\""
-
- # make it use ruby19 only
- sed -i \
- -e 's|RUBY = ruby|\019|' \
- ruby/config/Make.rules || die "sed failed"
- fi
-
- MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)"
-
- use test && python_export_best
-}
-
-src_compile() {
- # Do not remove this export or build will break!
- tc-export CXX
-
- 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
- building() {
- emake -C "${BUILD_DIR}" ${MAKE_RULES} || die "emake py-${EPYTHON} failed"
- }
- BUILD_DIR=python python_foreach_impl building
- fi
-
- if use ruby ; then
- emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake ruby failed"
- fi
-
- if use mono ; then
- emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake csharp failed"
- fi
-}
-
-src_install() {
- insinto /usr/share/${P}
- doins -r slice
-
- emake -C cpp ${MAKE_RULES} install || die "emake install failed"
-
- docinto cpp
-
- 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 "${DISTDIR}/${P}.pdf"
- fi
-
- if use python ; then
- installation() {
- mkdir -p "${D}/$(python_get_sitedir)" || die
-
- emake -C "${BUILD_DIR}" ${MAKE_RULES} \
- install_pythondir="\"${D}/$(python_get_sitedir)\"" \
- install_libdir="\"${D}/$(python_get_sitedir)\"" \
- install || die "emake py-${EPYTHON} install failed"
- }
- BUILD_DIR=python python_foreach_impl installation
-
- docinto python
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples-py
- doins -r python/demo/*
- fi
- fi
-
- if use ruby ; then
- dodir "${SITERUBY}"
- emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake ruby install failed"
-
- docinto ruby
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples-rb
- doins -r ruby/demo/*
- fi
- fi
-
- if use mono ; then
- emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake csharp install failed"
-
- # TODO: anyone has an idea what those are for?
- rm "${ED}"/usr/bin/*.xml
-
- docinto csharp
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples-cs
- doins -r csharp/demo/*
- fi
- fi
-}
-
-run_tests() {
- # Run tests through the script interface since Python test runner
- # fails to exit with non-zero code for some reason.
-
- pushd "${1}" >/dev/null || die
- ./allTests.py --script | sh
- ret=${?}
- popd >/dev/null || die
-
- return ${ret}
-}
-
-src_test() {
- run_tests cpp || die "emake cpp test failed"
-
- if use python ; then
- testing() {
- # tests require that the directory is named 'python'
- run_tests python || die "emake py-${EPYTHON} test failed"
- }
- BUILD_DIR=python python_foreach_impl testing
- fi
-
- if use ruby ; then
- run_tests ruby || die "emake ruby test failed"
- fi
-
- if use mono ; then
- # skip mono tests, bug #498484
- ewarn "Tests for C# are currently disabled."
-# run_tests csharp || die "emake csharp test failed"
- fi
-}
diff --git a/dev-libs/Ice/Ice-3.6.0-r2.ebuild b/dev-libs/Ice/Ice-3.6.1.ebuild
index a429859..6aeb184 100644
--- a/dev-libs/Ice/Ice-3.6.0-r2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.1.ebuild
@@ -12,7 +12,7 @@ inherit toolchain-funcs versionator python-r1 mono-env ruby-ng db-use
DESCRIPTION="ICE middleware C++ library and generator tools"
HOMEPAGE="http://www.zeroc.com/"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ~ia64 x86 ~x86-linux ~x64-macos"
@@ -45,7 +45,8 @@ DEPEND="${RDEPEND}
# TODO: java bindings
#overwrite ruby-ng.eclass default
-S="${WORKDIR}/${P,,}"
+S="${P,,}"
+S="${WORKDIR}/${S/_/-}"
pkg_setup() {
# prevent ruby-ng.eclass from messing with src_unpack
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 3f8cf81..2d763e7 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -1,5 +1,5 @@
-AUX dont-append-c++11-to-libs.patch 601 SHA256 50d17e49d05197dc4eaf0dd65a33b349cfb1e505b35ad6887bff7299fbb466df SHA512 db606339e17e10283f296e83050c661307030d5d93cd2924fcce5f18897c89f64b94ac0000bfa8f965df000d3006fb5128780a420d0617b5d805a17c7af59629 WHIRLPOOL ec1a1167bfe08c279ab05aa10686dad3ce06da0cc781a51ded26aa342c54d41cb16dcb5d9c737f4644076102e19fbf29b90e7d3fd8ff1b60570e7d2beef51d98
-AUX dont-separate-c++11-libs.patch 557 SHA256 ca20324e948d4a1a89a1e81be401a5c1d7cd50beb5c1e82c038481dc8951cd3b SHA512 ca1ae59b2a6d67bdeae0fc01011e2bd8a0296d789063f8b130da270d390e682910a6d697205882beaf90ea17eec261c7433fade85de3741d36c124190986d664 WHIRLPOOL fe4e92c795ed2b03fd09a8fe2c96f70433465eab4aaf73211cca453606d8df7faf0937b3db7866762388dcc7950ea1714e5fc3cf94e66e4f356c6773afad1dc9
-DIST Ice-3.6.0.tar.gz 5300956 SHA256 77933580cdc7fade0ebfce517935819e9eef5fc6b9e3f4143b07404daf54e25e SHA512 720767c09ebfea538b694e6f816de3cd3c8a204b5d8024689e93fb746e51ac19cd87b67bb213ad6b17e08e78ff88d3c0674e13cb960a8da2847c197047b1d928 WHIRLPOOL b2161cdf19a4ce36ad017f97bdef5a41e273293edf1615418b2f1a5ddc5a489aeea0cd82e2e909f879f9c890f539cbe7315b7b7b6f99eecb2ee520a2c91a0afe
-EBUILD Ice-3.6.0-r1.ebuild 7276 SHA256 bb848bee6f57cc983216f4df9ae473dae35bc6c9529a8278f4cf77a7a63e7bb2 SHA512 572245d9131c89509b49e52011cd55f01c16602b1ead4451d3481f5c22715cfe54e5ee93e69aa910cc560a708e837eb9a362f7b3637cfb0114811b5cb2b0a730 WHIRLPOOL 662b1f9f5605c0122fb1634e0f716a786ce8b82bccb82d6d9bbd61b6aca33d12c6e880856076a43e5e4c918c94f23a8e36e374ed84d3370abd8ccac13eae01ab
-EBUILD Ice-3.6.0-r2.ebuild 7328 SHA256 d5ebf99aa6b11b4cc6a1da9c95db6b4e9af717c08e01aa300f220f0b772f11a6 SHA512 5a34f57b257634acdd575bab181b916ae1d6bf85a70bae9700981e4521d48e7c90be8b29d0f5e3152f36d8a9beb634d4c908b8c976a1d224c164cdaac76b1974 WHIRLPOOL 6cb462700927df1ae52ebcd67cf4ab7b435e374fe1a818fce5572bcab1641dc82cae5cf242837eb52209778fbf43d65b2b33c2cf1c7227dc7d3c26b76a37694c
+AUX dont-append-c++11-to-libs.patch 601 SHA256 b315ef5424ea1a570b842c34fc4cf628cc4138fb165cb8748889817a831a4e73 SHA512 d6b4d305166aadfe1400ccbb4dcf4129bd0d22cdacd206f990532f4ee202c1f9394cbc6e958a4939e27821929964adb88387bbe3f632a7a814040373622d24d7 WHIRLPOOL d48368364878dd593ef1fbd5681df0fcb8c7683cc784c6b1991861a7e6e3682717eaf6590b11766069e7b3a24cb9b77d7d9b3e11998ef800e5aef701b8cf750f
+AUX dont-separate-c++11-libs.patch 557 SHA256 08d5e8d7631f0217827f88bc86561a38589d2ab8ed938d749076924988d402bc SHA512 1a2a5f1928641a54c2d9bbdf71b0b1ee277baf5a4dbece2fbdf980a78a05bc76ba9a3efeca914d6197cc73b5a518ede089e5b3c6a233b8294a2733e65f7cbf39 WHIRLPOOL a2ed1225f28e034790a9fc43591f9b4df8a8851887bfff4d9fad6d8ed2ea7178d18b405235b705a7ee1cd6dc0c73ba8a576f09e631adbd60a12e4e52e4e8838c
+DIST Ice-3.6.1.tar.gz 5338954 SHA256 454d81cb72986c1f04e297a81bca7563e3449a216ad63de8630122d34545ae78 SHA512 118f8db3047fcb1c164e937145f7b6345641ce89d7963fe306cca97699a83f994ea1022f1b0317531bac669259b42c2d051680fa1f937cf3c999ea63148cca9c WHIRLPOOL 6c2a47b4bbb96c9a9b35e7df9a20d249e64bee59031e1f745f9d28a95dc63f652ca708983cc7d5ebacfdf240ae57cf0d325982ea184413a14d6409a524ac95fd
+EBUILD Ice-3.6.1.ebuild 7345 SHA256 7ae0e1439e740cdbef1400e8bc15816b67a816de65cb4a0557d8bd4abd0a4745 SHA512 ca6a2cb20ef2bb9dd30741a18224a9f79c5430fbb2273d97baab51252c7b0b5ec08959f590ad06eff55045415a41924ba7f935d87c35efd00edb017f606120b3 WHIRLPOOL c9bc85c2de357f45727f8d4fc13a468ec4e5802ffaacb1832f46c1215959a4974d726b9e07f5550cd714d716e3ac909719f4623e90d4719061350f04d1a9efa2
+MISC ChangeLog 662 SHA256 5f499c177fe74ccb64c23c1f3c05151347434dfbb1dfc1f7e2cd8ed56965dd01 SHA512 dc8107b9493386945abb0c61d07f75023e32fe332e262783404035839420bd0854a095a6be1c3c6c03934b5283f56b1a10062a43c7e0e81626142db8aa7e64b1 WHIRLPOOL f47177f355b5c047657fe3f9c5228a314119e9247d15d5b2b14bc2ed778ee9fa514aa9297bf5bf1d616b2d3b9e6215a8a8445859fd24e48f1cfe2cf60e686930
diff --git a/dev-libs/Ice/files/dont-append-c++11-to-libs.patch b/dev-libs/Ice/files/dont-append-c++11-to-libs.patch
index 20fe1d8..a80fac8 100644
--- a/dev-libs/Ice/files/dont-append-c++11-to-libs.patch
+++ b/dev-libs/Ice/files/dont-append-c++11-to-libs.patch
@@ -1,5 +1,5 @@
---- ice-3.6.0/cpp/src/Ice/DynamicLibrary.cpp
-+++ ice-3.6.0/cpp/src/Ice/DynamicLibrary.cpp
+--- ice-3.6.1/cpp/src/Ice/DynamicLibrary.cpp
++++ ice-3.6.1/cpp/src/Ice/DynamicLibrary.cpp
@@ -89,9 +89,6 @@
if(comma == string::npos)
{
diff --git a/dev-libs/Ice/files/dont-separate-c++11-libs.patch b/dev-libs/Ice/files/dont-separate-c++11-libs.patch
index 967653a..5b2617a 100644
--- a/dev-libs/Ice/files/dont-separate-c++11-libs.patch
+++ b/dev-libs/Ice/files/dont-separate-c++11-libs.patch
@@ -1,5 +1,5 @@
---- ice-3.6.0/config/Make.common.rules 2015-06-23 16:30:20.000000000 +0100
-+++ ice-3.6.0/config/Make.common.rules 2015-07-04 17:45:58.061422073 +0100
+--- ice-3.6.1/config/Make.common.rules 2015-06-23 16:30:20.000000000 +0100
++++ ice-3.6.1/config/Make.common.rules 2015-07-04 17:45:58.061422073 +0100
@@ -115,15 +115,6 @@
lp32suffix = /i386-linux-gnu
endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 13:39:57 +0000