Slotted gtk+ depend and EAPI=2 bump to support it.

Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64

6 files changed, 44 insertions, 41 deletions

diff --git a/net-im/kf/ChangeLog b/net-im/kf/ChangeLog
index fc8b18b4a90a..e0f2d0afc490 100644
--- a/net-im/kf/ChangeLog
+++ b/net-im/kf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/kf
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kf/ChangeLog,v 1.13 2008/03/14 10:21:54 phreak Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kf/ChangeLog,v 1.14 2011/03/02 21:03:56 signals Exp $
+
+  02 Mar 2011; Kevin McCarthy <signals@gentoo.org> kf-0.1.3.ebuild,
+  kf-0.1.4.1.ebuild, kf-0.1.5.ebuild, kf-0.5.4.1.ebuild:
+  Slotted gtk+ depend and EAPI=2 bump to support it.
 
   14 Mar 2008; Christian Heim <phreak@gentoo.org> kf-0.1.3.ebuild,
   kf-0.1.4.1.ebuild, kf-0.1.5.ebuild, kf-0.5.4.1.ebuild:
diff --git a/net-im/kf/Manifest b/net-im/kf/Manifest
index b054da037a72..846389c4b834 100644
--- a/net-im/kf/Manifest
+++ b/net-im/kf/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kf-0.1.4.1-gtkspell-2.0.4-compatibility.diff 2125 RMD160 7f4208c64965738eddd807bba418055f3d84a286 SHA1 aa791b3f010d299cb4b8d2610a220278b01bedab SHA256 e592028774156184ee13c1913932fae702226d0183e9679cc67d8e7fa1dc67f4
 AUX kf-0.5.4.1-typedef_KfJispManager.patch 309 RMD160 15b5242c26f22b2ad5184d588d7084b23a201908 SHA1 fa53029474f2c88f4b65b8e4d2c534b5db65a546 SHA256 515f29eb7b0024c74aa86b4457d56c274b91cccfb4ee55ba553fbcf4e641e5f3
 DIST kf-0.1.3.tar.gz 183269 RMD160 ff86a1ff3df8e8953290c9fbd9d17a5bca3a3215 SHA1 44d843fccd3e205b0d27e162b005fb568ef3fc12 SHA256 444cfeea19be5912cd537bfb24bfa24efd022ba03608f8140b42d0e272cfb5cf
 DIST kf-0.1.4.1.tar.gz 245539 RMD160 af29ad1f7ccbebc35af633800857eaef03cbd26f SHA1 05df85adca14c65be3b052121aa19ef9f3b2c2c8 SHA256 3ce8afdf544f58de1fc71bb4f5ff3ab4d4a11b2f5cf6d7214adeca25418c5b63
 DIST kf-0.1.5.tar.gz 255253 RMD160 e80cb1b7fab30f4a14056a525ffefba886bebbc8 SHA1 0ec398a0ea524a8e4447aa35b4a05f63461656c2 SHA256 67df6c24b0a18dba7bc724810c2c62f8e7b871eaa2c31d0c84d03cb2908278da
 DIST kf-0.5.4.1.tar.gz 512040 RMD160 3470e8eba7d5586bd5248e4deed0d40258e2a77a SHA1 c74a525f4ea02233a75b8a588242e04d3ac45b9d SHA256 70068af405b4a18c84babded6a1d3fee1b87687d725c1c0456570f06c3841ef3
