[gentoo-commits] proj/x11:master commit in: x11-apps/mesa-progs/

["Michał Górny" <mgorny@gentoo.org>]

commit:     0f1a15ea72103b2f33f91040cd00f852c41ab395
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 07:51:55 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 07:52:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0f1a15ea

x11-apps/mesa-progs: Bump to git-2, use pkg-config.

(Portage version: 2.2.0_alpha55_p39/git/Linux x86_64, signed Manifest commit with key 42B9401D)

---
 x11-apps/mesa-progs/mesa-progs-9999.ebuild |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 993b32b..551e45d 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -6,8 +6,9 @@ EAPI=4
 
 MY_PN=${PN/progs/demos}
 MY_P=${MY_PN}-${PV}
-EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//}"
-[[ ${PV} = 9999* ]] && GIT_ECLASS="git"
+EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//}
+	http://anongit.freedesktop.org/${MY_PN/-//}"
+[[ ${PV} = 9999* ]] && GIT_ECLASS="git-2"
 inherit toolchain-funcs ${GIT_ECLASS}
 
 DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
@@ -20,7 +21,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE=""
 
 RDEPEND="virtual/opengl"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
@@ -31,8 +33,11 @@ src_configure() {
 }
 
 src_compile() {
+	local pkgs='gl x11'
 	tc-export CC
-	emake CPPFLAGS='-Isrc/util' LDLIBS='-lX11 -lGL -lm' src/xdemos/{glxgears,glxinfo}
+	emake \
+		CPPFLAGS="$(pkg-config --cflags ${pkgs}) -Isrc/util" \
+		LDLIBS="$(pkg-config --libs ${pkgs}) -lm" src/xdemos/{glxgears,glxinfo}
 }
 
 src_install() {