incorporate changes in Makefile by chneukirchen

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

diff --git a/x11-wm/cwm/ChangeLog b/x11-wm/cwm/ChangeLog
index b412c5576b238ca5152d111b3a52c1ef3fd80bbe..1f919c16bbb9f029fdb43f71480d598058b33d8c 100644 (file)
--- a/x11-wm/cwm/ChangeLog
+++ b/x11-wm/cwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/cwm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.26 2011/10/06 00:00:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/ChangeLog,v 1.27 2011/10/06 00:20:06 xmw Exp $
+
+  06 Oct 2011; Michael Weber <xmw@gentoo.org> cwm-99999999.ebuild:
+  incorporate changes in Makefile by chneukirchen
 
 *cwm-20110913-r1 (05 Oct 2011)
 *cwm-20110908-r1 (05 Oct 2011)

diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 4e64926fff8e375f7233b3ba8176a92171bf1933..8f08649ab49a06b6ab391f1845ffb04efebc1c1e 100644 (file)
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -12,13 +12,13 @@ EBUILD cwm-20110515.ebuild 859 RMD160 8e8898664f34dcf1e54191f7d4b4429c826ce9a2 S
 EBUILD cwm-20110726.ebuild 820 RMD160 3ffc17af6811c18b37fb8ae9b3b9d6fe36ccc564 SHA1 bab1ec91c11c99465258d3ab6defd8c00e1ddc39 SHA256 e92a6528d28abaef549f5f9981917b19d055cc01286566dc21bd99dad48a856d
 EBUILD cwm-20110908-r1.ebuild 867 RMD160 5bdb1290b1c7112e7b2b0f4f86bfae835acbae13 SHA1 ec6bc3e30a036dfed80b408790f9f7caee819b0a SHA256 967310fe01dcc110521501df6d62f09e84f9da782453a3e4229803b8fd32f01d
 EBUILD cwm-20110913-r1.ebuild 867 RMD160 02677583bde80fb1233217fad8d919c9d0e2bcfd SHA1 44c644497fff459060bc90bbba7f3ca5638ef612 SHA256 c812fedd5e8fb1ea51e37e43db6496b25964af24bf40dcf977fe46e33f180ec1
-EBUILD cwm-99999999.ebuild 933 RMD160 607745f69854d68625238dae38509ff349ec06b6 SHA1 0dc371e29d3ced06a35119a51b21531da24eca6e SHA256 205cd6d895bb92a6dc6a2e56cf62708aa41de718128664b0249dd60f24883de0
-MISC ChangeLog 3585 RMD160 c0440d616c0564cdbac1cdc9ab0b5fde69fa5460 SHA1 a13626f31189dfeeb47b4103542a3d4eb1092b31 SHA256 17100663b85576219e0b6be1225e494a33ab9765ab84ed7523aab1ed15394a61
+EBUILD cwm-99999999.ebuild 882 RMD160 452f274a67845bc24063638f940a8cfd9d3e0d16 SHA1 a787aa059712cde95f278bd200c71286dd85151e SHA256 86a2b1377537be32b7deb7eddf9e8ccd74e6cf3d11c5a9e5c56281c16bc2a65e
+MISC ChangeLog 3703 RMD160 56d89e9dc6b55e54c140349ca0b7e1b38ba6f0a3 SHA1 d908cdbe9fcd6c4e6b8b39d153633a9e7f6b236c SHA256 dd9a6960a2d1257d0ac17d1c99eb9f6f94c6c11569859c760da14b67adbe6827
 MISC metadata.xml 223 RMD160 ece0d9320b4ad1fdb29d1dec4f85e84ffda0d863 SHA1 325a16f4c96d533e8642c26ab395b06ab42f51b5 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6M78wACgkQknrdDGLu8JAHzwD/YTuJtgB5TE+IIdmN/z1cJ0Qb
-/Q5qcbMVN6bpcd0NvEoA/3TJ3Fsuwv/s7cpAXCJisoXvyh7TKAppYG8TwosGt98Z
-=tp6J
+iF4EAREIAAYFAk6M9DwACgkQknrdDGLu8JBTIgD/aIWsoP92uEVz4QDhgZdkp1+L
+d/NU7jjRZgYhiR/L8o8A/iY0zwISRd7bsJJKJvhew+MEfbVGX8adYy5FYcXWWSRH
+=+JAe
 -----END PGP SIGNATURE-----

diff --git a/x11-wm/cwm/cwm-99999999.ebuild b/x11-wm/cwm/cwm-99999999.ebuild
index 1eb6632ece0cec13c9f97660eec1537423a84938..2abe78d5fdceab037d32fac8d734310506cc35c0 100644 (file)
--- a/x11-wm/cwm/cwm-99999999.ebuild
+++ b/x11-wm/cwm/cwm-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-99999999.ebuild,v 1.4 2011/09/11 22:06:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/cwm/cwm-99999999.ebuild,v 1.5 2011/10/06 00:20:06 xmw Exp $
 
 EAPI=2
 
@@ -26,14 +26,12 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig
        sys-devel/bison"
 
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-20110726-Makefile.patch
-       export LDADD="${LDFLAGS}"
-       tc-export CC
+src_compile() {
+       emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
-       insinto /usr/share/applications
-       doins "${FILESDIR}"/${PN}.desktop || die
+       emake DESTDIR="${D}" PREFIX=/usr install || die
+       dodoc README || die
+       make_session_desktop ${PN} ${PN}
 }