| 1 |
ssuominen 11/01/31 18:24:05 |
| 2 |
|
| 3 |
Modified: metadata.xml imsettings-1.0.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Prevent automagic linking to libxfconf-0 and rename USE="xfce" to USE="xfconf" wrt #353117. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-i18n/imsettings/metadata.xml |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/imsettings/metadata.xml?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/imsettings/metadata.xml?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/imsettings/metadata.xml?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: metadata.xml |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/imsettings/metadata.xml,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- metadata.xml 8 Jan 2011 06:15:28 -0000 1.1 |
| 23 |
+++ metadata.xml 31 Jan 2011 18:24:05 -0000 1.2 |
| 24 |
@@ -3,6 +3,6 @@ |
| 25 |
<pkgmetadata> |
| 26 |
<herd>cjk</herd> |
| 27 |
<use> |
| 28 |
- <flag name='xfce'>Enable integration in XFCE desktop</flag> |
| 29 |
+ <flag name='xfconf'>Enable integration in the Xfce desktop environment with <pkg>xfce-base/xfconf</pkg></flag> |
| 30 |
</use> |
| 31 |
</pkgmetadata> |
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.2 app-i18n/imsettings/imsettings-1.0.0.ebuild |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/imsettings/imsettings-1.0.0.ebuild?rev=1.2&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/imsettings/imsettings-1.0.0.ebuild?rev=1.2&content-type=text/plain |
| 39 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/imsettings/imsettings-1.0.0.ebuild?r1=1.1&r2=1.2 |
| 40 |
|
| 41 |
Index: imsettings-1.0.0.ebuild |
| 42 |
=================================================================== |
| 43 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.0.0.ebuild,v |
| 44 |
retrieving revision 1.1 |
| 45 |
retrieving revision 1.2 |
| 46 |
diff -u -r1.1 -r1.2 |
| 47 |
--- imsettings-1.0.0.ebuild 8 Jan 2011 06:15:28 -0000 1.1 |
| 48 |
+++ imsettings-1.0.0.ebuild 31 Jan 2011 18:24:05 -0000 1.2 |
| 49 |
@@ -1,6 +1,6 @@ |
| 50 |
# Copyright 1999-2011 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.0.0.ebuild,v 1.1 2011/01/08 06:15:28 matsuu Exp $ |
| 53 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.0.0.ebuild,v 1.2 2011/01/31 18:24:05 ssuominen Exp $ |
| 54 |
|
| 55 |
EAPI=3 |
| 56 |
|
| 57 |
@@ -11,7 +11,7 @@ |
| 58 |
LICENSE="LGPL-2.1" |
| 59 |
SLOT="0" |
| 60 |
KEYWORDS="~amd64 ~x86" |
| 61 |
-IUSE="qt4 static-libs xfce" |
| 62 |
+IUSE="qt4 static-libs xfconf" |
| 63 |
|
| 64 |
# X11 connections are required for test. |
| 65 |
RESTRICT="test" |
| 66 |
@@ -24,21 +24,30 @@ |
| 67 |
x11-libs/libnotify |
| 68 |
x11-libs/libX11 |
| 69 |
qt4? ( x11-libs/qt-core:4 ) |
| 70 |
- xfce? ( xfce-base/xfconf )" |
| 71 |
+ xfconf? ( xfce-base/xfconf )" |
| 72 |
DEPEND="${RDEPEND} |
| 73 |
dev-util/pkgconfig" |
| 74 |
|
| 75 |
MY_XINPUTSH="90-xinput" |
| 76 |
|
| 77 |
+src_prepare() { |
| 78 |
+ # Prevent automagic linking to libxfconf-0. |
| 79 |
+ if ! use xfconf; then |
| 80 |
+ sed -i -e 's:libxfconf-0:dIsAbLe&:' configure || die |
| 81 |
+ fi |
| 82 |
+} |
| 83 |
+ |
| 84 |
src_configure() { |
| 85 |
econf \ |
| 86 |
$(use_enable static-libs static) \ |
| 87 |
- --with-xinputsh="${MY_XINPUTSH}" || die |
| 88 |
+ --with-xinputsh="${MY_XINPUTSH}" |
| 89 |
} |
| 90 |
|
| 91 |
src_install() { |
| 92 |
emake DESTDIR="${D}" install || die |
| 93 |
|
| 94 |
+ find "${ED}" -name '*.la' -exec rm -f '{}' + |
| 95 |
+ |
| 96 |
fperms 0755 /usr/libexec/xinputinfo.sh || die |
| 97 |
fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}" || die |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
|
| 102 |
1.2 app-i18n/imsettings/ChangeLog |
| 103 |
|
| 104 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/imsettings/ChangeLog?rev=1.2&view=markup |
| 105 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/imsettings/ChangeLog?rev=1.2&content-type=text/plain |
| 106 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/imsettings/ChangeLog?r1=1.1&r2=1.2 |
| 107 |
|
| 108 |
Index: ChangeLog |
| 109 |
=================================================================== |
| 110 |
RCS file: /var/cvsroot/gentoo-x86/app-i18n/imsettings/ChangeLog,v |
| 111 |
retrieving revision 1.1 |
| 112 |
retrieving revision 1.2 |
| 113 |
diff -u -r1.1 -r1.2 |
| 114 |
--- ChangeLog 8 Jan 2011 06:15:28 -0000 1.1 |
| 115 |
+++ ChangeLog 31 Jan 2011 18:24:05 -0000 1.2 |
| 116 |
@@ -1,6 +1,11 @@ |
| 117 |
# ChangeLog for app-i18n/imsettings |
| 118 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 119 |
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/ChangeLog,v 1.1 2011/01/08 06:15:28 matsuu Exp $ |
| 120 |
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/ChangeLog,v 1.2 2011/01/31 18:24:05 ssuominen Exp $ |
| 121 |
+ |
| 122 |
+ 31 Jan 2011; Samuli Suominen <ssuominen@g.o> imsettings-1.0.0.ebuild, |
| 123 |
+ metadata.xml: |
| 124 |
+ Prevent automagic linking to libxfconf-0 and rename USE="xfce" to |
| 125 |
+ USE="xfconf" wrt #353117. |
| 126 |
|
| 127 |
*imsettings-1.0.0 (08 Jan 2011) |
Archives