Use static-libs use flag instead of static. Fixes bug #322493 thanks to Kacper Kowali...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-libs/telepathy-qt4/ChangeLog b/net-libs/telepathy-qt4/ChangeLog
index c6b0e18d15a454a7a669da8099aa15ee8aa26805..e6c8a8ebf21372604a759f481433f04553ba2ad6 100644 (file)
--- a/net-libs/telepathy-qt4/ChangeLog
+++ b/net-libs/telepathy-qt4/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/telepathy-qt4
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt4/ChangeLog,v 1.1 2010/05/30 10:05:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt4/ChangeLog,v 1.2 2010/06/02 19:50:45 hwoarang Exp $
+
+*telepathy-qt4-0.3.4-r1 (02 Jun 2010)
+
+  02 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  -telepathy-qt4-0.3.4.ebuild, +telepathy-qt4-0.3.4-r1.ebuild:
+  Use static-libs use flag instead of static. Fixes bug #322493 thanks to
+  Kacper Kowalik (Xarthisius)
 
 *telepathy-qt4-0.3.4 (30 May 2010)
 

diff --git a/net-libs/telepathy-qt4/Manifest b/net-libs/telepathy-qt4/Manifest
index 08040089083de714b2b22532dad343f0120461ee..2c77d0d50ae84f1831965970965898d6326e623f 100644 (file)
--- a/net-libs/telepathy-qt4/Manifest
+++ b/net-libs/telepathy-qt4/Manifest
@@ -1,4 +1,4 @@
 DIST telepathy-qt4-0.3.4.tar.gz 3502544 RMD160 8208dd6e1161f90a97b69be057707dd30a209998 SHA1 5d228709e95a5a3151c20a3b8787916eba58b68f SHA256 6c1b006e1b963d9800bfc6d83da3d4a7949db81168bf4fbf5b3a43712a0a2616
-EBUILD telepathy-qt4-0.3.4.ebuild 979 RMD160 69247e3fff67723a69c701820a1dc7f60c6dbc96 SHA1 474613698d32fd55b2059cebe909046408a52e52 SHA256 f6f457c673815bfe70495b9cd46f970eb9233b678e8188c3ace2285621fd78f7
-MISC ChangeLog 441 RMD160 def6523cce2878fd465ea6880ecb93555a0b58b9 SHA1 777a20a12e6ff48a0e242fcdc4376755b76e118e SHA256 4b025970fd89744415d7d93f6b40a18f95faf05d4b9a3a82c928d5d026cf0a76
+EBUILD telepathy-qt4-0.3.4-r1.ebuild 1033 RMD160 9588d9bab94898dcceb6787811b210a3d0775e58 SHA1 8f5ef4bf277b5edb0c1d2c3c4fc204066b74b8db SHA256 91b488a7a098cb27aaecfc6c3cf726ecc570b1f92e3e52cea85f684fbc700f0a
+MISC ChangeLog 701 RMD160 fafe6234f130a4a9e25d55a0c713c1a40d713525 SHA1 eac40dfa7baee5bf1a4dbb00fcad43ada5be46f3 SHA256 4ee070b69db0f20c77cc0767c45e9460e4bcfeb8dc950f9c1c74aa84dfd92656
 MISC metadata.xml 157 RMD160 84dc01e4115bf31e84059fa795c95e94ad39df23 SHA1 fe6fa39ce2ba5cd6a8e7da28113fe05e22b5a39a SHA256 a2ffc792d4df94c3f8088e329c4bf74804540c2797f3e24ab0030acbdfd4b535

diff --git a/net-libs/telepathy-qt4/telepathy-qt4-0.3.4.ebuild b/net-libs/telepathy-qt4/telepathy-qt4-0.3.4-r1.ebuild
similarity index 71%
rename from net-libs/telepathy-qt4/telepathy-qt4-0.3.4.ebuild
rename to net-libs/telepathy-qt4/telepathy-qt4-0.3.4-r1.ebuild
index b743c63d94a58cb8a378990eb9d0e3707d6b0edc..80dcc6dbb4c1ba6d24607d8db6c5352a12449a29 100644 (file)
--- a/net-libs/telepathy-qt4/telepathy-qt4-0.3.4.ebuild
+++ b/net-libs/telepathy-qt4/telepathy-qt4-0.3.4-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt4/telepathy-qt4-0.3.4.ebuild,v 1.1 2010/05/30 10:05:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-qt4/telepathy-qt4-0.3.4-r1.ebuild,v 1.1 2010/06/02 19:50:45 hwoarang Exp $
 
 PYTHON_DEPEND="2"
 
 EAPI="2"
-inherit versionator python base
+inherit base multilib python versionator
 
 DESCRIPTION="Qt4 bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="http://telepathy.freedesktop.org/"
@@ -14,10 +14,11 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug static"
+IUSE="debug static-libs"
 
 RDEPEND="x11-libs/qt-core:4
-       x11-libs/qt-dbus:4"
+       x11-libs/qt-dbus:4
+       x11-libs/qt-test:4"
 DEPEND="${RDEPEND}
        dev-libs/libxslt
        dev-util/pkgconfig
@@ -29,7 +30,7 @@ pkg_setup() {
 }
 
 src_configure() {
-       econf $(use_enable debug) $(use_enable static)
+       econf $(use_enable debug) $(use_enable static-libs static)
 }
 
 src_test() {
@@ -38,5 +39,5 @@ src_test() {
 
 src_install() {
        base_src_install
-       ! use static && rm "${D}"/usr/$(get_libdir)/lib${PN}.la
+       ! use static-libs && rm "${D}"/usr/$(get_libdir)/lib${PN}.la
 }