Moved G2CONF into the global scope.

(Portage version: 2.2_rc33/svn/Linux x86_64)

svn path=/sunrise/; revision=8645

diff --git a/x11-wm/cairo-compmgr/ChangeLog b/x11-wm/cairo-compmgr/ChangeLog
index cbef92395c6798a8e3a6760536751c020980054f..add24be24a7077e2d80dd7ec2e6ace7a549af5ab 100644 (file)
--- a/x11-wm/cairo-compmgr/ChangeLog
+++ b/x11-wm/cairo-compmgr/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jun 2009; Christian Ruppert <idl0r@gentoo.org>
+  cairo-compmgr-0.2.93.ebuild:
+  Moved G2CONF into the global scope.
+
   08 Jun 2009; Ian Stakenvicius (_AxS_) <ian@aerobiology.ca>
   +cairo-compmgr-0.2.93.ebuild,
   +files/cairo-compmgr-0.2.93-glitz-code.patch,

diff --git a/x11-wm/cairo-compmgr/Manifest b/x11-wm/cairo-compmgr/Manifest
index 914b37332f1b75d4fb425bf172dec75c2b6e19c2..4e38ca85fac9481f1658ca521b3907a19ebbca3e 100644 (file)
--- a/x11-wm/cairo-compmgr/Manifest
+++ b/x11-wm/cairo-compmgr/Manifest
@@ -1,6 +1,6 @@
 AUX cairo-compmgr-0.2.93-glitz-code.patch 1132 RMD160 f9c12302bb56c10f4700b89a53fac1eb12868638 SHA1 74344a64d8df56bb22539a3376a4ac0867d8fa2a SHA256 84419ebab9f672089cfa205a766083003a2d923f6c650e0e37e7c50b9fea4c36
 AUX cairo-compmgr-0.2.93-glitz-tfp-undef.patch 397 RMD160 c24e9b49e7ce46fdf04181df5d3d16f93dec578e SHA1 d5a0cdc5234dc901c1a44cdcd18477eb1eb7d640 SHA256 0874b67a8b156fc073ff19bee06e825cc694f3f172e77c9c5b2ff8083475cc0c
 DIST cairo-compmgr-0.2.93.tar.gz 832806 RMD160 77e84c4996cabad70b729c1dfbbb94848669cf19 SHA1 0d4c3b8c98487c4c1ad63c10f5658578ec0bd723 SHA256 6cd4552cfa572ca1db593e0cbcd4b4089e613e6409e23e28d93bdd2e6243b05c
-EBUILD cairo-compmgr-0.2.93.ebuild 750 RMD160 60cafbed9be8884f9fdcee25103ab93387331ae8 SHA1 7ffdac7293204f984ee527b2a10bc8ba8361a85d SHA256 9e3747b86a684a37c2690d97d25b02847c59d68dc5d6a5a480bf4f916ce68a64
-MISC ChangeLog 405 RMD160 ce611ff975ba0dc996d9e1852aee06a27b7c6579 SHA1 9253cd043dac03c765ac17246109e80247466cef SHA256 b93987a2f3a1031ccf6b1c5ad1fcb7078773fec6e63d1458ac129615449361d0
+EBUILD cairo-compmgr-0.2.93.ebuild 733 RMD160 7627dc9b85c9915c7ac38319840d01355f27a65e SHA1 74a855a4382fd17ecaf10d5264b6c8b1e6b5ee45 SHA256 2945ab4bd4cf5ed804273b4870ff653d296f0d1d3a927cedcd44bb9cf9e63c5d
+MISC ChangeLog 527 RMD160 cad0a39b840aca4e443312abc413753d462b4b3e SHA1 4978a3bd7a74c08af0dacba814499f9139acd362 SHA256 409ef1e98cf94c89e3c827cd293a4dda4359266193f121909614b4d853e94fec
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/x11-wm/cairo-compmgr/cairo-compmgr-0.2.93.ebuild b/x11-wm/cairo-compmgr/cairo-compmgr-0.2.93.ebuild
index e4db19c0c1d07a66ac4f43055a387f3b9479bb7e..2395d63841be290f8a3b522b9174255dfe0d11a5 100644 (file)
--- a/x11-wm/cairo-compmgr/cairo-compmgr-0.2.93.ebuild
+++ b/x11-wm/cairo-compmgr/cairo-compmgr-0.2.93.ebuild
@@ -21,9 +21,7 @@ RDEPEND="x11-libs/gtk+:2
 DEPEND="${RDEPEND}
        >=x11-proto/glproto-1.4.9"
 
-pkg_setup() {
-       G2CONF="--disable-glitz --disable-glitz-tfp --enable-shave"
-}
+G2CONF="--disable-glitz --disable-glitz-tfp --enable-shave"
 
 src_prepare() {
        epatch "${FILESDIR}/${P}-glitz-tfp-undef.patch"