summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Noberasco <s4t4n@gentoo.org>2010-08-31 14:27:34 +0000
committerMichele Noberasco <s4t4n@gentoo.org>2010-08-31 14:27:34 +0000
commita3d40232aed0f3b91c77f081c23402aff6865466 (patch)
tree2dd880c4c02b9e724e29cedd8c3474563b2185bc /x11-plugins
parentgriffon26 is retiring, reassign to maintainer-needed. (diff)
downloadhistorical-a3d40232aed0f3b91c77f081c23402aff6865466.tar.gz
historical-a3d40232aed0f3b91c77f081c23402aff6865466.tar.bz2
historical-a3d40232aed0f3b91c77f081c23402aff6865466.zip
Reworked magic SEDs to honour Gentoo LDFLAGS.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/wmtimer/ChangeLog8
-rw-r--r--x11-plugins/wmtimer/Manifest6
-rw-r--r--x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild9
-rw-r--r--x11-plugins/wmtimer/wmtimer-2.92.ebuild9
4 files changed, 21 insertions, 11 deletions
diff --git a/x11-plugins/wmtimer/ChangeLog b/x11-plugins/wmtimer/ChangeLog
index 0493ac7ba451..53b1aece9d85 100644
--- a/x11-plugins/wmtimer/ChangeLog
+++ b/x11-plugins/wmtimer/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-plugins/wmtimer
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.23 2008/10/28 10:13:29 s4t4n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.24 2010/08/31 14:27:34 s4t4n Exp $
+
+ 28 Oct 2008; Michele Noberasco <s4t4n@gentoo.org> wmtimer-2.9.2-r1.ebuild,
+ wmtimer-2.9.2.ebuild:
+ Reworked magic SEDs to honour Gentoo LDFLAGS.
*wmtimer-2.92-r1 (28 Oct 2008)
diff --git a/x11-plugins/wmtimer/Manifest b/x11-plugins/wmtimer/Manifest
index db4d275ccca8..450b00630088 100644
--- a/x11-plugins/wmtimer/Manifest
+++ b/x11-plugins/wmtimer/Manifest
@@ -1,6 +1,6 @@
AUX wmtimer-counter-fix.patch 597 RMD160 ef4adeea10fc8c9a1284633061a0838b759921c2 SHA1 9a2ca01c24ee9d2fae0bbc33914ebe5c92b4ef59 SHA256 85deed43e3224fba6cc46c0212d99c0b5748d8fff7583a56a5543b593381ad4c
DIST wmtimer-2.92.tar.gz 22091 RMD160 c794df79ba3554400be4cc12b8309c2171e68652 SHA1 d72839e4233746d2288248e25079542030a34a77 SHA256 3726c0e0a0a95ce7c4c9dd8088b3f050d5268f70fef9341452f5449cef8c0cd4
-EBUILD wmtimer-2.92-r1.ebuild 982 RMD160 7bfae6e4139d45aab735b0667642792a95b96641 SHA1 fbb45b599c70640338b906157bfdeaf4e3968c33 SHA256 5cd67f27184d8828a65e5ecab690ca05eb24831dafa3cff671d0a296343464c2
-EBUILD wmtimer-2.92.ebuild 919 RMD160 3160632f6cd57fcafc342dc4f776a777c347472a SHA1 1ae8682683e98d5514d425a2a0c1e8938ee5a6d4 SHA256 c19d741a2b7e0e0138f31ca3c76003a13a63c836300db217780f13fdee0460e1
-MISC ChangeLog 2986 RMD160 01ffeab11283bd2eb06e306a342f85b20eb355e0 SHA1 3a07f781f83a55f481078add59fb69fd45fa2eaa SHA256 1186680cf99bc22aff1ea0bbae21d4c250aacbf632330d2581d81a6d7a524dc3
+EBUILD wmtimer-2.92-r1.ebuild 1106 RMD160 7b5fc80b59d1d6d25739ae82ab63b24e28a3ab02 SHA1 da9caea6500e5b02a301c9b06517e1eb01674b92 SHA256 b02c44c79757aa03e54cec5b354822b312a8d996d727039a4fb374eb9915b6e4
+EBUILD wmtimer-2.92.ebuild 1044 RMD160 8e9750875649cd3970cb2dd340d75f78b49de4c5 SHA1 0ab5688d3bd62b325e6ea03f5ae841727ad0f67e SHA256 8b7f9dadbfb8e1cb595a895e0dfe015d1acafbc269716fee9710f58801f2cb1b
+MISC ChangeLog 3136 RMD160 f4e437eb9ce3b008cff92681c967f8109d78b4e6 SHA1 33ba667f4e90e3a414123ec26c45ad92e004d0fa SHA256 b8c9b49fcdcd13bca74bb2d279e344dcfe7df7d3a6dff919c75050856cb74e30
MISC metadata.xml 505 RMD160 22adc6e29eede7047e57dcdee28858217f1c6eae SHA1 8ccbae9521fb42b35cdd1b39c042244e665d260b SHA256 e2d9c4eda52505bf90a61775c704f9dbce5fc7bf8bacaf23b27a53b62d307ac4
diff --git a/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild b/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild
index deb993bbddd8..0c2d7e19f7d9 100644
--- a/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild,v 1.1 2008/10/28 10:13:29 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild,v 1.2 2010/08/31 14:27:34 s4t4n Exp $
inherit eutils multilib toolchain-funcs
@@ -25,7 +25,10 @@ S=${WORKDIR}/${P}/${PN}
src_unpack() {
unpack ${A}
cd "${S}"
- sed -e "s:-O2::" -e "s:-g:${CFLAGS}:g" -i Makefile
+ sed -e "s:\$(CFLAGS)::" -i Makefile
+ sed -e "s:-g::g" -i Makefile
+ sed -e "s:-O2:\$(CFLAGS) ${CFLAGS}:" -i Makefile
+ sed -e "s:-o wmtimer:\$(LDFLAGS) -o wmtimer:" -i Makefile
epatch "${FILESDIR}"/"${PN}"-counter-fix.patch
}
diff --git a/x11-plugins/wmtimer/wmtimer-2.92.ebuild b/x11-plugins/wmtimer/wmtimer-2.92.ebuild
index 4efb37f0515b..129fab702763 100644
--- a/x11-plugins/wmtimer/wmtimer-2.92.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.92.ebuild,v 1.2 2008/01/13 02:40:01 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.92.ebuild,v 1.3 2010/08/31 14:27:34 s4t4n Exp $
inherit multilib toolchain-funcs
@@ -25,7 +25,10 @@ S=${WORKDIR}/${P}/${PN}
src_unpack() {
unpack ${A}
cd "${S}"
- sed -e "s:-O2::" -e "s:-g:${CFLAGS}:g" -i Makefile
+ sed -e "s:\$(CFLAGS)::" -i Makefile
+ sed -e "s:-g::g" -i Makefile
+ sed -e "s:-O2:\$(CFLAGS) ${CFLAGS}:" -i Makefile
+ sed -e "s:-o wmtimer:\$(LDFLAGS) -o wmtimer:" -i Makefile
}
src_compile() {