Add patch to enable shared lib building, bug 402829. Thanks to Pinkbyte

Package-Manager: portage-2.1.11.4/cvs/Linux x86_64

5 files changed, 38 insertions, 32 deletions

diff --git a/net-libs/qxmpp/ChangeLog b/net-libs/qxmpp/ChangeLog
index 2aec36e2c63c..9d9d5e0f3671 100644
--- a/net-libs/qxmpp/ChangeLog
+++ b/net-libs/qxmpp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/qxmpp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/ChangeLog,v 1.10 2012/06/14 21:07:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/ChangeLog,v 1.11 2012/07/03 15:32:50 maksbotan Exp $
+
+*qxmpp-0.3.61-r1 (03 Jul 2012)
+
+  03 Jul 2012; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/01_enable_shared_linking.patch, +qxmpp-0.3.61-r1.ebuild,
+  -qxmpp-0.3.47.ebuild, -qxmpp-0.3.61.ebuild:
+  Add patch to enable shared lib building, bug 402829. Thanks to Pinkbyte
 
   14 Jun 2012; Jeff Horelick <jdhore@gentoo.org> qxmpp-0.3.47.ebuild:
   marked x86 per bug 421123
@@ -42,4 +49,3 @@
   +qxmpp-9999.ebuild, +metadata.xml:
   Copy net-libs/qxmpp ebuilds from rion-overlay, thanks to 0xd34df00d. Bugs
   353690 and 375991
-
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 6ec014b2a69e..b90500ad0ea2 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 00_correct_install_path.patch 202 RMD160 ee9143154e5412cd66143c0ebe814dca3a5d0801 SHA1 6f1b072649acfd88694ce95a7d29a84a9ce9ebd6 SHA256 8ad140cb625aba4eb985599843eb9d2f2483f43aed558e36370173918ef4cbec
+AUX 01_enable_shared_linking.patch 261 RMD160 0d86e17d79b689d52f46fa039c48736e2985bca1 SHA1 597862bb0e8ce5698149aac2f5fd30bc2407fdbe SHA256 042f8c8462e9fe8fc840d2297991e690d0db07c7289c3376ed742f5abcaca2d0
 DIST qxmpp-0.3.45.2-extras.tar.bz2 200335 RMD160 8ec6f7e02bb630d00f3b0b2d8d167e04634572e3 SHA1 df9908a95615ef4640c6bca42867fd44df47edf0 SHA256 f213ccce04252eeabd2aa84a624326281dedf332e68a20b248f22ac6084929b5
-DIST qxmpp-0.3.47-extras.tar.bz2 204355 RMD160 d987e5d088b9f7d6678bcd395584fd2401cf0fe4 SHA1 6fc8187cd5d2479c523e8520a59d963ef1929828 SHA256 e21679dec2211c5de2a9a9a2c2071814c1198c0e4d2c61d799ed1ed9d51ff5dd
 DIST qxmpp-0.3.61-extras.tar.bz2 205766 RMD160 c5dc1eb126bcf7c14a2453f7e99f5df49a63c49a SHA1 54acadb9fbf7c59ced6ed73f1c75ebf7f691d0af SHA256 4309a8d91fe8b71214b1e7133f77bf23527f5e366f4bb44b8d2235da4622eb25
 EBUILD qxmpp-0.3.45.2.ebuild 682 RMD160 360db7d1987aed3d95b293f14a4434df04eeff6a SHA1 47fb3ff49ba2980ca600ce52f27df7ddd35ec967 SHA256 bf6664eca4c417871dfdaea4d8ebe43437a6787db3d0dcf233ed68a1d6fbc4f6
-EBUILD qxmpp-0.3.47.ebuild 680 RMD160 102892b9ca7e7f608b53a6e445a50d5591e57013 SHA1 dde428115189b9e459c361de41e4eb4d5ed9c10a SHA256 aa5d9e6cd49a7306ffcdc8ffe1b848fda833c86c9af43ad97cec8a1b68fea346
-EBUILD qxmpp-0.3.61.ebuild 682 RMD160 a07ae6c28b89befbb9e5e47984accd262cf453fd SHA1 59691fa867a298fcfa6a026a673f4217dea24c8d SHA256 39e87e06059215cc9ba2d14067e4f1a296eebf019a0f4e27df04cb12af125d91
+EBUILD qxmpp-0.3.61-r1.ebuild 746 RMD160 ed655ead5583dcb926358bcf24e6681cd1e31b0b SHA1 1125eb3c29f294955a0159bfe9bd106d7609569a SHA256 7cff1f14dd83882a7292398a8bf80d6ae40ae31b8ca6ed46eb66840ad3fc1637
 EBUILD qxmpp-9999.ebuild 899 RMD160 d6095bd5789afcd4e9f1d8178eda744a7dc0b45d SHA1 90cf2cc0f16b447ec7a2cfb4b70fd54981cb301b SHA256 f6187260fc91351bd9424233eb1c073bec1e7153b7ec5c360625fb589667cf33
