Merge updates from master

3 files changed, 113 insertions, 1 deletions

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b21435b1782d..c3de62265244 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -517,7 +517,7 @@ enable_cmake-utils_src_configure() {
 		includes="<INCLUDES>"
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die
-		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
 		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
 		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
@@ -532,6 +532,8 @@ enable_cmake-utils_src_configure() {
 	# Bug 542530, export those instead of setting paths in toolchain file
 	local -x CC=$(tc-getCC) CXX=$(tc-getCXX) FC=$(tc-getFC)
 	local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
+	# Bug 601292, set the compiler for assembly as well
+	local -x ASM=$(tc-getCC) ASMFLAGS=${CFLAGS}
 
 	if tc-is-cross-compiler; then
 		local sysname
@@ -602,6 +604,7 @@ enable_cmake-utils_src_configure() {
 	# Wipe the default optimization flags out of CMake
 	if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]] && ! has "${EAPI}" 2 3 4 5; then
 		cat >> ${common_config} <<- _EOF_ || die
+			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
diff --git a/net-im/openfire/Manifest b/net-im/openfire/Manifest
index e9221922f3d4..f45c27703ffc 100644
--- a/net-im/openfire/Manifest
+++ b/net-im/openfire/Manifest
@@ -1,2 +1,3 @@
 DIST openfire_src_4_0_2.tar.gz 98972324 SHA256 62e7a8a735431d45f5ad72a8ae9603743277372702e782ea514323bfd80a4efb SHA512 444762fec588d4b205c0d6247098861b246eb3f74061dfe47314a33daeb57e228e62132efac3d50fbffd31bd779ba986d0b59afe375d27f3f2923cecbd4f873a WHIRLPOOL 3259e09f1bf422415b0722bff96524be6831ee8d104b91b15fc2b8b25569da5e5f4920ad08080c4e44f1d9c74049c8b0344bbe534b0c3809483745e2452d08e9
 DIST openfire_src_4_0_3.tar.gz 99135040 SHA256 2eae0ac43826e0e084363c8640fa26ac6ec1369aa354bd2bdb268c2f801b2e55 SHA512 d610ac3d20f1d369f4ad5a695dccec6f5523d65675f6cc78cc6728ea03ee860668dae4fbfe13bf627df1f3e34b72306894f06d63cd3e32a93d3b47211e07a631 WHIRLPOOL 0887e71b4090fdd0c4236054b3df3791dc30da978bb45e3742459f0f3aed60d9402a9586d4a71038185edbf4c3dfb59fd79387cd3e7ce0e0038dca351f7be734
+DIST openfire_src_4_0_4.tar.gz 99136077 SHA256 66a7b4f00f2f15e6899b0fd8375914838b9401e5defe6dc3b1236c62e7f379a9 SHA512 9d6b80b3d96ba180ad9598fe07926eb1ae617d202842aec1ee460b1511a24d1b93de203fd5bbf20fd08ef738ae5d3e603e741b9856829fdde4d02007595ab50b WHIRLPOOL 3f6b3b5011ea0508351d90f6248e07fb503f5e7212dcca1ef77fd9fe7f3ac6ae5d0a156083edb74f867a871e5f4d2472937031d8ea6c7a4721d8ce7fa69c42a1
diff --git a/net-im/openfire/openfire-4.0.4.ebuild b/net-im/openfire/openfire-4.0.4.ebuild
new file mode 100644
index 000000000000..957cc4c97e52
--- /dev/null
+++ b/net-im/openfire/openfire-4.0.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils java-pkg-2 java-ant-2 systemd
+
+MY_P=${PN}_src_${PV//./_}
+DESCRIPTION="Openfire (formerly wildfire) real time collaboration (RTC) server"
+HOMEPAGE="http://www.igniterealtime.org/projects/openfire/"
+SRC_URI="http://www.igniterealtime.org/builds/openfire/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND="net-im/jabber-base
+	~dev-java/ant-contrib-1.0_beta2
+	>=virtual/jdk-1.7"
+
+S=${WORKDIR}/${PN}_src
+
+pkg_setup() {
+	if [[ -f /etc/env.d/98openfire ]]; then
+		einfo "This is an upgrade"
+		ewarn "As the plugin API changed, at least these plugins need to be updated also:"
+		ewarn "User Search, IM Gateway, Fastpath, Monitoring"
+		ewarn "they can be downloaded via Admin Console or at"
+		ewarn "    ${HOMEPAGE}"
+	else
+		ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+		ewarn "echo 'CONFIG_PROTECT=\"/opt/openfire/resources/security/\"' > /etc/env.d/98openfire "
+		ewarn "For more info see bug #139708"
+		sleep 11
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	# Jikes doesn't support -source 1.5
+	java-pkg_filter-compiler jikes
+
+	ANT_TASKS="ant-contrib"
+	eant -f build/build.xml openfire plugins $(use_doc)
+
+	# delete nativeAuth prebuilt libs:
+	#    uses outdated unmaintained libshaj, does not support amd64
+	rm -rfv target/openfire/resources/nativeAuth || die
+}
+
+src_install() {
+	dodir /opt/openfire
+
+	newinitd "${FILESDIR}"/openfire-initd openfire
+	newconfd "${FILESDIR}"/openfire-confd openfire
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	dodir /opt/openfire/conf
+	insinto /opt/openfire/conf
+	newins target/openfire/conf/openfire.xml openfire.xml.sample
+	newins target/openfire/conf/security.xml security.xml.sample
+
+	dodir /opt/openfire/logs
+	keepdir /opt/openfire/logs
+
+	dodir /opt/openfire/lib
+	insinto /opt/openfire/lib
+	doins target/openfire/lib/*
+
+	dodir /opt/openfire/plugins
+	insinto /opt/openfire/plugins
+	doins -r target/openfire/plugins/*
+
+	dodir /opt/openfire/resources
+	insinto /opt/openfire/resources
+	doins -r target/openfire/resources/*
+
+	if use doc; then
+		dohtml -r documentation/docs/*
+	fi
+	dodoc documentation/dist/*
+
+	#Protect ssl key on upgrade
+	dodir /etc/env.d/
+	echo 'CONFIG_PROTECT="/opt/openfire/resources/security/"' > "${D}"/etc/env.d/98openfire
+}
+
+pkg_postinst() {
+	local src
+	local dst
+
+	# http://community.igniterealtime.org/thread/52289
+	for dst in "${ROOT}"/opt/openfire/conf/{openfire,security}.xml
+	do
+		src="${dst}".sample
+		if [[ -f "${dst}" ]]; then
+			einfo "Leaving old '${dst}'"
+		else
+			einfo "Created default '${dst}'. Please edit."
+			cp -v "${src}" "${dst}" || ewarn "cp '${dst}' failed"
+			chmod -v 0600 "${dst}" || ewarn "chmod '${dst}' failed"
+		fi
+	done
+	chown -R jabber:jabber "${ROOT}"/opt/openfire
+}