jer 14/06/30 13:53:58 Modified: dmenu-9999.ebuild ChangeLog Log: Remove USE=xft. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 x11-misc/dmenu/dmenu-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild?r1=1.1&r2=1.2 Index: dmenu-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dmenu-9999.ebuild 30 Jun 2014 13:31:15 -0000 1.1 +++ dmenu-9999.ebuild 30 Jun 2014 13:53:58 -0000 1.2 @@ -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 @@ 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 @@ 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 + )" '' )" } 1.113 x11-misc/dmenu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/ChangeLog?rev=1.113&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/ChangeLog?rev=1.113&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/ChangeLog?r1=1.112&r2=1.113 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- ChangeLog 30 Jun 2014 13:31:15 -0000 1.112 +++ ChangeLog 30 Jun 2014 13:53:58 -0000 1.113 @@ -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 <[email protected]> dmenu-9999.ebuild: + Remove USE=xft. *dmenu-9999 (30 Jun 2014)
