summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-05-01 21:09:12 +0000
committerJeroen Roovers <jer@gentoo.org>2012-05-01 21:09:12 +0000
commit228b133f2146c36007bfedccbf14b242eff0e2f0 (patch)
treed204f28ad611babea31b6906c2a5c7d628576959 /x11-misc
parentAdd more runtime dependencies. Respect CC. Make sed script more robust and le... (diff)
downloadhistorical-228b133f2146c36007bfedccbf14b242eff0e2f0.tar.gz
historical-228b133f2146c36007bfedccbf14b242eff0e2f0.tar.bz2
historical-228b133f2146c36007bfedccbf14b242eff0e2f0.zip
Fix underlinking by Diego Elio Pettenò (bug #369591).
Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/trayer/ChangeLog5
-rw-r--r--x11-misc/trayer/Manifest10
-rw-r--r--x11-misc/trayer/trayer-1.0-r1.ebuild7
3 files changed, 15 insertions, 7 deletions
diff --git a/x11-misc/trayer/ChangeLog b/x11-misc/trayer/ChangeLog
index 3c31b4555c6b..9589ffb6196b 100644
--- a/x11-misc/trayer/ChangeLog
+++ b/x11-misc/trayer/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-misc/trayer
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/ChangeLog,v 1.20 2012/05/01 21:09:12 jer Exp $
+
+ 01 May 2012; Jeroen Roovers <jer@gentoo.org> trayer-1.0-r1.ebuild:
+ Fix underlinking by Diego Elio Pettenò (bug #369591).
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
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index 26e222f6ac1f..481bfb39a7dd 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -2,14 +2,14 @@
Hash: SHA1
DIST trayer-1.0.tar.gz 30445 RMD160 decb89b8348390c6cd26de1b1a6ef1f32ca1837d SHA1 23e8a42a697100991d5ba4c67be42a2b0b31212f SHA256 896647e972a0b189b8368a7de30480e90eede0078ebdbdb62051f18a58070fbd
-EBUILD trayer-1.0-r1.ebuild 972 RMD160 65d382a9bbfb094c91008c0dafdb3723b6dbb787 SHA1 48be37eb0ff31461c3d0a6e201f88c290ccf7306 SHA256 8a7e755181663adb193c65879b1c60365636dfd37571a99862a4b50b0e1d1213
+EBUILD trayer-1.0-r1.ebuild 1097 RMD160 dd6f619cf670b33741b67de7adfe7d06241fc2f8 SHA1 a144df0a0962b6e0f694cae699a1731a152a7ac4 SHA256 2cf71842fe761e623073982b92db5048d9315d6bc5754ce57da0f73b0afb71f0
EBUILD trayer-1.0.ebuild 867 RMD160 7337c27e70648f381d74f9a7917c98074208ab96 SHA1 9e8d4bbfa41bba45f72372b111520ffd12d14875 SHA256 08942cce315c2d2f6d55d960fcae4232a9b1da5589d8d053126addc645e99a96
-MISC ChangeLog 2442 RMD160 078028a064520e3f5f16185a860e656d5656450d SHA1 fbd8cc558c658b597f3558b43ecaab151ca4119a SHA256 eb1b27a22a30ce9cc34fb5f965a0e03f1fe2bafb94d925576ded172f4c9b8eb4
+MISC ChangeLog 2569 RMD160 180d4998bcef02f0d40dbb3626092dcaaa2eabac SHA1 74745b5eb8cefb0791f4d9701f56677c945ddc6e SHA256 79297fc3b94209f3ee07a952244ba4b095ea861cbc3461f81c153de74c49de7e
MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk+gTekACgkQVWmRsqeSphPN8ACfTOBR5DAN9YC77vQ1W8XM1W7A
-ORIAmwXPU54FFTGSxRPrhOyfHJCNbJn+
-=8P/3
+iEYEARECAAYFAk+gUP0ACgkQVWmRsqeSphOZqgCfeJ5x7ssKsqs4O+0PCM85o/BK
+fWAAni/zYTPzTd/ORHyf47AegOdJbOHi
+=wDTU
-----END PGP SIGNATURE-----
diff --git a/x11-misc/trayer/trayer-1.0-r1.ebuild b/x11-misc/trayer/trayer-1.0-r1.ebuild
index c7010d14b0b3..e04a42c389d8 100644
--- a/x11-misc/trayer/trayer-1.0-r1.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r1.ebuild
@@ -1,6 +1,6 @@
# 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.3 2012/05/01 20:55:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/trayer/trayer-1.0-r1.ebuild,v 1.4 2012/05/01 21:09:12 jer Exp $
EAPI=4
inherit toolchain-funcs
@@ -30,6 +30,11 @@ src_prepare() {
-e 's:$(LIBS) $(OBJ) $(SYSTRAYOBJ):$(OBJ) $(SYSTRAYOBJ) $(LIBS):' \
-e 's:strip:true:g' \
|| die
+ # fix underlinking, bug #369591
+ sed -i Makefile.common \
+ -e '/^LIBS/s:).*: x11):' \
+ -e '/^INC/s:).*: x11):' \
+ || die
}
src_compile() {