diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-01-31 18:24:05 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-31 18:24:05 +0000 |
| commit | d43c5433c5c7f8eee76d3c5442d0c4ff41d81de1 (patch) | |
| tree | 4f5572b906695083d7ad1a502e7fc246b95fd75d /app-i18n | |
| parent | Merge 'mad' and 'mp3' USEs as both plugins are needed for proper mp3 parsing.... (diff) | |
| download | gentoo-2-d43c5433c5c7f8eee76d3c5442d0c4ff41d81de1.tar.gz gentoo-2-d43c5433c5c7f8eee76d3c5442d0c4ff41d81de1.tar.bz2 gentoo-2-d43c5433c5c7f8eee76d3c5442d0c4ff41d81de1.zip | |
Prevent automagic linking to libxfconf-0 and rename USE="xfce" to USE="xfconf" wrt #353117.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'app-i18n')
| -rw-r--r-- | app-i18n/imsettings/ChangeLog | 7 | ||||
| -rw-r--r-- | app-i18n/imsettings/imsettings-1.0.0.ebuild | 17 | ||||
| -rw-r--r-- | app-i18n/imsettings/metadata.xml | 2 |
3 files changed, 20 insertions, 6 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/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> |