Respect user flags wrt bug 237698, do not pre-strip files wrt bug 252118

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 65 insertions, 17 deletions

diff --git a/x11-wm/aewm/ChangeLog b/x11-wm/aewm/ChangeLog
index 4e5032c229b5..eb2ac1baba12 100644
--- a/x11-wm/aewm/ChangeLog
+++ b/x11-wm/aewm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/aewm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/ChangeLog,v 1.24 2010/01/17 16:16:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/ChangeLog,v 1.25 2010/05/27 16:51:03 xarthisius Exp $
+
+  27 May 2010; Kacper Kowalik <xarthisius@gentoo.org> aewm-1.2.7.ebuild,
+  +files/aewm-1.2.7-ldflags.patch:
+  Respect user flags wrt bug 237698, do not pre-strip files wrt bug 252118.
+  Thanks Diego for reporting.
 
   17 Jan 2010; Ulrich Mueller <ulm@gentoo.org> aewm-1.2.7.ebuild:
   Change LICENSE, "aewm" is the same as "MIT 9wm".
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 51c139048339..d887c210b9a4 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX aewm-1.2.7-ldflags.patch 917 RMD160 9d16ca29f6e2eb638fabcbd5a7aae0e99177bc13 SHA1 735dfb86056b30fd9c11ba993494402dbf44d72c SHA256 43aa1cd52d2139eb02e2937176170c08666657f364ddb29076d38b5e42c5512f
 DIST aewm-1.2.7.tar.gz 41728 RMD160 d32bbce64c956d7d7256d1cc8d7bbf5ecbcfffba SHA1 9ed84856a3d11a38fb45a14fd2655f41e7f83320 SHA256 d18c329228dd7f4d2b3cea5696c56c995dd1d0108d56e749426a9f27b8773373
-EBUILD aewm-1.2.7.ebuild 1154 RMD160 a13738174d51b304caa3c64455046ff02c168e3c SHA1 6028d7304720a4985fd696d82d9a8c6f7b7b25ae SHA256 af3af4cd93f1eb76f65857b8d73ee8fa06032eb6f634fa79bfe7b9df212d6683
-MISC ChangeLog 2680 RMD160 e7b944266dfa0d6e371a4b4050879386c2a91703 SHA1 4c9d980527ea249cf8742700497cf0794e89cad6 SHA256 be18dfd2654ba1e79d1f53093936c07c830a84d3f2fc7643fe33fb150f7ec000
+EBUILD aewm-1.2.7.ebuild 1468 RMD160 62c60c13224b23308bff5dae8d75e50cf06a9922 SHA1 f7563974f60be851243f50180df5c6e2f63ef24c SHA256 ab238e0b13f1e00526c14658f67dbaf669c7e520074b6bc4f1862bf31eb838c3
+MISC ChangeLog 2902 RMD160 fc036364c4d7f144c9e2bedab693d92aeb0664aa SHA1 d349d328b42cbb8fc7c3442ec3e9d084c1dde6d6 SHA256 a5d3d4db111040d1c9bffe136eaa3d52680c58449797a9f6ec549be50ac3d8fd
 MISC metadata.xml 515 RMD160 81c0c4882302de8a7ffe35ae1043d78c067d5378 SHA1 031bccba2e26389d090a168527882dad5c646f68 SHA256 0ad1e0d3e4b254897ec3ce2d35e4129dce60b8e928ef487ea64c0fefc54e31fc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAktTOKEACgkQOeoy/oIi7uyoiwCfQGCZaubxS6EBthiPKjq8wrLS
-KOMAoNr+2saTS7fcI4vwaET13mycm3sy
-=Bphn
------END PGP SIGNATURE-----
diff --git a/x11-wm/aewm/aewm-1.2.7.ebuild b/x11-wm/aewm/aewm-1.2.7.ebuild
index 128d7035fb28..b9d6c8bff16d 100644
--- a/x11-wm/aewm/aewm-1.2.7.ebuild
+++ b/x11-wm/aewm/aewm-1.2.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/aewm-1.2.7.ebuild,v 1.9 2010/01/17 16:16:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/aewm-1.2.7.ebuild,v 1.10 2010/05/27 16:51:03 xarthisius Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A minimalistic X11 window manager."
 HOMEPAGE="http://www.red-bean.com/~decklin/software/aewm/"
@@ -36,11 +38,23 @@ src_unpack() {
 	sed -i \
 		-e 's/lucidasans-10/-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*/' \
 		src/aewmrc.sample || die "sed failed"
+
+	# QA:  Remove stripping
+	sed -i \
+		-e 's/install -s/install /' \
+		{src,clients}/Makefile || die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
 }
 
 src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
+	dodir /usr/bin || die
+	dodir /usr/share/man/man1 || die
 
 	emake \
 		DESTDIR="${D}" \
@@ -48,5 +62,5 @@ src_install() {
 		XROOT="/usr" \
 		install || die "emake install failed"
 
-	dodoc DESIGN NEWS README TODO
+	dodoc DESIGN NEWS README TODO || die
 }
diff --git a/x11-wm/aewm/files/aewm-1.2.7-ldflags.patch b/x11-wm/aewm/files/aewm-1.2.7-ldflags.patch
new file mode 100644
index 000000000000..e10808f00acb
--- /dev/null
+++ b/x11-wm/aewm/files/aewm-1.2.7-ldflags.patch
@@ -0,0 +1,38 @@
+Respect user LDFLAGS
+
+http://bugs.gentoo.org/show_bug.cgi?id=237698
+
+--- src/Makefile
++++ src/Makefile
+@@ -49,7 +49,7 @@
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@
+ 
+ $(OBJS): %.o: %.c $(HEADERS)
+ 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
+--- clients/Makefile
++++ clients/Makefile
+@@ -48,16 +48,16 @@
+ set-gnome-pda: $(MYLIBDIR)/panel.o $(AELIBDIR)/gnome-pda.o
+ 
+ $(GTKPROGS): %: %.o
+-	$(CC) $^ $(GTKLIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(GTKLIBS) -o $@
+ 
+ $(XAWPROGS): %: %.o
+-	$(CC) $^ $(XAWLIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(XAWLIBS) -o $@
+ 
+ $(X11PROGS): %: %.o
+-	$(CC) $^ $(X11LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(X11LIBS) -o $@
+ 
+ $(ETCPROGS): %: %.o
+-	$(CC) $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ # --------------------------------------------------------------------
+