-EBUILD kf-0.1.3.ebuild 612 RMD160 96ce49359833b4d9e7f3ad4bdf6cc16d6cb641a1 SHA1 9aaa4bc8cfd6e8ed1cb3b56ca24bdeb9df1d65fc SHA256 2b4ce3232c499562379a803f8b59a7385b3eaff0dd1fb4fd2b2b2d02ba2f381d
-EBUILD kf-0.1.4.1.ebuild 875 RMD160 cdeba44db2e00bc852a65efbcf65bce2be919e18 SHA1 324d5e288df1a861f2614c41945fc213afa4973e SHA256 dbdc5d3258d568c734006ea7f2e4ce8ea4f4fcffdbdac4a66abcd8e86bfd908f
-EBUILD kf-0.1.5.ebuild 893 RMD160 afdd6c6663820a6a1239404143a2774f2e1e2a93 SHA1 a24727b49dba51f10dcf70efd50999dc4fe448d2 SHA256 f392ed9eab018d20f5861a2745d2b4414349b9bf8abfd75e07cf2eb3ede46f12
-EBUILD kf-0.5.4.1.ebuild 954 RMD160 aac8c0f0e08c898624c6834bf7abb8a5d67f87a6 SHA1 2a639abd9eb43e9c83390a0eeca03abf68c4df0a SHA256 6470da865668bdf8bfaca2f292e967c877226434919933f4af6597ff4ae11566
-MISC ChangeLog 1953 RMD160 390bf7fe040fb7d99ec05250726e674bc52fd110 SHA1 059cdd379031eb61bf47614fff7ed84a53e72622 SHA256 75e00d6163d80e99a7b14a7da28f3854b40b3c5cd967bb2bb602ca5299995f3a
+EBUILD kf-0.1.3.ebuild 619 RMD160 6b667dbef713d0df17e412c2ccda5c85b5abee1b SHA1 3e73bd298efcc1817282d02726de7e980bf37632 SHA256 a7a5bc5d7ef83046ba3908383a140937b6d60aec0759f45ec4a93e54dcca5bb9
+EBUILD kf-0.1.4.1.ebuild 890 RMD160 076148b7bce6da1a2cd6020b565a9790d25c4941 SHA1 57a2a41a8bebff92f4ff903ca798106a95f1d3eb SHA256 e87f268a745028ab224b967dd4453a1a9250e32b4b3d32c90dc1cf6d80f064e2
+EBUILD kf-0.1.5.ebuild 897 RMD160 1fe132a27a93080b0982e3c3dea6cb5a0f7b4d69 SHA1 f882ddee72ee2adf7e418d1d937ac11b36f6bcfe SHA256 daa3611ff2bb01ead3d677001f2b3dda0f60f9c38e213ada4a5ad1150137411b
+EBUILD kf-0.5.4.1.ebuild 958 RMD160 febd2024efa980288b4dabef58598cb0c628c1e9 SHA1 b75a8a300c0b4f7db4d68f6b37ed9bbdeee094ea SHA256 da74e67e594a9f48a9e4cdc33c8a0beed369ac9fb72442495a8ed6d252144a92
+MISC ChangeLog 2133 RMD160 49f5776b9e2e9f8b24fede486785aa1f48d82177 SHA1 488dfaa0164b41fe518c21b2e1536fe075327222 SHA256 d197a43127a84707c8b4d424e469b52fb6cc0ec4c9764a28408a007627fefed5
 MISC metadata.xml 546 RMD160 78200ddbd2b59450fc03ae04891a17c02069c909 SHA1 d5e0a39cea870fbf0c1601c499cef4ef0d8fdb8d SHA256 850db9d5a5f8f00eba96bbe9396c4fcc0316068e1fe3ccf3bcd5d0fa81ed7b76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH2lHJyuNVb5qfaOYRAhQdAJ9vDCE32RTCNrPzpQpb/b32YeCE3wCeIM0c
-hWSgIUqsgZB+XtC9L4VXqRM=
-=s0B5
------END PGP SIGNATURE-----
diff --git a/net-im/kf/kf-0.1.3.ebuild b/net-im/kf/kf-0.1.3.ebuild
index c22a8690eef6..c3a593b0010a 100644
--- a/net-im/kf/kf-0.1.3.ebuild
+++ b/net-im/kf/kf-0.1.3.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kf/kf-0.1.3.ebuild,v 1.6 2008/03/14 10:21:54 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kf/kf-0.1.3.ebuild,v 1.7 2011/03/02 21:03:56 signals Exp $
+
+EAPI=2
 
 DESCRIPTION="kf is a simple Jabber messenger."
 HOMEPAGE="http://www.habazie.rams.pl/kf/"
 SRC_URI="http://www.habazie.rams.pl/kf/files/${P}.tar.gz"
 LICENSE="GPL-2"
