diff options
author | Michele Noberasco <s4t4n@gentoo.org> | 2010-09-09 09:54:32 +0000 |
---|---|---|
committer | Michele Noberasco <s4t4n@gentoo.org> | 2010-09-09 09:54:32 +0000 |
commit | 3c675100a294d06625869bf71ad2979f029460af (patch) | |
tree | a326abb73dacc7c5f228ad94c23deaf8849e4608 /x11-plugins | |
parent | Respect LDFLAGS. Bug #336261 (diff) | |
download | historical-3c675100a294d06625869bf71ad2979f029460af.tar.gz historical-3c675100a294d06625869bf71ad2979f029460af.tar.bz2 historical-3c675100a294d06625869bf71ad2979f029460af.zip |
Patched Makefile to make it at least decent. Closes bug #336547.
Package-Manager: portage-2.1.8.3/cvs/Linux i686
Diffstat (limited to 'x11-plugins')
-rw-r--r-- | x11-plugins/wmlaptop/ChangeLog | 8 | ||||
-rw-r--r-- | x11-plugins/wmlaptop/Manifest | 5 | ||||
-rw-r--r-- | x11-plugins/wmlaptop/files/wmlaptop-1.3-Makefile.patch | 32 | ||||
-rw-r--r-- | x11-plugins/wmlaptop/wmlaptop-1.3.ebuild | 18 |
4 files changed, 51 insertions, 12 deletions
diff --git a/x11-plugins/wmlaptop/ChangeLog b/x11-plugins/wmlaptop/ChangeLog index 9042f05fb43b..2f2cae7e7502 100644 --- a/x11-plugins/wmlaptop/ChangeLog +++ b/x11-plugins/wmlaptop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmlaptop -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.8 2009/01/14 15:54:35 s4t4n Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/ChangeLog,v 1.9 2010/09/09 09:54:32 s4t4n Exp $ + + 09 Sep 2010; Michele Noberasco <s4t4n@gentoo.org>; wmlaptop-1.3.ebuild, + +files/wmlaptop-1.3-Makefile.patch: + Patched Makefile to make it at least decent. Closes bug #336547. 14 Jan 2009; Michele Noberasco <s4t4n@gentoo.org>; wmlaptop-1.3.ebuild: Prevent automatic stripping of binaries. Closes bug #252109. diff --git a/x11-plugins/wmlaptop/Manifest b/x11-plugins/wmlaptop/Manifest index eca10ccf1bb1..7274fdc1e25d 100644 --- a/x11-plugins/wmlaptop/Manifest +++ b/x11-plugins/wmlaptop/Manifest @@ -1,5 +1,6 @@ +AUX wmlaptop-1.3-Makefile.patch 738 RMD160 fde1950424ed143a21d50731079f9fba43ec41d8 SHA1 89e7958421ae60a4942aad0dddbe28b9df504a66 SHA256 dead8f9796030e67002d45c55ed8b2f9fba57871e6f01c2cbd81cb0d97451460 AUX wmlaptop.desktop 174 RMD160 0637e06c1769afa153761b05598227938f8b4b35 SHA1 27064295cc712a33924cb94a1626e64dd53ac1ad SHA256 854b3490e71c715439a3f05bf38ca8538391e944748c94e7e0b15cc3542bc726 DIST wmlaptop-1.3.tar.bz2 54575 RMD160 6c08a2dc4f2bb722028fad7ae8be24e4fb5409fd SHA1 01911e8e9b817e4595758cd83b229d1e04370627 SHA256 5ce0ad86ebbf1e8167d0e7eb020389393cf08bd3c849dba9fce383d95a55281f -EBUILD wmlaptop-1.3.ebuild 1067 RMD160 af00db0645d2f36e126abfb44a3c4e3e201bb278 SHA1 4379f944909a7e6af0b5354ca279322b29c25174 SHA256 0aa7696be96a883b5eadcdf7d19338c2cc0d1cbcffcd25e49d845bcfc3c9919b -MISC ChangeLog 1117 RMD160 17ece1ccde64c179a1cd679419a94096acf9d1e1 SHA1 cb60f99f473851458cec892b41c105362c5eb25c SHA256 59ee513cc23a6ba0fc86e3b1b151fc1abb2cb9317d3575178301841a085a443b +EBUILD wmlaptop-1.3.ebuild 985 RMD160 e9f29bfc3d9f5644a11856af25758d22e6708dc0 SHA1 af0d9fcd5ffb139399b0b5796fde7a75a45bf4d7 SHA256 a970fdcb72c4c9743ed600d9c326048fd4ca8c2bdff58a8e0a3553f27e10aa65 +MISC ChangeLog 1297 RMD160 9a87f9cadaa6098968eb1d0f222fa4f58aebdb4e SHA1 c452dcc12a9eb35ca4bfb77fd0fe19b1d1e241fb SHA256 148b873e637694e3628d1db93d903fe5ffbc3c67adccde1c7732bade2d30da7b MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b diff --git a/x11-plugins/wmlaptop/files/wmlaptop-1.3-Makefile.patch b/x11-plugins/wmlaptop/files/wmlaptop-1.3-Makefile.patch new file mode 100644 index 000000000000..ab1148ce117e --- /dev/null +++ b/x11-plugins/wmlaptop/files/wmlaptop-1.3-Makefile.patch @@ -0,0 +1,32 @@ +--- /Makefile 2010-09-09 13:44:07.000000000 +0200 ++++ /Makefile.new 2010-09-09 13:47:40.000000000 +0200 +@@ -1,14 +1,17 @@ +- ++LIBDIR = -L/usr/X11R6/lib ++LIBS = -lXpm -lXext -lX11 ++OBJS = main.o init.o event.o draw.o battery.o cpu.o autoscript.o pixmap.o ++EXE = wmlaptop + + + .c.o: +- $(CC) -c $< -o $*.o $(CFLAGS) ++ $(CC) $(CFLAGS) -c $< -o $*.o + + all: $(EXE) + + $(EXE): $(OBJS) + ./buildCounter +- $(CC) -o $(EXE) $^ $(LIBDIR) $(LIBS) ++ $(CC) $(LDFLAGS) -o $(EXE) $^ $(LIBDIR) $(LIBS) + + + clean: +@@ -20,7 +23,7 @@ + reall: clean all + + install: +- /usr/bin/install -c -o 0 -g 0 -s -m 755 $(EXE) $(INSTALLDIR)/$(EXE) ++ /usr/bin/install -c -o 0 -g 0 -m 755 $(EXE) $(INSTALLDIR)/$(EXE) + chmod +s $(INSTALLDIR)/$(EXE) + + uninstall: diff --git a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild index 97681240dfe3..977590a065e7 100644 --- a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild +++ b/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2009 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/wmlaptop/wmlaptop-1.3.ebuild,v 1.7 2009/01/14 15:54:35 s4t4n Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild,v 1.8 2010/09/09 09:54:32 s4t4n Exp $ + +inherit eutils IUSE="" -MY_P=${P} -S=${WORKDIR}/${MY_P} +MY_P="${P}" +S="${WORKDIR}/${MY_P}/src" DESCRIPTION="Dockapp for laptop users" SRC_URI="http://www.dockapps.org/download.php/id/474/${P}.tar.bz2" @@ -24,20 +26,20 @@ KEYWORDS="~amd64 ~ppc x86" src_unpack() { unpack ${A} + cd "${S}" - #Prevent automatic stripping of binaries. Closes bug #252109 - sed -i 's/install -c -o 0 -g 0 -s -m/install -c -o 0 -g 0 -m/' "${S}/src/Makefile" + epatch "${FILESDIR}"/${P}-Makefile.patch } src_compile() { - emake CFLAGS="${CFLAGS} -Wall" || die "Compilation failed" + emake || die "Compilation failed" } src_install() { dodir /usr/bin einstall INSTALLDIR="${D}/usr/bin" || die "Installation failed" - dodoc AUTHORS README README.IT THANKS + dodoc ../AUTHORS ../README ../README.IT ../THANKS insinto /usr/share/applications doins "${FILESDIR}/${PN}.desktop" |