Respect CFLAGS again by Diego Elio Pettenò (bug #430790). Make build verbose so we can actually see that happening.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 69 insertions, 11 deletions

diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index c6f7d5e124ef..3204283e45a8 100644
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/dmenu
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.91 2012/03/15 13:48:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.92 2012/08/10 16:04:10 jer Exp $
+
+*dmenu-4.5-r2 (10 Aug 2012)
+
+  10 Aug 2012; Jeroen Roovers <jer@gentoo.org> +dmenu-4.5-r2.ebuild:
+  Respect CFLAGS again by Diego Elio Pettenò (bug #430790). Make build verbose
+  so we can actually see that happening.
 
   15 Mar 2012; Jeroen Roovers <jer@gentoo.org> -dmenu-4.4.1.ebuild,
   -dmenu-4.4.1-r1.ebuild, -dmenu-4.5.ebuild:
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 52aace49c812..296c4efc0804 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX dmenu-4.5-xft.patch 12982 RMD160 0e2aece9b6b2d191d52ad672a29844976ea98e1c SHA1 3b42a228ae083994ba126c86f92be98bd48595ff SHA256 858bece229eab333f58071bd6cd9319763b627ef4adf1bdd3629106eca83e446
-DIST dmenu-4.5.tar.gz 11543 RMD160 b771a84e0e9a8fbb29317c07fa77f92b64dcdc2f SHA1 70c1a13b950b7b0cb1bc35e30c6e861a78359953 SHA256 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850
-EBUILD dmenu-4.5-r1.ebuild 1149 RMD160 415901612f434c38af4afc311911f9a98a197ebd SHA1 9b2f2e3bdd89859a90db74049cd6b956f1a6ee5b SHA256 24dd4dc176a88443ea8c310a798e48813fadc8d099d4db3f3725abd5890e5661
-MISC ChangeLog 10115 RMD160 f7c05a57e89ae3e7b10c13975962a3bf8a6565b9 SHA1 196ea91d058a7a62615a2efbf105ef4d4c094ba4 SHA256 9a47e58326e8e399edb96c1040233766ea61f531210c48b2d0099b4fd354a12c
-MISC metadata.xml 360 RMD160 a58f42638fe914cfdf4578b4c90b645bbc58bfaa SHA1 e279a68bca7e7b2e01b5deb24f9e1fe72bc67b66 SHA256 f838ec30d2eed02af25ed63fff86629ee6a7866ba0a2f2bd41a29390a04bc965
+AUX dmenu-4.5-xft.patch 12982 SHA256 858bece229eab333f58071bd6cd9319763b627ef4adf1bdd3629106eca83e446 SHA512 75a24538e040da601e51e5d434b696618fb8f48815d3c8ed7b2fa9d6dc0b3b9703ef6edc7e7a205874173e1d954d936d704b34b7290ec48cfc0da0aafe8daf0f WHIRLPOOL d19462ac11b52def2ce007d4d9a9d76741000a1adbe89164cc71cc2879bfcb6aa5583dbd115a117b222a48fc8fb840165cca9804f38fd09ef1d883906ef923e5
+DIST dmenu-4.5.tar.gz 11543 SHA256 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 SHA512 872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248 WHIRLPOOL b91660f3028d314f1a10b994af73e6239c4aaabda6c9ab269bda7e37e0cd22c0eaf3b93998c4cb0fe1f9d8f2fd198afc2e70c237a46921ece9fd9a697f58c869
+EBUILD dmenu-4.5-r1.ebuild 1149 SHA256 24dd4dc176a88443ea8c310a798e48813fadc8d099d4db3f3725abd5890e5661 SHA512 7b3a5b09f4e38b782e880f357ef42ff929dc5c8454e0acfd0d79b6457b49432dc8930efb0ccf2bbe8cd0db3079d93ef1fdd96cdebbdcf0a21aaa6f2c848882a2 WHIRLPOOL 8918a1ceb836014e3158108ff669469b7c6a57e1f49897477aa018978c5543a65885f84f356361db018356e4dad0a4c2a3ed23dbfb06b8ce2b3f7b94842a4a5e
+EBUILD dmenu-4.5-r2.ebuild 1249 SHA256 4509b65efe827f4637a7f75b1adf32a9926408495eb2b7b7e1641f92e136c998 SHA512 8c5a3182ff6135fb12c777c5816330a92d5aae199d0cceadb805c883b6d9810eae21761395a3aad17e7e2e609c7c8dfd2d8ec6f9f3497738193ed693ef4f3240 WHIRLPOOL ee4ad0715d14db5d5ad4b9885b3524f7ed62a3c10c8d85a01ae1cb4a03d48cb56a37f5b6ff8ea3d73f3c50fad4ef58f25ab998f9b4beb2f8b770ab386ee2962d
+MISC ChangeLog 10335 SHA256 24a365f02ee8de04da7526896e00adfb6ec13447379889eacade73b5c8e60ae2 SHA512 9ffc753fc643e4397a2e32bcfb9acd7f60dd54bf3b83493ad7f202e749ca8561b9a8b925d6daa344263a0ae950b55cf1daf35a64fc356c9a7a6ed34183f8d261 WHIRLPOOL 92971080a087ba3060b8fc8668adea411d15d1fb6baffc6001330d984508eb1a893b30f285abf229417db559b8b031b5cd5844927538eeb34b94b39bf14b9542
+MISC metadata.xml 360 SHA256 f838ec30d2eed02af25ed63fff86629ee6a7866ba0a2f2bd41a29390a04bc965 SHA512 a66f33531cc6bd25f5135221824781f491d02ef285e91a36b33a5fdfaddf565a54531843b627e6dc00e0bef0965c930ab33161fdb7bed90a6d4c931b93510fc2 WHIRLPOOL 2ac7903f003c99e100bf22358dcee4f87b67dbb07e1226d07ffb766cee714b540fc87d02772a0113890d8c43092befe175410fa2650cab59029efcd7720bf8c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9h8xgACgkQVWmRsqeSphOY3wCeOjKh4jDS3WfHG5WhJg4rG8J2
-i2YAn2SKMrJqL++Xj2nHfVLZYSPvQApE
-=D2wM
+iEYEAREIAAYFAlAlMQAACgkQVWmRsqeSphNyuQCcDaZ/Ikr3GqbuIbQsoqjFZ+Vs
+KbMAn0UxeINsf46mHyeReChoMRdidXta
+=9GYG
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/dmenu/dmenu-4.5-r2.ebuild b/x11-misc/dmenu/dmenu-4.5-r2.ebuild
new file mode 100644
index 000000000000..b05c8274bc43
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.5-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-4.5-r2.ebuild,v 1.1 2012/08/10 16:04:10 jer Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="http://tools.suckless.org/dmenu/"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="xft xinerama"
+
+DEPEND="
+	x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Respect our flags
+	sed -i \
+		-e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall ${INCS} ${CPPFLAGS}|}' \
+		-e 's|LDFLAGS  = -s|LDFLAGS  +=|' \
+		-e 's|XINERAMALIBS  =|XINERAMALIBS  ?=|' \
+		-e 's|XINERAMAFLAGS =|XINERAMAFLAGS ?=|' \
+		config.mk || die
+	# Make make verbose
+	sed -i \
+		-e 's|^	@|	|g' \
+		-e '/^	echo/d' \
+		Makefile || die
+	use xft && epatch "${FILESDIR}"/${PN}-4.5-xft.patch
+}
+
+src_compile() {
+	if use xinerama; then
+		emake CC=$(tc-getCC)
+	else
+		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS=""
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+}