-DEPEND=">=x11-libs/gtk+-2
+DEPEND="x11-libs/gtk+:2
 	>=net-libs/loudmouth-0.15.1
 	>=gnome-base/libglade-2"
 SLOT="0"
diff --git a/net-im/kf/kf-0.1.4.1.ebuild b/net-im/kf/kf-0.1.4.1.ebuild
index a6b84cb24fc8..08c931dd38ed 100644
--- a/net-im/kf/kf-0.1.4.1.ebuild
+++ b/net-im/kf/kf-0.1.4.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kf/kf-0.1.4.1.ebuild,v 1.5 2008/03/14 10:21:54 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kf/kf-0.1.4.1.ebuild,v 1.6 2011/03/02 21:03:56 signals Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="kf is a simple Jabber messenger."
@@ -10,19 +11,21 @@ SRC_URI="http://www.habazie.rams.pl/kf/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="spell"
-DEPEND=">=x11-libs/gtk+-2
+DEPEND="x11-libs/gtk+:2
 	>=net-libs/loudmouth-0.16
 	>=gnome-base/libglade-2
 	spell? ( >=app-text/gtkspell-2.0.4 )"
 KEYWORDS="~x86 ~ppc ~sparc"
 
-src_unpack() {
-	unpack ${A}
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gtkspell-2.0.4-compatibility.diff
 }
 
-src_compile() {
+src_configure() {
 	econf `use_enable spell gtkspell` || die 'econf failed'
+}
+
+src_compile() {
 	emake || die 'emake failed'
 }
 
diff --git a/net-im/kf/kf-0.1.5.ebuild b/net-im/kf/kf-0.1.5.ebuild
index b63916af27ca..5b13e6909742 100644
--- a/net-im/kf/kf-0.1.5.ebuild
+++ b/net-im/kf/kf-0.1.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kf/kf-0.1.5.ebuild,v 1.2 2008/03/14 10:21:54 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kf/kf-0.1.5.ebuild,v 1.3 2011/03/02 21:03:56 signals Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="kf is a simple Jabber messenger."
@@ -10,20 +11,21 @@ SRC_URI="http://www.habazie.rams.pl/kf/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="spell"
-DEPEND=">=x11-libs/gtk+-2
+DEPEND="x11-libs/gtk+:2
 	>=net-libs/loudmouth-0.16
 	>=gnome-base/libglade-2
 	spell? ( >=app-text/gtkspell-2.0.4 )"
 KEYWORDS="~x86 ~ppc ~sparc"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.1.4.1-gtkspell-2.0.4-compatibility.diff
 }
 
-src_compile() {
+src_configure() {
 	econf `use_enable spell gtkspell` || die 'econf failed'
+}
+
+src_install() {
 	emake || die 'emake failed'
 }
 
diff --git a/net-im/kf/kf-0.5.4.1.ebuild b/net-im/kf/kf-0.5.4.1.ebuild
index 66b0bffa2bf1..5e463831574e 100644
--- a/net-im/kf/kf-0.5.4.1.ebuild
+++ b/net-im/kf/kf-0.5.4.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kf/kf-0.5.4.1.ebuild,v 1.2 2008/03/14 10:21:54 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kf/kf-0.5.4.1.ebuild,v 1.3 2011/03/02 21:03:56 signals Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="kf is a simple Jabber messenger."
@@ -10,23 +11,24 @@ SRC_URI="http://files.jabberstudio.org/kf/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="spell debug"
-DEPEND=">=x11-libs/gtk+-2
+DEPEND="x11-libs/gtk+:2
 	>=net-libs/loudmouth-0.16
 	>=gnome-base/libglade-2
 	spell? ( >=app-text/gtkspell-2.0.4 )"
 
 KEYWORDS="~x86 ~ppc ~sparc"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# wrong use of typedef struct _KfJispManager
 	epatch "${FILESDIR}"/${P}-typedef_KfJispManager.patch
 }
-src_compile() {
+
+src_configure() {
 	econf $(use_enable spell gtkspell) \
 		  $(use_enable debug) || die 'econf failed'
+}
+
+src_compile() {
 	emake || die 'emake failed'
 }