-MISC ChangeLog 1540 RMD160 59ccb4f556aa23b66fce89c12336e939d03591a1 SHA1 413026c8ac499a96c7c905b4b4e011848b143b12 SHA256 1dbc36dcd2b51903d37d68221cf58028e113a5c693bffcccd208bf48c68bba9b
+MISC ChangeLog 1813 RMD160 3dc6aab182dbc55dd7f1bb6c8f3ef12564f6f1f7 SHA1 b01455c2001c27db8c47469046473a73d122ab52 SHA256 16caf823c22bdf52a949f60d757cee9bd63e5b3ad6aec929176d1f7977b5b503
 MISC metadata.xml 263 RMD160 9994cfc6300a69009e4fdba8b6c01ea303212933 SHA1 798554ad79f0f517232af215b7131df750448669 SHA256 10c5d6e7dd89fdf08d8ed451e6217969ca1a012142e8bebf8b8847ac375e1986
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP8xDCAAoJEAmJmMX429reHeUH/jub38BHpmepHAp/coeYwxty
+FsUTOu5qxmosvD623KPkJIMv9MFHjH92nIaegUtB/k9MEk+Cm56yF8chZIJNwsTe
+12yG7VJnx51lLLcp9RLYvHKw0hI4YqnjW93xTaLqG6TXigFtlGdoEsAHvWG6U7+Z
+VVrrZqZFnnApSes2NRgBi6tGcrqXQcpcfTsjxvrShXhYJfymnZONRSHvGOjKtkHs
+XDPFLE7yP/zdugWmulKjCSyoqkzrkNYztZDlja/1XGTJNM/gFoGHGd97RhlgT2MC
+x1SFUp7pS0KfIiC9SKMrh9yYDUjqX/8hnwpvPn2OMdMMHXrKNtS38DkeDUA5zb0=
+=wOmM
+-----END PGP SIGNATURE-----
diff --git a/net-libs/qxmpp/files/01_enable_shared_linking.patch b/net-libs/qxmpp/files/01_enable_shared_linking.patch
new file mode 100644
index 000000000000..1b885f198765
--- /dev/null
+++ b/net-libs/qxmpp/files/01_enable_shared_linking.patch
@@ -0,0 +1,10 @@
+--- src/src.pro.orig	2012-06-23 22:26:25.708323070 +0400
++++ src/src.pro	2012-06-23 22:27:56.331317843 +0400
+@@ -8,7 +8,6 @@
+ 
+ TEMPLATE = lib
+ 
+-CONFIG += staticlib
+ INCLUDEPATH += $$QXMPP_INCLUDE_DIR $$QXMPP_INTERNAL_INCLUDES
+ LIBS += $$QXMPP_INTERNAL_LIBS
+ 
diff --git a/net-libs/qxmpp/qxmpp-0.3.47.ebuild b/net-libs/qxmpp/qxmpp-0.3.47.ebuild
deleted file mode 100644
index fcc1397fcb4d..000000000000
--- a/net-libs/qxmpp/qxmpp-0.3.47.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-0.3.47.ebuild,v 1.4 2012/06/14 21:07:26 jdhore Exp $
-
-EAPI=3
-
-inherit multilib qt4-r2
-
-DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework."
-HOMEPAGE="http://code.google.com/p/qxmpp/"
-SRC_URI="mirror://github/0xd34df00d/qxmpp-dev/${P}-extras.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +extras"
-
-DEPEND="x11-libs/qt-core
-		x11-libs/qt-gui
-		media-libs/speex"
-RDEPEND="${DEPEND}"
-
-src_configure(){
-	eqmake4 "${S}"/qxmpp.pro "PREFIX=/usr" "LIBDIR=$(get_libdir)"
-}
diff --git a/net-libs/qxmpp/qxmpp-0.3.61.ebuild b/net-libs/qxmpp/qxmpp-0.3.61-r1.ebuild
index 808a177a7ea6..50cd9876bc34 100644
--- a/net-libs/qxmpp/qxmpp-0.3.61.ebuild
+++ b/net-libs/qxmpp/qxmpp-0.3.61-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-0.3.61.ebuild,v 1.2 2012/04/23 20:28:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/qxmpp/qxmpp-0.3.61-r1.ebuild,v 1.1 2012/07/03 15:32:50 maksbotan Exp $
 
 EAPI=3
 
@@ -20,6 +20,8 @@ DEPEND="x11-libs/qt-core
 		media-libs/speex"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/01_enable_shared_linking.patch )
+
 src_configure(){
 	eqmake4 "${S}"/qxmpp.pro "PREFIX=/usr" "LIBDIR=$(get_libdir)"
 }