| 1 |
ssuominen 11/01/03 21:54:59 |
| 2 |
|
| 3 |
Modified: ChangeLog wmxkb-1.2.2.ebuild |
| 4 |
Log: |
| 5 |
Fix file collision with nvclock wrt #350496 by Joost Ruis. rewrite the ebuild while at it |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.13 x11-plugins/wmxkb/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmxkb/ChangeLog?rev=1.13&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmxkb/ChangeLog?rev=1.13&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmxkb/ChangeLog?r1=1.12&r2=1.13 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v |
| 19 |
retrieving revision 1.12 |
| 20 |
retrieving revision 1.13 |
| 21 |
diff -u -r1.12 -r1.13 |
| 22 |
--- ChangeLog 9 Sep 2010 10:33:35 -0000 1.12 |
| 23 |
+++ ChangeLog 3 Jan 2011 21:54:59 -0000 1.13 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for x11-plugins/wmxkb |
| 26 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.12 2010/09/09 10:33:35 s4t4n Exp $ |
| 28 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/ChangeLog,v 1.13 2011/01/03 21:54:59 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+ 03 Jan 2011; Samuli Suominen <ssuominen@g.o> wmxkb-1.2.2.ebuild: |
| 32 |
+ Fix file collision with nvclock wrt #350496 by Joost Ruis. |
| 33 |
|
| 34 |
09 Sep 2010; Michele Noberasco <s4t4n@g.o> wmxkb-1.2.2.ebuild: |
| 35 |
Honour Gentoo LDFLAGS, see bug #336528. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.10 x11-plugins/wmxkb/wmxkb-1.2.2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild?rev=1.10&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild?rev=1.10&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild?r1=1.9&r2=1.10 |
| 44 |
|
| 45 |
Index: wmxkb-1.2.2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild,v |
| 48 |
retrieving revision 1.9 |
| 49 |
retrieving revision 1.10 |
| 50 |
diff -u -r1.9 -r1.10 |
| 51 |
--- wmxkb-1.2.2.ebuild 9 Sep 2010 10:33:35 -0000 1.9 |
| 52 |
+++ wmxkb-1.2.2.ebuild 3 Jan 2011 21:54:59 -0000 1.10 |
| 53 |
@@ -1,17 +1,18 @@ |
| 54 |
-# Copyright 1999-2010 Gentoo Foundation |
| 55 |
+# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.9 2010/09/09 10:33:35 s4t4n Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild,v 1.10 2011/01/03 21:54:59 ssuominen Exp $ |
| 59 |
|
| 60 |
EAPI=2 |
| 61 |
-IUSE="" |
| 62 |
+inherit toolchain-funcs |
| 63 |
|
| 64 |
DESCRIPTION="Dockable keyboard layout switcher for Window Maker" |
| 65 |
HOMEPAGE="http://wmalms.tripod.com/#WMXKB" |
| 66 |
SRC_URI="mirror://gentoo/${P}.tar.gz" |
| 67 |
|
| 68 |
-SLOT="0" |
| 69 |
LICENSE="GPL-2" |
| 70 |
+SLOT="0" |
| 71 |
KEYWORDS="~amd64 ~ppc ~sparc x86" |
| 72 |
+IUSE="" |
| 73 |
|
| 74 |
RDEPEND="x11-libs/libX11 |
| 75 |
x11-libs/libXt |
| 76 |
@@ -23,17 +24,19 @@ |
| 77 |
x11-proto/inputproto" |
| 78 |
|
| 79 |
src_prepare() { |
| 80 |
- #Honour Gentoo LDFLAGS, see bug #336528. |
| 81 |
- sed -ie "s/\$(LD) -o/\$(LD) \$(LDFLAGS) -o/" Makefile.in |
| 82 |
+ sed -i -e 's:$(LD) -o:$(CC) $(LDFLAGS) -o:' Makefile.in || die #336528 |
| 83 |
+} |
| 84 |
+ |
| 85 |
+src_compile() { |
| 86 |
+ emake CC="$(tc-getCC)" || die |
| 87 |
} |
| 88 |
|
| 89 |
-src_install () { |
| 90 |
- make DESTDIR="${D}" BINDIR="${D}/usr/bin" DOCDIR="${D}/usr/share/doc" DATADIR="${D}/usr/share" install |
| 91 |
+src_install() { |
| 92 |
+ dobin wmxkb || die #242188 |
| 93 |
|
| 94 |
- #install binary by hand per bug #242188 |
| 95 |
- dobin wmxkb |
| 96 |
+ insinto /usr/share/pixmaps/wmxkb |
| 97 |
+ doins pixmaps/*.xpm || die |
| 98 |
|
| 99 |
- dodoc README |
| 100 |
- cd "${WORKDIR}/${P}/doc" |
| 101 |
- dodoc manual_body.html manual_title.html manual.book |
| 102 |
+ dodoc CHANGES README || die #350496 |
| 103 |
+ dohtml doc/*.html || die |
| 104 |
} |
Archives