Revision bumps adds patch to fix build with gold linker. Patch by kensington <gentoo@scribeofthenile.com>. Fixes bug #369907.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux i686

4 files changed, 141 insertions, 17 deletions

diff --git a/net-im/qutim/ChangeLog b/net-im/qutim/ChangeLog
index 717f0aa178aa..83e692c8b1ad 100644
--- a/net-im/qutim/ChangeLog
+++ b/net-im/qutim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/qutim
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.12 2011/06/13 15:12:17 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/ChangeLog,v 1.13 2012/03/16 11:58:25 johu Exp $
+
+*qutim-0.2.0-r4 (16 Mar 2012)
+
+  16 Mar 2012; Johannes Huber <johu@gentoo.org> +files/qutim-0.2.0-gold.patch,
+  +qutim-0.2.0-r4.ebuild:
+  Revision bumps adds patch to fix build with gold linker. Patch by kensington
+  <gentoo@scribeofthenile.com>. Fixes bug #369907.
 
   13 Jun 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Remove myself from metadata.xml
diff --git a/net-im/qutim/Manifest b/net-im/qutim/Manifest
index e945e07c5ce5..72e5a1299d3a 100644
--- a/net-im/qutim/Manifest
+++ b/net-im/qutim/Manifest
@@ -2,24 +2,20 @@
 Hash: SHA512
 
 AUX fix_insecure_rpath.patch 1129 RMD160 e7c10a11ac11ec90eba6d25b6b84f0f4701f5ae1 SHA1 ac79bf92d96437273379db12bb928bd9cee5408d SHA256 cf74d7e20071d398f617faff7e7470b221f599cc0677ddb676ea57bc58a5d4ad
+AUX qutim-0.2.0-gold.patch 178 RMD160 85144ae8b7173ee7fe4680c278cd322a60dafaf8 SHA1 dec2f5a5bc028c96a56c26b61665f36568941007 SHA256 1fa929958b466b8f469f42479bb9b9a9203fb3d3b84f09eea2cd8e3e2cdedb66
 DIST qutim-0.2.0.tar.bz2 2536041 RMD160 59ab7bb364c0cb15deba96cc0c50471a3902f96c SHA1 b21399950252a100bd99840f6d6dc8093eaeb082 SHA256 272fba12d2fea5a550a504a3fb75ea5852e2fd086f0873079433d6361cfbc232
 EBUILD qutim-0.2.0-r3.ebuild 2890 RMD160 9c2e3375b2358d488e1c26ae1088482177cfea5e SHA1 3d6f17c90fb7e1124d9e87c5f42b4854338f61a1 SHA256 6ba6316aea2bf0341e64a0fa6f146c5e1d1cf51d5ca09f2061c0a77358e4a516
-MISC ChangeLog 2053 RMD160 0e4630e561e08265a658efaf047b430e79d13b54 SHA1 aebd73fbf0bca25569528e55b7b718c994c83cb7 SHA256 e184be7c12d662d16e70d92ff4d891c6eaf5ec6551b3b9fff3705a3982964bfd
+EBUILD qutim-0.2.0-r4.ebuild 2919 RMD160 8d441c5d0f674a43454b79786ef6f61d2e05fa8f SHA1 bc66cc29826eaa2c8037eba276f0af8dc4ae2a58 SHA256 58d908372904124798d79f864c91e357625f0bf831e87f3ae1c26ff9f53f3252
+MISC ChangeLog 2316 RMD160 676b6d4702a5437ee057265f4e0b2c766d676c35 SHA1 376f04589f6ea0f445893c87b671f6318cc357cf SHA256 079e28e54f718a10c5ff8562d6155e1404353e5171331f684e425bb6cc9d5734
 MISC metadata.xml 472 RMD160 d74734fc01394cd825676bfd2ac7a56cfbaa3ca2 SHA1 dbe1cdd030c5a94771ddba6988c6facf82daaa3b SHA256 cff03be9a4e8c342da41ca722630f1dd89e3d613cca0bacd2ef18ac3253eea5c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN9iiKAAoJEPqDWhW0r/LCXEQP/0tidwre/615FpcpuFfHzWgK
-H1x7CbrpkD/tVJFdGuOKNlg4U7mx90UAdKLJUZc+rb7Bk6WHVN2YI94OYBeAeEjL
-yKuNj5zhbxawY+DRTYzWXGD71oCVJEwe+XladmUpctRhsYd3c85XQwf1fRBKzU0q
-V0D9BHV1oWVdwA7xV2oZreBzLfEP4MSTGM1rkbCBDyRW/NN64kgTF8cigTiuit9q
-aysVvdta15S9vMj2sPiKZ1F8j9RSY1V+hPZzgsLDTpq/cRUbicdyE4r0saz95mOF
-0cGxWrHf7JwYdCFyRP3v4ekpCsICfbvZpIBrwLaFGA1vXx+V9ypYqWg0ky/Dp/Qb
-sZFHJgXkhYfDOvFe4Bkh1EIH2qiFdOe5RemDConyYrDQY5m+HOfe/+LysfBapRBk
-1zlh5XgYFk94W15U03lws4gLPphYZDjuXSYUgWGv6Hw7dizMBBquwbqltfTmHZCP
-2+iZdgYEdWmaP1gz2B4QRh9G5N92VTmXx5Pvf3SCgV5qTJyblzLEumKHEmyONFnS
-ZTeGYlvb2JoAJ+9CTsqn5K69qwjupM+lCvxJ+tl5nfetpJ9g9XBjxHf2IFFhCkE0
-d7CxN4rpTeOGVO/XPvekneD2IuW0ldJE/5vb2gli29/kSdpqHRXHm7NMo5dVlYct
-yikb6fQjV7DMdOuSVASi
-=pKB0
+iQEcBAEBCgAGBQJPYywyAAoJEO+t9ga+3I3aHB8H/3ABXFcXj6KYm5SDuCVFw6iS
+uyFyyDgcfmQO5EuGbKJj76uwlAgmt09bP0JkoovM5dMOIwJ/U70Sb4OvWjqEuAjk
+IYCRpvj+SpZdZo9KK466Fs9ER+0AQxeardkI6X+TKf3GyHs4OzY536bWLTNrFlfK
+h8KxOX7Vki08vt5AYZHmq4mgsEHjqZw/kJp5Bffi1LctXyuWIZ4c/xbpX0S2LGKi
+0r3zPin0/lvhIBWjFP6CR1Dw1x+SiBUX4u1jwh/YBOmuuFwpqb4FgrCq7ug+xL3A
+BTGjnawnJEqkcgjQJo+Sefdyz0wLoZO9g9eXAFCAKWF7hgOmIqGS+m0LKUmUG7I=
+=6CyA
 -----END PGP SIGNATURE-----
