added prefix support (bug #385567)

Package-Manager: portage-2.2.0_alpha145/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

3 files changed, 281 insertions, 10 deletions

diff --git a/dev-libs/Ice/ChangeLog b/dev-libs/Ice/ChangeLog
index 527e00b4c36d..2440a1e3b154 100644
--- a/dev-libs/Ice/ChangeLog
+++ b/dev-libs/Ice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2012/11/16 13:40:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/ChangeLog,v 1.18 2012/12/10 01:07:54 ottxor Exp $
+
+*Ice-3.4.2-r1 (10 Dec 2012)
+
+  10 Dec 2012; Christoph Junghans <ottxor@gentoo.org> +Ice-3.4.2-r1.ebuild:
+  added prefix support (bug #385567)
 
   16 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> Ice-3.4.2.ebuild:
   Fix building with >=sys-devel/gcc-4.7 wrt #422585
@@ -263,4 +268,3 @@
   18 Jan 2006; Chris White <chriswhite@gentoo.org>
   +files/ice-3.0.0-makefile.patch, +metadata.xml, +ice-3.0.0.ebuild:
   Initial import into the tree.  Masked because of sys-libs/db depend.
-
diff --git a/dev-libs/Ice/Ice-3.4.2-r1.ebuild b/dev-libs/Ice/Ice-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..33449fe7bee3
--- /dev/null
+++ b/dev-libs/Ice/Ice-3.4.2-r1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.2-r1.ebuild,v 1.1 2012/12/10 01:07:54 ottxor Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+
+inherit toolchain-funcs versionator python mono ruby-ng db-use
+
+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 ~ia64 ~x86 ~x64-macos ~x86-linux"
+IUSE="doc examples +ncurses mono python ruby test debug"
+
+RDEPEND=">=dev-libs/expat-2.0.1
+	>=app-arch/bzip2-1.0.5
+	>=dev-libs/openssl-0.9.8o
+	>=sys-libs/db-4.8.30[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* )"
+
+# 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() {
+	if use python || use test; then
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with src_unpack
+	default
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-3.4.1-db5.patch \
+		"${FILESDIR}"/${PN}-3.4.2-gcc46.patch \
+		"${WORKDIR}"/${PN}-3.4.2-gcc47.patch
+
+	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=\"${ED}/usr\"
+		install_docdir=\"${ED}/usr/share/doc/${PF}\"
+		install_configdir=\"${ED}/usr/share/Ice-${PV}/config\"
+		embedded_runpath_prefix=\"${EPREFIX}/usr\"
+		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$(db_includedir)"
+	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-$(db_findver sys-libs/db)|" \
+		cpp/config/Make.rules{,.Linux} py/config/Make.rules || die "sed failed"
+
+	if use python ; then
+		python_copy_sources py
+		mv py py.orig
+	fi
+
+	if use ruby ; then
+		SITERUBY="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
+		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
+			install_libdir=\"${ED}/${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=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/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
+		building() {
+			mv py-${PYTHON_ABI} py
+			emake -C py ${MAKE_RULES} || die "emake py failed (for py-${PYTHON_ABI})"
+			mv py py-${PYTHON_ABI}
+		}
+		python_execute_function building
+	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
+		installation() {
+			dodir $(python_get_sitedir)
+			mv py-${PYTHON_ABI} py
+			emake -C py ${MAKE_RULES} install_pythondir="\"${D}/$(python_get_sitedir)\"" install_libdir="\"${D}/$(python_get_sitedir)\"" install || die "emake py install failed (for py-${PYTHON_ABI})"
+			mv py py-${PYTHON_ABI}
+		}
+		python_execute_function installation
+
+		docinto py
+		dodoc py.orig/CHANGES py.orig/README
+
+		if use examples ; then
+			insinto /usr/share/doc/${PF}/examples-py
+			doins -r py.orig/demo/*
+		fi
+
+		cd "${ED}/$(python_get_sitedir -f)"
+		PYTHON_MODULES=(*.py)
+		PYTHON_MODULES+=(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 "${ED}"/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
+		testing() {
+			mv py-${PYTHON_ABI} py
+			emake -C py ${MAKE_RULES} test || die "emake py test failed (for py-${PYTHON_ABI})"
+			mv py py-${PYTHON_ABI}
+		}
+		python_execute_function testing
+	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 && python_mod_optimize "${PYTHON_MODULES[@]}"
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup "${PYTHON_MODULES[@]}"
+}
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
index 521312b10fc6..e4eca5d57dcd 100644
--- a/dev-libs/Ice/Manifest
+++ b/dev-libs/Ice/Manifest
@@ -6,17 +6,18 @@ AUX Ice-3.4.2-gcc46.patch 275 SHA256 eb1d14656f19ee919441586682308210ec9877fc814
 DIST Ice-3.4.2-gcc47.patch.bz2 10177 SHA256 b9fe0d8091a83113452ae3a94a04a407ab987d609529631cfe061e5b83ab45f5 SHA512 52b4c4917904f6d76c72e2bd76e47c694c59439a9c0333c2e0d8e4c7c84e94bd4a450747a08fda28a6c570d2ebc70644e6037db3368cb0261d27bb7c99016f21 WHIRLPOOL 0ac187184dce0d5dc5423f330a5afeeaebb3ad6f899290507aad1ef7510105a657a76b8d7bb335ca9e7b5beade0faa1128c19e4bd82354a9083b01a1def0515d
 DIST Ice-3.4.2.pdf.gz 4232836 SHA256 6400efa65f879f964590759222dd46010bfeb3e430787a4d53e826a54cbc4067 SHA512 2ef70d27893e933ecbededfbf737b4033dd4d744c0577f4cf5efd132ca22f0d655378439ddda21254689d393f721ca41fa8ff80eb9691c03630b93cd1a6d81b7 WHIRLPOOL d19a04ddb8f0c0a26036c0163e413d9dacfc9a964ca04d33902c21627e6fed4cc7451a95bcb8327e3a7b56eceed8ae1250ce12a126f8a64903a608beeac82df8
 DIST Ice-3.4.2.tar.gz 5485106 SHA256 dcf0484495b6df0849ec90a00e8204fe5fe1c0d3882bb438bf2c1d062f15c979 SHA512 4a69fbddf53112d36805dd276c9af5e221677ea45108553e1e7d580e18ba5a61b2444b8b44d5b2a88132cdebcba989a0dc212029ccbd8e17a2e70bcf50ebb6c8 WHIRLPOOL a79c0348d0454d802af85c72c249a9e162108b71391a77f7b0c9887f3d22974dd4729426308247af8aabda6babc0608691fbb622ac25a54820e8c20ca4e80ec7
+EBUILD Ice-3.4.2-r1.ebuild 6927 SHA256 7969ede248b35a7a55c9886275994641d7e83632d603444038f05cbfc9966c5b SHA512 e932170cf7084c67202093dda69c4681e06eeaf7d8fdea362f72f0c8b8dca1dc4067a1c015f535ee2a3622cc4c6b51d2a084fafce738ed20efe1b77c2517b1c8 WHIRLPOOL 79bf36f093bdca576ee2b82ea9e8e09c8a2a8f094dffcc880909bc24ef6ec8d372713e6d79e00f0169e4a8449d883da53fb3adbb86acec449a0ef125c14778d3
 EBUILD Ice-3.4.2.ebuild 6943 SHA256 3e022c22eb20a7d2669efcd945cc89e5f1d6b06ceb7396a40e6e21d4d6d506b5 SHA512 f16a25e0f74db7169ba70ce78ede040d791eb430c3320f8c28d28572bf2be858b195aabcdab840fe4fe5cbda840df56888da61d14f05f17db442b66d96f3e138 WHIRLPOOL 828bfacc4d07bb4c352b97514b3c7f733ebb42ae40fd558a4ecdc4fabbe7cc9badd3a78441c00499e53ab2b7117e03720fc0abde95ba60a751e5c4c9feb611b2
-MISC ChangeLog 9972 SHA256 883fc2cba58a96b5325089ee83431ee355705bd0dff02d129515c0c24d2d0997 SHA512 a9a628a83eb96f9198b95acaeec42e53427a7030726ed198fb120aa213b0ec17f90a69a5063364234f0c66e95afd43865a0325bd355e489a345e5a9f2ce20d20 WHIRLPOOL f25f80ceb07d6358472f7483e07cf0c65a052d6f6e08261c8bc29d173a1a25ea856b86ab1761b7a6640933ab2c7abfd7bfb9a3b5d63f22b1454d204604d1be53
+MISC ChangeLog 10111 SHA256 2e0121fef63bc93b85f7b6018c9e6fffe66445bbbfc0058c4a22ab9a6d8cde6b SHA512 c0c23d56ef3d34a0095cfb8fc1c1469091f1ef6d2bbe2863936d05f35bec59ae385f4fa07a824b49665dbe630fc9812242c6ecb518ed8087503d6e662a541fae WHIRLPOOL 9bc37f7fca210970c437081b7284602339434cedd129a78ca70b0d2bdd8dbf940eaf20895762a633f1ac96caf980168f3eed56459b398d08e9bdbb967be8c0de
 MISC metadata.xml 339 SHA256 dec27f6d803819a7791826c1a98a83a1c21a23df0a3384234ac68abf8b8466a3 SHA512 a52d0a34b45483cbf16e870e458c31e002a62fbe4c18b7839964476696a8650c6db254392f8ff6166f4a434958eb2384cd3267f004c45726d75907983f494e60 WHIRLPOOL 8362526bb468b608b63bb17ea08ee20050904aeed1728efea1e48420fb2b5e820cedcedbecee0a37c0a2b061e0a06aa67ce6b18e148d4fbb785d528e6a80c2f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQpkDmAAoJEEdUh39IaPFNXOQH/RMxqhWOxJrPCrkjIp8AxVq1
-JN4/k/NYA/s8HvIHUQUHld1yKCq8BHJS8p/PJWXcnlBj7tKVLr7MFgQSMn8N2t9y
-xfMzvr+eGqnSjnQ/2jwfICPJWOWRiMq+gpVC7Bi+DaivwMDEBHVc5aDDjU0Mh8x1
-JoAU15+YqpHNG+EBWOR4PWxnqvZvXNW/lU6mXWnKlBpSJjEnUq7NI6WlLXl4/9Ld
-49HqYPI4yc2XY6PGMy2et0qhG2o58MwLnW5YLc5IZaptTYvbtTWg5fcdQc2bQ++X
-i9vP+E+bw4Sv1lGrVUpkTX0PAyAN8dVeD+FYhuQIei/PPMuyi5R5/5yNRaLSxuM=
-=nAm4
+iQEcBAEBCAAGBQJQxTYsAAoJEOeBhlrCAAWG9RYH/2cTD5xSTJqDLXT06FqVY5Fs
+5N0PqUhMAPxfpNQiezORBcvJK92+13gS+znajeOkTiwBaJCam6IxPvJrGGCGjIb2
+3+GnrQJb0FcMHBkO6VE9+ZBA8KHreOsKZcwiNN5gvoSa0sod1df/xX6Xlw+CkqGh
+YAbthSx+HNouYDQca6x/sWIRngCIomq+v0XWPujeDKSb5GTUP4awVIKOKTceeZTd
+xfrsEU18H+z3JnibdhOy1RRVdfKFSf4I8Y82cMZskVK/LueiGA1o96ZrAR19+SUX
+IcnQmKB7FcUUW1uKH9x+s0ap7eph73QhBfU6HgEJln+5pmZVCDar6PZ4k+8r6M0=
+=GX6z
 -----END PGP SIGNATURE-----