Add check for deprecated guile USE flag, in order to compile with recent guile versio...

Package-Manager: portage-2.1.2.2

diff --git a/x11-misc/xbindkeys/ChangeLog b/x11-misc/xbindkeys/ChangeLog
index daf7cd360dfff225d88089e93e6aa39e5cffccb6..1747fbebfc336412f0e4ddf90689abbe5f67c1fb 100644 (file)
--- a/x11-misc/xbindkeys/ChangeLog
+++ b/x11-misc/xbindkeys/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xbindkeys
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbindkeys/ChangeLog,v 1.47 2007/02/18 20:55:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbindkeys/ChangeLog,v 1.48 2007/03/14 01:18:50 troll Exp $
+
+  14 Mar 2007; Przemysław Maciąg <troll@gentoo.org>
+  xbindkeys-1.7.3.ebuild, xbindkeys-1.8.0.ebuild:
+  Add check for compilation with guile-1.8 (see #163650). Thx to
+  degrenier@easyconnect.fr
 
   18 Feb 2007; Fabian Groffen <grobian@gentoo.org> xbindkeys-1.7.3.ebuild,
   xbindkeys-1.8.0.ebuild:

diff --git a/x11-misc/xbindkeys/Manifest b/x11-misc/xbindkeys/Manifest
index 4ea05e711bec5bf8917e4cfcb160b0692594ec0e..3529bcbc61f27818086c718d53e2c3499d0dfaa2 100644 (file)
--- a/x11-misc/xbindkeys/Manifest
+++ b/x11-misc/xbindkeys/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xbindkeys-1.7.3.tar.gz 110561 RMD160 134207d4370c98f74d39aeb0cf79d94cbbaeae38 SHA1 ccbc30d27d9a65cf2531c41e5d2db106e9029e7a SHA256 73a73cd934629b54bba23653ce6f9aa78abda13a8a027387da1ab37e2d272d14
 DIST xbindkeys-1.8.0.tar.gz 129930 RMD160 09ff8520b2b8865ae2cd7218b9acf2a87ed29286 SHA1 155a5c3479b192f875fff7ee23890b6108ebaca7 SHA256 c422637814d76cf6f85acc9b3372fede6ea7295b2c31884ac68ee4833cf06f79
-EBUILD xbindkeys-1.7.3.ebuild 889 RMD160 fb6fc9a0d682ed3cfbf919c54c447fe6585f6c47 SHA1 484a8544eead1049943d65e2a39607421bade260 SHA256 d491bfa7845bf077cc09c8b0d2d24b8828cf2fa7dd597b3f8f7796b5906ffb50
-MD5 32b33b968994b11977b07c0822c0c0c0 xbindkeys-1.7.3.ebuild 889
-RMD160 fb6fc9a0d682ed3cfbf919c54c447fe6585f6c47 xbindkeys-1.7.3.ebuild 889
-SHA256 d491bfa7845bf077cc09c8b0d2d24b8828cf2fa7dd597b3f8f7796b5906ffb50 xbindkeys-1.7.3.ebuild 889
-EBUILD xbindkeys-1.8.0.ebuild 893 RMD160 e73874c74f452d27ff18ea08ac41e7e99341688d SHA1 34590a1c63bf72b16e5f1dd1155e424db648506a SHA256 f78dab59fae1703f083c254a26402c0f9ea10275b042ae7bc6234616ca6eb1d9
-MD5 239bf52295642e350098384cff23fcab xbindkeys-1.8.0.ebuild 893
-RMD160 e73874c74f452d27ff18ea08ac41e7e99341688d xbindkeys-1.8.0.ebuild 893
-SHA256 f78dab59fae1703f083c254a26402c0f9ea10275b042ae7bc6234616ca6eb1d9 xbindkeys-1.8.0.ebuild 893
-MISC ChangeLog 5941 RMD160 fecc22243347ec15f1d0538c2d9bcfdac7128b7c SHA1 28ab5b613447691cd456414f70345c376a9f0448 SHA256 2dab6d883d2acee3f8a9ae73539945761cdcdbaaf8fb0aca3a7009e16ab79a55
-MD5 c173a57a593c6c5fa9dc6d36dfc17f3d ChangeLog 5941
-RMD160 fecc22243347ec15f1d0538c2d9bcfdac7128b7c ChangeLog 5941
-SHA256 2dab6d883d2acee3f8a9ae73539945761cdcdbaaf8fb0aca3a7009e16ab79a55 ChangeLog 5941
+EBUILD xbindkeys-1.7.3.ebuild 1285 RMD160 c44da5aa8e64554fdeb82a7c44cf4e97a3b08612 SHA1 d8d68063fb475fbad98cfeedca91cfba328cceca SHA256 c0da39abbe0342880ae85118681613ae0310d6473101e23fcc07faa3ad8b9afd
+MD5 0d8930dd385c96313e546118953bb1b6 xbindkeys-1.7.3.ebuild 1285
+RMD160 c44da5aa8e64554fdeb82a7c44cf4e97a3b08612 xbindkeys-1.7.3.ebuild 1285
+SHA256 c0da39abbe0342880ae85118681613ae0310d6473101e23fcc07faa3ad8b9afd xbindkeys-1.7.3.ebuild 1285
+EBUILD xbindkeys-1.8.0.ebuild 1289 RMD160 084959bbc8f845973cf3ef0b18ea06a5d1ea7342 SHA1 a8fdf03ea5d8a9ce675b62b95829aae18ce531ff SHA256 d7b923b3cbc43a1c94640f81fe3a4b2ab500c77a33d2b15fe3375ff78dc033c6
+MD5 e2536077923d6da92a9916d63fd94435 xbindkeys-1.8.0.ebuild 1289
+RMD160 084959bbc8f845973cf3ef0b18ea06a5d1ea7342 xbindkeys-1.8.0.ebuild 1289
+SHA256 d7b923b3cbc43a1c94640f81fe3a4b2ab500c77a33d2b15fe3375ff78dc033c6 xbindkeys-1.8.0.ebuild 1289
+MISC ChangeLog 6136 RMD160 e5dd1870485e3ab6cc97fb24b1e5a2bcdc118cd7 SHA1 ea108f07d09ad62e519edc2cab2591c7d256548f SHA256 47a009f0788e5611619ff1a0e6fcd3ac8f2d000438f08507efd467ea235e05b7
+MD5 d478e8e82138e3502f8348402d50f80f ChangeLog 6136
+RMD160 e5dd1870485e3ab6cc97fb24b1e5a2bcdc118cd7 ChangeLog 6136
+SHA256 47a009f0788e5611619ff1a0e6fcd3ac8f2d000438f08507efd467ea235e05b7 ChangeLog 6136
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -22,3 +25,10 @@ SHA256 ef1e6e13f6dbae2c9999506620b8266e82a7db8e5f8c0bee13c8c046712a0eb8 files/di
 MD5 c8558c7bf6dd45592f61f6d0c1a57474 files/digest-xbindkeys-1.8.0 247
 RMD160 d982fa0dff414c877b70704aeb3db42dc2a0bd58 files/digest-xbindkeys-1.8.0 247
 SHA256 95e6266a65b392a57453f7fd8e6340422f22c6c56c09366c3758d60186d6433b files/digest-xbindkeys-1.8.0 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF91DxexDpKttj3ykRAs/TAJ4zdymjzJZs4YCV8cxFfSbLF9Cl3wCfcASY
+6K+wcEshJis4ST0JNwt8xHg=
+=GiZY
+-----END PGP SIGNATURE-----

diff --git a/x11-misc/xbindkeys/xbindkeys-1.7.3.ebuild b/x11-misc/xbindkeys/xbindkeys-1.7.3.ebuild
index 18aa95945a03a6406c3d63741de4e80fe27926e5..0ccaa0eaca5dca0a3b7c9da6da515c521ea45827 100644 (file)
--- a/x11-misc/xbindkeys/xbindkeys-1.7.3.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.7.3.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbindkeys/xbindkeys-1.7.3.ebuild,v 1.9 2007/02/18 20:55:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbindkeys/xbindkeys-1.7.3.ebuild,v 1.10 2007/03/14 01:18:50 troll Exp $
+
+inherit eutils
 
 IUSE="guile tk"
 
 DESCRIPTION="Tool for launching commands on keystrokes"
 SRC_URI="http://hocwp.free.fr/xbindkeys/${P}.tar.gz"
 HOMEPAGE="http://hocwp.free.fr/xbindkeys/"
+
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 SLOT="0"
@@ -14,26 +17,28 @@ SLOT="0"
 RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
        guile? ( dev-scheme/guile )
        tk? ( dev-lang/tk )"
-
 DEPEND="${RDEPEND}
        || ( x11-proto/xproto virtual/x11 )"
 
-src_compile() {
+pkg_setup() {
+       if use guile && has_version ">=dev-scheme/guile-1.8" \
+               && ! built_with_use ">=dev-scheme/guile-1.8" deprecated
+       then
+               eerror "In order to compile xbindkeys with guile-1.8 or higher, you need"
+               eerror "to recompile dev-scheme/guile with the \"deprecated\" USE flag."
+               die "Please re-emerge dev-scheme/guile with USE=\"deprecated\"."
+       fi
+}
 
+src_compile() {
        local myconf
        use tk || myconf="${myconf} --disable-tk"
        use guile || myconf="${myconf} --disable-guile"
 
-       econf ${myconf} || die
-       emake DESTDIR=${D} || die
-
-
+       econf ${myconf} || die "configure failed"
+       emake DESTDIR=${D} || die "make failed"
 }
 
 src_install() {
-
-       emake DESTDIR=${D} \
-               BINDIR=/usr/bin install || die "Installation failed"
-
+       make DESTDIR=${D} BINDIR=/usr/bin install || die "make install failed"
 }
-

diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.0.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.0.ebuild
index f8e0920718a17a7be8ebe6af5ab0b2be4260e2dd..2504c01270b372b5de752f2491973ecd3b7dd831 100644 (file)
--- a/x11-misc/xbindkeys/xbindkeys-1.8.0.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.0.ebuild
@@ -1,38 +1,44 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbindkeys/xbindkeys-1.8.0.ebuild,v 1.2 2007/02/18 20:55:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbindkeys/xbindkeys-1.8.0.ebuild,v 1.3 2007/03/14 01:18:50 troll Exp $
+
+inherit eutils
+
+IUSE="guile tk"
 
 DESCRIPTION="Tool for launching commands on keystrokes"
 SRC_URI="http://hocwp.free.fr/xbindkeys/${P}.tar.gz"
 HOMEPAGE="http://hocwp.free.fr/xbindkeys/"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 
-IUSE="guile tk"
-
 RDEPEND="|| ( x11-libs/libX11 virtual/x11 )
        guile? ( dev-scheme/guile )
        tk? ( dev-lang/tk )"
-
 DEPEND="${RDEPEND}
        || ( x11-proto/xproto virtual/x11 )"
 
-src_compile() {
+pkg_setup() {
+       if use guile && has_version ">=dev-scheme/guile-1.8" \
+               && ! built_with_use ">=dev-scheme/guile-1.8" deprecated
+       then
+               eerror "In order to compile xbindkeys with guile-1.8 or higher, you need"
+               eerror "to recompile dev-scheme/guile with the \"deprecated\" USE flag."
+               die "Please re-emerge dev-scheme/guile with USE=\"deprecated\"."
+       fi
+}
 
+src_compile() {
        local myconf
        use tk || myconf="${myconf} --disable-tk"
        use guile || myconf="${myconf} --disable-guile"
 
-       econf ${myconf} || die
-       emake DESTDIR=${D} || die
-
+       econf ${myconf} || die "configure failed"
+       emake DESTDIR=${D} || die "make failed"
 }
 
 src_install() {
-
-       emake DESTDIR=${D} \
-               BINDIR=/usr/bin install || die "Installation failed"
-
+       make DESTDIR=${D} BINDIR=/usr/bin install || die "make install failed"
 }