From ed6b181cd87b02391acb2daba3ee3e71d6e04389 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 17 Mar 2010 14:32:02 +0000 Subject: [PATCH] Migrate to xorg-2 eclass. Move to eapi3. Work with eselect-opengl properly. Package-Manager: portage-2.2_rc65/cvs/Linux x86_64 --- x11-apps/xdriinfo/ChangeLog | 7 ++++++- x11-apps/xdriinfo/Manifest | 14 ++++++++++++-- x11-apps/xdriinfo/xdriinfo-1.0.3.ebuild | 21 ++++++++++++++------- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/x11-apps/xdriinfo/ChangeLog b/x11-apps/xdriinfo/ChangeLog index 0841f2d1a5aa..8b3229ea30ad 100644 --- a/x11-apps/xdriinfo/ChangeLog +++ b/x11-apps/xdriinfo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-apps/xdriinfo # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.46 2010/01/23 18:52:33 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.47 2010/03/17 14:32:02 scarabeus Exp $ + + 17 Mar 2010; Tomáš Chvátal + xdriinfo-1.0.3.ebuild: + Migrate to xorg-2 eclass. Move to eapi3. Work with eselect-opengl + properly. 23 Jan 2010; Tomáš Chvátal -xdriinfo-1.0.2.ebuild: diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest index 04c96504c136..104271c9faf1 100644 --- a/x11-apps/xdriinfo/Manifest +++ b/x11-apps/xdriinfo/Manifest @@ -1,4 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST xdriinfo-1.0.3.tar.bz2 97688 RMD160 29dc363bd2a2456fcc89b9146be6363db6974a66 SHA1 d211d6f12f4c801d2f4cf184c6daae37aa5858ff SHA256 2b762afd08c798d79fd6dacfd6280da39105927fa2bd91e3b1ba75b8cddc259c -EBUILD xdriinfo-1.0.3.ebuild 719 RMD160 b850f9fc4c01a942dd0cbb285346fc2a9ee47c8d SHA1 bb886489e70d2c6efe74ce415f7a1d664a59c9da SHA256 a3de92a7d56ee8ed0431b841b30a7bbb81e78f256376e2e71ba21d38cc55e92d -MISC ChangeLog 5736 RMD160 9cbe666faed1795fc351f1d9df2c269b14293e17 SHA1 b6b50778dd367d858c1fa49a9eb8e48c47a20917 SHA256 7d6e24ceb851bec134210903245446b78086de0a7c42710def7246f26fea8585 +EBUILD xdriinfo-1.0.3.ebuild 889 RMD160 83fb5f6476db07c92050f6485fb7fe0d663c37ff SHA1 82d439eda4d45112850d68f90fb0c818abc5d800 SHA256 02cb7789b5a931ced189c5423ae4408d0494acb2db0fed7d51a673b2b296d040 +MISC ChangeLog 5897 RMD160 c35ad07276061f7c4e3558ce054d6bac0326c34a SHA1 12d2eee5261d40f8c445109c726b66eaf5a3e819 SHA256 be6bdf702bd0888c44e44a4ba3433aa63bc75ea121692785dd6e6368524b7563 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkug58cACgkQHB6c3gNBRYdYnACgt5T+BVKO14USS23gRVbnuV4U +0qwAoI/g8o46zjw4ouDPBjKLth0xXumy +=gLiB +-----END PGP SIGNATURE----- diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.3.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.3.ebuild index 0ab9ede9af4c..68df1351291b 100644 --- a/x11-apps/xdriinfo/xdriinfo-1.0.3.ebuild +++ b/x11-apps/xdriinfo/xdriinfo-1.0.3.ebuild @@ -1,8 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/xdriinfo-1.0.3.ebuild,v 1.9 2010/01/18 19:10:52 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/xdriinfo-1.0.3.ebuild,v 1.10 2010/03/17 14:32:02 scarabeus Exp $ -inherit x-modular +EAPI=3 + +XORG_STATIC="no" +inherit xorg-2 DESCRIPTION="query configuration information of DRI drivers" @@ -16,13 +19,17 @@ DEPEND="${RDEPEND} x11-proto/glproto" pkg_setup() { - # Bug #138920 - ewarn "Forcing on xorg-x11 for header sanity..." OLD_IMPLEM="$(eselect opengl show)" - eselect opengl set --impl-headers xorg-x11 + + if [[ ${OLD_IMPLEM} != xorg-x11 ]]; then + # Bug #138920 + ewarn "Forcing on xorg-x11 for header sanity..." + einfo "If compilation fails run:" + einfo "# eselect opengl set ${OLD_IMPLEM}" + eselect opengl set xorg-x11 + fi } pkg_postinst() { - echo - eselect opengl set ${OLD_IMPLEM} + [[ ${OLD_IMPLEM} != xorg-x11 ]] && eselect opengl set ${OLD_IMPLEM} } -- 2.26.2