Add more runtime dependencies. Respect CC. Make sed script more robust and less cryptic, run sed just once. Use do* instead of einstall.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 33 insertions, 32 deletions

diff --git a/x11-misc/trayer/ChangeLog b/x11-misc/trayer/ChangeLog
index 13eb9f47a300..3c31b4555c6b 100644
--- a/x11-misc/trayer/ChangeLog
+++ b/x11-misc/trayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/trayer
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/ChangeLog,v 1.18 2011/03/28 14:34:48 nirbheek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/ChangeLog,v 1.19 2012/05/01 20:55:58 jer Exp $
+
+  01 May 2012; Jeroen Roovers <jer@gentoo.org> trayer-1.0-r1.ebuild:
+  Add more runtime dependencies. Respect CC. Make sed script more robust and
+  less cryptic, run sed just once. Use do* instead of einstall.
 
   28 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> trayer-1.0.ebuild,
   trayer-1.0-r1.ebuild:
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index 67062b143b58..26e222f6ac1f 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -2,24 +2,14 @@
 Hash: SHA1
 
 DIST trayer-1.0.tar.gz 30445 RMD160 decb89b8348390c6cd26de1b1a6ef1f32ca1837d SHA1 23e8a42a697100991d5ba4c67be42a2b0b31212f SHA256 896647e972a0b189b8368a7de30480e90eede0078ebdbdb62051f18a58070fbd
-EBUILD trayer-1.0-r1.ebuild 971 RMD160 a1c707bbd2d57545e51ec84033945c45418b46bb SHA1 ded5b676a993c0261bd92b6554e38bddc01c99c5 SHA256 0e11440cb2b501a7027362942c97ab27f7fb7ce16c7ec690b8737913b77bd2f3
+EBUILD trayer-1.0-r1.ebuild 972 RMD160 65d382a9bbfb094c91008c0dafdb3723b6dbb787 SHA1 48be37eb0ff31461c3d0a6e201f88c290ccf7306 SHA256 8a7e755181663adb193c65879b1c60365636dfd37571a99862a4b50b0e1d1213
 EBUILD trayer-1.0.ebuild 867 RMD160 7337c27e70648f381d74f9a7917c98074208ab96 SHA1 9e8d4bbfa41bba45f72372b111520ffd12d14875 SHA256 08942cce315c2d2f6d55d960fcae4232a9b1da5589d8d053126addc645e99a96
-MISC ChangeLog 2236 RMD160 6fdd858d01e52a8e1a5dd566c1ddfc531c3fecf8 SHA1 2ce96c2e1a2a7bcfb6c7afb70635d08840c926db SHA256 f5c1af1cfd73d20a7247a85289d1817c61d1432af641cd17960b8cf349720dd3
+MISC ChangeLog 2442 RMD160 078028a064520e3f5f16185a860e656d5656450d SHA1 fbd8cc558c658b597f3558b43ecaab151ca4119a SHA256 eb1b27a22a30ce9cc34fb5f965a0e03f1fe2bafb94d925576ded172f4c9b8eb4
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNkJyPAAoJEO/kOhxWD91k2EsP/2U5Eo+SeYlTM/Insjky22VU
-DxsJOtDjfp3qWRu3CM/Mk4vM9vy3kuSWhqROtScyfS6HjHnF7aF2nUkGnALwlYjz
-oveMV4KtecrvgA+B0JHYfsCByCXQOKPxkLDUd86RqTjVUxH/cBXhllFr5hH5xHj/
-MA1juXMmbptMXzjpvMsWQyO4r8P9wI3SzX6YdD5s0vwY9oVdcA3nmi5i7lchgpgO
-ENoOPjYiEkwtbVBYASLFF3f60351PMATU/+aV9W4xLIU4txcmD6/81A2TULu2nVh
-HaA6mINeS6tA5G0FeBqWk1+PqHbJ91AndgJ4MX8Jo6TdvrQwrEyLQuo2Xf29nEeK
-FsZK16zIz59fuZSJkoLCEWfshQk1/qVxYuoWMxg3fNuTp3YjiLccGkxrccs+fAn6
-x+glhAY0jdomqc0zzmT/xy7mcIZMuxmZoTq5o/UiE0AeG/uSo/9s+vitaoyc/SI5
-58luka6LgG/Xsl4IgUEtdqM+fNb594diFDA+iHzbUNImpuUMN2jNsgF/bQdMERv7
-u9zMXhfucqFH4ivOXJkeiKjfASnTFNUZ7fCeSxrl5sv+vgDja1kJpJ2Wr1VnmjzL
-BUbrZFrMn2o3ck896pPIhj8C1LP7EstTj1bb5YDIxdwJ18HWa68eDsKk9SMUoR/K
-s5DQPglivsGXwYH2/Uq2
-=NUVX
+iEYEARECAAYFAk+gTekACgkQVWmRsqeSphPN8ACfTOBR5DAN9YC77vQ1W8XM1W7A
+ORIAmwXPU54FFTGSxRPrhOyfHJCNbJn+
+=8P/3
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/trayer/trayer-1.0-r1.ebuild b/x11-misc/trayer/trayer-1.0-r1.ebuild
index f70efe11d3c9..c7010d14b0b3 100644
--- a/x11-misc/trayer/trayer-1.0-r1.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/trayer-1.0-r1.ebuild,v 1.2 2011/03/28 14:34:48 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/trayer-1.0-r1.ebuild,v 1.3 2012/05/01 20:55:58 jer Exp $
 
-EAPI="1"
+EAPI=4
+inherit toolchain-funcs
 
 DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
 HOMEPAGE="http://fvwm-crystal.org"
@@ -11,26 +12,32 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/pkgconfig
+"
 
+src_prepare() {
 	# fix for as-needed, bug #141707
-	sed -i Makefile \
-		-e 's/$(LIBS) $(OBJ) $(SYSTRAYOBJ)/$(OBJ) $(SYSTRAYOBJ) $(LIBS)/'
 	# fix pre-stripped files, bug #252098
-	sed -i "40,+3d" Makefile || die "failed to fix Makefile"
+	sed -i Makefile \
+		-e 's:$(LIBS) $(OBJ) $(SYSTRAYOBJ):$(OBJ) $(SYSTRAYOBJ) $(LIBS):' \
+		-e 's:strip:true:g' \
+		|| die
 }
 
 src_compile() {
-	emake -j1 CFLAGS="${CFLAGS}" || die "emake failed"
+	emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	einstall PREFIX="${D}"/usr || die "einstall failed"
+	dobin trayer
+	doman trayer.1
 	dodoc CHANGELOG CREDITS README
 }