diff options
| author |   Michele Noberasco <s4t4n@gentoo.org> | 2010-09-01 07:16:26 +0000 |
|---|---|---|
| committer | Michele Noberasco <s4t4n@gentoo.org> | 2010-09-01 07:16:26 +0000 |
| commit | 44e0a6205fed1ef40712859f8f23b7676af54d38 (patch) | |
| tree | 166880228966a62f6fdbac95ff97cdf2f4cfcbaf /x11-plugins | |
| parent | Respect LDFLAGS. Bug #335469 (diff) | |
| download | historical-44e0a6205fed1ef40712859f8f23b7676af54d38.tar.gz historical-44e0a6205fed1ef40712859f8f23b7676af54d38.tar.bz2 historical-44e0a6205fed1ef40712859f8f23b7676af54d38.zip | |
Honour Gentoo LDFLAGS. Closes bug #335425.
Removed old Makedile patch relying on sed instead.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmbio/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-plugins/wmbio/Manifest | 5 | ||||
| -rw-r--r-- | x11-plugins/wmbio/files/wmbio-Makefile.patch | 17 | ||||
| -rw-r--r-- | x11-plugins/wmbio/wmbio-1.02.ebuild | 7 |
4 files changed, 13 insertions, 23 deletions
diff --git a/x11-plugins/wmbio/ChangeLog b/x11-plugins/wmbio/ChangeLog index 3dd08ce0c211..8a5f249bcfe3 100644 --- a/x11-plugins/wmbio/ChangeLog +++ b/x11-plugins/wmbio/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-plugins/wmbio # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.15 2010/02/09 15:00:21 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/ChangeLog,v 1.16 2010/09/01 07:16:26 s4t4n Exp $ + + 01 Sep 2010; Michele Noberasco <s4t4n@gentoo.org> wmbio-1.02.ebuild, + -files/wmbio-Makefile.patch: + Honour Gentoo LDFLAGS. Closes bug #335425. + Removed old Makedile patch relying on sed instead. 09 Feb 2010; Ben de Groot <yngwin@gentoo.org> wmbio-1.02.ebuild: Fix typo (bug 299547). Migrate to eapi-2. diff --git a/x11-plugins/wmbio/Manifest b/x11-plugins/wmbio/Manifest index 7ca6f4caa18b..f79f09044643 100644 --- a/x11-plugins/wmbio/Manifest +++ b/x11-plugins/wmbio/Manifest @@ -1,5 +1,4 @@ -AUX wmbio-Makefile.patch 371 RMD160 0fd3167631d29ce103cfc947c21425f8756d6fc6 SHA1 1b2732476a22811e8f8c301ceb4c5b598ed78d8a SHA256 39523dd9471a5a2cf8aedff44afbcecca77070eb7cc787d25fcea7b02ed277bb DIST wmbio-1.02.tar.gz 21799 RMD160 a862c6baf320c6139819608daf30fa5da9db32c6 SHA1 d0642d5f51752b2ec6e178b3a7a628a9ab7bb7e1 SHA256 165483b121f2af7ce2f09a62f0f9fbe02118960c281fe5f4eacad62de39a0dbf -EBUILD wmbio-1.02.ebuild 832 RMD160 1e4cc9da8c815dbe33c4db7edd2fe4334c98d3b9 SHA1 c45ead28f90e837f46eb5c478c6adadda1158f73 SHA256 ef8283c86222ecf7b65797ba7de316bd1082e495fcd9cc7e02229f0ed4acf06f -MISC ChangeLog 1702 RMD160 10dd6689dc86162a9fb6970a0b1695bcbc96d169 SHA1 47667a0f13bac699d10dc89df5c198b5cf28d432 SHA256 a6f88fa9c1ff9926211c4a4020ff82a73076e9f33946e1644c5b704a853be15d +EBUILD wmbio-1.02.ebuild 906 RMD160 56f15f765083ff3576e1c838991faa90966ebae8 SHA1 5ca6761eea37dabd50513934a221431530984ad3 SHA256 3ad48b3f4221b75162c05814998d539b312059842d68cfd0cd003991b4735e15 +MISC ChangeLog 1902 RMD160 37fa8573a34280b81d85ff5f27063a9559a25607 SHA1 97ede7b0c4f9a144547205a40d48cdffdbc2b787 SHA256 c05bc0439d92e73aa509831718f231eb0d396f28a688178e9451ec8be1a9c259 MISC metadata.xml 439 RMD160 bfc171df6368fb10665093de608a1c1dddc91ad1 SHA1 46b5d8049e021e2192db9c90fe8183913941539d SHA256 e961fded2ce79844765a54512d37c444690ffed1f5748ac43f2c48ccc8f00b9b diff --git a/x11-plugins/wmbio/files/wmbio-Makefile.patch b/x11-plugins/wmbio/files/wmbio-Makefile.patch deleted file mode 100644 index a2ad498fb8f3..000000000000 --- a/x11-plugins/wmbio/files/wmbio-Makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile 2004-08-23 21:27:12.839943656 +0200 -+++ Makefile 2004-08-23 21:27:44.224172528 +0200 -@@ -3,12 +3,12 @@ - OBJS = wmbio.o wmgeneral.o - - .c.o: -- cc -c -g -O2 -Wall $< -o $*.o -+ cc -c ${CFLAGS} -Wall $< -o $*.o - - all: wmbio - - wmbio: $(OBJS) -- cc -o wmbio $^ $(LIBDIR) $(LIBS) -+ cc -o wmbio $^ ${CFLAGS} $(LIBDIR) $(LIBS) - - clean: - for i in $(OBJS) ; do \ diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild index 77a62dd287ee..5cb14e3db633 100644 --- a/x11-plugins/wmbio/wmbio-1.02.ebuild +++ b/x11-plugins/wmbio/wmbio-1.02.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/wmbio-1.02.ebuild,v 1.11 2010/02/09 15:00:21 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbio/wmbio-1.02.ebuild,v 1.12 2010/09/01 07:16:26 s4t4n Exp $ EAPI=2 inherit eutils @@ -24,7 +24,10 @@ S=${WORKDIR}/${P}/src src_prepare() { # Honour Gentoo CFLAGS - epatch "${FILESDIR}"/${PN}-Makefile.patch + sed -i "s/-g -O2/\$(CFLAGS)/" Makefile + + # Honour Gentoo LDFLAGS + sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile } src_compile() { |