diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-01-03 21:54:59 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-03 21:54:59 +0000 |
| commit | 31901044cdebefab885eb48fc60b8b9a4789c3cd (patch) | |
| tree | 7337e81f3aa2e641c8be1e53c94054ba8bf3bd67 /x11-plugins | |
| parent | Pin dependencies to appropriate slots. (diff) | |
| download | historical-31901044cdebefab885eb48fc60b8b9a4789c3cd.tar.gz historical-31901044cdebefab885eb48fc60b8b9a4789c3cd.tar.bz2 historical-31901044cdebefab885eb48fc60b8b9a4789c3cd.zip | |
Fix file collision with nvclock wrt #350496 by Joost Ruis. rewrite the ebuild while at it
Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmxkb/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-plugins/wmxkb/Manifest | 4 | ||||
| -rw-r--r-- | x11-plugins/wmxkb/wmxkb-1.2.2.ebuild | 29 |
3 files changed, 23 insertions, 17 deletions
diff --git a/x11-plugins/wmxkb/ChangeLog b/x11-plugins/wmxkb/ChangeLog index 63cfd7ec57a5..8fbcf0eba58e 100644 --- a/x11-plugins/wmxkb/ChangeLog +++ b/x11-plugins/wmxkb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-plugins/wmxkb -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.12 2010/09/09 10:33:35 s4t4n Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.13 2011/01/03 21:54:59 ssuominen Exp $ + + 03 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> wmxkb-1.2.2.ebuild: + Fix file collision with nvclock wrt #350496 by Joost Ruis. 09 Sep 2010; Michele Noberasco <s4t4n@gentoo.org> wmxkb-1.2.2.ebuild: Honour Gentoo LDFLAGS, see bug #336528. diff --git a/x11-plugins/wmxkb/Manifest b/x11-plugins/wmxkb/Manifest index c8dc97b49309..1337def2c7d2 100644 --- a/x11-plugins/wmxkb/Manifest +++ b/x11-plugins/wmxkb/Manifest @@ -1,4 +1,4 @@ DIST wmxkb-1.2.2.tar.gz 196726 RMD160 04ab33a960ea9af9a1a30312bc43ee31c63f4ef4 SHA1 5662a1b7e26817901f32c45d258a9c5ac1eb12bf SHA256 26c3d7404543b5f6e5feedc4edde5217a0ba750852fb1a36297adaf77bff322f -EBUILD wmxkb-1.2.2.ebuild 992 RMD160 526be04fa13f1e5e52877414b51f8b208618b3a2 SHA1 06bb33375d09479b849d0d7c15222c795d0ee5b4 SHA256 e9b51f0008ea1b5641bb7168ebc5f3fe3ef11114b60d7da82ebde9720c2ef5b7 -MISC ChangeLog 1400 RMD160 26c10bb6de7531b34fbe91467497fc1a40b9f182 SHA1 7bfdaede913ca9e39d62d781f3e54fd606e91d45 SHA256 de1bda02a1d98cfb6d712fa92dd97e90ce21cfc535e8a9e2fa6a6ef4a3c087c8 +EBUILD wmxkb-1.2.2.ebuild 943 RMD160 824711b7da5ea9b889bce372ae8d995df9c7daf6 SHA1 0eb53ec5f22d1088a20be204e343bf43df84289e SHA256 66d0e8a9e9577b8d07fa5a880cf1cb5ed5ee9324ef9fc8b3d42b0f984cb72e3e +MISC ChangeLog 1540 RMD160 17211c2b998e159d089f2065a98a7bad585ddd3d SHA1 476532bd1c96ab6bf83af8309f7e37bc9e887cbb SHA256 8d97bec0c4d41c5c4d3544356ef91a6bcbdf230183e557decb216d3247a09402 MISC metadata.xml 173 RMD160 cac75840c6ed88c2ec5de55b1a7e99dd077161c1 SHA1 2685b3da7c9efbdcd015f472b70e966775639de8 SHA256 1ee892c11499f123ea91c590ccec013c5036c55d16f7dcb3982c157e36e4842f diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild index 755cff2c7c6f..ef2a2c94371b 100644 --- a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild +++ b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.9 2010/09/09 10:33:35 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.10 2011/01/03 21:54:59 ssuominen Exp $ EAPI=2 -IUSE="" +inherit toolchain-funcs DESCRIPTION="Dockable keyboard layout switcher for Window Maker" HOMEPAGE="http://wmalms.tripod.com/#WMXKB" SRC_URI="mirror://gentoo/${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc x86" +IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXt @@ -23,17 +24,19 @@ DEPEND="${RDEPEND} x11-proto/inputproto" src_prepare() { - #Honour Gentoo LDFLAGS, see bug #336528. - sed -ie "s/\$(LD) -o/\$(LD) \$(LDFLAGS) -o/" Makefile.in + sed -i -e 's:$(LD) -o:$(CC) $(LDFLAGS) -o:' Makefile.in || die #336528 +} + +src_compile() { + emake CC="$(tc-getCC)" || die } -src_install () { - make DESTDIR="${D}" BINDIR="${D}/usr/bin" DOCDIR="${D}/usr/share/doc" DATADIR="${D}/usr/share" install +src_install() { + dobin wmxkb || die #242188 - #install binary by hand per bug #242188 - dobin wmxkb + insinto /usr/share/pixmaps/wmxkb + doins pixmaps/*.xpm || die - dodoc README - cd "${WORKDIR}/${P}/doc" - dodoc manual_body.html manual_title.html manual.book + dodoc CHANGES README || die #350496 + dohtml doc/*.html || die } |