diff --git a/net-im/qutim/files/qutim-0.2.0-gold.patch b/net-im/qutim/files/qutim-0.2.0-gold.patch
new file mode 100644
index 000000000000..9b96f70dad11
--- /dev/null
+++ b/net-im/qutim/files/qutim-0.2.0-gold.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -446,6 +446,7 @@
+ 	${QT_LIBRARIES}
+ 	${QT_QTMAIN_LIBRARY}
+ 	${QUTIM_LIBS}
++	-lX11
+ 	)
+ 
+ SET (module_install_dir "${CMAKE_ROOT}/Modules")
\ No newline at end of file
diff --git a/net-im/qutim/qutim-0.2.0-r4.ebuild b/net-im/qutim/qutim-0.2.0-r4.ebuild
new file mode 100644
index 000000000000..1a57052e3870
--- /dev/null
+++ b/net-im/qutim/qutim-0.2.0-r4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutim/qutim-0.2.0-r4.ebuild,v 1.1 2012/03/16 11:58:25 johu Exp $
+
+EAPI="2"
+LANGSLONG="bg_BG cs_CZ de_DE uk_UA"
+LANGS="ru"
+
+inherit eutils qt4-r2 cmake-utils
+MY_PN="${PN/im/IM}"
+
+DESCRIPTION="New Qt4-based Instant Messenger (ICQ)."
+HOMEPAGE="http://www.qutim.org"
+LICENSE="GPL-2"
+SRC_URI="http://qutim.org/uploads/src/${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug histman icq irc xmpp gnutls mrim ssl vkontakte yandexnarod"
+
+DEPEND="x11-libs/qt-gui:4[debug?]
+	x11-libs/qt-webkit:4
+	|| ( media-libs/phonon x11-libs/qt-phonon )
+	xmpp? ( ssl? ( dev-libs/openssl )
+		gnutls? ( net-libs/gnutls ) )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/fix_insecure_rpath.patch
+	"${FILESDIR}"/${P}-gold.patch
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+	# fix translations directory
+	einfo "Fixing LINGUAS path"
+	sed -i "s/languages/\/usr\/share\/${PN}\/languages/" src/${PN}.cpp
+}
+
+src_compile() {
+	# build main executable
+	cmake-utils_src_compile
+	found=0
+	# build protocol support
+	if use xmpp; then
+		found=1
+		cd  "${S}"/plugins/jabber || die
+		mkdir build
+		cd build
+		cmake -C "${TMPDIR}"/gentoo_common_config.cmake \
+			  $(cmake-utils_use ssl OpenSSL) \
+			  $(cmake-utils_use gnutls GNUTLS) ../ || die
+		emake || die
+	fi
+	# build mrim
+	if use mrim; then
+		found=1
+		cd "${S}"/plugins/mrim || die
+		mkdir build
+		cd build
+		cmake -C "${TMPDIR}"/gentoo_common_config.cmake ../ || die
+		emake || die "failed to compile mrim plugin"
+	fi
+	# Qt4 based projects so I shall use eqmake4
+	cd "${S}"/plugins || die
+	for i in histman yandexnarod icq irc vkontakte;do
+		if use ${i}; then
+			found=1
+			cd "${i}"
+			einfo "now building ${i}-plugin"
+			eqmake4 ${i}.pro
+			emake || die "failed to compile ${i} plugin"
+			cd ..
+		fi
+	done
+
+}
+
+src_install(){
+	# not recommended by upstream and probably broken
+	#cmake-utils_src_install
+	dobin "${WORKDIR}/${P}_build/${PN}" || die
+
+	cd "${S}"/plugins || die
+	insinto "/usr/$(get_libdir)/qutim"
+	[[ $found -eq 1 ]] && doins $(find . -type f -executable -iname "*.so")
+	doicon "${S}"/icons/${PN}_64.png || die "Failed to install icon"
+	make_desktop_entry ${PN} ${MY_PN} ${PN}_64 \
+	"Network;InstantMessaging;Qt" || die "make_desktop_entry failed"
+
+	#install linguas
+	for X in ${LANGSLONG}; do
+		for Z in ${LINGUAS}; do
+			if [[ ${X%_*} == ${Z} ]]; then
+				einfo "Installing ${Z} translation files"
+				insinto /usr/share/${PN}/languages/${X}/
+				doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation"
+			fi
+		done
+	done
+	for X in ${LANGS}; do
+		for Z in ${LINGUAS}; do
+			if [[ ${X} == ${Z} ]]; then
+				einfo "Installing ${Z} translation files"
+				insinto /usr/share/${PN}/languages/${X}/
+				doins -r "${S}"/languages/${X}/binaries/* || die "failed to install ${X} translation"
+			fi
+		done
+	done
+
+}