diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-06-30 13:53:59 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-06-30 13:53:59 +0000 |
| commit | 1c58843937a59f7dda8b1ca8ffc5272fd4acd3f8 (patch) | |
| tree | 3dac9ef9039d507144c133ed20f9007c39216877 /x11-misc | |
| parent | Add fix for mips dynlink, upstream commit 2d8cc92a (diff) | |
| download | historical-1c58843937a59f7dda8b1ca8ffc5272fd4acd3f8.tar.gz historical-1c58843937a59f7dda8b1ca8ffc5272fd4acd3f8.tar.bz2 historical-1c58843937a59f7dda8b1ca8ffc5272fd4acd3f8.zip | |
Remove USE=xft.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/dmenu/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-misc/dmenu/Manifest | 10 | ||||
| -rw-r--r-- | x11-misc/dmenu/dmenu-9999.ebuild | 21 |
3 files changed, 21 insertions, 15 deletions
diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog index c4fb31e98514..8632a83a8b9f 100644 --- a/x11-misc/dmenu/ChangeLog +++ b/x11-misc/dmenu/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-misc/dmenu # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.112 2014/06/30 13:31:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.113 2014/06/30 13:53:58 jer Exp $ + + 30 Jun 2014; Jeroen Roovers <jer@gentoo.org> dmenu-9999.ebuild: + Remove USE=xft. *dmenu-9999 (30 Jun 2014) diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest index 141c9d84abe2..d98351da2db3 100644 --- a/x11-misc/dmenu/Manifest +++ b/x11-misc/dmenu/Manifest @@ -6,13 +6,13 @@ AUX dmenu-4.5-xft-3.patch 11564 SHA256 8a32e9a433dcd71480df349e33f7f4935d80f0809 DIST dmenu-4.5.tar.gz 11543 SHA256 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 SHA512 872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248 WHIRLPOOL b91660f3028d314f1a10b994af73e6239c4aaabda6c9ab269bda7e37e0cd22c0eaf3b93998c4cb0fe1f9d8f2fd198afc2e70c237a46921ece9fd9a697f58c869 EBUILD dmenu-4.5-r3.ebuild 1479 SHA256 f4cac368326c302772179a9d636c06e966005243d8aad596eeb07a1cdf8c2dfa SHA512 fe4d804236dfdf976ff349d90a884f355ea99c133cc4907cf5db7fa07f9a51fa6a99f4c63b8ba65380c96b318547fa4b423dd90e4b8593dddfba5500002a1526 WHIRLPOOL 8fe35131619b1f823cc2a0beb1b03a8a1c6f246d62de4c9d0ab6bc9c4ed60f1e2bebf2e90691622765c1b2b9c1a0ea520f25c0548733213fe79734f9d3e1c2d0 EBUILD dmenu-4.5-r4.ebuild 1484 SHA256 50406d18a4d7997607c4149af3756df4155c5ba676196f558168840b70f31fb6 SHA512 d164e3b5739809dbde17cda5a9a558c81e95caf23be6c51013936f98ca66b193d85dbffc8d396d6970e4604cf100ceb0663131468b650a25fe78a5d2e8037593 WHIRLPOOL 9ea33bac4397bbbbe2766d970b0968286263affb95c454997dca5a3f9a3a710c0674b5a511a1edd6d6a9d76d1c0ef66a417a6f6564286f4e6142628e8a8117db -EBUILD dmenu-9999.ebuild 1457 SHA256 287d09331bb6ac862d1bb7160143c4cecce664233de71a9164337ae8110f502e SHA512 11d849b296669087e0919df887c06d7196750f31fe4d5c5b258dd7af035fb838d594034eebd40f9d2ec88b8b50695954526355ff5067f0fc1186591071e474d6 WHIRLPOOL 7ad62ffdb84d80ead35479f079698bf5eab95462105a8d3bcd47951cab472d79a61ab898dc30d0c3a960a4f3c198db52319e8c34521157a7e05c800c066e00af -MISC ChangeLog 12761 SHA256 156f2ec2ca6dad90cc0f408c8b9e93e6bdbeb7a05a5ee29fe31c5015c653e9bd SHA512 98d9b5fb4fb8a5361ddb8bb2c134f747068a74f60ccc9fe69feb0e9a25fee200d6e80fb5be9d6f0ad15b2d40c8685eb96034da3572261e5683cff97e8c52435e WHIRLPOOL ca9c98163ca3ddebda5bb7d252630c5c02c41a1324c3365bf1888095203d7e985a4a4365b1e5da50e0252bcd5e7cd456832f23545973410e9f58ae97a8bc800d +EBUILD dmenu-9999.ebuild 1317 SHA256 cffd821e265d1682993c2e36152e75138c42258384026671d71129a73609a8d0 SHA512 e3893930f3e5ae9ea5298611123eef06bc196b009c6e1eb1863b2cafd291a582276bd27b45c5ac6d1826c8c34d9683cb6970e38b4db4164467130e676909783a WHIRLPOOL 0cb72182562c484b360808df4b3c12a5d5981f2cea95c2cf0401f3dd64439a89303437e451537fd7fdf3269e968f44f66abefa8ef51c741203ecc76bf05f6420 +MISC ChangeLog 12846 SHA256 589a246ea7e73bbe10b5351404966d6a0eab4d8d252efc7102ef0b8549fe36d8 SHA512 837f61b7a2c39aaced2178ae733738305f50d0fd4a3a5f09b056d2a2d0e8f9af0fceaf9f7387cf3bd3adaee85f8942fdbc59b6b31039c65b6c0341761a6c8a61 WHIRLPOOL 4df426814e80259c1b25e53581479f0cb73ae2d48f8a1f7c3fc00aaec83613c3ebd3fb3142597b62d4db5b4d1613860792bb8223c753a4c70e896c6206ec860d MISC metadata.xml 328 SHA256 849994be8ceade2d17e28f22db54a0c2732509f7be7741ddcfad2c2c80bb09dc SHA512 7dfeba848d22dc9f4953acbaefdfffea99cb5eaf11f8c397d8ee4a14fb31454652f9eb48b126e55c7d50cb030ebf42e802a85948401b67130408ff85d5ea2ae7 WHIRLPOOL a8b014b6d17c4f5588bf66edd90234de8990eb1c896f92e6882a82919f2f7996ef45989c2cac75bd08961d5a48a9343f38447faa396aec2408a55251deb8c01b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlOxZqQACgkQVWmRsqeSphPeTQCfedcli+ZizdVUxjb5txRGtXZF -zpEAnAj47c6WY+gAxN2Lsn7kN7ri2THG -=8GEI +iEYEAREIAAYFAlOxa/cACgkQVWmRsqeSphNx8QCfWcJGgg1mJCNqN84f5EePa5PR +F2IAniDSRKmY2lqtIZ4TLSU/AI422S22 +=SgZO -----END PGP SIGNATURE----- diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild index 3604ede5dfbb..408037adae4d 100644 --- a/x11-misc/dmenu/dmenu-9999.ebuild +++ b/x11-misc/dmenu/dmenu-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild,v 1.1 2014/06/30 13:31:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild,v 1.2 2014/06/30 13:53:58 jer Exp $ EAPI=5 inherit eutils git-r3 savedconfig toolchain-funcs @@ -12,15 +12,13 @@ EGIT_REPO_URI="git://git.suckless.org/dmenu" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="xft xinerama" +IUSE="xinerama" RDEPEND=" x11-libs/libX11 - xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) " DEPEND="${RDEPEND} - xft? ( virtual/pkgconfig ) xinerama? ( virtual/pkgconfig ) " @@ -40,17 +38,22 @@ src_prepare() { epatch_user } +src_configure() { + tc-export PKG_CONFIG +} + src_compile() { - emake CC=$(tc-getCC) \ - "XFTINC=$( $(tc-getPKG_CONFIG) --cflags xft 2>/dev/null )" \ - "XFTLIBS=$( $(tc-getPKG_CONFIG) --libs xft 2>/dev/null )" \ + emake \ + CC=$(tc-getCC) \ "XINERAMAFLAGS=$( usex xinerama "-DXINERAMA $( - $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null + ${PKG_CONFIG} --cflags xinerama 2>/dev/null )" '' )" \ "XINERAMALIBS=$( - usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' + usex xinerama "$( + ${PKG_CONFIG} --libs xinerama 2>/dev/null + )" '' )" } |