| 1 |
jer 12/05/01 20:55:58 |
| 2 |
|
| 3 |
Modified: trayer-1.0-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add more runtime dependencies. Respect CC. Make sed script more robust and less cryptic, run sed just once. Use do* instead of einstall. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 x11-misc/trayer/trayer-1.0-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/trayer/trayer-1.0-r1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/trayer/trayer-1.0-r1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/trayer/trayer-1.0-r1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: trayer-1.0-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/trayer/trayer-1.0-r1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- trayer-1.0-r1.ebuild 28 Mar 2011 14:34:48 -0000 1.2 |
| 23 |
+++ trayer-1.0-r1.ebuild 1 May 2012 20:55:58 -0000 1.3 |
| 24 |
@@ -1,8 +1,9 @@ |
| 25 |
-# Copyright 1999-2011 Gentoo Foundation |
| 26 |
+# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/trayer-1.0-r1.ebuild,v 1.2 2011/03/28 14:34:48 nirbheek Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/trayer-1.0-r1.ebuild,v 1.3 2012/05/01 20:55:58 jer Exp $ |
| 30 |
|
| 31 |
-EAPI="1" |
| 32 |
+EAPI=4 |
| 33 |
+inherit toolchain-funcs |
| 34 |
|
| 35 |
DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop" |
| 36 |
HOMEPAGE="http://fvwm-crystal.org" |
| 37 |
@@ -11,26 +12,32 @@ |
| 38 |
SLOT="0" |
| 39 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" |
| 40 |
IUSE="" |
| 41 |
-RDEPEND="x11-libs/gtk+:2" |
| 42 |
-DEPEND="${RDEPEND} |
| 43 |
- dev-util/pkgconfig" |
| 44 |
- |
| 45 |
-src_unpack() { |
| 46 |
- unpack ${A} |
| 47 |
- cd "${S}" |
| 48 |
+RDEPEND=" |
| 49 |
+ dev-libs/glib:2 |
| 50 |
+ x11-libs/gdk-pixbuf |
| 51 |
+ x11-libs/gtk+:2 |
| 52 |
+ x11-libs/libX11 |
| 53 |
+" |
| 54 |
+DEPEND=" |
| 55 |
+ ${RDEPEND} |
| 56 |
+ dev-util/pkgconfig |
| 57 |
+" |
| 58 |
|
| 59 |
+src_prepare() { |
| 60 |
# fix for as-needed, bug #141707 |
| 61 |
- sed -i Makefile \ |
| 62 |
- -e 's/$(LIBS) $(OBJ) $(SYSTRAYOBJ)/$(OBJ) $(SYSTRAYOBJ) $(LIBS)/' |
| 63 |
# fix pre-stripped files, bug #252098 |
| 64 |
- sed -i "40,+3d" Makefile || die "failed to fix Makefile" |
| 65 |
+ sed -i Makefile \ |
| 66 |
+ -e 's:$(LIBS) $(OBJ) $(SYSTRAYOBJ):$(OBJ) $(SYSTRAYOBJ) $(LIBS):' \ |
| 67 |
+ -e 's:strip:true:g' \ |
| 68 |
+ || die |
| 69 |
} |
| 70 |
|
| 71 |
src_compile() { |
| 72 |
- emake -j1 CFLAGS="${CFLAGS}" || die "emake failed" |
| 73 |
+ emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
- einstall PREFIX="${D}"/usr || die "einstall failed" |
| 78 |
+ dobin trayer |
| 79 |
+ doman trayer.1 |
| 80 |
dodoc CHANGELOG CREDITS README |
| 81 |
} |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.19 x11-misc/trayer/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/trayer/ChangeLog?rev=1.19&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/trayer/ChangeLog?rev=1.19&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/trayer/ChangeLog?r1=1.18&r2=1.19 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/trayer/ChangeLog,v |
| 94 |
retrieving revision 1.18 |
| 95 |
retrieving revision 1.19 |
| 96 |
diff -u -r1.18 -r1.19 |
| 97 |
--- ChangeLog 28 Mar 2011 14:34:48 -0000 1.18 |
| 98 |
+++ ChangeLog 1 May 2012 20:55:58 -0000 1.19 |
| 99 |
@@ -1,6 +1,10 @@ |
| 100 |
# ChangeLog for x11-misc/trayer |
| 101 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/ChangeLog,v 1.18 2011/03/28 14:34:48 nirbheek Exp $ |
| 103 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/ChangeLog,v 1.19 2012/05/01 20:55:58 jer Exp $ |
| 105 |
+ |
| 106 |
+ 01 May 2012; Jeroen Roovers <jer@g.o> trayer-1.0-r1.ebuild: |
| 107 |
+ Add more runtime dependencies. Respect CC. Make sed script more robust and |
| 108 |
+ less cryptic, run sed just once. Use do* instead of einstall. |
| 109 |
|
| 110 |
28 Mar 2011; Nirbheek Chauhan <nirbheek@g.o> trayer-1.0.ebuild, |
| 111 |
trayer-1.0-r1.ebuild: |
Archives