Use cross-toolchain pkgconfig.

Package-Manager: portage-2.2.0_alpha176/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 70 insertions, 5 deletions

diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index 0d9c7b614c79..4e1d02b99f21 100644
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/dmenu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.99 2013/05/03 13:47:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.100 2013/05/20 19:47:01 jer Exp $
+
+*dmenu-4.5-r3 (20 May 2013)
+
+  20 May 2013; Jeroen Roovers <jer@gentoo.org> +dmenu-4.5-r3.ebuild:
+  Use cross-toolchain pkgconfig.
 
   03 May 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Add myself as maintainer.
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 39ce47cb76ba..2d258382da36 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -4,12 +4,13 @@ Hash: SHA256
 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-r2.ebuild 1258 SHA256 c929f072e5f16b8504873747de2b2f81013f1904e8a3acb0e336a6d27b6dbd07 SHA512 d06dc40791b3530937da6a6b4e6c3f24672fffa641288e13cda7ca98ea786ec4c2991cbe32c96fe0b750fe0811aa5f163182a56ba53476acb57d96619f286479 WHIRLPOOL b66ec2f57caea0367033231940262a870fd35e00508a2691a000398babc3476d4b6bddb11afc728460fd82307448c3c34148b6b9ebe2920e148c60d61826cf22
-MISC ChangeLog 11088 SHA256 00a3ee1f7764990ec975b4ac86fd92e6df8ba02eb4354c9271998b6467134c1d SHA512 8360de89e814a450abb46fce77063dba632bbc731a1b7b7469cfc9ed7237236152af65d001229707aa4d4820456b9edd475b8ae9a1d0570d48b8fc5fd8a068ba WHIRLPOOL f202e6e116b656665005634fed7cbf5e8a7bca93e95aaeca87f574cac649430fc7841ae532545d982beb498bd77f20e0eeda7034929d5f754e36b02e3ca48fba
+EBUILD dmenu-4.5-r3.ebuild 1472 SHA256 58ab68fc571b7ce9895bea9538ae4b7adb04cb49643fbe0e93289f7e668c768a SHA512 a2cf7e8cfb848a19b486ae03d7f86cb2f1517f2fccd440a22fbc5d631001dceafbf08a26ba1ad437181177327e86930f4dcc79d781dc9b84fea40861b86a421d WHIRLPOOL 229144e380738b512278d6eb9575188200210d4df69ca535eb03d61cdbd3e1f9876daaed8905ec7e568d8e7436eff38f954b2ac44e24f737b9472518b47826cb
+MISC ChangeLog 11221 SHA256 7b961e61863983b6311c5a766185eb1dc232cb25a5284b56ed89690d4ca569ea SHA512 a9461d9055f4ff86e31b2475dd458aed6b3420c9b4d07d4e1e5e3cf44a89bd8cbc5eea3e43f070440a372013fdc0877e391454d533571f6cbbd2ef62a3008baf WHIRLPOOL 18686558679a3a92d5e5cc09f683b66439f3047ac6ddca36a6e59e6fd13ac4d91fb9e11234aa383c19fdfc5e656fd1cd71e763e86ddeca9163e041c1b11f20fd
 MISC metadata.xml 419 SHA256 cfdd16257ce31f12950af301a8938acd161fc41911272019f3ca671dcea02eaa SHA512 bc55bd23f992945125999acda0ca5de3faba1450bb1c101920c78363a71f5578833e6777a1441adb6aa0c6ecaef32a7ac94fd86641f591278d0134e4f18034de WHIRLPOOL 28b5621de931057e19afee0b3220f3a5dbbdfe6f109aaa9269a06098ec732b476dd6319e1f12003199eaa33d5a949c540ef27490d3eadaec9dfc2d24c5670eac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGDv/MACgkQVWmRsqeSphMBCgCffci1tpgx3guzFAmsFfhP1A9w
-QxsAnR6kU/ha2bap3VQFWi+3pHULlcO9
-=nk4f
+iEYEAREIAAYFAlGafbcACgkQVWmRsqeSphOO5QCeMAalxHxv8NuB0UPOymwlEXhs
+wwsAn2kmCaDI/3OPL3z/4QyebA2v8ZTP
+=WCBw
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/dmenu/dmenu-4.5-r3.ebuild b/x11-misc/dmenu/dmenu-4.5-r3.ebuild
new file mode 100644
index 000000000000..82227c5fc130
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.5-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-4.5-r3.ebuild,v 1.1 2013/05/20 19:47:01 jer Exp $
+
+EAPI=5
+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"
+
+RDEPEND="
+	x11-libs/libX11
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	xft? ( virtual/pkgconfig )
+	xinerama? ( virtual/pkgconfig )
+"
+
+src_prepare() {
+	# Respect our flags
+	sed -i \
+		-e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)|}' \
+		-e '/^LDFLAGS/s|= -s|+=|' \
+		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
+
+	epatch_user
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) \
+		XFTINC=$( $(tc-getPKG_CONFIG) --cflags xft 2>/dev/null ) \
+		XFTLIBS=$( $(tc-getPKG_CONFIG) --libs xft 2>/dev/null ) \
+		XINERAMAFLAGS=$(
+			usex xinerama "-DXINERAMA $(
+				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+			)" ''
+		) \
+		XINERAMALIBS=$(
+			usex xinerama $( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null) ''
+		)
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+}