Prevent automagic linking to libxfconf-0 and rename USE="xfce" to USE="xfconf" wrt #353117.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 23 insertions, 29 deletions

diff --git a/app-i18n/imsettings/ChangeLog b/app-i18n/imsettings/ChangeLog
index ff266be822d6..2b00036e2038 100644
--- a/app-i18n/imsettings/ChangeLog
+++ b/app-i18n/imsettings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/imsettings
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/ChangeLog,v 1.1 2011/01/08 06:15:28 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/ChangeLog,v 1.2 2011/01/31 18:24:05 ssuominen Exp $
+
+  31 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> imsettings-1.0.0.ebuild,
+  metadata.xml:
+  Prevent automagic linking to libxfconf-0 and rename USE="xfce" to
+  USE="xfconf" wrt #353117.
 
 *imsettings-1.0.0 (08 Jan 2011)
 
diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index 1924914a5231..638efcb4539e 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST imsettings-1.0.0.tar.bz2 570007 RMD160 765ef8cd7272d69cd02ddc8ff461374d8f9a6e2c SHA1 d6e72a796278081067a3bc99a9bed2403a2f5027 SHA256 66bf77933800aaf87eb07c68db49c7d18699b671783d82e6f01052228cb496d9
-EBUILD imsettings-1.0.0.ebuild 1302 RMD160 17565928ce44d1a3c32f662d3e2418c67e500e28 SHA1 62fd4421ff75c73f55569166483609182e4861cc SHA256 4527122c68302ffcc6aa6a47c8461371d6e08f1d318dad5aa3433d19a4e36523
-MISC ChangeLog 355 RMD160 f5d01402d45f80b337634e8c5fb4e0e6052c99e3 SHA1 d28edda139d7792d88ea65fc6dfd925d023adbe1 SHA256 fae4c768304972e32af0fdd5ffe11615ab541b8ef7a28708b224246faa2ca737
-MISC metadata.xml 231 RMD160 75200cba4ee5103e132224627d48d476a62545f1 SHA1 b0dd5e115534ba370c2893a192d2400aa6d419cd SHA256 63de22b40020d4042c9ce625bd6511c70dcf660f5a2c6fa126146b60a757926a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNKAEGAAoJECaGw+YFKA1pp1QQAJSSBnjIu7a6+FZY5NiMOmG5
-3fNqevsp1BytZQ4H/zL+5LMkcpODZ9ScbV53UtQnJqxnp0rN3EclvzqCdLxx3xwm
-SI3L0x3jPRWyg36dQVfI0RXY6uYY8TNQfKFNdxsRab/lHRCEjyBRvPDRAsBjZ5w9
-WTlbpdWRtJxheZxVpDz3PDMTggPG6FRLIIh/G8RT+8vgWcb4TN5pFQDdej76WM6o
-c8gPyevCKx3p84eY6G5AN6eFq/tSO7wM8c/h84s0FLDNX0NFECv6muU4qsyaMd2J
-nFXxX8IXF9C+AO+zgTQx09YhBo3Of/X19RL3kgNxhm3ZXLafwPztIJSKECGxXhdt
-+37IDs22JQQ5EGRB5Y386BqzpJvrj9/b17oZY5M/tJn7JPjHCK/RLziAdeijuIKH
-+7WbNHB6h1eugKGuTyCWiGWEJOd9uUSLft23oEjK3VBWRqHJeeAQbe9IVP6VQJWR
-jCgJL61MCO6ejUSVFeNbvuILq0w64wL1xwYJxSLiwQ681+VE1uVHibea5ZZQSZVD
-gwy00qTh9dSKujoQJ+CtcrjN+tAjCULkNp0yfQpVfbGJKNmO3jnirdDjVF9HD4mR
-5CwzHE/UWbOFJ2VFfV+/bk9JQGbg5r2v38c8WjbiAtvB8uLCAObH0iKm3pZw1Vem
-65Ne7Aj8tOasdvwIr7KE
-=TSqE
------END PGP SIGNATURE-----
+EBUILD imsettings-1.0.0.ebuild 1495 RMD160 5cc126f572b992133790928f5b2362977ef05d31 SHA1 d1630274e29c5528cc3ffc4bdadda0291682e015 SHA256 3faa978c570009a01aa7a075491f01f21a4c842d29b13b70ffbe83fe31f487fe
+MISC ChangeLog 550 RMD160 a9a4e167bc155d366f49bebdc9738b5e4e7a8636 SHA1 eb7c5852c542743b39af03fd9c54c458f3b60e3e SHA256 71e0683d006e6055769b7f539e444aafcac963aaa04bf946989c52866a4113b7
+MISC metadata.xml 282 RMD160 9f36b738155c88fda983f1b26fb6bb140f8b1080 SHA1 5bb53341ab0835d84fdd70f192eaa1415c90b670 SHA256 5ba2ba2aabd29f07552a4b611794f74d49b472f235b5dc67d9ef206657e70b82
diff --git a/app-i18n/imsettings/imsettings-1.0.0.ebuild b/app-i18n/imsettings/imsettings-1.0.0.ebuild
index f66a7395ab37..98fc47948688 100644
--- a/app-i18n/imsettings/imsettings-1.0.0.ebuild
+++ b/app-i18n/imsettings/imsettings-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.0.0.ebuild,v 1.1 2011/01/08 06:15:28 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.0.0.ebuild,v 1.2 2011/01/31 18:24:05 ssuominen Exp $
 
 EAPI=3
 
@@ -11,7 +11,7 @@ SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="qt4 static-libs xfce"
+IUSE="qt4 static-libs xfconf"
 
 # X11 connections are required for test.
 RESTRICT="test"
@@ -24,21 +24,30 @@ RDEPEND=">=dev-libs/check-0.9.4
 	x11-libs/libnotify
 	x11-libs/libX11
 	qt4? ( x11-libs/qt-core:4 )
-	xfce? ( xfce-base/xfconf )"
+	xfconf? ( xfce-base/xfconf )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 MY_XINPUTSH="90-xinput"
 
+src_prepare() {
+	# Prevent automagic linking to libxfconf-0.
+	if ! use xfconf; then
+		sed -i -e 's:libxfconf-0:dIsAbLe&:' configure || die
+	fi
+}
+
 src_configure() {
 	econf \
 		$(use_enable static-libs static) \
-		--with-xinputsh="${MY_XINPUTSH}" || die
+		--with-xinputsh="${MY_XINPUTSH}"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 
+	find "${ED}" -name '*.la' -exec rm -f '{}' +
+
 	fperms 0755 /usr/libexec/xinputinfo.sh || die
 	fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}" || die
 
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 8cf5c37610e7..ab4f7701afa5 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>cjk</herd>
 <use>
-  <flag name='xfce'>Enable integration in XFCE desktop</flag>
+  <flag name='xfconf'>Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag>
 </use>
 </pkgmetadata>