Die if imlib2 is compiled without X in USE (bug #163762).

Package-Manager: portage-2.1.2-r4

diff --git a/x11-misc/idesk/ChangeLog b/x11-misc/idesk/ChangeLog
index e6549dff0813a94929832145ad0b5b174c153f73..81a25f6ea8ab21394658db882c27ae69fef3da3e 100644 (file)
--- a/x11-misc/idesk/ChangeLog
+++ b/x11-misc/idesk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/idesk
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/ChangeLog,v 1.49 2006/07/11 08:42:36 nelchael Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/ChangeLog,v 1.50 2007/01/28 19:36:06 nelchael Exp $
+
+  28 Jan 2007; Krzysiek Pawlik <nelchael@gentoo.org> idesk-0.7.5-r1.ebuild:
+  Die if imlib2 is compiled without X in USE (bug #163762).
 
   11 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> -idesk-0.5.6.ebuild,
   -idesk-0.7.4.ebuild:

diff --git a/x11-misc/idesk/Manifest b/x11-misc/idesk/Manifest
index 6f456f8422e6f5c98a7e5fbb7d8186473a425dd0..3547346edd3ebc1c3ade2dccad771d6fbf84ed7d 100644 (file)
--- a/x11-misc/idesk/Manifest
+++ b/x11-misc/idesk/Manifest
@@ -17,15 +17,15 @@ AUX ideskrc05.5 7091 RMD160 705d476dabb143677d8d40b13e432ecc0f12b2ac SHA1 0633f2
 MD5 d6f779298131bfbc97f59b71dea6e5ce files/ideskrc05.5 7091
 RMD160 705d476dabb143677d8d40b13e432ecc0f12b2ac files/ideskrc05.5 7091
 SHA256 26aa553a178b31067bee04800421ce7b187826ed29fb03fb619ae8f1c52139c8 files/ideskrc05.5 7091
-DIST idesk-0.7.5.tar.bz2 185858 RMD160 cef8fefc139dd96d6a7cf8c43637d9a504d2df14 SHA256 d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3
-EBUILD idesk-0.7.5-r1.ebuild 1092 RMD160 d053cae05c368dd0ac4f70fae28f12cdf3e4fbe2 SHA1 88f115972c2b3aa23e3d5cacd84a23a23bfedcb2 SHA256 e3b05db09aa6e53de2d3ca9384d2337fe2cbd5c2d07bf02c17268e38287368cd
-MD5 df8b22e5839ba9a16af9e28c9388efb3 idesk-0.7.5-r1.ebuild 1092
-RMD160 d053cae05c368dd0ac4f70fae28f12cdf3e4fbe2 idesk-0.7.5-r1.ebuild 1092
-SHA256 e3b05db09aa6e53de2d3ca9384d2337fe2cbd5c2d07bf02c17268e38287368cd idesk-0.7.5-r1.ebuild 1092
-MISC ChangeLog 6878 RMD160 b111e652e7618487cc964761fe72c8fc53767b22 SHA1 c673ee1d2d8d38d09d5f3dffc9690b67351652ec SHA256 b7271c9a8b766103bb81f6a75b7e5984c6e69a0556486354b476019d65afd5e0
-MD5 e836abdfc021aa0de200996ec5bca93f ChangeLog 6878
-RMD160 b111e652e7618487cc964761fe72c8fc53767b22 ChangeLog 6878
-SHA256 b7271c9a8b766103bb81f6a75b7e5984c6e69a0556486354b476019d65afd5e0 ChangeLog 6878
+DIST idesk-0.7.5.tar.bz2 185858 RMD160 cef8fefc139dd96d6a7cf8c43637d9a504d2df14 SHA1 d00a2183835f06ff29aca61efecd831edf19ba49 SHA256 d4b7ea5dcf6d49d83e2df9512d4c6388f11632a702b14f42a1bc6bffb617b3d3
+EBUILD idesk-0.7.5-r1.ebuild 1316 RMD160 faf3465d7843947c1662ffb748ddce35f875f2dd SHA1 14a6c4527c1a3b47019b91ae13bc18eccc47128a SHA256 1a06b3ef16f9777339453ee489b24ed56d10df5b58719f4734b293a7a901cae4
+MD5 cc53e1fd679bfddb35182b5dac1a5102 idesk-0.7.5-r1.ebuild 1316
+RMD160 faf3465d7843947c1662ffb748ddce35f875f2dd idesk-0.7.5-r1.ebuild 1316
+SHA256 1a06b3ef16f9777339453ee489b24ed56d10df5b58719f4734b293a7a901cae4 idesk-0.7.5-r1.ebuild 1316
+MISC ChangeLog 7015 RMD160 069020de229451ad8016990ac442b31f3e86d219 SHA1 1a2210f79e11f2db5ea80d1143c34f50050fc143 SHA256 2e57b3b4c71e65e50118c0c5502fe8b3c66c593b3e29f27db5306c83d419b18a
+MD5 9b9d72af1e34fc25e53e2410a4fcecb9 ChangeLog 7015
+RMD160 069020de229451ad8016990ac442b31f3e86d219 ChangeLog 7015
+SHA256 2e57b3b4c71e65e50118c0c5502fe8b3c66c593b3e29f27db5306c83d419b18a ChangeLog 7015
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -34,9 +34,9 @@ MD5 cca81d74e137b2eacce6e7ac670a3d8a files/digest-idesk-0.7.5-r1 238
 RMD160 e32522724b1a7e8d731bb0b34abb958174226eb5 files/digest-idesk-0.7.5-r1 238
 SHA256 a87f919e9f81cfe0a6554636d6907d0aa46a9b040c51e60558a08a389f35615d files/digest-idesk-0.7.5-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFEs2SXgo/w9rxVVVERApGXAJ9fLI+U/A46GzNuwZBXpFsifKTWVQCfX6UT
-UW3L2eCzs4+eNErSjnSsrcg=
-=ngNF
+iD8DBQFFvPssgo/w9rxVVVERAon4AKCY6oTYKERuh83fC+2BOvlCxqljIQCfQsuM
+oeQbmiTnvlYhH92C7kH59KI=
+=ff/W
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/idesk/idesk-0.7.5-r1.ebuild b/x11-misc/idesk/idesk-0.7.5-r1.ebuild
index dd14e74f975ed11b4deadd65fca9b855f822995a..e4f8403e7dc1ba546c635628bac000251e4436c7 100644 (file)
--- a/x11-misc/idesk/idesk-0.7.5-r1.ebuild
+++ b/x11-misc/idesk/idesk-0.7.5-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/idesk-0.7.5-r1.ebuild,v 1.7 2006/05/23 20:29:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/idesk/idesk-0.7.5-r1.ebuild,v 1.8 2007/01/28 19:36:06 nelchael Exp $
+
+inherit eutils
 
 DESCRIPTION="Utility to place icons on the root window"
 HOMEPAGE="http://idesk.sourceforge.net/"
@@ -22,6 +24,15 @@ DEPEND=">=media-libs/imlib2-1.1.2.20040912
        media-libs/libart_lgpl
        x11-libs/startup-notification"
 
+pkg_setup() {
+
+       if ! built_with_use media-libs/imlib2 X; then
+               eerror "You need to have media-libs/imlib2 compiled with USE=\"X\""
+               die "You need to have media-libs/imlib2 compiled with USE=\"X\""
+       fi
+
+}
+
 src_unpack() {
        unpack "${A}"
        cd "${S}"